Changeset 592

Timestamp:

08/02/10 21:36:58 (14 years ago)

Author:

walter

Message:

more 64

Files:

• branches/dmd-1.x/src/backend/cod1.c (modified) (1 diff)
• branches/dmd-1.x/src/glue.c (modified) (2 diffs)
• trunk/src/backend/cod1.c (modified) (1 diff)
• trunk/src/glue.c (modified) (2 diffs)

branches/dmd-1.x/src/backend/cod1.c

@@ -2477 +2477 @@
-            int xmmcnt = XMM0;
-            for (int i = np; --i >= 0;)
-            {
-                static const unsigned char argregs[6] = { DI,SI,DX,CX,R8,R9 };
-                elem *ep = parameters[i].e;
-                tym_t ty = ep->Ety;
-                if (r < sizeof(argregs)/sizeof(argregs[0]))     // if more arg regs
-                {
-                    if (
-                        // This must match type_jparam()
-                        ty64reg(ty) ||
-                        ((tybasic(ty) == TYstruct || tybasic(ty) == TYarray) &&
-                         ep->Enumbytes <= REGSIZE && ep->Enumbytes != 3 && ep->Enumbytes)
-                        )
-                    {
-                        parameters[i].reg = argregs[r];
-                        r++;
-                        continue;       // goes in register, not stack
-                    }
-                }
-else 
+
-                {
-                    if (tyfloating(ty) && tysize(ty) <= 8)
-                    {
-                        parameters[i].reg = xmmcnt;
-                        xmmcnt++;
-                        continue;       // goes in register, not stack
-                    }
-                }
-                parameters[i].reg = -1;         // -1 means no register
-                numpara += paramsize(ep,stackalign);
-            }
-            assert((numpara & (REGSIZE - 1)) == 0);
-            assert((stackpush & (REGSIZE - 1)) == 0);
-
-            /* Adjust start of the stack so after all args are pushed,
-             * the stack will be aligned.
-             */
-            if (STACKALIGN == 16 && (numpara + stackpush) & (STACKALIGN - 1))
-            {
-                numalign = STACKALIGN - ((numpara + stackpush) & (STACKALIGN - 1));

branches/dmd-1.x/src/glue.c

@@ -719 +719 @@
-        params[pi] = v_arguments->toSymbol();
-        pi += 1;
-    }
-    if (parameters)
-    {
-        for (i = 0; i < parameters->dim; i++)
-        {   VarDeclaration *v = (VarDeclaration *)parameters->data[i];
-            if (v->csym)
-            {
-                error("compiler error, parameter '%s', bugzilla 2962?", v->toChars());
-                assert(0);
-            }
-            params[pi + i] = v->toSymbol();
-        }
-        pi += i;
-    }
-
-    if (reverse)
-    {   // Reverse params[] entries
-        for (i = 0; i < pi/2; i++)
-
-
-
+
+
-            params[i] = params[pi - 1 - i];
-            params[pi - 1 - i] = sptmp;
-        }
-    }
-
-    if (shidden)
-    {
-#if 0
-        // shidden becomes last parameter
-        params[pi] = shidden;
-#else
-        // shidden becomes first parameter
-        memmove(params + 1, params, pi * sizeof(params[0]));
-        params[0] = shidden;
-#endif
-        pi++;
-    }
-
-
-    if (sthis)
@@ -772 +771 @@
-    }
-
-    if ((global.params.isLinux || global.params.isOSX || global.params.isFreeBSD || global.params.isSolaris) &&
-         linkage != LINKd && shidden && sthis)
-    {
-        /* swap shidden and sthis
-         */
-        Symbol *sp = params[0];
-        params[0] = params[1];
-        params[1] = sp;
-    }
-
-    for (i = 0; i < pi; i++)
-    {   Symbol *sp = params[i];
-        sp->Sclass = SCparameter;
-        sp->Sflags &= ~SFLspill;
-        sp->Sfl = FLpara;
-        symbol_add(sp);
-    }
-
-First parameter goes in register
+Determine register assignments
-    if (pi)
-    {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
-
-    if (func->fbody)
-    {   block *b;
-        Blockx bx;
-        Statement *sbody;
-
-        localgot = NULL;
-
-        sbody = func->fbody;
-        memset(&bx,0,sizeof(bx));
-        bx.startblock = block_calloc();
-        bx.curblock = bx.startblock;
-        bx.funcsym = s;
-        bx.scope_index = -1;
-        bx.classdec = cd;
-        bx.member = func;
-        bx.module = getModule();
-        irs.blx = &bx;

trunk/src/backend/cod1.c

@@ -2477 +2477 @@
-            int xmmcnt = XMM0;
-            for (int i = np; --i >= 0;)
-            {
-                static const unsigned char argregs[6] = { DI,SI,DX,CX,R8,R9 };
-                elem *ep = parameters[i].e;
-                tym_t ty = ep->Ety;
-                if (r < sizeof(argregs)/sizeof(argregs[0]))     // if more arg regs
-                {
-                    if (
-                        // This must match type_jparam()
-                        ty64reg(ty) ||
-                        ((tybasic(ty) == TYstruct || tybasic(ty) == TYarray) &&
-                         ep->Enumbytes <= REGSIZE && ep->Enumbytes != 3 && ep->Enumbytes)
-                        )
-                    {
-                        parameters[i].reg = argregs[r];
-                        r++;
-                        continue;       // goes in register, not stack
-                    }
-                }
-else 
+
-                {
-                    if (tyfloating(ty) && tysize(ty) <= 8)
-                    {
-                        parameters[i].reg = xmmcnt;
-                        xmmcnt++;
-                        continue;       // goes in register, not stack
-                    }
-                }
-                parameters[i].reg = -1;         // -1 means no register
-                numpara += paramsize(ep,stackalign);
-            }
-            assert((numpara & (REGSIZE - 1)) == 0);
-            assert((stackpush & (REGSIZE - 1)) == 0);
-
-            /* Adjust start of the stack so after all args are pushed,
-             * the stack will be aligned.
-             */
-            if (STACKALIGN == 16 && (numpara + stackpush) & (STACKALIGN - 1))
-            {
-                numalign = STACKALIGN - ((numpara + stackpush) & (STACKALIGN - 1));

trunk/src/glue.c

@@ -719 +719 @@
-        params[pi] = v_arguments->toSymbol();
-        pi += 1;
-    }
-    if (parameters)
-    {
-        for (i = 0; i < parameters->dim; i++)
-        {   VarDeclaration *v = (VarDeclaration *)parameters->data[i];
-            if (v->csym)
-            {
-                error("compiler error, parameter '%s', bugzilla 2962?", v->toChars());
-                assert(0);
-            }
-            params[pi + i] = v->toSymbol();
-        }
-        pi += i;
-    }
-
-    if (reverse)
-    {   // Reverse params[] entries
-        for (i = 0; i < pi/2; i++)
-
-
-
+
+
-            params[i] = params[pi - 1 - i];
-            params[pi - 1 - i] = sptmp;
-        }
-    }
-
-    if (shidden)
-    {
-#if 0
-        // shidden becomes last parameter
-        params[pi] = shidden;
-#else
-        // shidden becomes first parameter
-        memmove(params + 1, params, pi * sizeof(params[0]));
-        params[0] = shidden;
-#endif
-        pi++;
-    }
-
-
-    if (sthis)
@@ -772 +771 @@
-    }
-
-    if ((global.params.isLinux || global.params.isOSX || global.params.isFreeBSD || global.params.isSolaris) &&
-         linkage != LINKd && shidden && sthis)
-    {
-        /* swap shidden and sthis
-         */
-        Symbol *sp = params[0];
-        params[0] = params[1];
-        params[1] = sp;
-    }
-
-    for (i = 0; i < pi; i++)
-    {   Symbol *sp = params[i];
-        sp->Sclass = SCparameter;
-        sp->Sflags &= ~SFLspill;
-        sp->Sfl = FLpara;
-        symbol_add(sp);
-    }
-
-First parameter goes in register
+Determine register assignments
-    if (pi)
-    {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
-
-    if (func->fbody)
-    {   block *b;
-        Blockx bx;
-        Statement *sbody;
-
-        localgot = NULL;
-
-        sbody = func->fbody;
-        memset(&bx,0,sizeof(bx));
-        bx.startblock = block_calloc();
-        bx.curblock = bx.startblock;
-        bx.funcsym = s;
-        bx.scope_index = -1;
-        bx.classdec = cd;
-        bx.member = func;
-        bx.module = getModule();
-        irs.blx = &bx;