Changeset 930:7985bb036db4

Timestamp:

02/03/09 15:46:46 (3 years ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Follow the D ABI and pass the last arg in a register if it is a struct that fits.

Files:

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

dmd/mtype.c

@@ -2692 +2692 @@
-    this->usesThis = false;
-    this->usesNest = false;
+    this->structInregArg = false;
-    this->retAttrs = 0;
-    this->thisAttrs = 0;
-    this->reverseParams = false;
-reverseIndex
+firstRealArg
-}
-
@@ -2709 +2710 @@
-    t->thisAttrs = thisAttrs;
-    t->reverseParams = reverseParams;
-reverseIndex = reverseIndex
+firstRealArg = firstRealArg
-    return t;
-}

dmd/mtype.h

@@ -439 +439 @@
-    bool usesThis;
-    bool usesNest;
+    bool structInregArg;
-    unsigned retAttrs;
-    unsigned thisAttrs; // also used for nest
+    // parameter index in the llvm function that contains the first not-implicit arg
+    size_t firstRealArg;
-
-    bool reverseParams;
-    size_t reverseIndex;
-};
-

gen/functions.cpp

@@ -102 +102 @@
-    }
-
+    // now that all implicit args are done, store the start of the real args
+    f->firstRealArg = paramvec.size();
+
-    // number of formal params
-    size_t n = Argument::dim(f->parameters);
@@ -115 +118 @@
-        {
-            f->reverseParams = true;
-            f->reverseIndex = paramvec.size();
-        }
-    }
@@ -178 +180 @@
-    if (f->reverseParams)
-    {
-
-
-
-
-
-
+
+
-
-#if X86_PASS_IN_EAX
-tell first param to be passed in a register if we can
+pass first param in EAX if it fits, is not floating point and is not a 3 byte struct.
-    // ONLY extern(D) functions !
-    if ((n > 0 || usesthis || usesnest) && f->linkage == LINKd)
@@ -193 +191 @@
-        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
-
-            int n_inreg = f->reverseParams ? n - 1 : 0;
-            Argument* arg = Argument::getNth(f->parameters, n_inreg);
@@ -210 +205 @@
-                Type* t = arg->type->toBasetype();
-
-
+
+
-                // are candidate for being passed in EAX
-                if (
@@ -217 +213 @@
-                    ((arg->storageClass & STCin) &&
-                     ((t->isscalar() && !t->isfloating()) ||
-
-
+
+
+
-                   )
-                {
-                    arg->llvmAttrs |= llvm::Attribute::InReg;
-                    assert((f->thisAttrs & llvm::Attribute::InReg) == 0 && "can't have two inreg args!");
+
+                    // structs need to go from {...}* byval to {...} inreg
+                    if ((arg->storageClass & STCin) && t->ty == Tstruct)
+                    {
+                        int n_param = f->reverseParams ? f->firstRealArg + n - 1 - n_inreg : f->firstRealArg + n_inreg;
+                        assert(isaPointer(paramvec[n_param]) && (arg->llvmAttrs & llvm::Attribute::ByVal)
+                            && "struct parameter expected to be {...}* byval before inreg is applied");
+                        paramvec[n_param] = paramvec[n_param]->getContainedType(0);
+                        arg->llvmAttrs &= ~llvm::Attribute::ByVal;
+                        f->structInregArg = true;
+                    }
-                }
-            }
@@ -228 +236 @@
-    }
-#endif // X86_PASS_IN_EAX
+
+    // construct function type
+    bool isvararg = !(dVararg || arrayVararg) && f->varargs;
+    llvm::FunctionType* functype = llvm::FunctionType::get(actualRettype, paramvec, isvararg);
-
-    // done
@@ -740 +752 @@
-            VarDeclaration* vd = argsym->isVarDeclaration();
-            assert(vd);
+
+            IrLocal* irloc = vd->ir.irLocal;
+            assert(irloc);
+
+            // if it's inreg struct arg, allocate storage
+            if (f->structInregArg && i == (f->reverseParams ? n - 1 : 0))
+            {
+                int n_param = f->reverseParams ? f->firstRealArg + n - 1 - i : f->firstRealArg + i;
+                assert(!f->usesNest && !f->usesThis && isaStruct(functype->getParamType(n_param))
+                    && "Preconditions for inreg struct arg not met!");
+
+                LLValue* mem = DtoAlloca(functype->getParamType(n_param), "inregstructarg");
+                DtoStore(irloc->value, mem);
+                irloc->value = mem;
+            }
-
-        #if DMDV2
@@ -749 +776 @@
-                fd->nestedVars.insert(vd);
-            }
-
-            IrLocal* irloc = vd->ir.irLocal;
-            assert(irloc);
-
-            bool refout = vd->storage_class & (STCref | STCout);

gen/tocall.cpp

@@ -371 +371 @@
-            LLValue* arg = argval->getRVal();
-
+            // if it's a struct inreg arg, load first to pass as first-class value
+            if (tf->structInregArg && i == (tf->reverseParams ? n - 1 : 0))
+            {
+                assert(fnarg->llvmAttrs & llvm::Attribute::InReg);
+                arg = DtoLoad(arg);
+            }
+
-            int j = tf->reverseParams ? beg + n - i - 1 : beg + i;
-
@@ -396 +403 @@
-        if (tf->reverseParams)
-        {
-reverseIndex
+firstRealArg
-            std::reverse(attrptr.begin(), attrptr.end());
-        }