|
From: <sv...@va...> - 2005-04-03 14:59:59
|
Author: sewardj
Date: 2005-04-03 15:59:54 +0100 (Sun, 03 Apr 2005)
New Revision: 1117
Modified:
trunk/priv/guest-x86/toIR.c
Log:
Reinstate ADC Iv, eAX.
Modified: trunk/priv/guest-x86/toIR.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/guest-x86/toIR.c 2005-04-01 20:19:20 UTC (rev 1116)
+++ trunk/priv/guest-x86/toIR.c 2005-04-03 14:59:54 UTC (rev 1117)
@@ -2113,6 +2113,7 @@
/* op $immediate, AL/AX/EAX. */
static
UInt dis_op_imm_A ( Int size,
+ Bool carrying,
IROp op8,
Bool keep,
UInt delta,
@@ -2125,13 +2126,22 @@
UInt lit =3D getUDisp(size,delta);
assign(dst0, getIReg(size,R_EAX));
assign(src, mkU(ty,lit));
- assign(dst1, binop(mkSizedOp(ty,op8), mkexpr(dst0), mkexpr(src)) );
- if (isAddSub(op8))
+
+ if (isAddSub(op8) && !carrying) {
+ assign(dst1, binop(mkSizedOp(ty,op8), mkexpr(dst0), mkexpr(src)) )=
;
setFlags_DEP1_DEP2(op8, dst0, src, ty);
+ }=20
else
- if (isLogic(op8))
+ if (isLogic(op8)) {
+ vassert(!carrying);
+ assign(dst1, binop(mkSizedOp(ty,op8), mkexpr(dst0), mkexpr(src)) )=
;
setFlags_DEP1(op8, dst1, ty);
+ }=20
else
+ if (op8 =3D=3D Iop_Add8 && carrying) {
+ helper_ADC( size, dst1, dst0, src );
+ }
+ else
vpanic("dis_op_imm_A(x86,guest)");
=20
if (keep)
@@ -10799,26 +10809,26 @@
/* ------------------------ opl imm, A ----------------- */
=20
case 0x04: /* ADD Ib, AL */
- delta =3D dis_op_imm_A( 1, Iop_Add8, True, delta, "add" );
+ delta =3D dis_op_imm_A( 1, False, Iop_Add8, True, delta, "add" );
break;
case 0x05: /* ADD Iv, eAX */
- delta =3D dis_op_imm_A(sz, Iop_Add8, True, delta, "add" );
+ delta =3D dis_op_imm_A( sz, False, Iop_Add8, True, delta, "add" );
break;
=20
case 0x0C: /* OR Ib, AL */
- delta =3D dis_op_imm_A( 1, Iop_Or8, True, delta, "or" );
+ delta =3D dis_op_imm_A( 1, False, Iop_Or8, True, delta, "or" );
break;
case 0x0D: /* OR Iv, eAX */
- delta =3D dis_op_imm_A( sz, Iop_Or8, True, delta, "or" );
+ delta =3D dis_op_imm_A( sz, False, Iop_Or8, True, delta, "or" );
break;
=20
//-- case 0x14: /* ADC Ib, AL */
//-- delta =3D dis_op_imm_A( 1, ADC, True, delta, "adc" );
//-- break;
-//-- case 0x15: /* ADC Iv, eAX */
-//-- delta =3D dis_op_imm_A( sz, ADC, True, delta, "adc" );
-//-- break;
-//--=20
+ case 0x15: /* ADC Iv, eAX */
+ delta =3D dis_op_imm_A( sz, True, Iop_Add8, True, delta, "adc" );
+ break;
+
//-- case 0x1C: /* SBB Ib, AL */
//-- delta =3D dis_op_imm_A( 1, SBB, True, delta, "sbb" );
//-- break;
@@ -10827,38 +10837,38 @@
//-- break;
//--=20
case 0x24: /* AND Ib, AL */
- delta =3D dis_op_imm_A( 1, Iop_And8, True, delta, "and" );
+ delta =3D dis_op_imm_A( 1, False, Iop_And8, True, delta, "and" );
break;
case 0x25: /* AND Iv, eAX */
- delta =3D dis_op_imm_A( sz, Iop_And8, True, delta, "and" );
+ delta =3D dis_op_imm_A( sz, False, Iop_And8, True, delta, "and" );
break;
=20
case 0x2C: /* SUB Ib, AL */
- delta =3D dis_op_imm_A(1, Iop_Sub8, True, delta, "sub" );
+ delta =3D dis_op_imm_A( 1, False, Iop_Sub8, True, delta, "sub" );
break;
case 0x2D: /* SUB Iv, eAX */
- delta =3D dis_op_imm_A( sz, Iop_Sub8, True, delta, "sub" );
+ delta =3D dis_op_imm_A( sz, False, Iop_Sub8, True, delta, "sub" );
break;
=20
case 0x34: /* XOR Ib, AL */
- delta =3D dis_op_imm_A( 1, Iop_Xor8, True, delta, "xor" );
+ delta =3D dis_op_imm_A( 1, False, Iop_Xor8, True, delta, "xor" );
break;
case 0x35: /* XOR Iv, eAX */
- delta =3D dis_op_imm_A( sz, Iop_Xor8, True, delta, "xor" );
+ delta =3D dis_op_imm_A( sz, False, Iop_Xor8, True, delta, "xor" );
break;
=20
case 0x3C: /* CMP Ib, AL */
- delta =3D dis_op_imm_A( 1, Iop_Sub8, False, delta, "cmp" );
+ delta =3D dis_op_imm_A( 1, False, Iop_Sub8, False, delta, "cmp" )=
;
break;
case 0x3D: /* CMP Iv, eAX */
- delta =3D dis_op_imm_A( sz, Iop_Sub8, False, delta, "cmp" );
+ delta =3D dis_op_imm_A( sz, False, Iop_Sub8, False, delta, "cmp" )=
;
break;
=20
case 0xA8: /* TEST Ib, AL */
- delta =3D dis_op_imm_A( 1, Iop_And8, False, delta, "test" );
+ delta =3D dis_op_imm_A( 1, False, Iop_And8, False, delta, "test" =
);
break;
case 0xA9: /* TEST Iv, eAX */
- delta =3D dis_op_imm_A( sz, Iop_And8, False, delta, "test" );
+ delta =3D dis_op_imm_A( sz, False, Iop_And8, False, delta, "test" =
);
break;
=20
/* ------------------------ opl Ev, Gv ----------------- */
|