diff options
author | Richard Henderson <rth@twiddle.net> | 2013-01-23 12:34:26 -0800 |
---|---|---|
committer | Richard Henderson <rth@twiddle.net> | 2013-02-18 15:03:56 -0800 |
commit | e207582f6660e0e2d10a2e79e664e456e80b2887 (patch) | |
tree | 1ad9c9cf5eb62680b3776c4cfa8e1456765fea5a /target-i386/translate.c | |
parent | 3ca51d07dae5b2d2301431c55b08d4faaad95d91 (diff) | |
download | hqemu-e207582f6660e0e2d10a2e79e664e456e80b2887.zip hqemu-e207582f6660e0e2d10a2e79e664e456e80b2887.tar.gz |
target-i386: Don't clobber s->cc_op in gen_update_cc_op
Use a dirty flag to know whether env->cc_op is up to date,
rather than forcing s->cc_op to DYNAMIC and losing info.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target-i386/translate.c')
-rw-r--r-- | target-i386/translate.c | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/target-i386/translate.c b/target-i386/translate.c index 6df76d6..cabdeda 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -90,6 +90,7 @@ typedef struct DisasContext { #endif int ss32; /* 32 bit stack segment */ CCOp cc_op; /* current CC operation */ + bool cc_op_dirty; int addseg; /* non zero if either DS/ES/SS have a non zero base */ int f_st; /* currently unused */ int vm86; /* vm86 mode */ @@ -173,9 +174,27 @@ enum { OR_A0, /* temporary register used when doing address evaluation */ }; -static inline void set_cc_op(DisasContext *s, CCOp op) +static void set_cc_op(DisasContext *s, CCOp op) { - s->cc_op = op; + if (s->cc_op != op) { + s->cc_op = op; + /* The DYNAMIC setting is translator only, and should never be + stored. Thus we always consider it clean. */ + s->cc_op_dirty = (op != CC_OP_DYNAMIC); + } +} + +static inline void gen_op_set_cc_op(int32_t val) +{ + tcg_gen_movi_i32(cpu_cc_op, val); +} + +static void gen_update_cc_op(DisasContext *s) +{ + if (s->cc_op_dirty) { + gen_op_set_cc_op(s->cc_op); + s->cc_op_dirty = false; + } } static inline void gen_op_movl_T0_0(void) @@ -444,11 +463,6 @@ static inline void gen_op_add_reg_T0(int size, int reg) } } -static inline void gen_op_set_cc_op(int32_t val) -{ - tcg_gen_movi_i32(cpu_cc_op, val); -} - static inline void gen_op_addl_A0_reg_sN(int shift, int reg) { tcg_gen_mov_tl(cpu_tmp0, cpu_regs[reg]); @@ -800,14 +814,6 @@ static inline void gen_movs(DisasContext *s, int ot) gen_op_add_reg_T0(s->aflag, R_EDI); } -static inline void gen_update_cc_op(DisasContext *s) -{ - if (s->cc_op != CC_OP_DYNAMIC) { - gen_op_set_cc_op(s->cc_op); - set_cc_op(s, CC_OP_DYNAMIC); - } -} - static void gen_op_update1_cc(void) { tcg_gen_discard_tl(cpu_cc_src); @@ -7816,6 +7822,7 @@ static inline void gen_intermediate_code_internal(CPUX86State *env, dc->tf = (flags >> TF_SHIFT) & 1; dc->singlestep_enabled = env->singlestep_enabled; dc->cc_op = CC_OP_DYNAMIC; + dc->cc_op_dirty = false; dc->cs_base = cs_base; dc->tb = tb; dc->popl_esp_hack = 0; |