Changeset 770

Timestamp:

11/29/10 03:41:47 (14 years ago)

Author:

walter

Message:

bugzilla 5275 x86_64 related hidden function parameter mishandled

Files:

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

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

@@ -8 +8 @@
- * only. The license is in /dmd/src/dmd/backendlicense.txt
- * or /dm/src/dmd/backendlicense.txt
- * For any other uses, please contact Digital Mars.
- */
-
-#if !SPP
-
-#include        <stdio.h>
-#include        <string.h>
-#include        <time.h>
-#include        "cc.h"
-#include        "el.h"
-#include        "oper.h"
-#include        "code.h"
-#include        "type.h"
-#include        "global.h"
-
-static char __file__[] = __FILE__;      /* for tassert.h                */
-#include        "tassert.h"
-
+/*************************************
+ * Handy function to answer the question: who the heck is generating this piece of code?
+ */
+inline void ccheck(code *cs)
+{
+//    if (cs->Iop == LEA && (cs->Irm & 0x3F) == 0x34 && cs->Isib == 7) *(char*)0=0;
+}
+
-/*****************************
- * Find last code in list.
- */
-
-code *code_last(code *c)
-{
-    if (c)
-    {   while (c->next)
-            c = c->next;
-    }
-    return c;
-}
-
-/*****************************
- * Set flag bits on last code in list.
- */
-
-void code_orflag(code *c,unsigned flag)
-{
-    if (flag && c)
@@ -145 +153 @@
- * Note that unused operands are garbage.
- * gen1() and gen2() are shortcut routines.
- * Input:
- *      c ->    linked list that code is to be added to end of
- *      cs ->   data for the code
- * Returns:
- *      pointer to start of code list
- */
-
-code *gen(code *c,code *cs)
-{   code *ce,*cstart;
-    unsigned reg;
-
-#ifdef DEBUG                            /* this is a high usage routine */
-    assert(cs);
-#endif
-    assert(I64 || cs->Irex == 0);
-    ce = code_calloc();
-    *ce = *cs;
-    //printf("ce = %p %02x\n", ce, ce->Iop);
-if (ce->Iop == LEA && ce->Irm == 4 && ce->Isib == 0x6D && ce->IFL1 == FLunde) *(char*)0=0
+ccheck(ce)
-    if (config.flags4 & CFG4optimized &&
-        ce->IFL2 == FLconst &&
-        (ce->Iop == 0x81 || ce->Iop == 0x80) &&
-        reghasvalue((ce->Iop == 0x80) ? BYTEREGS : ALLREGS,ce->IEV2.Vlong,&reg) &&
-        !(ce->Iflags & CFopsize && I16)
-       )
-    {   // See if we can replace immediate instruction with register instruction
-        static unsigned char regop[8] =
-                { 0x00,0x08,0x10,0x18,0x20,0x28,0x30,0x38 };
-
-        //printf("replacing 0x%02x, val = x%lx\n",ce->Iop,ce->IEV2.Vlong);
-        ce->Iop = regop[(ce->Irm & modregrm(0,7,0)) >> 3] | (ce->Iop & 1);
-        code_newreg(ce, reg);
-    }
-    code_next(ce) = CNIL;
-    if (c)
-    {   cstart = c;
-        while (code_next(c)) c = code_next(c);  /* find end of list     */
-        code_next(c) = ce;                      /* link into list       */
-        return cstart;
@@ -192 +200 @@
-
-  ce = code_calloc();
-  ce->Iop = op;
-  assert(op != LEA);
-  if (c)
-  {     cstart = c;
-        while (code_next(c)) c = code_next(c);  /* find end of list     */
-        code_next(c) = ce;                      /* link into list       */
-        return cstart;
-  }
-  return ce;
-}
-
-code *gen2(code *c,unsigned op,unsigned rm)
-{ code *ce,*cstart;
-
-  cstart = ce = code_calloc();
-  /*cxcalloc++;*/
-  ce->Iop = op;
-  ce->Iea = rm;
+  ccheck(ce);
-  if (c)
-  {     cstart = c;
-        while (code_next(c)) c = code_next(c);  /* find end of list     */
-        code_next(c) = ce;                      /* link into list       */
-  }
-  return cstart;
-}
-
-code *gen2sib(code *c,unsigned op,unsigned rm,unsigned sib)
-{ code *ce,*cstart;
-
-  cstart = ce = code_calloc();
-  /*cxcalloc++;*/
-  if (op == LEA && (rm & 0xFF) == 4 && (sib & 0xFF) == 0x6D) *(char*)0=0;
-  ce->Iop = op;
-  ce->Irm = rm;
-  ce->Isib = sib;
-  ce->Irex = (rm | (sib & (REX_B << 16))) >> 16;
-  if (sib & (REX_R << 16))
-        ce->Irex |= REX_X;
+  ccheck(ce);
-  if (c)
-  {     cstart = c;
-        while (code_next(c)) c = code_next(c);  /* find end of list     */
-        code_next(c) = ce;                      /* link into list       */
-  }
-  return cstart;
-}
-
-code *genregs(code *c,unsigned op,unsigned dstreg,unsigned srcreg)
-{ return gen2(c,op,modregxrmx(3,dstreg,srcreg)); }
-
-code *gentstreg(code *c,unsigned t)
-{
-    c = gen2(c,0x85,modregxrmx(3,t,t));   // TEST t,t
-    code_orflag(c,CFpsw);
-    return c;
-}
-
-code *genpush(code *c, unsigned reg)
-{
@@ -342 +351 @@
-            c = genjmp(c,JP,FLcode,(block *) cnop);
-            cat(cj,cnop);
-            break;
-        case 1 << 8:                    /* toggled no jump              */
-        case 0 << 8:
-            break;
-        default:
-#ifdef DEBUG
-            printf("jop = x%x\n",op);
-#endif
-            assert(0);
-    }
-    return cat(c,cj);
-}
-
-code *gencs(code *c,unsigned op,unsigned ea,unsigned FL2,symbol *s)
-{   code cs;
-
-    cs.Iop = op;
-    cs.Iea = ea;
+    ccheck(&cs);
-    cs.Iflags = 0;
-    cs.IFL2 = FL2;
-    cs.IEVsym2 = s;
-    cs.IEVoffset2 = 0;
-
-    return gen(c,&cs);
-}
-
-code *genc2(code *c,unsigned op,unsigned ea,targ_size_t EV2)
-{   code cs;
-
-    cs.Iop = op;
-    cs.Iea = ea;
+    ccheck(&cs);
-    cs.Iflags = CFoff;
-    cs.IFL2 = FLconst;
-    cs.IEV2.Vsize_t = EV2;
-    return gen(c,&cs);
-}
-
-/*****************
- * Generate code.
- */
-
-code *genc1(code *c,unsigned op,unsigned ea,unsigned FL1,targ_size_t EV1)
-{   code cs;
-
-    assert(FL1 < FLMAX);
-    cs.Iop = op;
-    cs.Iflags = CFoff;
-    cs.Iea = ea;
+    ccheck(&cs);
-    cs.IFL1 = FL1;
-    cs.IEV1.Vsize_t = EV1;
-if (cs.Iop == LEA && cs.IFL1 == FLunde) *(char*)0=0;
-    return gen(c,&cs);
-}
-
-/*****************
- * Generate code.
- */
-
-code *genc(code *c,unsigned op,unsigned ea,unsigned FL1,targ_size_t EV1,unsigned FL2,targ_size_t EV2)
-{   code cs;
-
-    assert(FL1 < FLMAX);
-    cs.Iop = op;
-    cs.Iea = ea;
+    ccheck(&cs);
-    cs.Iflags = CFoff;
-    cs.IFL1 = FL1;
-    cs.IEV1.Vsize_t = EV1;
-    assert(FL2 < FLMAX);
-    cs.IFL2 = FL2;
-    cs.IEV2.Vsize_t = EV2;
-    return gen(c,&cs);
-}
-
-/***************************************
- * Generate immediate multiply instruction for r1=r2*imm.
- * Optimize it into LEA's if we can.
- */
-
-code *genmulimm(code *c,unsigned r1,unsigned r2,targ_int imm)
-{   code cs;
-
-    // These optimizations should probably be put into pinholeopt()
-    switch (imm)
-    {   case 1:
@@ -539 +551 @@
- *      set flags based on result
- * Else if flags & 8
- *      do not disturb flags
- * Else
- *      don't care about flags
- * If flags & 1 then byte move
- * If flags & 2 then short move (for I32 and I64)
- * If flags & 4 then don't disturb unused portion of register
- * If flags & 16 then reg is a byte register AL..BH
- * If flags & 64 then 64 bit move (I64 only)
- * Returns:
- *      code (if any) generated
- */
-
-code *movregconst(code *c,unsigned reg,targ_size_t value,regm_t flags)
-{   unsigned r;
-    regm_t regm;
-    regm_t mreg;
-    targ_size_t regv;
-
+    //printf("movregconst(%llx)\n", value);
-#define genclrreg(a,r) genregs(a,0x31,r,r)
-
-    regm = regcon.immed.mval & mask[reg];
-    regv = regcon.immed.value[reg];
-
-    if (flags & 1)      // 8 bits
-    {   unsigned msk;
-
-        value &= 0xFF;
-        regm &= BYTEREGS;
-
-        // If we already have the right value in the right register
-        if (regm && (regv & 0xFF) == value)
-            goto L2;
-
-        if (flags & 16 && reg & 4 &&    // if an H byte register
-            regcon.immed.mval & mask[reg & 3] &&
-            (((regv = regcon.immed.value[reg & 3]) >> 8) & 0xFF) == value)
-            goto L2;
-

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

@@ -2948 +2948 @@
-                    {   if (mfuncreg == 0)      /* if no registers left */
-                        {   needframe = TRUE;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-  }
-#endif
-
-    retregs = regmask(e->Ety, tym1);
-
-    // If stack needs cleanup
-    if (OTbinary(e->Eoper) &&
-        !typfunc(tym1) &&
-      !(s && s->Sflags & SFLexit))
-    {
-        if (tym1 == TYhfunc)
-        {   // Hidden parameter is popped off by the callee
-4
-4
-4
-4
+REGSIZE
+REGSIZE
+REGSIZE
+REGSIZE
-        }
-        else
-            c = genstackclean(c,numpara + numalign,retregs);
-    }
-    else
-    {
-        c = genadjesp(c,-numpara);
-        stackpush -= numpara;
-        if (numalign)
-            c = genstackclean(c,numalign,retregs);
-    }
-
-    /* Special handling for functions which return a floating point
-       value in the top of the 8087 stack.
-     */
-
-    if (retregs & mST0)
-    {
-        if (*pretregs)                  // if we want the result
-        {   //assert(stackused == 0);

trunk/src/backend/cod1.c

@@ -2948 +2948 @@
-                    {   if (mfuncreg == 0)      /* if no registers left */
-                        {   needframe = TRUE;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-  }
-#endif
-
-    retregs = regmask(e->Ety, tym1);
-
-    // If stack needs cleanup
-    if (OTbinary(e->Eoper) &&
-        !typfunc(tym1) &&
-      !(s && s->Sflags & SFLexit))
-    {
-        if (tym1 == TYhfunc)
-        {   // Hidden parameter is popped off by the callee
-4
-4
-4
-4
+REGSIZE
+REGSIZE
+REGSIZE
+REGSIZE
-        }
-        else
-            c = genstackclean(c,numpara + numalign,retregs);
-    }
-    else
-    {
-        c = genadjesp(c,-numpara);
-        stackpush -= numpara;
-        if (numalign)
-            c = genstackclean(c,numalign,retregs);
-    }
-
-    /* Special handling for functions which return a floating point
-       value in the top of the 8087 stack.
-     */
-
-    if (retregs & mST0)
-    {
-        if (*pretregs)                  // if we want the result
-        {   //assert(stackused == 0);