Changeset 720:e177ae483f8e

Timestamp:

10/22/08 18:34:46 (3 months ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>

branch:

default

Message:

Added inreg attribute where appropriate on x86 to follow ABI docs.
Removed now unnecessary temporary variable in StringExp?.

Files:

• dmd/mtype.c (modified) (2 diffs)
• dmd/mtype.h (modified) (1 diff)
• gen/functions.cpp (modified) (2 diffs)
• gen/tocall.cpp (modified) (2 diffs)
• gen/toir.cpp (modified) (1 diff)

dmd/mtype.c

@@ -2673 +2673 @@
-    this->usesNest = false;
-    this->retAttrs = 0;
+    this->thisAttrs = 0;
-}
-
@@ -2684 +2685 @@
-    t->usesNest = usesNest;
-    t->retAttrs = retAttrs;
+    t->thisAttrs = thisAttrs;
-    return t;
-}

dmd/mtype.h

@@ -440 +440 @@
-    bool usesNest;
-    unsigned retAttrs;
+    unsigned thisAttrs; // also used for nest
-};
-

gen/functions.cpp

@@ -172 +172 @@
-    llvm::FunctionType* functype = llvm::FunctionType::get(actualRettype, paramvec, isvararg);
-
+    // tell first param to be passed in a register if we can
+    // ONLY extern(D) functions !
+    if ((n > 0 || usesthis || usesnest) && f->linkage == LINKd)
+    {
+        // FIXME: Only x86 right now ...
+        if (global.params.cpu == ARCHx86)
+        {
+            // pass first param in EAX if it fits, is not floating point and is not a 3 byte struct.
+            // FIXME: struct are not passed in EAX yet
+
+            // if there is a implicit context parameter, pass it in EAX
+            if (usesthis || usesnest)
+            {
+                f->thisAttrs |= llvm::Attribute::InReg;
+            }
+            // otherwise check the first formal parameter
+            else
+            {
+                Argument* arg = Argument::getNth(f->parameters, 0);
+                Type* t = arg->type->toBasetype();
+
+                // 32bit ints, pointers, classes and static arrays are candidate for being passed in EAX
+                if ((arg->storageClass & STCin) &&
+                    ((t->isscalar() && !t->isfloating()) || t->ty == Tclass || t->ty == Tsarray) &&
+                    (t->size() <= PTRSIZE))
+                {
+                    arg->llvmAttrs |= llvm::Attribute::InReg;
+                }
+            }
+        }
+    }
+
+    // done
-    f->retInPtr = retinptr;
-    f->usesThis = usesthis;
@@ -348 +381 @@
-        PAWI.Index = 1;
-        PAWI.Attrs = llvm::Attribute::StructRet;
+        attrs.push_back(PAWI);
+    }
+
+    // set this/nest param attrs
+    if (f->thisAttrs)
+    {
+        PAWI.Index = f->retInPtr ? 2 : 1;
+        PAWI.Attrs = f->thisAttrs;
-        attrs.push_back(PAWI);
-    }

gen/tocall.cpp

@@ -258 +258 @@
-        ++argiter;
-        args.push_back(retvar);
+
+        // add attrs for hidden ptr
-        palist = palist.addAttr(1, llvm::Attribute::StructRet);
-    }
@@ -300 +302 @@
-            fatal();
-        }
+
+        // add attributes for context argument
+        if (tf->thisAttrs)
+            palist = palist.addAttr(retinptr?2:1, tf->thisAttrs);
-    }
-

gen/toir.cpp

@@ -374 +374 @@
-    if (dtype->ty == Tarray) {
-        LLConstant* clen = llvm::ConstantInt::get(DtoSize_t(),len,false);
-
-
-
+
-    }
-    else if (dtype->ty == Tsarray) {