Changeset 807

Timestamp:

12/14/10 10:19:40 (14 years ago)

Author:

walter

Message:

cdaddass fix for 64

Files:

• branches/dmd-1.x/src/backend/cod4.c (modified) (2 diffs)
• branches/dmd-1.x/src/backend/el.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/el.h (modified) (1 diff)
• trunk/src/backend/cod4.c (modified) (2 diffs)
• trunk/src/backend/el.c (modified) (1 diff)
• trunk/src/backend/el.h (modified) (1 diff)

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

@@ -724 +724 @@
-                c = gen1(c,0x48 + reg);         // DEC reg
-            else
-            {
-                c = genc2(c,0x81,modregrm(3,0,reg),postinc);
-            }
-        }
-    }
-    freenode(e1);
-    return c;
-}
-
-
-/************************
- * Generate code for += -= &= |= ^= negass
- */
-
-code *cdaddass(elem *e,regm_t *pretregs)
-{ regm_t retregs,forccs,forregs;
-  tym_t tyml;
-  unsigned reg,op,op1,op2,mode,wantres;
-  targ_long val;
-  int byte;
-  code *cl,*cr,*c,*ce,cs;
-  elem *e1;
-  elem *e2;
-  unsigned opsize;
-  unsigned reverse;
-  int sz;
-  regm_t varregm;
-  unsigned varreg;
-  unsigned cflags;
-
-  //printf("cdaddass(e=%p, *pretregs = x%x)\n",e,*pretregs);
-  op = e->Eoper;
-  retregs = 0;
-  reverse = 0;
-  e1 = e->E1;
-  tyml = tybasic(e1->Ety);              // type of lvalue
-  sz = tysize[tyml];
-  byte = (sz == 1);                     // 1 for byte operation, else 0
-  if (tyfloating(tyml))
@@ -838 +837 @@
-                cs.Iop = 0x81;
-                getlvalue_msw(&cs);
-                cs.IFL2 = FLconst;
-                cs.IEV2.Vuns = 0;
-                gen(c,&cs);                     // SBB EA+2,0
-                break;
-
-            case LLONGSIZE:
-                if (I16)
-                    assert(0);                      // not implemented yet
-                goto neg_2reg;
-
-            default:
-                assert(0);
-        }
-        c = cat3(cl,cr,c);
-        forccs = 0;             // flags already set by NEG
-        *pretregs &= ~mPSW;
-  }
-  else if ((e2 = e->E2)->Eoper == OPconst &&    // if rvalue is a const
+      el_signx32(e2) &&
-       // Don't evaluate e2 in register if we can use an INC or DEC
-      (((sz <= REGSIZE || tyfv(tyml)) &&
-        (op == OPaddass || op == OPminass) &&
-(val = el_tolong(e2)) == 1 || val == -1
+el_allbits(e2, 1) || el_allbits(e2, -1)
-       ) ||
-       (!evalinregister(e2) && tyml != TYhptr)
-      )
-     )
-  {
-        cl = getlvalue(&cs,e1,0);
-        cl = cat(cl,modEA(&cs));
-        cs.IFL2 = FLconst;
-        cs.IEV2.Vint = e2->EV.Vint;
-        if (sz <= REGSIZE || tyfv(tyml) || opsize)
-        {
-size_t i = cs.IEV2.Vsize_
+int i = cs.IEV2.Vin
-
-            /* Handle shortcuts. Watch out for if result has    */
-            /* to be in flags.                                  */
-
-            if (reghasvalue(ALLREGS,i,&reg) && i != 1 && i != -1 &&
-                !opsize)
-            {
-                cs.Iop = op1;
-                cs.Irm |= modregrm(0,reg,0);
-            }
-            else
-            {
-                cs.Iop = 0x81;
-                cs.Irm |= modregrm(0,mode,0);
-                switch (op)
-                {   case OPminass:      /* convert to +=        */
-                        cs.Irm ^= modregrm(0,5,0);
-                        i = -i;
-                        cs.IEV2.Vsize_t = i;
-                        /* FALL-THROUGH */

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

@@ -3011 +3011 @@
-    value = e->EV.Vullong;
-    switch (tysize(e->Ety))
-    {
-        case 1: value = (signed char) value;
-                break;
-        case 2: value = (short) value;
-                break;
-        case 4: value = (int) value;
-                break;
-        case 8: break;
-        default:
-                assert(0);
-    }
-    if (bit == -1)
-        value++;
-    else if (bit == 1)
-        value--;
-    return value == 0;
-}
-
+/********************************************
+ * Determine if constant e is a 32 bit or less value, or is a 32 bit value sign extended to 64 bits.
+ */
+
+int el_signx32(elem *e)
+{
+    elem_debug(e);
+    assert(e->Eoper == OPconst);
+    if (tysize(e->Ety) == 8)
+    {
+        if (e->EV.Vullong != (int)e->EV.Vullong)
+            return FALSE;
+    }
+    return TRUE;
+}
+
-/******************************
- * Extract long double value from constant elem.
- * Silently ignore types which are not floating point values.
- */
-
-targ_ldouble el_toldouble(elem *e)
-{   targ_ldouble result;
-
-    elem_debug(e);
-    assert(cnst(e));
-#if TX86
-    switch (tybasic(typemask(e)))
-    {
-        case TYfloat:
-        case TYifloat:
-            result = e->EV.Vfloat;
-            break;
-        case TYdouble:
-        case TYidouble:
-        case TYdouble_alias:

branches/dmd-1.x/src/backend/el.h

@@ -166 +166 @@
-#define el_copy(to,from) {*(to) = *(from);}
-#endif
-elem_p el_alloctmp(tym_t);
-elem_p el_selecte1(elem_p);
-elem_p el_selecte2(elem_p);
-elem_p el_copytree(elem_p);
-void   el_replace_sym(elem *e,symbol *s1,symbol *s2);
-elem_p el_scancommas(elem_p);
-int el_sideeffect(elem_p);
-#if TX86
-int el_depends(elem *ea,elem *eb);
-#endif
-#if LONGLONG
-targ_llong el_tolongt(elem_p);
-targ_llong el_tolong(elem_p);
-#else
-targ_long el_tolongt(elem_p);
-targ_long el_tolong(elem_p);
-#endif
-int el_allbits(elem_p,int);
+int el_signx32(elem_p);
-targ_ldouble el_toldouble(elem_p);
-void el_toconst(elem_p);
-elem_p el_same(elem_p *);
-int el_match(elem_p ,elem_p);
-int el_match2(elem_p ,elem_p);
-int el_match3(elem_p ,elem_p);
-int el_match4(elem_p ,elem_p);
-
-int el_appears(elem *e,symbol *s);
-Symbol *el_basesym(elem *e);
-int el_anydef(elem *ed, elem *e);
-elem_p el_bint(unsigned,type *,elem_p ,elem_p);
-elem_p el_unat(unsigned,type *,elem_p);
-elem_p el_bin(unsigned,tym_t,elem_p ,elem_p);
-elem_p el_una(unsigned,tym_t,elem_p);
-#if LONGLONG    // DJB
-elem_p el_longt(type *,targ_llong);
-#else
-elem_p el_longt(type *,targ_long);
-#endif

trunk/src/backend/cod4.c

@@ -724 +724 @@
-                c = gen1(c,0x48 + reg);         // DEC reg
-            else
-            {
-                c = genc2(c,0x81,modregrm(3,0,reg),postinc);
-            }
-        }
-    }
-    freenode(e1);
-    return c;
-}
-
-
-/************************
- * Generate code for += -= &= |= ^= negass
- */
-
-code *cdaddass(elem *e,regm_t *pretregs)
-{ regm_t retregs,forccs,forregs;
-  tym_t tyml;
-  unsigned reg,op,op1,op2,mode,wantres;
-  targ_long val;
-  int byte;
-  code *cl,*cr,*c,*ce,cs;
-  elem *e1;
-  elem *e2;
-  unsigned opsize;
-  unsigned reverse;
-  int sz;
-  regm_t varregm;
-  unsigned varreg;
-  unsigned cflags;
-
-  //printf("cdaddass(e=%p, *pretregs = x%x)\n",e,*pretregs);
-  op = e->Eoper;
-  retregs = 0;
-  reverse = 0;
-  e1 = e->E1;
-  tyml = tybasic(e1->Ety);              // type of lvalue
-  sz = tysize[tyml];
-  byte = (sz == 1);                     // 1 for byte operation, else 0
-  if (tyfloating(tyml))
@@ -838 +837 @@
-                cs.Iop = 0x81;
-                getlvalue_msw(&cs);
-                cs.IFL2 = FLconst;
-                cs.IEV2.Vuns = 0;
-                gen(c,&cs);                     // SBB EA+2,0
-                break;
-
-            case LLONGSIZE:
-                if (I16)
-                    assert(0);                      // not implemented yet
-                goto neg_2reg;
-
-            default:
-                assert(0);
-        }
-        c = cat3(cl,cr,c);
-        forccs = 0;             // flags already set by NEG
-        *pretregs &= ~mPSW;
-  }
-  else if ((e2 = e->E2)->Eoper == OPconst &&    // if rvalue is a const
+      el_signx32(e2) &&
-       // Don't evaluate e2 in register if we can use an INC or DEC
-      (((sz <= REGSIZE || tyfv(tyml)) &&
-        (op == OPaddass || op == OPminass) &&
-(val = el_tolong(e2)) == 1 || val == -1
+el_allbits(e2, 1) || el_allbits(e2, -1)
-       ) ||
-       (!evalinregister(e2) && tyml != TYhptr)
-      )
-     )
-  {
-        cl = getlvalue(&cs,e1,0);
-        cl = cat(cl,modEA(&cs));
-        cs.IFL2 = FLconst;
-        cs.IEV2.Vint = e2->EV.Vint;
-        if (sz <= REGSIZE || tyfv(tyml) || opsize)
-        {
-size_t i = cs.IEV2.Vsize_
+int i = cs.IEV2.Vin
-
-            /* Handle shortcuts. Watch out for if result has    */
-            /* to be in flags.                                  */
-
-            if (reghasvalue(ALLREGS,i,&reg) && i != 1 && i != -1 &&
-                !opsize)
-            {
-                cs.Iop = op1;
-                cs.Irm |= modregrm(0,reg,0);
-            }
-            else
-            {
-                cs.Iop = 0x81;
-                cs.Irm |= modregrm(0,mode,0);
-                switch (op)
-                {   case OPminass:      /* convert to +=        */
-                        cs.Irm ^= modregrm(0,5,0);
-                        i = -i;
-                        cs.IEV2.Vsize_t = i;
-                        /* FALL-THROUGH */

trunk/src/backend/el.c

@@ -3011 +3011 @@
-    value = e->EV.Vullong;
-    switch (tysize(e->Ety))
-    {
-        case 1: value = (signed char) value;
-                break;
-        case 2: value = (short) value;
-                break;
-        case 4: value = (int) value;
-                break;
-        case 8: break;
-        default:
-                assert(0);
-    }
-    if (bit == -1)
-        value++;
-    else if (bit == 1)
-        value--;
-    return value == 0;
-}
-
+/********************************************
+ * Determine if constant e is a 32 bit or less value, or is a 32 bit value sign extended to 64 bits.
+ */
+
+int el_signx32(elem *e)
+{
+    elem_debug(e);
+    assert(e->Eoper == OPconst);
+    if (tysize(e->Ety) == 8)
+    {
+        if (e->EV.Vullong != (int)e->EV.Vullong)
+            return FALSE;
+    }
+    return TRUE;
+}
+
-/******************************
- * Extract long double value from constant elem.
- * Silently ignore types which are not floating point values.
- */
-
-targ_ldouble el_toldouble(elem *e)
-{   targ_ldouble result;
-
-    elem_debug(e);
-    assert(cnst(e));
-#if TX86
-    switch (tybasic(typemask(e)))
-    {
-        case TYfloat:
-        case TYifloat:
-            result = e->EV.Vfloat;
-            break;
-        case TYdouble:
-        case TYidouble:
-        case TYdouble_alias:

trunk/src/backend/el.h

@@ -166 +166 @@
-#define el_copy(to,from) {*(to) = *(from);}
-#endif
-elem_p el_alloctmp(tym_t);
-elem_p el_selecte1(elem_p);
-elem_p el_selecte2(elem_p);
-elem_p el_copytree(elem_p);
-void   el_replace_sym(elem *e,symbol *s1,symbol *s2);
-elem_p el_scancommas(elem_p);
-int el_sideeffect(elem_p);
-#if TX86
-int el_depends(elem *ea,elem *eb);
-#endif
-#if LONGLONG
-targ_llong el_tolongt(elem_p);
-targ_llong el_tolong(elem_p);
-#else
-targ_long el_tolongt(elem_p);
-targ_long el_tolong(elem_p);
-#endif
-int el_allbits(elem_p,int);
+int el_signx32(elem_p);
-targ_ldouble el_toldouble(elem_p);
-void el_toconst(elem_p);
-elem_p el_same(elem_p *);
-int el_match(elem_p ,elem_p);
-int el_match2(elem_p ,elem_p);
-int el_match3(elem_p ,elem_p);
-int el_match4(elem_p ,elem_p);
-
-int el_appears(elem *e,symbol *s);
-Symbol *el_basesym(elem *e);
-int el_anydef(elem *ed, elem *e);
-elem_p el_bint(unsigned,type *,elem_p ,elem_p);
-elem_p el_unat(unsigned,type *,elem_p);
-elem_p el_bin(unsigned,tym_t,elem_p ,elem_p);
-elem_p el_una(unsigned,tym_t,elem_p);
-#if LONGLONG    // DJB
-elem_p el_longt(type *,targ_llong);
-#else
-elem_p el_longt(type *,targ_long);
-#endif