Changeset 831

Timestamp:

01/01/11 04:20:07 (14 years ago)

Author:

walter

Message:

64 bits

Files:

• branches/dmd-1.x/src/backend/cod2.c (modified) (1 diff)
• trunk/src/backend/cod2.c (modified) (1 diff)

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

@@ -643 +643 @@
-                    }
-                }
-                rval = reghasvalue(byte ? BYTEREGS : ALLREGS,i,&rreg);
-                cs.IEV2.Vint = i;
-        L3:
-                op1 ^= byte;
-                cs.Iflags |= word;
-                if (rval)
-                {   cs.Iop = op1 ^ 2;
-                    mode = rreg;
-                }
-                else
-                    cs.Iop = 0x81;
-                cs.Irm = modregrm(3,mode&7,reg&7);
-                if (mode & 8)
-                    cs.Irex |= REX_R;
-                if (reg & 8)
-                    cs.Irex |= REX_B;
-                if (I64 && sz == 8)
-                    cs.Irex |= REX_W;
-reg >= 4
+(reg >= 4 || (rval && rreg >= 4))
-                    cs.Irex |= REX;
-                cs.IFL2 = (e2->Eoper == OPconst) ? FLconst : el_fl(e2);
-                /* Modify instruction for special cases */
-                switch (e->Eoper)
-                {   case OPadd:
-                    {   int iop;
-
-                        if (i == 1)
-                            iop = 0;                    /* INC reg      */
-                        else if (i == -1)
-                            iop = 8;                    /* DEC reg      */
-                        else
-                            break;
-                        cs.Iop = (0x40 | iop | reg) ^ byte;
-                        if ((byte && *pretregs & mPSW) || I64)
-                        {   cs.Irm = modregrm(3,0,reg & 7) | iop;
-                            cs.Iop = 0xFF;
-                        }
-                        break;
-                    }

trunk/src/backend/cod2.c

@@ -643 +643 @@
-                    }
-                }
-                rval = reghasvalue(byte ? BYTEREGS : ALLREGS,i,&rreg);
-                cs.IEV2.Vint = i;
-        L3:
-                op1 ^= byte;
-                cs.Iflags |= word;
-                if (rval)
-                {   cs.Iop = op1 ^ 2;
-                    mode = rreg;
-                }
-                else
-                    cs.Iop = 0x81;
-                cs.Irm = modregrm(3,mode&7,reg&7);
-                if (mode & 8)
-                    cs.Irex |= REX_R;
-                if (reg & 8)
-                    cs.Irex |= REX_B;
-                if (I64 && sz == 8)
-                    cs.Irex |= REX_W;
-reg >= 4
+(reg >= 4 || (rval && rreg >= 4))
-                    cs.Irex |= REX;
-                cs.IFL2 = (e2->Eoper == OPconst) ? FLconst : el_fl(e2);
-                /* Modify instruction for special cases */
-                switch (e->Eoper)
-                {   case OPadd:
-                    {   int iop;
-
-                        if (i == 1)
-                            iop = 0;                    /* INC reg      */
-                        else if (i == -1)
-                            iop = 8;                    /* DEC reg      */
-                        else
-                            break;
-                        cs.Iop = (0x40 | iop | reg) ^ byte;
-                        if ((byte && *pretregs & mPSW) || I64)
-                        {   cs.Irm = modregrm(3,0,reg & 7) | iop;
-                            cs.Iop = 0xFF;
-                        }
-                        break;
-                    }