projects/ldc: gen/toir.cpp comparison

comparison gen/toir.cpp @ 308:6b62e8cdf970 trunk

[svn r329] Cleaned up a bunch of array code for handling special slice cases no longer relevant.

author	lindquist
date	Sat, 28 Jun 2008 05:57:16 +0200
parents	895e1b50cf2a
children	a498b736a0bd

comparison

equal deleted inserted replaced

-:7ade5e035beb
+:6b62e8cdf970
 DValue* SliceExp::toElem(IRState* p)
 {
 Logger::print("SliceExp::toElem: %s | %s\n", toChars(), type->toChars());
 LOG_SCOPE;
-Type* t = DtoDType(type);
+// this is the new slicing code, it's different in that a full slice will no longer retain the original pointer.
-Type* e1type = DtoDType(e1->type);
+// but this was broken if there *was* no original pointer, ie. a slice of a slice...
+// now all slices have *both* the 'len' and 'ptr' fields set to != null.
-DValue* v = e1->toElem(p);
-LLValue* vmem = v->getRVal();
+// value being sliced
-assert(vmem);
+LLValue* elen;
+LLValue* eptr;
-LLValue* zero = DtoConstUint(0);
+DValue* e = e1->toElem(p);
-LLValue* one = DtoConstUint(1);
+// handle pointer slicing
-LLValue* emem = 0;
+Type* etype = e1->type->toBasetype();
-LLValue* earg = 0;
+if (etype->ty == Tpointer)
+{
-// partial slice
+assert(lwr);
+eptr = e->getRVal();
+}
+// array slice
+else
+{
+eptr = DtoArrayPtr(e);
+}
+// has lower bound, pointer needs adjustment
 if (lwr)
 {
+// must have upper bound too then
 assert(upr);
-p->arrays.push_back(v);
+// get bounds (make sure $ works)
+p->arrays.push_back(e);
 DValue* lo = lwr->toElem(p);
-bool lwr_is_zero = false;
-if (DConstValue* cv = lo->isConst())
-{
-assert(llvm::isa<llvm::ConstantInt>(cv->c));
-if (e1type->ty == Tpointer) {
-emem = v->getRVal();
-}
-else if (e1type->ty == Tarray) {
-LLValue* tmp = DtoGEP(vmem,zero,one);
-emem = DtoLoad(tmp);
-}
-else if (e1type->ty == Tsarray) {
-emem = DtoGEP(vmem,zero,zero);
-}
-else
-assert(emem);
-llvm::ConstantInt* c = llvm::cast<llvm::ConstantInt>(cv->c);
-if (!(lwr_is_zero = c->isZero())) {
-emem = DtoGEP1(emem,cv->c);
-}
-}
-else
-{
-if (e1type->ty == Tarray) {
-LLValue* tmp = DtoGEP(vmem,zero,one);
-tmp = DtoLoad(tmp);
-emem = DtoGEP1(tmp,lo->getRVal());
-}
-else if (e1type->ty == Tsarray) {
-emem = DtoGEP(vmem,zero,lo->getRVal());
-}
-else if (e1type->ty == Tpointer) {
-emem = DtoGEP1(v->getRVal(),lo->getRVal());
-}
-else {
-Logger::println("type = %s", e1type->toChars());
-assert(0);
-}
-}
 DValue* up = upr->toElem(p);
 p->arrays.pop_back();
+LLValue* vlo = lo->getRVal();
-if (DConstValue* cv = up->isConst())
+LLValue* vup = up->getRVal();
-{
-assert(llvm::isa<llvm::ConstantInt>(cv->c));
+// offset by lower
-if (lwr_is_zero) {
+eptr = DtoGEP1(eptr, vlo);
-earg = cv->c;
-}
+// adjust length
-else {
+elen = p->ir->CreateSub(vup, vlo, "tmp");
-if (lo->isConst()) {
+}
-LLConstant* clo = llvm::cast<llvm::Constant>(lo->getRVal());
+// no bounds or full slice -> just convert to slice
-LLConstant* cup = llvm::cast<llvm::Constant>(cv->c);
-earg = llvm::ConstantExpr::getSub(cup, clo);
-}
-else {
-earg = llvm::BinaryOperator::createSub(cv->c, lo->getRVal(), "tmp", p->scopebb());
-}
-}
-}
-else
-{
-if (lwr_is_zero) {
-earg = up->getRVal();
-}
-else {
-earg = llvm::BinaryOperator::createSub(up->getRVal(), lo->getRVal(), "tmp", p->scopebb());
-}
-}
-}
-// full slice
 else
 {
-emem = vmem;
+assert(e1->type->toBasetype()->ty != Tpointer);
-}
+elen = DtoArrayLen(e);
+}
-if (earg) Logger::cout() << "slice exp result, length = " << *earg << '\n';
-Logger::cout() << "slice exp result, ptr = " << *emem << '\n';
+return new DSliceValue(type, elen, eptr);
-return new DSliceValue(type,earg,emem);
 }
 //////////////////////////////////////////////////////////////////////////////////////////
 DValue* CmpExp::toElem(IRState* p)
 LOG_SCOPE;
 DValue* u = e1->toElem(p);
 DValue* v = e2->toElem(p);
+Type* t1 = e1->type->toBasetype();
+// handle dynarray specially
+if (t1->ty == Tarray)
+return new DImValue(type, DtoDynArrayIs(op,u,v));
 LLValue* l = u->getRVal();
 LLValue* r = v->getRVal();
-Type* t1 = DtoDType(e1->type);
 LLValue* eval = 0;
-if (t1->ty == Tarray) {
+if (t1->ty == Tdelegate) {
-if (v->isNull()) {
-r = NULL;
-}
-else {
-assert(l->getType() == r->getType());
-}
-eval = DtoDynArrayIs(op,l,r);
-}
-else if (t1->ty == Tdelegate) {
 if (v->isNull()) {
 r = NULL;
 }
 else {
 assert(l->getType() == r->getType());
 {
 DValue* topval = p->topexp()->v;
 // slice assignment (copy)
 if (DSliceValue* s = topval->isSlice())
 {
-dstMem = s->ptr;
+assert(s->ptr->getType()->getContainedType(0) == llStoType->getContainedType(0));
+dstMem = DtoBitCast(s->ptr, getPtrToType(llStoType));
 sliceInPlace = true;
-assert(s->len == NULL);
+// FIXME: insert bounds checks
 }
 // static array assignment
 else if (topval->getType()->toBasetype()->ty == Tsarray)
 {
 dstMem = topval->getLVal();

Mercurial > projects > ldc

comparison gen/toir.cpp @ 308:6b62e8cdf970 trunk