Changeset 813

Timestamp:

12/23/10 06:50:12 (14 years ago)

Author:

walter

Message:

Brad's backend 64 bit changes

Files:

• trunk/src/backend/cod2.c (modified) (1 diff)
• trunk/src/backend/cod4.c (modified) (1 diff)

trunk/src/backend/cod2.c

@@ -1695 +1695 @@
-
-  if (op1 != OPcond && op1 != OPandand && op1 != OPoror &&
-      op1 != OPnot && op1 != OPbool &&
-      e21->Eoper == OPconst &&
-      sz1 <= REGSIZE &&
-      *pretregs & (mBP | ALLREGS) &&
-      tysize(e21->Ety) <= REGSIZE && !tyfloating(e21->Ety))
-  {     // Recognize (e ? c : f)
-        unsigned reg;
-        regm_t retregs;
-
-        cnop1 = gennop(CNIL);
-        retregs = mPSW;
-        jop = jmpopcode(e1);            // get jmp condition
-        c = codelem(e1,&retregs,FALSE);
-
-        // Set the register with e21 without affecting the flags
-        retregs = *pretregs & (ALLREGS | mBP);
-        if (retregs & ~regcon.mvar)
-            retregs &= ~regcon.mvar;    // don't disturb register variables
-
+
+
-        retregs = mask[reg];
-
-        c = cat(c,cse_flush(1));                // flush CSE's to memory
-        c = genjmp(c,jop,FLcode,(block *)cnop1);
-        freenode(e21);
-
-        regconsave = regcon;
-        stackpushsave = stackpush;
-
-        c2 = codelem(e22,&retregs,FALSE);
-
-        andregcon(&regconsave);
-        assert(stackpushsave == stackpush);
-
-        freenode(e2);
-        c = cat6(cc,c,c2,cnop1,fixresult(e,retregs,pretregs),NULL);
-        goto Lret;
-  }
-
-  cnop1 = gennop(CNIL);

trunk/src/backend/cod4.c

@@ -3216 +3216 @@
-
-/*************************************
- * Generate code for OPbsf and OPbsr.
- */
-
-code *cdbscan(elem *e, regm_t *pretregs)
-{
-    regm_t retregs;
-    unsigned reg;
-    int sz;
-    tym_t tyml;
-    code *cl,*cg;
-    code cs;
-
-    //printf("cdbscan()\n");
-    //elem_print(e);
-    if (*pretregs == 0)
-        return codelem(e->E1,pretregs,FALSE);
-    tyml = tybasic(e->E1->Ety);
-    sz = tysize[tyml];
-
+ || sz == 8
-
-    if ((e->E1->Eoper == OPind && !e->E1->Ecount) || e->E1->Eoper == OPvar)
-    {
-        cl = getlvalue(&cs, e->E1, RMload);     // get addressing mode
-    }
-    else
-    {
-        retregs = allregs;
-        cl = codelem(e->E1, &retregs, FALSE);
-        reg = findreg(retregs);
-        cs.Irm = modregrm(3,0,reg & 7);
-        cs.Iflags = 0;
-        cs.Irex = 0;
-        if (reg & 8)
-            cs.Irex |= REX_B;
-    }
-
-    retregs = *pretregs & allregs;
-    if  (!retregs)
-        retregs = allregs;
-    cg = allocreg(&retregs, &reg, e->Ety);
-
-    cs.Iop = (e->Eoper == OPbsf) ? 0x0FBC : 0x0FBD;        // BSF/BSR reg,EA
-    code_newreg(&cs, reg);
-    if (!I16 && sz == SHORTSIZE)
-        cs.Iflags |= CFopsize;
-    cg = gen(cg,&cs);
+    if (sz == 8)
+        code_orrex(cg, REX_W);
-
-    return cat3(cl,cg,fixresult(e,retregs,pretregs));
-}
-
-/*******************************************
- * Generate code for OPpair, OPrpair.
- */
-
-code *cdpair(elem *e, regm_t *pretregs)
-{
-    regm_t retregs;
-    regm_t regs1;
-    regm_t regs2;
-    unsigned reg;
-    code *cg;
-    code *c1;
-    code *c2;
-
-    if (*pretregs == 0)                         // if don't want result
-    {   c1 = codelem(e->E1,pretregs,FALSE);     // eval left leaf