[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 36/49] target-i386: Change gen_op_mov_reg_A0 size par
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 36/49] target-i386: Change gen_op_mov_reg_A0 size parameter to TCGMemOp |
Date: |
Tue, 7 Jan 2014 13:00:26 -0800 |
Change the domain of the parameter and update all callers.
Which lets us defer completely to gen_op_mov_reg_v.
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target-i386/translate.c | 32 ++++++++------------------------
1 file changed, 8 insertions(+), 24 deletions(-)
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 8861973..9b191ad 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -334,25 +334,9 @@ static inline void gen_op_mov_reg_T1(TCGMemOp ot, int reg)
gen_op_mov_reg_v(ot, reg, cpu_T[1]);
}
-static void gen_op_mov_reg_A0(TCGMemOp size, int reg)
+static inline void gen_op_mov_reg_A0(TCGMemOp size, int reg)
{
- switch (size) {
- case MO_8:
- tcg_gen_deposit_tl(cpu_regs[reg], cpu_regs[reg], cpu_A0, 0, 16);
- break;
- case MO_16:
- /* For x86_64, this sets the higher half of register to zero.
- For i386, this is equivalent to a mov. */
- tcg_gen_ext32u_tl(cpu_regs[reg], cpu_A0);
- break;
-#ifdef TARGET_X86_64
- case MO_32:
- tcg_gen_mov_tl(cpu_regs[reg], cpu_A0);
- break;
-#endif
- default:
- tcg_abort();
- }
+ gen_op_mov_reg_v(size, reg, cpu_A0);
}
static inline void gen_op_mov_v_reg(TCGMemOp ot, TCGv t0, int reg)
@@ -2381,7 +2365,7 @@ static void gen_push_T0(DisasContext *s)
gen_op_addq_A0_im(-2);
gen_op_st_v(s, MO_16, cpu_T[0], cpu_A0);
}
- gen_op_mov_reg_A0(2, R_ESP);
+ gen_op_mov_reg_A0(MO_64, R_ESP);
} else
#endif
{
@@ -2402,9 +2386,9 @@ static void gen_push_T0(DisasContext *s)
}
gen_op_st_v(s, s->dflag + 1, cpu_T[0], cpu_A0);
if (s->ss32 && !s->addseg)
- gen_op_mov_reg_A0(1, R_ESP);
+ gen_op_mov_reg_A0(MO_32, R_ESP);
else
- gen_op_mov_reg_T1(s->ss32 + 1, R_ESP);
+ gen_op_mov_reg_T1(MO_16 + s->ss32, R_ESP);
}
}
@@ -2422,7 +2406,7 @@ static void gen_push_T1(DisasContext *s)
gen_op_addq_A0_im(-2);
gen_op_st_v(s, MO_16, cpu_T[1], cpu_A0);
}
- gen_op_mov_reg_A0(2, R_ESP);
+ gen_op_mov_reg_A0(MO_64, R_ESP);
} else
#endif
{
@@ -2442,7 +2426,7 @@ static void gen_push_T1(DisasContext *s)
gen_op_st_v(s, s->dflag + 1, cpu_T[1], cpu_A0);
if (s->ss32 && !s->addseg)
- gen_op_mov_reg_A0(1, R_ESP);
+ gen_op_mov_reg_A0(MO_32, R_ESP);
else
gen_stack_update(s, (-2) << s->dflag);
}
@@ -5566,7 +5550,7 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
s->addseg = 0;
gen_lea_modrm(env, s, modrm);
s->addseg = val;
- gen_op_mov_reg_A0(ot - MO_16, reg);
+ gen_op_mov_reg_A0(ot, reg);
break;
case 0xa0: /* mov EAX, Ov */
--
1.8.4.2
- [Qemu-devel] [PULL 27/49] target-i386: Remove gen_movtl_T*_im, (continued)
- [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, 2014/01/07
- [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 <=
- [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
- [Qemu-devel] [PULL 48/49] target-i386: Rename gen_op_jmp_T0 to gen_op_jmp_v, Richard Henderson, 2014/01/07
- [Qemu-devel] [PULL 49/49] target-i386: Tidy ljmp, Richard Henderson, 2014/01/07