diff -rup -U 5 ../qemu-snap/target-i386/translate.c ./target-i386/translate.c --- ../qemu-snap/target-i386/translate.c 2004-09-05 23:52:37.000000000 +0100 +++ ./target-i386/translate.c 2004-09-07 01:38:38.000000000 +0100 @@ -1431,11 +1431,11 @@ static inline void gen_jcc(DisasContext if (!inv) { func((long)tb, val, next_eip); } else { func((long)tb, next_eip, val); } - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } else { if (s->cc_op != CC_OP_DYNAMIC) { gen_op_set_cc_op(s->cc_op); s->cc_op = CC_OP_DYNAMIC; } @@ -1519,15 +1519,15 @@ static void gen_movl_seg_T0(DisasContext /* abort translation because the addseg value may change or because ss32 may change. For R_SS, translation must always stop as a special handling must be done to disable hardware interrupts for the next instruction */ if (seg_reg == R_SS || (s->code32 && seg_reg < R_FS)) - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } else { gen_op_movl_seg_T0_vm(offsetof(CPUX86State,segs[seg_reg])); if (seg_reg == R_SS) - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } } static inline void gen_stack_update(DisasContext *s, int addend) { @@ -1710,11 +1710,11 @@ static void gen_exception(DisasContext * { if (s->cc_op != CC_OP_DYNAMIC) gen_op_set_cc_op(s->cc_op); gen_op_jmp_im(cur_eip); gen_op_raise_exception(trapno); - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } /* an interrupt is different from an exception because of the priviledge checks */ static void gen_interrupt(DisasContext *s, int intno, @@ -1722,20 +1722,20 @@ static void gen_interrupt(DisasContext * { if (s->cc_op != CC_OP_DYNAMIC) gen_op_set_cc_op(s->cc_op); gen_op_jmp_im(cur_eip); gen_op_raise_interrupt(intno, next_eip); - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } static void gen_debug(DisasContext *s, unsigned int cur_eip) { if (s->cc_op != CC_OP_DYNAMIC) gen_op_set_cc_op(s->cc_op); gen_op_jmp_im(cur_eip); gen_op_debug(); - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } /* generate a generic end of block. Trace exception is also generated if needed */ static void gen_eob(DisasContext *s) @@ -1751,11 +1751,11 @@ static void gen_eob(DisasContext *s) gen_op_raise_exception(EXCP01_SSTP); } else { gen_op_movl_T0_0(); gen_op_exit_tb(); } - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } /* generate a jump to eip. No segment change must happen before as a direct call to the next block may occur */ static void gen_jmp(DisasContext *s, unsigned int eip) @@ -1764,11 +1764,11 @@ static void gen_jmp(DisasContext *s, uns if (s->jmp_opt) { if (s->cc_op != CC_OP_DYNAMIC) gen_op_set_cc_op(s->cc_op); gen_op_jmp((long)tb, eip); - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } else { gen_op_jmp_im(eip); gen_eob(s); } } @@ -3904,11 +3904,11 @@ static uint8_t *disas_insn(DisasContext } else { if (s->cc_op != CC_OP_DYNAMIC) gen_op_set_cc_op(s->cc_op); gen_op_jmp_im(s->pc - s->cs_base); gen_op_hlt(); - s->is_jmp = 3; + s->is_jmp = DISAS_TB_JUMP; } break; case 0x100: modrm = ldub_code(s->pc++); mod = (modrm >> 6) & 3;