Changeset 627

Timestamp:

08/25/10 17:37:50 (1 year ago)

Author:

walter

Message:

64 bit stuff

Files:

• branches/dmd-1.x/src/backend/cg87.c (modified) (7 diffs)
• branches/dmd-1.x/src/backend/cgcod.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/cgelem.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/cgen.c (modified) (5 diffs)
• branches/dmd-1.x/src/backend/cod1.c (modified) (8 diffs)
• branches/dmd-1.x/src/backend/cod2.c (modified) (9 diffs)
• branches/dmd-1.x/src/backend/cod3.c (modified) (4 diffs)
• branches/dmd-1.x/src/backend/cod4.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/debug.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/el.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/evalu8.c (modified) (1 diff)
• branches/dmd-1.x/src/todt.c (modified) (6 diffs)
• trunk/src/backend/cg87.c (modified) (7 diffs)
• trunk/src/backend/cgcod.c (modified) (1 diff)
• trunk/src/backend/cgelem.c (modified) (1 diff)
• trunk/src/backend/cgen.c (modified) (5 diffs)
• trunk/src/backend/cod1.c (modified) (8 diffs)
• trunk/src/backend/cod2.c (modified) (9 diffs)
• trunk/src/backend/cod3.c (modified) (4 diffs)
• trunk/src/backend/cod4.c (modified) (1 diff)
• trunk/src/backend/debug.c (modified) (1 diff)
• trunk/src/backend/el.c (modified) (1 diff)
• trunk/src/backend/evalu8.c (modified) (1 diff)
• trunk/src/todt.c (modified) (8 diffs)

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

@@ -211 +211 @@
- */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        code *c;
@@ -230 +244 @@
-        else
-        {
-
+
+
+
-                stackused++;
-                assert(stackused <= 8);
@@ -490 +506 @@
-        floatreg = TRUE;
-        reflocal = TRUE;
-0xF8
+~7
-            c = genfwait(c);
-
-
+
-}
-
@@ -842 +857 @@
-            }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    if (*pretregs & mST0)
@@ -1717 +1756 @@
-                    c = codelem(e->E1,&retregs,FALSE);
-                L3:
-!I32
+I16
-                    {
-                        /* MOV floatreg+2,reg   */
@@ -3322 +3361 @@
-            c2 = genctst(c2,e,0);               // FTST
-    }
+    else if ((tym == TYcfloat || tym == TYcdouble) &&
+             *pretregs & (mXMM0|mXMM1) && retregs & mST01)
+    {
+        if (*pretregs & mPSW && !(retregs & mPSW))
+            c1 = genctst(c1,e,0);               // FTST
+        pop87();
+        c1 = genfltreg(c1, ESC(MFdouble,1),3,0); // FSTP floatreg
+        genfwait(c1);
+        c2 = getregs(mXMM0|mXMM1);
+        c2 = genfltreg(c2, 0xF20F10, XMM1 - XMM0, 0);    // MOVD XMM1,floatreg
+
+        pop87();
+        c2 = genfltreg(c2, ESC(MFdouble,1),3,0); // FSTP floatreg
+        genfwait(c2);
+        c2 = genfltreg(c2, 0xF20F10, XMM0 - XMM0, 0);    // MOVD XMM0,floatreg
+    }
+    else if ((tym == TYcfloat || tym == TYcdouble) &&
+             retregs & (mXMM0|mXMM1) && *pretregs & mST01)
+    {
+        c1 = push87();
+        c1 = genfltreg(c1, 0xF20F11, XMM0-XMM0, 0);        // MOVD floatreg, XMM0
+        genfltreg(c1, 0xDD, 0, 0);              // FLD double ptr floatreg
+
+        c2 = push87();
+        c2 = genfltreg(c2, 0xF20F11, XMM1-XMM0, 0);        // MOV floatreg, XMM1
+        genfltreg(c2, 0xDD, 0, 0);              // FLD double ptr floatreg
+
+        if (*pretregs & mPSW)
+            c2 = genctst(c2,e,0);               // FTST
+    }
-    else
-    {   if (*pretregs & mPSW)
@@ -3399 +3468 @@
-    int i;
-
+    //printf("cload87(e = %p, *pretregs = %s)\n", e, regm_str(*pretregs));
-    sz = tysize[ty] / 2;
-    memset(&cs, 0, sizeof(cs));

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

@@ -394 +394 @@
-            }
-        }
-I32
+!I16
-            break;                      // use the long conditional jmps
-    } while (flag);                     // loop till no more bytes saved

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

@@ -2073 +2073 @@
-
-            // See if we can replace with OPremquo
-intsize)
+REGSIZE && !I64)  // need cent and ucent working for I64 to work
-            {
-                // Don't do it if there are special code sequences in the

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

@@ -161 +161 @@
-    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;
-    if (config.flags4 & CFG4optimized &&
-        ce->IFL2 == FLconst &&
@@ -171 +173 @@
-                { 0x00,0x08,0x10,0x18,0x20,0x28,0x30,0x38 };
-
-
+        
-        ce->Iop = regop[(ce->Irm & modregrm(0,7,0)) >> 3] | (ce->Iop & 1);
-        code_newreg(ce, reg);
@@ -190 +192 @@
-  ce = code_calloc();
-  ce->Iop = op;
+  assert(op != LEA);
-  if (c)
-  {     cstart = c;
@@ -219 +222 @@
-  cstart = ce = code_calloc();
-  /*cxcalloc++;*/
+  if (op == LEA && (rm & 0xFF) == 4 && (sib & 0xFF) == 0x6D) *(char*)0=0;
-  ce->Iop = op;
-  ce->Irm = rm;
@@ -387 +391 @@
-    cs.IFL1 = FL1;
-    cs.IEV1.Vsize_t = EV1;
+if (cs.Iop == LEA && cs.IFL1 == FLunde) *(char*)0=0;
-    return gen(c,&cs);
-}

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

@@ -1873 +1873 @@
-            c = allocreg(pretregs,&rreg,tym); /* allocate return regs   */
-            if (sz > REGSIZE)
-
-
-
-
-
-
-
+
+
+
+
+
-
-                ce = genmovreg(ce,msrreg,msreg); /* MOV msrreg,msreg    */
-                ce = genmovreg(ce,lsrreg,lsreg); /* MOV lsrreg,lsreg    */
-            }
+            else if (retregs & XMMREGS)
+            {
+                reg = findreg(retregs & XMMREGS);
+                // MOVD floatreg, XMM?
+                ce = genfltreg(ce,0xF20F11,reg - XMM0,0);
+                // MOV rreg,floatreg
+                ce = genfltreg(ce,0x8B,rreg,0);
+                if (sz == 8)
+                    code_orrex(ce,REX_W);
+            }
-            else
-
+
+
-                ce = genmovreg(ce,rreg,reg);    /* MOV rreg,reg         */
-            }
@@ -1913 +1922 @@
-code *callclib(elem *e,unsigned clib,regm_t *pretregs,regm_t keepmask)
-{
+    //printf("callclib(e = %p, clib = %d, *pretregs = %s, keepmask = %s\n", e, clib, regm_str(*pretregs), regm_str(keepmask));
+    //elem_print(e);
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-  static symbol lib[] =
@@ -2099 +2110 @@
-        #define INFfloat        2       // if this is floating point
-        #define INFwkdone       4       // if weak extern is already done
+        #define INF64           8       // if 64 bit only
-    char push87;                        // # of pushes onto the 8087 stack
-    char pop87;                         // # of pops off of the 8087 stack
@@ -2176 +2188 @@
-    {mPSW, mPSW, 0,INF32|INFfloat,0,4}, // _Ccmp
-
-
-
+64|INF
+64|INF
-  };
-
@@ -2220 +2232 @@
-  assert(clib < CLIBMAX);
-  symbol *s = &lib[clib];
-
+
+
-  code *cpop = CNIL;
-  code *c = getregs((~s->Sregsaved & (mES | mBP | ALLREGS)) & ~keepmask); // mask of regs destroyed
@@ -3611 +3624 @@
-            c = cat(c,ce);
-        }
-
-
-
-
+
+
-            c = allocreg(&regm,&reg,TYoffset);  /* get a register */
-
+nt i
-            ce = loadea(e,&cs,0x8B,reg,i,0,0);  /* MOV reg,data+6 */
-            if (tyfloating(tym))                // TYdouble or TYdouble_alias
@@ -3624 +3635 @@
-            while ((i -= REGSIZE) >= 0)
-            {
-
+ode *c
-                if (i == 0)
-                    c1->Iflags |= CFpsw;                // need the flags on last OR
@@ -3630 +3641 @@
-            }
-        }
-LNGDBLSIZE)       
+tysize[TYldouble])
-            return load87(e,0,pretregs,NULL,-1);
-        else
+        {
+#ifdef DEBUG
+            elem_print(e);
+#endif
-            assert(0);
+        }
-        return c;
-  }

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

@@ -228 +228 @@
-            if (reghasvalue(byte ? BYTEREGS : ALLREGS,value,&reg))
-                goto L11;
-
+ && !I64
-            {
-                assert(value == (int)value);    // sign extend imm32
@@ -410 +410 @@
-            cs.Irm = modregrm(2,reg & 7,4);
-            cs.Isib = modregrm(ss,reg1 & 7,reg2 & 7);
+            assert(reg2 != BP);
-            cs.Iflags = CFoff;
-            cs.Irex = 0;
@@ -777 +778 @@
-    }
-
+    //printf("cdmul(e = %p, *pretregs = %s)\n", e, regm_str(*pretregs));
-    keepregs = 0;
-    cs.Iflags = 0;
@@ -1028 +1030 @@
-                    {
-#if 1
-
+
+
-                        cl = codelem(e->E1,&regm,TRUE);
-                        unsigned r = findreg(regm);
@@ -1034 +1037 @@
-                        if (ss2)
-                        {   // Don't use EBP
-mBP
+(mBP | mR13)
-                            if (!resreg)
-                                resreg = retregs;
@@ -1042 +1045 @@
-                        c = gen2sib(CNIL,0x8D,grex | modregxrm(0,reg,4),
-                                              modregxrmx(ss,r,r));
+                        assert((r & 7) != BP);
-                        if (ss2)
-                        {
@@ -1089 +1093 @@
-                    {
-                                // Don't use EBP
-mBP
+(mBP | mR13)
-                                if (!resreg)
-                                    resreg = retregs;
-                                cl = allocreg(&resreg,&reg,TYint);
-
-ALLREGS
+(ALLREGS & ~mR13)
-                                cl = cat(cl,codelem(e->E1,&sregm,FALSE));
-                                unsigned sreg = findreg(sregm);
@@ -1101 +1105 @@
-                                // SHL sreg,shift
-                                // LEA reg,[sreg * 8][reg]
+                                assert((sreg & 7) != BP);
+                                assert((reg & 7) != BP);
-                                c = gen2sib(CNIL,0x8D,grex | modregxrm(0,reg,4),
-                                                      modregxrmx(2,sreg,sreg));
@@ -1209 +1215 @@
-    default:                                    /* OPconst and operators */
-    L2:
+        //printf("test2 %p, retregs = %s rretregs = %s resreg = %s\n", e, regm_str(retregs), regm_str(rretregs), regm_str(resreg));
-        cl = codelem(e1,&retregs,FALSE);        /* eval left leaf       */
-        cr = scodelem(e2,&rretregs,retregs,TRUE);       /* get rvalue   */

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

@@ -3495 +3495 @@
-                if (!ci)
-                    goto Lbackjmp;      // couldn't find it
-I32
+!I16
-                        c->IEVpointer2 = ad;
-                else                    /* else conditional             */
@@ -3506 +3506 @@
-                                c->Iop = op ^ 1;        /* converse jmp */
-                                c->Iflags &= ~CFjmp16;
-32 ? 5 : 3
+16 ? 3 : 5
-                                cn = code_next(c);
-                                cn->Iop = JMP;          /* long jump    */
@@ -3543 +3543 @@
-
-    for (size = 0; c; c = code_next(c))
-
+
+
+
+
+
-//printf("calcblksize(c = x%x) = %d\n", c, size);
-    return size;
@@ -5040 +5044 @@
-  {     unsigned rm = c->Irm;
-        printf(" rm=%02x=%d,%d,%d",rm,(rm>>6)&3,(rm>>3)&7,rm&7);
-I32
+!I16
-        {   unsigned char sib = c->Isib;
-            printf(" sib=%02x=%d,%d,%d",sib,(sib>>6)&3,(sib>>3)&7,sib&7);

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

@@ -2879 +2879 @@
-    if (!(!*pretregs || retregs))
-    {   WROP(e->Eoper);
-
+
+
-    }
-#endif

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

@@ -209 +209 @@
-                    case TYdouble:
-                        dbg_printf("%g ",e->EV.Vdouble);
+                        break;
+                    case TYcent:
+                    case TYucent:
+                        dbg_printf("%lld+%lld ", e->EV.Vcent.msw, e->EV.Vcent.lsw);
-                        break;
-                    default:

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

@@ -2564 +2564 @@
-                                goto nomatch;
-                        break;
+                    case TYcent:
+                    case TYucent:
+                        if (n1->EV.Vcent.lsw != n2->EV.Vcent.lsw ||
+                            n1->EV.Vcent.msw != n2->EV.Vcent.msw)
+                                goto nomatch;
+                        break;
-                    case TYenum:
-                        if (PARSER)

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

@@ -193 +193 @@
-                    b = 0;
-                    break;
+
+                case TYcent:
+                case TYucent:
+                    b = e->EV.Vcent.lsw || e->EV.Vcent.msw;
+                    break;
+
-                default:
-#ifdef DEBUG

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

@@ -287 +287 @@
-            d = NULL;
-            if (tb->ty == Tarray)
-dword
+size_t
-            dtxoff(&d, s, 0, TYnptr);
-            break;
@@ -402 +402 @@
-            d = NULL;
-            if (tb->ty == Tarray)
-dword
+size_t
-            dtxoff(&d, s, 0, TYnptr);
-            break;
@@ -544 +544 @@
-    {
-        case Tarray:
-dword
+size_t
-            pdt = dtabytes(pdt, TYnptr, 0, (len + 1) * sz, (char *)string);
-            break;
@@ -600 +600 @@
-        case Tarray:
-            if (t->ty == Tarray)
-dword
+size_t
-            if (d)
-            {
@@ -612 +612 @@
-            }
-            else
-dword
+size_t
-
-            break;
@@ -790 +790 @@
-    // Put in first two members, the vtbl[] and the monitor
-    dtxoff(pdt, toVtblSymbol(), 0, TYnptr);
-dword
+size_t
-
-    // Put in the rest

trunk/src/backend/cg87.c

@@ -211 +211 @@
- */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        code *c;
@@ -230 +244 @@
-        else
-        {
-
+
+
+
-                stackused++;
-                assert(stackused <= 8);
@@ -490 +506 @@
-        floatreg = TRUE;
-        reflocal = TRUE;
-0xF8
+~7
-            c = genfwait(c);
-
-
+
-}
-
@@ -842 +857 @@
-            }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    if (*pretregs & mST0)
@@ -1717 +1756 @@
-                    c = codelem(e->E1,&retregs,FALSE);
-                L3:
-!I32
+I16
-                    {
-                        /* MOV floatreg+2,reg   */
@@ -3322 +3361 @@
-            c2 = genctst(c2,e,0);               // FTST
-    }
+    else if ((tym == TYcfloat || tym == TYcdouble) &&
+             *pretregs & (mXMM0|mXMM1) && retregs & mST01)
+    {
+        if (*pretregs & mPSW && !(retregs & mPSW))
+            c1 = genctst(c1,e,0);               // FTST
+        pop87();
+        c1 = genfltreg(c1, ESC(MFdouble,1),3,0); // FSTP floatreg
+        genfwait(c1);
+        c2 = getregs(mXMM0|mXMM1);
+        c2 = genfltreg(c2, 0xF20F10, XMM1 - XMM0, 0);    // MOVD XMM1,floatreg
+
+        pop87();
+        c2 = genfltreg(c2, ESC(MFdouble,1),3,0); // FSTP floatreg
+        genfwait(c2);
+        c2 = genfltreg(c2, 0xF20F10, XMM0 - XMM0, 0);    // MOVD XMM0,floatreg
+    }
+    else if ((tym == TYcfloat || tym == TYcdouble) &&
+             retregs & (mXMM0|mXMM1) && *pretregs & mST01)
+    {
+        c1 = push87();
+        c1 = genfltreg(c1, 0xF20F11, XMM0-XMM0, 0);        // MOVD floatreg, XMM0
+        genfltreg(c1, 0xDD, 0, 0);              // FLD double ptr floatreg
+
+        c2 = push87();
+        c2 = genfltreg(c2, 0xF20F11, XMM1-XMM0, 0);        // MOV floatreg, XMM1
+        genfltreg(c2, 0xDD, 0, 0);              // FLD double ptr floatreg
+
+        if (*pretregs & mPSW)
+            c2 = genctst(c2,e,0);               // FTST
+    }
-    else
-    {   if (*pretregs & mPSW)
@@ -3399 +3468 @@
-    int i;
-
+    //printf("cload87(e = %p, *pretregs = %s)\n", e, regm_str(*pretregs));
-    sz = tysize[ty] / 2;
-    memset(&cs, 0, sizeof(cs));

trunk/src/backend/cgcod.c

@@ -394 +394 @@
-            }
-        }
-I32
+!I16
-            break;                      // use the long conditional jmps
-    } while (flag);                     // loop till no more bytes saved

trunk/src/backend/cgelem.c

@@ -2073 +2073 @@
-
-            // See if we can replace with OPremquo
-intsize)
+REGSIZE && !I64)  // need cent and ucent working for I64 to work
-            {
-                // Don't do it if there are special code sequences in the

trunk/src/backend/cgen.c

@@ -161 +161 @@
-    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;
-    if (config.flags4 & CFG4optimized &&
-        ce->IFL2 == FLconst &&
@@ -171 +173 @@
-                { 0x00,0x08,0x10,0x18,0x20,0x28,0x30,0x38 };
-
-
+        
-        ce->Iop = regop[(ce->Irm & modregrm(0,7,0)) >> 3] | (ce->Iop & 1);
-        code_newreg(ce, reg);
@@ -190 +192 @@
-  ce = code_calloc();
-  ce->Iop = op;
+  assert(op != LEA);
-  if (c)
-  {     cstart = c;
@@ -219 +222 @@
-  cstart = ce = code_calloc();
-  /*cxcalloc++;*/
+  if (op == LEA && (rm & 0xFF) == 4 && (sib & 0xFF) == 0x6D) *(char*)0=0;
-  ce->Iop = op;
-  ce->Irm = rm;
@@ -387 +391 @@
-    cs.IFL1 = FL1;
-    cs.IEV1.Vsize_t = EV1;
+if (cs.Iop == LEA && cs.IFL1 == FLunde) *(char*)0=0;
-    return gen(c,&cs);
-}

trunk/src/backend/cod1.c

@@ -1873 +1873 @@
-            c = allocreg(pretregs,&rreg,tym); /* allocate return regs   */
-            if (sz > REGSIZE)
-
-
-
-
-
-
-
+
+
+
+
+
-
-                ce = genmovreg(ce,msrreg,msreg); /* MOV msrreg,msreg    */
-                ce = genmovreg(ce,lsrreg,lsreg); /* MOV lsrreg,lsreg    */
-            }
+            else if (retregs & XMMREGS)
+            {
+                reg = findreg(retregs & XMMREGS);
+                // MOVD floatreg, XMM?
+                ce = genfltreg(ce,0xF20F11,reg - XMM0,0);
+                // MOV rreg,floatreg
+                ce = genfltreg(ce,0x8B,rreg,0);
+                if (sz == 8)
+                    code_orrex(ce,REX_W);
+            }
-            else
-
+
+
-                ce = genmovreg(ce,rreg,reg);    /* MOV rreg,reg         */
-            }
@@ -1913 +1922 @@
-code *callclib(elem *e,unsigned clib,regm_t *pretregs,regm_t keepmask)
-{
+    //printf("callclib(e = %p, clib = %d, *pretregs = %s, keepmask = %s\n", e, clib, regm_str(*pretregs), regm_str(keepmask));
+    //elem_print(e);
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-  static symbol lib[] =
@@ -2099 +2110 @@
-        #define INFfloat        2       // if this is floating point
-        #define INFwkdone       4       // if weak extern is already done
+        #define INF64           8       // if 64 bit only
-    char push87;                        // # of pushes onto the 8087 stack
-    char pop87;                         // # of pops off of the 8087 stack
@@ -2176 +2188 @@
-    {mPSW, mPSW, 0,INF32|INFfloat,0,4}, // _Ccmp
-
-
-
+64|INF
+64|INF
-  };
-
@@ -2220 +2232 @@
-  assert(clib < CLIBMAX);
-  symbol *s = &lib[clib];
-
+
+
-  code *cpop = CNIL;
-  code *c = getregs((~s->Sregsaved & (mES | mBP | ALLREGS)) & ~keepmask); // mask of regs destroyed
@@ -3611 +3624 @@
-            c = cat(c,ce);
-        }
-
-
-
-
+
+
-            c = allocreg(&regm,&reg,TYoffset);  /* get a register */
-
+nt i
-            ce = loadea(e,&cs,0x8B,reg,i,0,0);  /* MOV reg,data+6 */
-            if (tyfloating(tym))                // TYdouble or TYdouble_alias
@@ -3624 +3635 @@
-            while ((i -= REGSIZE) >= 0)
-            {
-
+ode *c
-                if (i == 0)
-                    c1->Iflags |= CFpsw;                // need the flags on last OR
@@ -3630 +3641 @@
-            }
-        }
-LNGDBLSIZE)       
+tysize[TYldouble])
-            return load87(e,0,pretregs,NULL,-1);
-        else
+        {
+#ifdef DEBUG
+            elem_print(e);
+#endif
-            assert(0);
+        }
-        return c;
-  }

trunk/src/backend/cod2.c

@@ -228 +228 @@
-            if (reghasvalue(byte ? BYTEREGS : ALLREGS,value,&reg))
-                goto L11;
-
+ && !I64
-            {
-                assert(value == (int)value);    // sign extend imm32
@@ -410 +410 @@
-            cs.Irm = modregrm(2,reg & 7,4);
-            cs.Isib = modregrm(ss,reg1 & 7,reg2 & 7);
+            assert(reg2 != BP);
-            cs.Iflags = CFoff;
-            cs.Irex = 0;
@@ -777 +778 @@
-    }
-
+    //printf("cdmul(e = %p, *pretregs = %s)\n", e, regm_str(*pretregs));
-    keepregs = 0;
-    cs.Iflags = 0;
@@ -1028 +1030 @@
-                    {
-#if 1
-
+
+
-                        cl = codelem(e->E1,&regm,TRUE);
-                        unsigned r = findreg(regm);
@@ -1034 +1037 @@
-                        if (ss2)
-                        {   // Don't use EBP
-mBP
+(mBP | mR13)
-                            if (!resreg)
-                                resreg = retregs;
@@ -1042 +1045 @@
-                        c = gen2sib(CNIL,0x8D,grex | modregxrm(0,reg,4),
-                                              modregxrmx(ss,r,r));
+                        assert((r & 7) != BP);
-                        if (ss2)
-                        {
@@ -1089 +1093 @@
-                    {
-                                // Don't use EBP
-mBP
+(mBP | mR13)
-                                if (!resreg)
-                                    resreg = retregs;
-                                cl = allocreg(&resreg,&reg,TYint);
-
-ALLREGS
+(ALLREGS & ~mR13)
-                                cl = cat(cl,codelem(e->E1,&sregm,FALSE));
-                                unsigned sreg = findreg(sregm);
@@ -1101 +1105 @@
-                                // SHL sreg,shift
-                                // LEA reg,[sreg * 8][reg]
+                                assert((sreg & 7) != BP);
+                                assert((reg & 7) != BP);
-                                c = gen2sib(CNIL,0x8D,grex | modregxrm(0,reg,4),
-                                                      modregxrmx(2,sreg,sreg));
@@ -1209 +1215 @@
-    default:                                    /* OPconst and operators */
-    L2:
+        //printf("test2 %p, retregs = %s rretregs = %s resreg = %s\n", e, regm_str(retregs), regm_str(rretregs), regm_str(resreg));
-        cl = codelem(e1,&retregs,FALSE);        /* eval left leaf       */
-        cr = scodelem(e2,&rretregs,retregs,TRUE);       /* get rvalue   */

trunk/src/backend/cod3.c

@@ -3495 +3495 @@
-                if (!ci)
-                    goto Lbackjmp;      // couldn't find it
-I32
+!I16
-                        c->IEVpointer2 = ad;
-                else                    /* else conditional             */
@@ -3506 +3506 @@
-                                c->Iop = op ^ 1;        /* converse jmp */
-                                c->Iflags &= ~CFjmp16;
-32 ? 5 : 3
+16 ? 3 : 5
-                                cn = code_next(c);
-                                cn->Iop = JMP;          /* long jump    */
@@ -3543 +3543 @@
-
-    for (size = 0; c; c = code_next(c))
-
+
+
+
+
+
-//printf("calcblksize(c = x%x) = %d\n", c, size);
-    return size;
@@ -5040 +5044 @@
-  {     unsigned rm = c->Irm;
-        printf(" rm=%02x=%d,%d,%d",rm,(rm>>6)&3,(rm>>3)&7,rm&7);
-I32
+!I16
-        {   unsigned char sib = c->Isib;
-            printf(" sib=%02x=%d,%d,%d",sib,(sib>>6)&3,(sib>>3)&7,sib&7);

trunk/src/backend/cod4.c

@@ -2879 +2879 @@
-    if (!(!*pretregs || retregs))
-    {   WROP(e->Eoper);
-
+
+
-    }
-#endif

trunk/src/backend/debug.c

@@ -209 +209 @@
-                    case TYdouble:
-                        dbg_printf("%g ",e->EV.Vdouble);
+                        break;
+                    case TYcent:
+                    case TYucent:
+                        dbg_printf("%lld+%lld ", e->EV.Vcent.msw, e->EV.Vcent.lsw);
-                        break;
-                    default:

trunk/src/backend/el.c

@@ -2564 +2564 @@
-                                goto nomatch;
-                        break;
+                    case TYcent:
+                    case TYucent:
+                        if (n1->EV.Vcent.lsw != n2->EV.Vcent.lsw ||
+                            n1->EV.Vcent.msw != n2->EV.Vcent.msw)
+                                goto nomatch;
+                        break;
-                    case TYenum:
-                        if (PARSER)

trunk/src/backend/evalu8.c

@@ -193 +193 @@
-                    b = 0;
-                    break;
+
+                case TYcent:
+                case TYucent:
+                    b = e->EV.Vcent.lsw || e->EV.Vcent.msw;
+                    break;
+
-                default:
-#ifdef DEBUG

trunk/src/todt.c

@@ -152 +152 @@
-                    dim *= tsa->dim->toInteger();
-                }
+                //printf("sz = %d, dim = %d, vsz = %d\n", sz, dim, vsz);
-                assert(sz == vsz || sz * dim <= vsz);
-
@@ -283 +284 @@
-            d = NULL;
-            if (tb->ty == Tarray)
-dword
+size_t
-            dtxoff(&d, s, 0, TYnptr);
-            break;
@@ -398 +399 @@
-            d = NULL;
-            if (tb->ty == Tarray)
-dword
+size_t
-            dtxoff(&d, s, 0, TYnptr);
-            break;
@@ -540 +541 @@
-    {
-        case Tarray:
-dword
+size_t
-            pdt = dtabytes(pdt, TYnptr, 0, (len + 1) * sz, (char *)string);
-            break;
@@ -596 +597 @@
-        case Tarray:
-            if (t->ty == Tarray)
-dword
+size_t
-            if (d)
-            {
@@ -608 +609 @@
-            }
-            else
-dword
+size_t
-
-            break;
@@ -696 +697 @@
-                    dim *= tsa->dim->toInteger();
-                }
+
-                for (size_t i = 0; i < dim; i++)
-                {
@@ -788 +790 @@
-    // Put in first two members, the vtbl[] and the monitor
-    dtxoff(pdt, toVtblSymbol(), 0, TYnptr);
-dword
+size_t
-
-    // Put in the rest