Changeset 723:55f6c2e454d7

Timestamp:

10/25/08 00:03:28 (3 months ago)

Author:

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

branch:

default

Message:

Implemented correct parameter order according to x86-32 ABI documentation.
Changed AA types to just a void* .

Files:

• dmd/attrib.c (modified) (2 diffs)
• dmd/expression.c (modified) (3 diffs)
• dmd/mangle.c (modified) (1 diff)
• dmd/mars.h (modified) (1 diff)
• dmd/mtype.c (modified) (5 diffs)
• dmd/mtype.h (modified) (1 diff)
• gen/functions.cpp (modified) (13 diffs)
• gen/tocall.cpp (modified) (11 diffs)
• gen/tollvm.cpp (modified) (2 diffs)
• tests/mini/intrinsics.d (modified) (1 diff)

dmd/attrib.c

@@ -417 +417 @@
-    case LINKwindows:   p = "Windows";      break;
-    case LINKpascal:    p = "Pascal";       break;
+
+    // LDC
+    case LINKintrinsic: p = "Intrinsic"; break;
+
-    default:
-        assert(0);
@@ -1004 +1008 @@
-                fd->llvmInternal = llvm_internal;
-                fd->intrinsicName = arg1str;
+                fd->linkage = LINKintrinsic;
+                ((TypeFunction*)fd->type)->linkage = LINKintrinsic;
-            }
-            else if (TemplateDeclaration* td = s->isTemplateDeclaration())

dmd/expression.c

@@ -685 +685 @@
-        }
-
+// LDC we don't want this!
+#if !IN_LLVM
-        // Convert static arrays to pointers
-        tb = arg->type->toBasetype();
@@ -691 +693 @@
-        arg = arg->checkToPointer();
-        }
+#endif
+
-
-        // Convert lazy argument to a delegate
@@ -702 +706 @@
-
-        // If not D linkage, do promotions
-
+
+
-        {
-        // Promote bytes, words, etc., to ints

dmd/mangle.c

@@ -105 +105 @@
-            break;
-
+        // LDC
+        case LINKintrinsic:
+
-        case LINKc:
-        case LINKwindows:

dmd/mars.h

@@ -310 +310 @@
-    LINKwindows,
-    LINKpascal,
+
+    // LDC
+    LINKintrinsic,
-};
-

dmd/mtype.c

@@ -2674 +2674 @@
-    this->retAttrs = 0;
-    this->thisAttrs = 0;
+    this->reverseParams = false;
+    this->reverseIndex = 0;
-}
-
@@ -2686 +2688 @@
-    t->retAttrs = retAttrs;
-    t->thisAttrs = thisAttrs;
+    t->reverseParams = reverseParams;
+    t->reverseIndex = reverseIndex;
-    return t;
-}
@@ -2795 +2799 @@
-    case LINKpascal:    mc = 'V';   break;
-    case LINKcpp:       mc = 'R';   break;
+
+    // LDC
+    case LINKintrinsic: mc = 'Q';   break;
+
-    default:
-        assert(0);
@@ -2827 +2835 @@
-        case LINKpascal:    p = "Pascal ";  break;
-        case LINKcpp:   p = "C++ "; break;
+
+        // LDC
+        case LINKintrinsic: p = "Intrinsic"; break;
+
-        default:
-        assert(0);
@@ -2862 +2874 @@
-        case LINKpascal:    p = "Pascal ";  break;
-        case LINKcpp:   p = "C++ "; break;
+
+        // LDC
+        case LINKintrinsic: p = "Intrinsic"; break;
+
-        default:
-        assert(0);

dmd/mtype.h

@@ -441 +441 @@
-    unsigned retAttrs;
-    unsigned thisAttrs; // also used for nest
+
+    bool reverseParams;
+    size_t reverseIndex;
-};
-

gen/functions.cpp

@@ -21 +21 @@
-#include "gen/classes.h"
-#include "gen/dvalue.h"
+
+#include <algorithm>
-
-const llvm::FunctionType* DtoFunctionType(Type* type, const LLType* thistype, const LLType* nesttype, bool ismain)
@@ -112 +114 @@
-    }
-
+    // number of formal params
-    size_t n = Argument::dim(f->parameters);
+
+    // on x86 we need to reverse the formal params in some cases to match the ABI
+    if (global.params.cpu == ARCHx86)
+    {
+        // more than one formal arg,
+        // extern(D) linkage
+        // not a D-style vararg
+        if (n > 1 && f->linkage == LINKd && !typesafeVararg)
+        {
+            f->reverseParams = true;
+            f->reverseIndex = paramvec.size();
+        }
+    }
+
-
-    for (int i=0; i < n; ++i) {
@@ -168 +185 @@
-    }
-
+    // reverse params?
+    if (f->reverseParams)
+    {
+        std::reverse(paramvec.begin() + f->reverseIndex, paramvec.end());
+    }
+
-    // construct function type
-    bool isvararg = !(typesafeVararg || arrayVararg) && f->varargs;
@@ -190 +213 @@
-            else
-            {
+                int inreg = f->reverseParams ? n - 1 : 0;
-                Argument* arg = Argument::getNth(f->parameters, 0);
-                Type* t = arg->type->toBasetype();
@@ -341 +365 @@
-            fdecl->llvmInternal = LLVMintrinsic;
-            DtoOverloadedIntrinsicName(tinst, tempdecl, fdecl->intrinsicName);
+            fdecl->linkage = LINKintrinsic;
+            ((TypeFunction*)fdecl->type)->linkage = LINKintrinsic;
-        }
-    }
@@ -355 +381 @@
-static void set_param_attrs(TypeFunction* f, llvm::Function* func, FuncDeclaration* fdecl)
-{
-1
+0
-    if (f->retInPtr) ++llidx;
-    if (f->usesThis) ++llidx;
@@ -363 +389 @@
-
-    int funcNumArgs = func->getArgumentList().size();
-
-
-
+
+
-    llvm::AttributeWithIndex PAWI;
-
@@ -393 +418 @@
-
-    // set attrs on the rest of the arguments
-
+
+
+
+
+
+
-    {
-        Argument* fnarg = Argument::getNth(f->parameters, k);
-        assert(fnarg);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            attrs.push_back(PAWI);
-
-
-
-
+
+
+
+
+
-}
-
@@ -504 +547 @@
-        // name parameters
-        llvm::Function::arg_iterator iarg = func->arg_begin();
-
+
-        if (f->retInPtr) {
-            iarg->setName(".sretarg");
@@ -510 +553 @@
-            ++iarg;
-        }
-
+
-        if (f->usesThis) {
-            iarg->setName("this");
@@ -533 +576 @@
-        }
-
+        int k = 0;
+
-        for (; iarg != func->arg_end(); ++iarg)
-        {
-            if (fdecl->parameters && fdecl->parameters->dim > k)
-            {
-
+
+
+
+
+
+
-                VarDeclaration* argvd = argsym->isVarDeclaration();
-                assert(argvd);
@@ -544 +594 @@
-                argvd->ir.irLocal->value = iarg;
-                iarg->setName(argvd->ident->toChars());
+
+                k++;
-            }
-            else
@@ -903 +955 @@
-
-    // ref/out arg
-(fnarg->storageClass & STCref) || (fnarg->storageClass &
+fnarg->storageClass & (STCref |
-    {
-        if (arg->isVar() || arg->isLRValue())

gen/tocall.cpp

@@ -35 +35 @@
-unsigned DtoCallingConv(LINK l)
-{
-
+ || l == LINKintrinsic
-        return llvm::CallingConv::C;
-    else if (l == LINKd || l == LINKdefault)
@@ -112 +112 @@
-//////////////////////////////////////////////////////////////////////////////////////////
-
-llvm::AttrListPtr& palist
+std::vector<llvm::AttributeWithIndex>& attrs
-{
-    Logger::println("doing d-style variadic arguments");
@@ -196 +196 @@
-
-        if (fnarg->llvmAttrs)
-
+
+
+
+
+
+
-
-        ++argidx;
@@ -235 +240 @@
-    assert(callableTy);
-
+    if (Logger::enabled())
+    {
+        Logger::cout() << "callable: " << *callable << '\n';
+    }
+
-    // get n arguments
-    size_t n_arguments = arguments ? arguments->dim : 0;
@@ -243 +253 @@
-
-    // parameter attributes
-
+
+
-
-    // return attrs
-    if (tf->retAttrs)
-
+
+
+
+
+
-
-    // handle implicit arguments
@@ -260 +275 @@
-
-        // add attrs for hidden ptr
-
+
+
+
-    }
-
@@ -305 +322 @@
-        // add attributes for context argument
-        if (tf->thisAttrs)
-
+
+
+
+
+
-    }
-
@@ -327 +348 @@
-    else if (dvarargs)
-    {
-palist
+attrs
-    }
-
-    // otherwise we're looking at a normal function call
+    // or a C style vararg call
-    else
-    {
-        Logger::println("doing normal arguments");
-
-
+
+
+
+
+
+
+
+
+
-            Argument* fnarg = Argument::getNth(tf->parameters, i);
+            assert(fnarg);
-            DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]);
-            LLValue* arg = argval->getRVal();
-
-
+
+
+
+
+
+
+
-                if (Logger::enabled())
-                {
@@ -346 +381 @@
-                    Logger::cout() << "expects: " << *callableTy->getParamType(j) << '\n';
-                }
-
-
-
-
-
+
+
+
+
+
+
+
-            ++argiter;
-            args.push_back(arg);
+        }
+
+        // reverse the relevant params as well as the param attrs
+        if (tf->reverseParams)
+        {
+            std::reverse(args.begin() + tf->reverseIndex, args.end());
+            std::reverse(attrptr.begin(), attrptr.end());
+        }
+
+        // add attributes
+        for (int i = 0; i < n; i++)
+        {
+            if (attrptr[i])
+            {
+                Attr.Index = beg + i + 1;
+                Attr.Attrs = attrptr[i];
+                attrs.push_back(Attr);
+            }
+        }
+
+        // do C varargs
+        if (n_arguments > n)
+        {
+            for (int i=n; i<n_arguments; i++)
+            {
+                Argument* fnarg = Argument::getNth(tf->parameters, i);
+                DValue* argval = DtoArgument(fnarg, (Expression*)arguments->data[i]);
+                LLValue* arg = argval->getRVal();
+
+                // FIXME: do we need any param attrs here ?
+
+                ++argiter;
+                args.push_back(arg);
+            }
-        }
-    }
@@ -406 +477 @@
-
-    // set calling convention and parameter attributes
+    llvm::AttrListPtr attrlist = llvm::AttrListPtr::get(attrs.begin(), attrs.end());
-    if (dfnval && dfnval->func)
-    {
-        LLFunction* llfunc = llvm::dyn_cast<LLFunction>(dfnval->val);
-
-pa
+ // override intrinsic attrs
+attr
-        else
-            call->setCallingConv(callconv);
@@ -416 +488 @@
-    else
-        call->setCallingConv(callconv);
-pa
+attr
-
-    return new DImValue(resulttype, retllval);

gen/tollvm.cpp

@@ -164 +164 @@
-    // associative arrays
-    case Taarray:
+    #if 1
+        return getVoidPtrType();
+    #else
-    {
-        TypeAArray* taa = (TypeAArray*)t;
@@ -169 +172 @@
-        return getPtrToType(LLStructType::get(DtoType(taa->key), DtoType(taa->next), 0));
-    }
+    #endif
-
-/*

tests/mini/intrinsics.d

@@ -22 +22 @@
-    real r;
-    printf("Enter real: ");
-f", &d
+lf", &r
-    r = 3.2311167891231231234754764576;
-    version(X86)