Fix BSF and BSR instructions in the x86 emulator.
Patch courtesy of Michael Yaroslavtsev.
This commit is contained in:
parent
3b5b7ef5c2
commit
66fa87292e
|
@ -2129,7 +2129,7 @@ static void x86emuOp2_bsf(u8 X86EMU_UNUSED(op2))
|
||||||
uint srcoffset;
|
uint srcoffset;
|
||||||
|
|
||||||
START_OF_INSTR();
|
START_OF_INSTR();
|
||||||
DECODE_PRINTF("BSF\n");
|
DECODE_PRINTF("BSF\t");
|
||||||
FETCH_DECODE_MODRM(mod, rh, rl);
|
FETCH_DECODE_MODRM(mod, rh, rl);
|
||||||
switch(mod) {
|
switch(mod) {
|
||||||
case 0:
|
case 0:
|
||||||
|
@ -2209,25 +2209,25 @@ static void x86emuOp2_bsf(u8 X86EMU_UNUSED(op2))
|
||||||
break;
|
break;
|
||||||
case 3: /* register to register */
|
case 3: /* register to register */
|
||||||
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
|
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
|
||||||
u32 *srcreg, *dstreg;
|
u32 srcval, *dstreg;
|
||||||
|
|
||||||
srcreg = DECODE_RM_LONG_REGISTER(rl);
|
srcval = *DECODE_RM_LONG_REGISTER(rl);
|
||||||
DECODE_PRINTF(",");
|
DECODE_PRINTF(",");
|
||||||
dstreg = DECODE_RM_LONG_REGISTER(rh);
|
dstreg = DECODE_RM_LONG_REGISTER(rh);
|
||||||
TRACE_AND_STEP();
|
TRACE_AND_STEP();
|
||||||
CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
|
CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
|
||||||
for(*dstreg = 0; *dstreg < 32; (*dstreg)++)
|
for(*dstreg = 0; *dstreg < 32; (*dstreg)++)
|
||||||
if ((*srcreg >> *dstreg) & 1) break;
|
if ((srcval >> *dstreg) & 1) break;
|
||||||
} else {
|
} else {
|
||||||
u16 *srcreg, *dstreg;
|
u16 srcval, *dstreg;
|
||||||
|
|
||||||
srcreg = DECODE_RM_WORD_REGISTER(rl);
|
srcval = *DECODE_RM_WORD_REGISTER(rl);
|
||||||
DECODE_PRINTF(",");
|
DECODE_PRINTF(",");
|
||||||
dstreg = DECODE_RM_WORD_REGISTER(rh);
|
dstreg = DECODE_RM_WORD_REGISTER(rh);
|
||||||
TRACE_AND_STEP();
|
TRACE_AND_STEP();
|
||||||
CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
|
CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
|
||||||
for(*dstreg = 0; *dstreg < 16; (*dstreg)++)
|
for(*dstreg = 0; *dstreg < 16; (*dstreg)++)
|
||||||
if ((*srcreg >> *dstreg) & 1) break;
|
if ((srcval >> *dstreg) & 1) break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -2245,7 +2245,7 @@ static void x86emuOp2_bsr(u8 X86EMU_UNUSED(op2))
|
||||||
uint srcoffset;
|
uint srcoffset;
|
||||||
|
|
||||||
START_OF_INSTR();
|
START_OF_INSTR();
|
||||||
DECODE_PRINTF("BSF\n");
|
DECODE_PRINTF("BSR\t");
|
||||||
FETCH_DECODE_MODRM(mod, rh, rl);
|
FETCH_DECODE_MODRM(mod, rh, rl);
|
||||||
switch(mod) {
|
switch(mod) {
|
||||||
case 0:
|
case 0:
|
||||||
|
@ -2325,25 +2325,25 @@ static void x86emuOp2_bsr(u8 X86EMU_UNUSED(op2))
|
||||||
break;
|
break;
|
||||||
case 3: /* register to register */
|
case 3: /* register to register */
|
||||||
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
|
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
|
||||||
u32 *srcreg, *dstreg;
|
u32 srcval, *dstreg;
|
||||||
|
|
||||||
srcreg = DECODE_RM_LONG_REGISTER(rl);
|
srcval = *DECODE_RM_LONG_REGISTER(rl);
|
||||||
DECODE_PRINTF(",");
|
DECODE_PRINTF(",");
|
||||||
dstreg = DECODE_RM_LONG_REGISTER(rh);
|
dstreg = DECODE_RM_LONG_REGISTER(rh);
|
||||||
TRACE_AND_STEP();
|
TRACE_AND_STEP();
|
||||||
CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
|
CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
|
||||||
for(*dstreg = 31; *dstreg > 0; (*dstreg)--)
|
for(*dstreg = 31; *dstreg > 0; (*dstreg)--)
|
||||||
if ((*srcreg >> *dstreg) & 1) break;
|
if ((srcval >> *dstreg) & 1) break;
|
||||||
} else {
|
} else {
|
||||||
u16 *srcreg, *dstreg;
|
u16 srcval, *dstreg;
|
||||||
|
|
||||||
srcreg = DECODE_RM_WORD_REGISTER(rl);
|
srcval = *DECODE_RM_WORD_REGISTER(rl);
|
||||||
DECODE_PRINTF(",");
|
DECODE_PRINTF(",");
|
||||||
dstreg = DECODE_RM_WORD_REGISTER(rh);
|
dstreg = DECODE_RM_WORD_REGISTER(rh);
|
||||||
TRACE_AND_STEP();
|
TRACE_AND_STEP();
|
||||||
CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
|
CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
|
||||||
for(*dstreg = 15; *dstreg > 0; (*dstreg)--)
|
for(*dstreg = 15; *dstreg > 0; (*dstreg)--)
|
||||||
if ((*srcreg >> *dstreg) & 1) break;
|
if ((srcval >> *dstreg) & 1) break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user