Mercurial > projects > ldc

diff gen/arrays.cpp @ 945:03d7c4aac654

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SWITCHED TO LLVM 2.5 ! Applied patch from ticket #129 to compile against latest LLVM. Thanks Frits van Bommel. Fixed implicit return by asm block at the end of a function on x86-32. Other architectures will produce an error at the moment. Adding support for new targets is fairly simple. Fixed return calling convention for complex numbers, ST and ST(1) were switched around. Added some testcases. I've run a dstress test and there are no regressions. However, the runtime does not seem to compile with symbolic debug information. -O3 -release -inline works well and is what I used for the dstress run. Tango does not compile, a small workaround is needed in tango.io.digest.Digest.Digest.hexDigest. See ticket #206 .
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Sun, 08 Feb 2009 05:26:54 +0100
parents 5e3bb0c3ea8b
children 8c73ff5f69e0
line wrap: on
line diff
--- a/gen/arrays.cpp	Sun Feb 08 05:14:24 2009 +0100
+++ b/gen/arrays.cpp	Sun Feb 08 05:26:54 2009 +0100
@@ -100,7 +100,7 @@
     // this simplifies codegen later on as llvm null's have no address!
     if (isaConstant(val) && isaConstant(val)->isNullValue())
     {
-        size_t X = getABITypeSize(val->getType());
+        size_t X = getTypePaddedSize(val->getType());
         LLValue* nbytes = gIR->ir->CreateMul(dim, DtoConstSize_t(X), ".nbytes");
         DtoMemSetZero(ptr, nbytes);
         return;
@@ -181,7 +181,7 @@
         assert(arrayelemty == valuety && "ArrayInit doesn't work on elem-initialized static arrays");
         args[0] = DtoBitCast(args[0], getVoidPtrType());
         args[2] = DtoBitCast(args[2], getVoidPtrType());
-        args.push_back(DtoConstSize_t(getABITypeSize(DtoType(arrayelemty))));
+        args.push_back(DtoConstSize_t(getTypePaddedSize(DtoType(arrayelemty))));
         break;
 
     default:
@@ -331,7 +331,7 @@
 {
     assert(e->len != 0);
     const LLType* t = e->ptr->getType()->getContainedType(0);
-    sz = gIR->ir->CreateMul(DtoConstSize_t(getABITypeSize(t)), e->len, "tmp");
+    sz = gIR->ir->CreateMul(DtoConstSize_t(getTypePaddedSize(t)), e->len, "tmp");
     return e->ptr;
 }
 
@@ -362,7 +362,7 @@
 {
     Logger::println("StaticArrayCopy");
 
-    size_t n = getABITypeSize(dst->getType()->getContainedType(0));
+    size_t n = getTypePaddedSize(dst->getType()->getContainedType(0));
     DtoMemCpy(dst, src, DtoConstSize_t(n));
 }
 
@@ -534,7 +534,7 @@
     src1 = gIR->ir->CreateGEP(src1,len1,"tmp");
 
     // memcpy
-    LLValue* elemSize = DtoConstSize_t(getABITypeSize(src2->getType()->getContainedType(0)));
+    LLValue* elemSize = DtoConstSize_t(getTypePaddedSize(src2->getType()->getContainedType(0)));
     LLValue* bytelen = gIR->ir->CreateMul(len2, elemSize, "tmp");
     DtoMemCpy(src1,src2,bytelen);
 
@@ -570,7 +570,7 @@
     src2 = DtoArrayPtr(e2);
 
     // first memcpy
-    LLValue* elemSize = DtoConstSize_t(getABITypeSize(src1->getType()->getContainedType(0)));
+    LLValue* elemSize = DtoConstSize_t(getTypePaddedSize(src1->getType()->getContainedType(0)));
     LLValue* bytelen = gIR->ir->CreateMul(len1, elemSize, "tmp");
     DtoMemCpy(mem,src1,bytelen);
 
@@ -613,7 +613,7 @@
 
         mem = gIR->ir->CreateGEP(mem,DtoConstSize_t(1),"tmp");
 
-        LLValue* elemSize = DtoConstSize_t(getABITypeSize(src1->getType()->getContainedType(0)));
+        LLValue* elemSize = DtoConstSize_t(getTypePaddedSize(src1->getType()->getContainedType(0)));
         LLValue* bytelen = gIR->ir->CreateMul(len1, elemSize, "tmp");
         DtoMemCpy(mem,src1,bytelen);
 
@@ -632,7 +632,7 @@
 
         src1 = DtoArrayPtr(e1);
 
-        LLValue* elemSize = DtoConstSize_t(getABITypeSize(src1->getType()->getContainedType(0)));
+        LLValue* elemSize = DtoConstSize_t(getTypePaddedSize(src1->getType()->getContainedType(0)));
         LLValue* bytelen = gIR->ir->CreateMul(len1, elemSize, "tmp");
         DtoMemCpy(mem,src1,bytelen);
 
@@ -769,8 +769,8 @@
     assert(elemty);
     assert(newelemty);
 
-    size_t esz = getABITypeSize(elemty);
-    size_t nsz = getABITypeSize(newelemty);
+    size_t esz = getTypePaddedSize(elemty);
+    size_t nsz = getTypePaddedSize(newelemty);
     if (esz == nsz)
         return len;