Changeset 819

Timestamp:

12/27/10 05:44:50 (14 years ago)

Author:

walter

Message:

64 bit fix

Files:

• 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/cod1.c

@@ -639 +639 @@
-                {       if (regcon.cse.value[i] == e && // if register has elem
-                            /* watch out for a CWD destroying DX        */
-                            !(i == DX && op == 0xF7 && desmsk & mDX))
-                        {
-                                /* if ES, then it can only be a load    */
-                                if (i == ES)
-                                {       if (op != 0x8B)
-                                            goto L1;    /* not a load   */
-                                        cs->Iop = 0x8C; /* MOV reg,ES   */
-                                        cs->Irm = modregrm(3,0,reg & 7);
-                                        if (reg & 8)
-                                            code_orrex(cs, REX_B);
-                                }
-                                else    // XXX reg,i
-                                {
-                                    cs->Irm = modregrm(3,reg & 7,i & 7);
-                                    if (reg & 8)
-                                        cs->Irex |= REX_R;
-                                    if (i & 8)
-                                        cs->Irex |= REX_B;
-i >= 4
+(i >= 4 || reg >= 4)
-                                        cs->Irex |= REX;
-                                    if (I64 && (sz == 8 || sz == 16))
-                                        cs->Irex |= REX_W;
-                                }
-                                c = CNIL;
-                                goto L2;
-                        }
-                        rm &= ~mask[i];
-                }
-        }
-  }
-
-L1:
-  c = getlvalue(cs,e,keepmsk);
-  if (offset == REGSIZE)
-        getlvalue_msw(cs);
-  else
-        cs->IEVoffset1 += offset;
-  if (I64 && reg >= 4 && sz == 1)               // if byte register
-        // Can only address those 8 bit registers if a REX byte is present

trunk/src/backend/cod1.c

@@ -639 +639 @@
-                {       if (regcon.cse.value[i] == e && // if register has elem
-                            /* watch out for a CWD destroying DX        */
-                            !(i == DX && op == 0xF7 && desmsk & mDX))
-                        {
-                                /* if ES, then it can only be a load    */
-                                if (i == ES)
-                                {       if (op != 0x8B)
-                                            goto L1;    /* not a load   */
-                                        cs->Iop = 0x8C; /* MOV reg,ES   */
-                                        cs->Irm = modregrm(3,0,reg & 7);
-                                        if (reg & 8)
-                                            code_orrex(cs, REX_B);
-                                }
-                                else    // XXX reg,i
-                                {
-                                    cs->Irm = modregrm(3,reg & 7,i & 7);
-                                    if (reg & 8)
-                                        cs->Irex |= REX_R;
-                                    if (i & 8)
-                                        cs->Irex |= REX_B;
-i >= 4
+(i >= 4 || reg >= 4)
-                                        cs->Irex |= REX;
-                                    if (I64 && (sz == 8 || sz == 16))
-                                        cs->Irex |= REX_W;
-                                }
-                                c = CNIL;
-                                goto L2;
-                        }
-                        rm &= ~mask[i];
-                }
-        }
-  }
-
-L1:
-  c = getlvalue(cs,e,keepmsk);
-  if (offset == REGSIZE)
-        getlvalue_msw(cs);
-  else
-        cs->IEVoffset1 += offset;
-  if (I64 && reg >= 4 && sz == 1)               // if byte register
-        // Can only address those 8 bit registers if a REX byte is present