[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 34/49] target-i386: Change gen_op_j*z_ecx size parame
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 34/49] target-i386: Change gen_op_j*z_ecx size parameter to TCGMemOp |
Date: |
Tue, 7 Jan 2014 13:00:24 -0800 |
Change the domain of the parameter and update all callers.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target-i386/translate.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 47897b4..f1b4932 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -605,17 +605,17 @@ static void gen_exts(TCGMemOp ot, TCGv reg)
gen_ext_tl(reg, reg, ot, true);
}
-static inline void gen_op_jnz_ecx(int size, int label1)
+static inline void gen_op_jnz_ecx(TCGMemOp size, int label1)
{
tcg_gen_mov_tl(cpu_tmp0, cpu_regs[R_ECX]);
- gen_extu(size + 1, cpu_tmp0);
+ gen_extu(size, cpu_tmp0);
tcg_gen_brcondi_tl(TCG_COND_NE, cpu_tmp0, 0, label1);
}
-static inline void gen_op_jz_ecx(int size, int label1)
+static inline void gen_op_jz_ecx(TCGMemOp size, int label1)
{
tcg_gen_mov_tl(cpu_tmp0, cpu_regs[R_ECX]);
- gen_extu(size + 1, cpu_tmp0);
+ gen_extu(size, cpu_tmp0);
tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_tmp0, 0, label1);
}
@@ -1113,7 +1113,7 @@ static int gen_jz_ecx_string(DisasContext *s,
target_ulong next_eip)
l1 = gen_new_label();
l2 = gen_new_label();
- gen_op_jnz_ecx(s->aflag, l1);
+ gen_op_jnz_ecx(s->aflag + 1, l1);
gen_set_label(l2);
gen_jmp_tb(s, next_eip, 1);
gen_set_label(l1);
@@ -1209,7 +1209,7 @@ static inline void gen_repz_ ## op(DisasContext *s,
TCGMemOp ot, \
/* a loop would cause two single step exceptions if ECX = 1 \
before rep string_insn */ \
if (!s->jmp_opt) \
- gen_op_jz_ecx(s->aflag, l2); \
+ gen_op_jz_ecx(s->aflag + 1, l2); \
gen_jmp(s, cur_eip); \
}
@@ -1227,7 +1227,7 @@ static inline void gen_repz_ ## op(DisasContext *s,
TCGMemOp ot, \
gen_update_cc_op(s); \
gen_jcc1(s, (JCC_Z << 1) | (nz ^ 1), l2); \
if (!s->jmp_opt) \
- gen_op_jz_ecx(s->aflag, l2); \
+ gen_op_jz_ecx(s->aflag + 1, l2); \
gen_jmp(s, cur_eip); \
}
@@ -7134,16 +7134,16 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
case 0: /* loopnz */
case 1: /* loopz */
gen_op_add_reg_im(s->aflag + 1, R_ECX, -1);
- gen_op_jz_ecx(s->aflag, l3);
+ gen_op_jz_ecx(s->aflag + 1, l3);
gen_jcc1(s, (JCC_Z << 1) | (b ^ 1), l1);
break;
case 2: /* loop */
gen_op_add_reg_im(s->aflag + 1, R_ECX, -1);
- gen_op_jnz_ecx(s->aflag, l1);
+ gen_op_jnz_ecx(s->aflag + 1, l1);
break;
default:
case 3: /* jcxz */
- gen_op_jz_ecx(s->aflag, l1);
+ gen_op_jz_ecx(s->aflag + 1, l1);
break;
}
--
1.8.4.2
- [Qemu-devel] [PULL 23/49] target-i386: Remove gen_op_movl_T0_0, (continued)
- [Qemu-devel] [PULL 23/49] target-i386: Remove gen_op_movl_T0_0, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 25/49] target-i386: Remove gen_op_movl_T0_im*, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 27/49] target-i386: Remove gen_movtl_T*_im, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 26/49] target-i386: Remove gen_op_mov*_A0_im, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 28/49] target-i386: Remove gen_op_andl_T0_ffff, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 30/49] target-i386: Remove gen_op_movl_T0_T1, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 29/49] target-i386: Remove gen_op_andl_T0_im, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 31/49] target-i386: Remove gen_op_andl_A0_ffff, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 32/49] target-i386: Use TCGMemOp for 'ot' variables, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 33/49] target-i386: Change gen_op_add_reg_* size parameter to TCGMemOp, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 34/49] target-i386: Change gen_op_j*z_ecx size parameter to TCGMemOp,
Richard Henderson <=
- [Qemu-devel] [PULL 35/49] target-i386: Change aflag to TCGMemOp, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 36/49] target-i386: Change gen_op_mov_reg_A0 size parameter to TCGMemOp, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 38/49] target-i386: Tidy addr16 code in gen_lea_modrm, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 37/49] target-i386: Change dflag to TCGMemOp, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 39/49] target-i386: Combine gen_push_T* into gen_push_v, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 40/49] target_i386: Clean up gen_pop_T0, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 44/49] target-i386: Remove gen_op_addl_T0_T1, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 45/49] target-i386: Remove gen_op_mov_TN_reg, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 46/49] target-i386: Remove gen_op_mov_reg_A0, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 47/49] target-i386: Tidy some size computation, Richard Henderson, 2014/01/07