i386 + x86_64 mttcg
PATCH v3 11/13 target/i386: move cpu_tmp1_i64 to DisasContext
In reply to Emilio G. Cota--- target/i386/translate.c | 160 ++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 80 deletions(-)
target/i386/translate.c +80 -80
@@ -79,8 +79,6 @@ static TCGv cpu_seg_base[6];static TCGv_i64 cpu_bndl[4 ];static TCGv_i64 cpu_bndu[4 ]; -static TCGv_i64 cpu_tmp1_i64; -#include "exec/gen-icount.h" #ifdef TARGET_X86_64
@@ -143,6 +141,7 @@ typedef struct DisasContext {TCGv_ptr ptr1;TCGv_i32 tmp2_i32;TCGv_i32 tmp3_i32; +TCGv_i64 tmp1_i64;sigjmp_buf jmpbuf; } DisasContext;
@@ -2107,12 +2106,12 @@ static void gen_bndck(CPUX86State *env, DisasContext *s, int modrm, {TCGv ea =gen_lea_modrm_1 (s,gen_lea_modrm_0 (env, s, modrm)); -tcg_gen_extu_tl_i64 (cpu_tmp1_i64, ea); +tcg_gen_extu_tl_i64 (s->tmp1_i64, ea);if (!CODE64 (s)) { -tcg_gen_ext32u_i64 (cpu_tmp1_i64, cpu_tmp1_i64); +tcg_gen_ext32u_i64 (s->tmp1_i64, s->tmp1_i64); } -tcg_gen_setcond_i64 (cond, cpu_tmp1_i64, cpu_tmp1_i64, bndv); -tcg_gen_extrl_i64_i32 (s->tmp2_i32, cpu_tmp1_i64); +tcg_gen_setcond_i64 (cond, s->tmp1_i64, s->tmp1_i64, bndv); +tcg_gen_extrl_i64_i32 (s->tmp2_i32, s->tmp1_i64);gen_helper_bndck (cpu_env, s->tmp2_i32); }
@@ -2641,48 +2640,48 @@ static void gen_jmp(DisasContext *s, target_ulong eip)static inline void gen_ldq_env_A0 (DisasContext *s,int offset) { -tcg_gen_qemu_ld_i64 (cpu_tmp1_i64, s->A0, s->mem_index,MO_LEQ ); -tcg_gen_st_i64 (cpu_tmp1_i64, cpu_env, offset); +tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ ); +tcg_gen_st_i64 (s->tmp1_i64, cpu_env, offset); }static inline void gen_stq_env_A0 (DisasContext *s,int offset) { -tcg_gen_ld_i64 (cpu_tmp1_i64, cpu_env, offset); -tcg_gen_qemu_st_i64 (cpu_tmp1_i64, s->A0, s->mem_index,MO_LEQ ); +tcg_gen_ld_i64 (s->tmp1_i64, cpu_env, offset); +tcg_gen_qemu_st_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ ); }static inline void gen_ldo_env_A0 (DisasContext *s,int offset) {int mem_index = s->mem_index; -tcg_gen_qemu_ld_i64 (cpu_tmp1_i64, s->A0, mem_index,MO_LEQ ); - tcg_gen_st_i64(cpu_tmp1_i64, cpu_env, offset + offsetof(ZMMReg, ZMM_Q(0))); +tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->A0, mem_index,MO_LEQ ); + tcg_gen_st_i64(s->tmp1_i64, cpu_env, offset + offsetof(ZMMReg, ZMM_Q(0)));tcg_gen_addi_tl (s->tmp0, s->A0,8 ); -tcg_gen_qemu_ld_i64 (cpu_tmp1_i64, s->tmp0, mem_index,MO_LEQ ); - tcg_gen_st_i64(cpu_tmp1_i64, cpu_env, offset + offsetof(ZMMReg, ZMM_Q(1))); +tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->tmp0, mem_index,MO_LEQ ); + tcg_gen_st_i64(s->tmp1_i64, cpu_env, offset + offsetof(ZMMReg, ZMM_Q(1))); }static inline void gen_sto_env_A0 (DisasContext *s,int offset) {int mem_index = s->mem_index; - tcg_gen_ld_i64(cpu_tmp1_i64, cpu_env, offset + offsetof(ZMMReg, ZMM_Q(0))); -tcg_gen_qemu_st_i64 (cpu_tmp1_i64, s->A0, mem_index,MO_LEQ ); + tcg_gen_ld_i64(s->tmp1_i64, cpu_env, offset + offsetof(ZMMReg, ZMM_Q(0))); +tcg_gen_qemu_st_i64 (s->tmp1_i64, s->A0, mem_index,MO_LEQ );tcg_gen_addi_tl (s->tmp0, s->A0,8 ); - tcg_gen_ld_i64(cpu_tmp1_i64, cpu_env, offset + offsetof(ZMMReg, ZMM_Q(1))); -tcg_gen_qemu_st_i64 (cpu_tmp1_i64, s->tmp0, mem_index,MO_LEQ ); + tcg_gen_ld_i64(s->tmp1_i64, cpu_env, offset + offsetof(ZMMReg, ZMM_Q(1))); +tcg_gen_qemu_st_i64 (s->tmp1_i64, s->tmp0, mem_index,MO_LEQ ); } -static inline void gen_op_movo (int d_offset,int s_offset) +static inline void gen_op_movo (DisasContext *s,int d_offset,int s_offset) { - tcg_gen_ld_i64(cpu_tmp1_i64, cpu_env, s_offset + offsetof(ZMMReg, ZMM_Q(0))); - tcg_gen_st_i64(cpu_tmp1_i64, cpu_env, d_offset + offsetof(ZMMReg, ZMM_Q(0))); - tcg_gen_ld_i64(cpu_tmp1_i64, cpu_env, s_offset + offsetof(ZMMReg, ZMM_Q(1))); - tcg_gen_st_i64(cpu_tmp1_i64, cpu_env, d_offset + offsetof(ZMMReg, ZMM_Q(1))); + tcg_gen_ld_i64(s->tmp1_i64, cpu_env, s_offset + offsetof(ZMMReg, ZMM_Q(0))); + tcg_gen_st_i64(s->tmp1_i64, cpu_env, d_offset + offsetof(ZMMReg, ZMM_Q(0))); + tcg_gen_ld_i64(s->tmp1_i64, cpu_env, s_offset + offsetof(ZMMReg, ZMM_Q(1))); + tcg_gen_st_i64(s->tmp1_i64, cpu_env, d_offset + offsetof(ZMMReg, ZMM_Q(1))); } -static inline void gen_op_movq (int d_offset,int s_offset) +static inline void gen_op_movq (DisasContext *s,int d_offset,int s_offset) { -tcg_gen_ld_i64 (cpu_tmp1_i64, cpu_env, s_offset); -tcg_gen_st_i64 (cpu_tmp1_i64, cpu_env, d_offset); +tcg_gen_ld_i64 (s->tmp1_i64, cpu_env, s_offset); +tcg_gen_st_i64 (s->tmp1_i64, cpu_env, d_offset); }static inline void gen_op_movl (DisasContext *s,int d_offset,int s_offset)
@@ -2691,10 +2690,10 @@ static inline void gen_op_movl(DisasContext *s, int d_offset, int s_offset)tcg_gen_st_i32 (s->tmp2_i32, cpu_env, d_offset); } -static inline void gen_op_movq_env_0 (int d_offset) +static inline void gen_op_movq_env_0 (DisasContext *s,int d_offset) { -tcg_gen_movi_i64 (cpu_tmp1_i64,0 ); -tcg_gen_st_i64 (cpu_tmp1_i64, cpu_env, d_offset); +tcg_gen_movi_i64 (s->tmp1_i64,0 ); +tcg_gen_st_i64 (s->tmp1_i64, cpu_env, d_offset); }typedef void (*SSEFunc_i_ep )(TCGv_i32 val,TCGv_ptr env,TCGv_ptr reg);
@@ -3178,9 +3177,9 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, gen_ldq_env_A0(s, offsetof(CPUX86State, fpregs[reg].mmx)); }else { rm = (modrm &7 ); -tcg_gen_ld_i64 (cpu_tmp1_i64, cpu_env, +tcg_gen_ld_i64 (s->tmp1_i64, cpu_env, offsetof(CPUX86State,fpregs[rm].mmx)); -tcg_gen_st_i64 (cpu_tmp1_i64, cpu_env, +tcg_gen_st_i64 (s->tmp1_i64, cpu_env, offsetof(CPUX86State,fpregs[reg].mmx)); }break ;
@@ -3195,7 +3194,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, gen_ldo_env_A0(s, offsetof(CPUX86State, xmm_regs[reg])); }else { rm = (modrm &7 ) |REX_B (s); - gen_op_movo(offsetof(CPUX86State,xmm_regs[reg]), + gen_op_movo(s, offsetof(CPUX86State, xmm_regs[reg]), offsetof(CPUX86State,xmm_regs[rm])); }break ;
@@ -3230,7 +3229,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, offsetof(CPUX86State, xmm_regs[reg].ZMM_L(3))); }else { rm = (modrm &7 ) |REX_B (s); - gen_op_movq(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(0)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(0)), offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(0))); }break ;
@@ -3243,7 +3242,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, }else {/* movhlps */ rm = (modrm &7 ) |REX_B (s); - gen_op_movq(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(0)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(0)), offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(1))); }break ;
@@ -3270,10 +3269,10 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, xmm_regs[reg].ZMM_Q(0))); }else { rm = (modrm &7 ) |REX_B (s); - gen_op_movq(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(0)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(0)), offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(0))); } - gen_op_movq(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(1)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(1)), offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(0)));break ;case 0x016 :/* movhps */
@@ -3285,7 +3284,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, }else {/* movlhps */ rm = (modrm &7 ) |REX_B (s); - gen_op_movq(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(1)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(1)), offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(0))); }break ;
@@ -3361,10 +3360,10 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, xmm_regs[reg].ZMM_Q(0))); }else { rm = (modrm &7 ) |REX_B (s); - gen_op_movq(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(0)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(0)), offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(0))); } - gen_op_movq_env_0(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(1))); + gen_op_movq_env_0(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(1)));break ;case 0x7f :/* movq ea, mm */ if (mod !=3 ) {
@@ -3372,7 +3371,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, gen_stq_env_A0(s, offsetof(CPUX86State, fpregs[reg].mmx)); }else { rm = (modrm &7 ); - gen_op_movq(offsetof(CPUX86State,fpregs[rm].mmx), + gen_op_movq(s, offsetof(CPUX86State, fpregs[rm].mmx), offsetof(CPUX86State,fpregs[reg].mmx)); }break ;
@@ -3387,7 +3386,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, gen_sto_env_A0(s, offsetof(CPUX86State, xmm_regs[reg])); }else { rm = (modrm &7 ) |REX_B (s); - gen_op_movo(offsetof(CPUX86State,xmm_regs[rm]), + gen_op_movo(s, offsetof(CPUX86State, xmm_regs[rm]), offsetof(CPUX86State,xmm_regs[reg])); }break ;
@@ -3410,7 +3409,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, xmm_regs[reg].ZMM_Q(0))); }else { rm = (modrm &7 ) |REX_B (s); - gen_op_movq(offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(0)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[rm].ZMM_Q(0)), offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(0))); }break ;
@@ -3643,22 +3642,23 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, xmm_regs[reg].ZMM_Q(0))); }else { rm = (modrm &7 ) |REX_B (s); - gen_op_movq(offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(0)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[rm].ZMM_Q(0)), offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(0))); - gen_op_movq_env_0(offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(1))); +gen_op_movq_env_0 (s, + offsetof(CPUX86State, xmm_regs[rm].ZMM_Q(1))); }break ;case 0x2d6 :/* movq2dq */ gen_helper_enter_mmx (cpu_env); rm = (modrm &7 ); - gen_op_movq(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(0)), + gen_op_movq(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(0)), offsetof(CPUX86State,fpregs[rm].mmx)); - gen_op_movq_env_0(offsetof(CPUX86State,xmm_regs[reg].ZMM_Q(1))); + gen_op_movq_env_0(s, offsetof(CPUX86State, xmm_regs[reg].ZMM_Q(1)));break ;case 0x3d6 :/* movdq2q */ gen_helper_enter_mmx (cpu_env); rm = (modrm &7 ) |REX_B (s); - gen_op_movq(offsetof(CPUX86State,fpregs[reg & 7].mmx), + gen_op_movq(s, offsetof(CPUX86State, fpregs[reg & 7].mmx), offsetof(CPUX86State,xmm_regs[rm].ZMM_Q(0)));break ;case 0xd7 :/* pmovmskb */
@@ -4174,13 +4174,13 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, } }else {/* pextrq */ #ifdef TARGET_X86_64 -tcg_gen_ld_i64 (cpu_tmp1_i64, cpu_env, +tcg_gen_ld_i64 (s->tmp1_i64, cpu_env, offsetof(CPUX86State , xmm_regs[reg].ZMM_Q(val & 1)));if (mod ==3 ) { -tcg_gen_mov_i64 (cpu_regs[rm], cpu_tmp1_i64); +tcg_gen_mov_i64 (cpu_regs[rm], s->tmp1_i64); }else { -tcg_gen_qemu_st_i64 (cpu_tmp1_i64, s->A0, +tcg_gen_qemu_st_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ ); }#else
@@ -4251,12 +4251,12 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, }else {/* pinsrq */ #ifdef TARGET_X86_64 if (mod ==3 ) { -gen_op_mov_v_reg (ot, cpu_tmp1_i64, rm); +gen_op_mov_v_reg (ot, s->tmp1_i64, rm); }else { -tcg_gen_qemu_ld_i64 (cpu_tmp1_i64, s->A0, +tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ ); } -tcg_gen_st_i64 (cpu_tmp1_i64, cpu_env, +tcg_gen_st_i64 (s->tmp1_i64, cpu_env, offsetof(CPUX86State , xmm_regs[reg].ZMM_Q(val & 1)));#else
@@ -5831,9 +5831,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_helper_fildl_FT0 (cpu_env, s->tmp2_i32);break ;case 2 : -tcg_gen_qemu_ld_i64 (cpu_tmp1_i64, s->A0, +tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ ); -gen_helper_fldl_FT0 (cpu_env, cpu_tmp1_i64); +gen_helper_fldl_FT0 (cpu_env, s->tmp1_i64);break ;case 3 :default :
@@ -5870,9 +5870,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_helper_fildl_ST0 (cpu_env, s->tmp2_i32);break ;case 2 : -tcg_gen_qemu_ld_i64 (cpu_tmp1_i64, s->A0, +tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ ); -gen_helper_fldl_ST0 (cpu_env, cpu_tmp1_i64); +gen_helper_fldl_ST0 (cpu_env, s->tmp1_i64);break ;case 3 :default :
@@ -5891,8 +5891,8 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) s->mem_index, MO_LEUL);break ;case 2 : -gen_helper_fisttll_ST0 (cpu_tmp1_i64, cpu_env); -tcg_gen_qemu_st_i64 (cpu_tmp1_i64, s->A0, +gen_helper_fisttll_ST0 (s->tmp1_i64, cpu_env); +tcg_gen_qemu_st_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ );break ;case 3 :
@@ -5917,8 +5917,8 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) s->mem_index, MO_LEUL);break ;case 2 : -gen_helper_fstl_ST0 (cpu_tmp1_i64, cpu_env); -tcg_gen_qemu_st_i64 (cpu_tmp1_i64, s->A0, +gen_helper_fstl_ST0 (s->tmp1_i64, cpu_env); +tcg_gen_qemu_st_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ );break ;case 3 :
@@ -5975,12 +5975,12 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_helper_fpop (cpu_env);break ;case 0x3d :/* fildll */ -tcg_gen_qemu_ld_i64 (cpu_tmp1_i64, s->A0, s->mem_index,MO_LEQ ); -gen_helper_fildll_ST0 (cpu_env, cpu_tmp1_i64); +tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ ); +gen_helper_fildll_ST0 (cpu_env, s->tmp1_i64);break ;case 0x3f :/* fistpll */ -gen_helper_fistll_ST0 (cpu_tmp1_i64, cpu_env); -tcg_gen_qemu_st_i64 (cpu_tmp1_i64, s->A0, s->mem_index,MO_LEQ ); +gen_helper_fistll_ST0 (s->tmp1_i64, cpu_env); +tcg_gen_qemu_st_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ );gen_helper_fpop (cpu_env);break ;default :
@@ -7387,8 +7387,8 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op; }tcg_gen_trunc_tl_i32 (s->tmp2_i32, cpu_regs[R_ECX ]); -gen_helper_xgetbv (cpu_tmp1_i64, cpu_env, s->tmp2_i32); -tcg_gen_extr_i64_tl (cpu_regs[R_EAX ], cpu_regs[R_EDX ], cpu_tmp1_i64); +gen_helper_xgetbv (s->tmp1_i64, cpu_env, s->tmp2_i32); +tcg_gen_extr_i64_tl (cpu_regs[R_EAX ], cpu_regs[R_EDX ], s->tmp1_i64);break ;case 0xd1 :/* xsetbv */
@@ -7401,10 +7401,10 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_exception (s,EXCP0D_GPF , pc_start - s->cs_base);break ; } -tcg_gen_concat_tl_i64 (cpu_tmp1_i64, cpu_regs[R_EAX ], +tcg_gen_concat_tl_i64 (s->tmp1_i64, cpu_regs[R_EAX ], cpu_regs[R_EDX ]);tcg_gen_trunc_tl_i32 (s->tmp2_i32, cpu_regs[R_ECX ]); -gen_helper_xsetbv (cpu_env, s->tmp2_i32, cpu_tmp1_i64); +gen_helper_xsetbv (cpu_env, s->tmp2_i32, s->tmp1_i64);/* End TB because translation flags may change. */ gen_jmp_im (s, s->pc - s->cs_base);gen_eob (s);
@@ -7564,17 +7564,17 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op; }tcg_gen_trunc_tl_i32 (s->tmp2_i32, cpu_regs[R_ECX ]); -gen_helper_rdpkru (cpu_tmp1_i64, cpu_env, s->tmp2_i32); -tcg_gen_extr_i64_tl (cpu_regs[R_EAX ], cpu_regs[R_EDX ], cpu_tmp1_i64); +gen_helper_rdpkru (s->tmp1_i64, cpu_env, s->tmp2_i32); +tcg_gen_extr_i64_tl (cpu_regs[R_EAX ], cpu_regs[R_EDX ], s->tmp1_i64);break ;case 0xef :/* wrpkru */ if (prefixes &PREFIX_LOCK ) { goto illegal_op; } -tcg_gen_concat_tl_i64 (cpu_tmp1_i64, cpu_regs[R_EAX ], +tcg_gen_concat_tl_i64 (s->tmp1_i64, cpu_regs[R_EAX ], cpu_regs[R_EDX ]);tcg_gen_trunc_tl_i32 (s->tmp2_i32, cpu_regs[R_ECX ]); -gen_helper_wrpkru (cpu_env, s->tmp2_i32, cpu_tmp1_i64); +gen_helper_wrpkru (cpu_env, s->tmp2_i32, s->tmp1_i64);break ; CASE_MODRM_OP(6): /* lmsw */if (s->cpl !=0 ) {
@@ -8141,9 +8141,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op; }gen_lea_modrm (env, s, modrm); -tcg_gen_concat_tl_i64 (cpu_tmp1_i64, cpu_regs[R_EAX ], +tcg_gen_concat_tl_i64 (s->tmp1_i64, cpu_regs[R_EAX ], cpu_regs[R_EDX ]); -gen_helper_xsave (cpu_env, s->A0, cpu_tmp1_i64); +gen_helper_xsave (cpu_env, s->A0, s->tmp1_i64);break ; CASE_MODRM_MEM_OP(5): /* xrstor */
@@ -8153,9 +8153,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op; }gen_lea_modrm (env, s, modrm); -tcg_gen_concat_tl_i64 (cpu_tmp1_i64, cpu_regs[R_EAX ], +tcg_gen_concat_tl_i64 (s->tmp1_i64, cpu_regs[R_EAX ], cpu_regs[R_EDX ]); -gen_helper_xrstor (cpu_env, s->A0, cpu_tmp1_i64); +gen_helper_xrstor (cpu_env, s->A0, s->tmp1_i64);/* XRSTOR is how MPX is enabled, which changes how we translate. Thus we need to end the TB. */ gen_update_cc_op (s);
@@ -8181,9 +8181,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op; }gen_lea_modrm (env, s, modrm); -tcg_gen_concat_tl_i64 (cpu_tmp1_i64, cpu_regs[R_EAX ], +tcg_gen_concat_tl_i64 (s->tmp1_i64, cpu_regs[R_EAX ], cpu_regs[R_EDX ]); -gen_helper_xsaveopt (cpu_env, s->A0, cpu_tmp1_i64); +gen_helper_xsaveopt (cpu_env, s->A0, s->tmp1_i64); }break ;
@@ -8484,7 +8484,7 @@ static void i386_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu) dc->A0 =tcg_temp_new (); dc->tmp0 =tcg_temp_new (); - cpu_tmp1_i64 =tcg_temp_new_i64 (); + dc->tmp1_i64 =tcg_temp_new_i64 (); dc->tmp2_i32 =tcg_temp_new_i32 (); dc->tmp3_i32 =tcg_temp_new_i32 (); dc->tmp4 =tcg_temp_new ();
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH v3 11/13] target/i386: move cpu_tmp1_i64 to DisasContext
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- target/i386/translate.c | 160 ++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 80 deletions(-)
r~
PATCH v3 12/13 target/i386: move x86_64_hregs to DisasContext
In reply to Emilio G. CotaAnd convert it to a bool to use an existing hole
in the struct.
--- target/i386/translate.c | 307 ++++++++++++++++++++-------------------- 1 file changed, 154 insertions(+), 153 deletions(-)
target/i386/translate.c +154 -153
@@ -81,10 +81,6 @@ static TCGv_i64 cpu_bndu[4];#include "exec/gen-icount.h" -#ifdef TARGET_X86_64 -static int x86_64_hregs; -#endif - typedef struct DisasContext { DisasContextBase base;
@@ -109,6 +105,9 @@ typedef struct DisasContext {int ss32;/* 32 bit stack segment */ CCOp cc_op;/* current CC operation */ bool cc_op_dirty; +#ifdef TARGET_X86_64 +bool x86_64_hregs; +#endif int addseg;/* non zero if either DS/ES/SS have a non zero base */ int f_st;/* currently unused */ int vm86;/* vm86 mode */
@@ -307,13 +306,13 @@ static void gen_update_cc_op(DisasContext *s)* [AH, CH, DH, BH], ie "bits 15..8 of register N-4". Return * true for this special case, false otherwise. */ -static inline bool byte_reg_is_xH (int reg) +static inline bool byte_reg_is_xH (DisasContext *s,int reg) {if (reg <4 ) {return false; }#ifdef TARGET_X86_64 -if (reg >=8 || x86_64_hregs) { +if (reg >=8 || s->x86_64_hregs) {return false; }#endif
@@ -360,11 +359,11 @@ static inline TCGMemOp mo_b_d32(int b, TCGMemOp ot)return b &1 ? (ot ==MO_16 ?MO_16 :MO_32 ) :MO_8 ; } -static void gen_op_mov_reg_v (TCGMemOp ot,int reg,TCGv t0) +static void gen_op_mov_reg_v (DisasContext *s,TCGMemOp ot,int reg,TCGv t0) {switch (ot) {case MO_8 : -if (!byte_reg_is_xH (reg)) { +if (!byte_reg_is_xH (s, reg)) {tcg_gen_deposit_tl (cpu_regs[reg], cpu_regs[reg], t0,0 ,8 ); }else {tcg_gen_deposit_tl (cpu_regs[reg -4 ], cpu_regs[reg -4 ], t0,8 ,8 );
@@ -388,9 +387,10 @@ static void gen_op_mov_reg_v(TCGMemOp ot, int reg, TCGv t0) } } -static inline void gen_op_mov_v_reg (TCGMemOp ot,TCGv t0,int reg) +static inline +void gen_op_mov_v_reg (DisasContext *s,TCGMemOp ot,TCGv t0,int reg) { -if (ot ==MO_8 &&byte_reg_is_xH (reg)) { +if (ot ==MO_8 &&byte_reg_is_xH (s, reg)) {tcg_gen_extract_tl (t0, cpu_regs[reg -4 ],8 ,8 ); }else {tcg_gen_mov_tl (t0, cpu_regs[reg]);
@@ -414,13 +414,13 @@ static inlinevoid gen_op_add_reg_im (DisasContext *s,TCGMemOp size,int reg,int32_t val) {tcg_gen_addi_tl (s->tmp0, cpu_regs[reg], val); -gen_op_mov_reg_v (size, reg, s->tmp0); +gen_op_mov_reg_v (s, size, reg, s->tmp0); }static inline void gen_op_add_reg_T0 (DisasContext *s,TCGMemOp size,int reg) {tcg_gen_add_tl (s->tmp0, cpu_regs[reg], s->T0); -gen_op_mov_reg_v (size, reg, s->tmp0); +gen_op_mov_reg_v (s, size, reg, s->tmp0); }static inline void gen_op_ld_v (DisasContext *s,int idx,TCGv t0,TCGv a0)
@@ -438,7 +438,7 @@ static inline void gen_op_st_rm_T0_A0(DisasContext *s, int idx, int d)if (d ==OR_TMP0 ) {gen_op_st_v (s, idx, s->T0, s->A0); }else { -gen_op_mov_reg_v (idx, d, s->T0); +gen_op_mov_reg_v (s, idx, d, s->T0); } }
@@ -1077,7 +1077,7 @@ static TCGLabel *gen_jz_ecx_string(DisasContext *s, target_ulong next_eip)static inline void gen_stos (DisasContext *s,TCGMemOp ot) { -gen_op_mov_v_reg (MO_32 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_32 , s->T0,R_EAX );gen_string_movl_A0_EDI (s);gen_op_st_v (s, ot, s->T0, s->A0);gen_op_movl_T0_Dshift (s, ot);
@@ -1088,7 +1088,7 @@ static inline void gen_lods(DisasContext *s, TCGMemOp ot) {gen_string_movl_A0_ESI (s);gen_op_ld_v (s, ot, s->T0, s->A0); -gen_op_mov_reg_v (ot,R_EAX , s->T0); +gen_op_mov_reg_v (s, ot,R_EAX , s->T0);gen_op_movl_T0_Dshift (s, ot);gen_op_add_reg_T0 (s, s->aflag,R_ESI ); }
@@ -1272,7 +1272,7 @@ static void gen_helper_fp_arith_STN_ST0(int op, int opreg)static void gen_op (DisasContext *s1,int op,TCGMemOp ot,int d) {if (d !=OR_TMP0 ) { -gen_op_mov_v_reg (ot, s1->T0, d); +gen_op_mov_v_reg (s1, ot, s1->T0, d); }else if (!(s1->prefix &PREFIX_LOCK )) {gen_op_ld_v (s1, ot, s1->T0, s1->A0); }
@@ -1383,7 +1383,7 @@ static void gen_inc(DisasContext *s1, TCGMemOp ot, int d, int c) s1->mem_index, ot | MO_LE); }else {if (d !=OR_TMP0 ) { -gen_op_mov_v_reg (ot, s1->T0, d); +gen_op_mov_v_reg (s1, ot, s1->T0, d); }else {gen_op_ld_v (s1, ot, s1->T0, s1->A0); }
@@ -1450,7 +1450,7 @@ static void gen_shift_rm_T1(DisasContext *s, TCGMemOp ot, int op1,if (op1 ==OR_TMP0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); }tcg_gen_andi_tl (s->T1, s->T1, mask);
@@ -1486,7 +1486,7 @@ static void gen_shift_rm_im(DisasContext *s, TCGMemOp ot, int op1, int op2,if (op1 ==OR_TMP0 )gen_op_ld_v (s, ot, s->T0, s->A0);else -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); op2 &= mask;if (op2 !=0 ) {
@@ -1526,7 +1526,7 @@ static void gen_rot_rm_T1(DisasContext *s, TCGMemOp ot, int op1, int is_right)if (op1 ==OR_TMP0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); }tcg_gen_andi_tl (s->T1, s->T1, mask);
@@ -1612,7 +1612,7 @@ static void gen_rot_rm_im(DisasContext *s, TCGMemOp ot, int op1, int op2,if (op1 ==OR_TMP0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); } op2 &= mask;
@@ -1690,7 +1690,7 @@ static void gen_rotc_rm_T1(DisasContext *s, TCGMemOp ot, int op1,if (op1 ==OR_TMP0 )gen_op_ld_v (s, ot, s->T0, s->A0);else -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1);if (is_right) {switch (ot) {
@@ -1746,7 +1746,7 @@ static void gen_shiftd_rm_T1(DisasContext *s, TCGMemOp ot, int op1,if (op1 ==OR_TMP0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); } count =tcg_temp_new ();
@@ -1820,7 +1820,7 @@ static void gen_shiftd_rm_T1(DisasContext *s, TCGMemOp ot, int op1,static void gen_shift (DisasContext *s1,int op,TCGMemOp ot,int d,int s) {if (s !=OR_TMP1 ) -gen_op_mov_v_reg (ot, s1->T1, s); +gen_op_mov_v_reg (s1, ot, s1->T1, s);switch (op) {case OP_ROL :gen_rot_rm_T1 (s1, ot, d,0 );
@@ -2133,23 +2133,23 @@ static void gen_ldst_modrm(CPUX86State *env, DisasContext *s, int modrm,if (mod ==3 ) {if (is_store) {if (reg !=OR_TMP0 ) -gen_op_mov_v_reg (ot, s->T0, reg); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_v_reg (s, ot, s->T0, reg); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm);if (reg !=OR_TMP0 ) -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0); } }else {gen_lea_modrm (env, s, modrm);if (is_store) {if (reg !=OR_TMP0 ) -gen_op_mov_v_reg (ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T0, reg);gen_op_st_v (s, ot, s->T0, s->A0); }else {gen_op_ld_v (s, ot, s->T0, s->A0);if (reg !=OR_TMP0 ) -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0); } } }
@@ -2260,7 +2260,7 @@ static void gen_cmovcc1(CPUX86State *env, DisasContext *s, TCGMemOp ot, int b,tcg_gen_movcond_tl (cc.cond, s->T0, cc.reg, cc.reg2, s->T0, cpu_regs[reg]); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);if (cc.mask !=-1 ) {tcg_temp_free (cc.reg);
@@ -2354,7 +2354,7 @@ static void gen_push_v(DisasContext *s, TCGv val) }gen_op_st_v (s, d_ot, val, s->A0); -gen_op_mov_reg_v (a_ot,R_ESP , new_esp); +gen_op_mov_reg_v (s, a_ot,R_ESP , new_esp); }/* two step pop is necessary for precise exceptions */
@@ -2409,7 +2409,7 @@ static void gen_popa(DisasContext *s)tcg_gen_addi_tl (s->A0, cpu_regs[R_ESP ], i * size);gen_lea_v_seg (s, s_ot, s->A0,R_SS ,-1 );gen_op_ld_v (s, d_ot, s->T0, s->A0); -gen_op_mov_reg_v (d_ot,7 - i, s->T0); +gen_op_mov_reg_v (s, d_ot,7 - i, s->T0); }gen_stack_update (s,8 * size);
@@ -2448,11 +2448,11 @@ static void gen_enter(DisasContext *s, int esp_addend, int level) }/* Copy the FrameTemp value to EBP. */ -gen_op_mov_reg_v (a_ot,R_EBP , s->T1); +gen_op_mov_reg_v (s, a_ot,R_EBP , s->T1);/* Compute the final value of ESP. */ tcg_gen_subi_tl (s->T1, s->T1, esp_addend + size * level); -gen_op_mov_reg_v (a_ot,R_ESP , s->T1); +gen_op_mov_reg_v (s, a_ot,R_ESP , s->T1); }static void gen_leave (DisasContext *s)
@@ -2465,8 +2465,8 @@ static void gen_leave(DisasContext *s)tcg_gen_addi_tl (s->T1, cpu_regs[R_EBP ],1 << d_ot); -gen_op_mov_reg_v (d_ot,R_EBP , s->T0); -gen_op_mov_reg_v (a_ot,R_ESP , s->T1); +gen_op_mov_reg_v (s, d_ot,R_EBP , s->T0); +gen_op_mov_reg_v (s, a_ot,R_ESP , s->T1); }static void gen_exception (DisasContext *s,int trapno,target_ulong cur_eip)
@@ -3598,7 +3598,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, goto illegal_op;#endif } -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0xc4 :/* pinsrw */ case 0x1c4 :
@@ -3633,7 +3633,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, offsetof(CPUX86State,fpregs[rm].mmx.MMX_W(val))); } reg = ((modrm >>3 ) &7 ) | rex_r; -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0x1d6 :/* movq ea, xmm */ if (mod !=3 ) {
@@ -3787,7 +3787,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, s->T0, tcg_const_i32(8 << ot)); ot =mo_64_32 (s->dflag); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0x1f0 :/* crc32 or movbe */
@@ -3814,7 +3814,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,if ((b &1 ) ==0 ) {tcg_gen_qemu_ld_tl (s->T0, s->A0, s->mem_index, ot |MO_BE ); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0); }else {tcg_gen_qemu_st_tl (cpu_regs[reg], s->A0, s->mem_index, ot |MO_BE );
@@ -3830,7 +3830,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, ot =mo_64_32 (s->dflag);gen_ldst_modrm (env, s, modrm, ot,OR_TMP0 ,0 );tcg_gen_andc_tl (s->T0, s->T0, cpu_regs[s->vex_v]); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);gen_op_update1_cc (s);set_cc_op (s,CC_OP_LOGICB + ot);break ;
@@ -3868,7 +3868,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_subi_tl (s->T1, s->T1,1 );tcg_gen_and_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);gen_op_update1_cc (s);set_cc_op (s,CC_OP_LOGICB + ot); }
@@ -3896,7 +3896,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_movi_tl (s->A0,-1 );tcg_gen_shl_tl (s->A0, s->A0, s->T1);tcg_gen_andc_tl (s->T0, s->T0, s->A0); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);gen_op_update1_cc (s);set_cc_op (s,CC_OP_BMILGB + ot);break ;
@@ -4071,7 +4071,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, }tcg_gen_shr_tl (s->T0, s->T0, s->T1); } -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0x0f3 :
@@ -4104,7 +4104,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, goto unknown_op; }tcg_gen_mov_tl (cpu_cc_dst, s->T0); -gen_op_mov_reg_v (ot, s->vex_v, s->T0); +gen_op_mov_reg_v (s, ot, s->vex_v, s->T0);set_cc_op (s,CC_OP_BMILGB + ot);break ;
@@ -4145,7 +4145,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_ld8u_tl (s->T0, cpu_env, offsetof(CPUX86State , xmm_regs[reg].ZMM_B(val & 15)));if (mod ==3 ) { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {tcg_gen_qemu_st_tl (s->T0, s->A0, s->mem_index,MO_UB );
@@ -4155,7 +4155,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_ld16u_tl (s->T0, cpu_env, offsetof(CPUX86State , xmm_regs[reg].ZMM_W(val & 7)));if (mod ==3 ) { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {tcg_gen_qemu_st_tl (s->T0, s->A0, s->mem_index,MO_LEUW );
@@ -4192,7 +4192,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_ld32u_tl (s->T0, cpu_env, offsetof(CPUX86State , xmm_regs[reg].ZMM_L(val & 3)));if (mod ==3 ) { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {tcg_gen_qemu_st_tl (s->T0, s->A0, s->mem_index,MO_LEUL );
@@ -4200,7 +4200,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,break ;case 0x20 :/* pinsrb */ if (mod ==3 ) { -gen_op_mov_v_reg (MO_32 , s->T0, rm); +gen_op_mov_v_reg (s,MO_32 , s->T0, rm); }else {tcg_gen_qemu_ld_tl (s->T0, s->A0, s->mem_index,MO_UB );
@@ -4251,7 +4251,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, }else {/* pinsrq */ #ifdef TARGET_X86_64 if (mod ==3 ) { -gen_op_mov_v_reg (ot, s->tmp1_i64, rm); +gen_op_mov_v_reg (s, ot, s->tmp1_i64, rm); }else {tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ );
@@ -4326,7 +4326,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_rotri_i32 (s->tmp2_i32, s->tmp2_i32, b &31 );tcg_gen_extu_i32_tl (s->T0, s->tmp2_i32); } -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;default :
@@ -4489,7 +4489,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)#ifdef TARGET_X86_64 s->rex_x =0 ; s->rex_b =0 ; - x86_64_hregs =0 ; + s->x86_64_hregs = false;#endif s->rip_offset =0 ;/* for relative ip address */ s->vex_l =0 ;
@@ -4548,7 +4548,8 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) rex_r = (b &0x4 ) <<1 ; s->rex_x = (b &0x2 ) <<2 ;REX_B (s) = (b &0x1 ) <<3 ; - x86_64_hregs =1 ;/* select uniform byte register addressing */ +/* select uniform byte register addressing */ + s->x86_64_hregs = true; goto next_byte; }break ;
@@ -4576,7 +4577,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op; }#ifdef TARGET_X86_64 -if (x86_64_hregs) { +if (s->x86_64_hregs) { goto illegal_op; }#endif
@@ -4681,12 +4682,12 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)/* xor reg, reg optimisation */ set_cc_op (s,CC_OP_CLR );tcg_gen_movi_tl (s->T0,0 ); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ; }else { opreg = rm; } -gen_op_mov_v_reg (ot, s->T1, reg); +gen_op_mov_v_reg (s, ot, s->T1, reg);gen_op (s, op, ot, opreg);break ;case 1 :/* OP Gv, Ev */
@@ -4700,7 +4701,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }else if (op ==OP_XORL && rm == reg) { goto xor_zero; }else { -gen_op_mov_v_reg (ot, s->T1, rm); +gen_op_mov_v_reg (s, ot, s->T1, rm); }gen_op (s, op, ot, reg);break ;
@@ -4786,7 +4787,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_ld_v (s, ot, s->T0, s->A0); } }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm); }switch (op) {
@@ -4809,7 +4810,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod !=3 ) {gen_op_st_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); } }break ;
@@ -4847,7 +4848,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod !=3 ) {gen_op_st_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); } }gen_op_update_neg_cc (s);
@@ -4856,26 +4857,26 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)case 4 :/* mul */ switch (ot) {case MO_8 : -gen_op_mov_v_reg (MO_8 , s->T1,R_EAX ); +gen_op_mov_v_reg (s,MO_8 , s->T1,R_EAX );tcg_gen_ext8u_tl (s->T0, s->T0);tcg_gen_ext8u_tl (s->T1, s->T1);/* XXX: use 32 bit mul which could be faster */ tcg_gen_mul_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_andi_tl (cpu_cc_src, s->T0,0xff00 );set_cc_op (s,CC_OP_MULB );break ;case MO_16 : -gen_op_mov_v_reg (MO_16 , s->T1,R_EAX ); +gen_op_mov_v_reg (s,MO_16 , s->T1,R_EAX );tcg_gen_ext16u_tl (s->T0, s->T0);tcg_gen_ext16u_tl (s->T1, s->T1);/* XXX: use 32 bit mul which could be faster */ tcg_gen_mul_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_shri_tl (s->T0, s->T0,16 ); -gen_op_mov_reg_v (MO_16 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EDX , s->T0);tcg_gen_mov_tl (cpu_cc_src, s->T0);set_cc_op (s,CC_OP_MULW );break ;
@@ -4905,29 +4906,29 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)case 5 :/* imul */ switch (ot) {case MO_8 : -gen_op_mov_v_reg (MO_8 , s->T1,R_EAX ); +gen_op_mov_v_reg (s,MO_8 , s->T1,R_EAX );tcg_gen_ext8s_tl (s->T0, s->T0);tcg_gen_ext8s_tl (s->T1, s->T1);/* XXX: use 32 bit mul which could be faster */ tcg_gen_mul_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_ext8s_tl (s->tmp0, s->T0);tcg_gen_sub_tl (cpu_cc_src, s->T0, s->tmp0);set_cc_op (s,CC_OP_MULB );break ;case MO_16 : -gen_op_mov_v_reg (MO_16 , s->T1,R_EAX ); +gen_op_mov_v_reg (s,MO_16 , s->T1,R_EAX );tcg_gen_ext16s_tl (s->T0, s->T0);tcg_gen_ext16s_tl (s->T1, s->T1);/* XXX: use 32 bit mul which could be faster */ tcg_gen_mul_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_ext16s_tl (s->tmp0, s->T0);tcg_gen_sub_tl (cpu_cc_src, s->T0, s->tmp0);tcg_gen_shri_tl (s->T0, s->T0,16 ); -gen_op_mov_reg_v (MO_16 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EDX , s->T0);set_cc_op (s,CC_OP_MULW );break ;default :
@@ -5026,7 +5027,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (op >=2 && op !=3 && op !=5 )gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm); }switch (op) {
@@ -5115,7 +5116,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) reg = ((modrm >>3 ) &7 ) | rex_r;gen_ldst_modrm (env, s, modrm, ot,OR_TMP0 ,0 ); -gen_op_mov_v_reg (ot, s->T1, reg); +gen_op_mov_v_reg (s, ot, s->T1, reg);gen_op_testl_T0_T1_cc (s);set_cc_op (s,CC_OP_LOGICB + ot);break ;
@@ -5125,7 +5126,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) ot =mo_b_d (b, dflag); val =insn_get (env, s, ot); -gen_op_mov_v_reg (ot, s->T0,OR_EAX ); +gen_op_mov_v_reg (s, ot, s->T0,OR_EAX );tcg_gen_movi_tl (s->T1, val);gen_op_testl_T0_T1_cc (s);set_cc_op (s,CC_OP_LOGICB + ot);
@@ -5135,20 +5136,20 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)switch (dflag) {#ifdef TARGET_X86_64 case MO_64 : -gen_op_mov_v_reg (MO_32 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_32 , s->T0,R_EAX );tcg_gen_ext32s_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_64 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_64 ,R_EAX , s->T0);break ;#endif case MO_32 : -gen_op_mov_v_reg (MO_16 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_16 , s->T0,R_EAX );tcg_gen_ext16s_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_32 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_32 ,R_EAX , s->T0);break ;case MO_16 : -gen_op_mov_v_reg (MO_8 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_8 , s->T0,R_EAX );tcg_gen_ext8s_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);break ;default :tcg_abort ();
@@ -5158,22 +5159,22 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)switch (dflag) {#ifdef TARGET_X86_64 case MO_64 : -gen_op_mov_v_reg (MO_64 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_64 , s->T0,R_EAX );tcg_gen_sari_tl (s->T0, s->T0,63 ); -gen_op_mov_reg_v (MO_64 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_64 ,R_EDX , s->T0);break ;#endif case MO_32 : -gen_op_mov_v_reg (MO_32 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_32 , s->T0,R_EAX );tcg_gen_ext32s_tl (s->T0, s->T0);tcg_gen_sari_tl (s->T0, s->T0,31 ); -gen_op_mov_reg_v (MO_32 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_32 ,R_EDX , s->T0);break ;case MO_16 : -gen_op_mov_v_reg (MO_16 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_16 , s->T0,R_EAX );tcg_gen_ext16s_tl (s->T0, s->T0);tcg_gen_sari_tl (s->T0, s->T0,15 ); -gen_op_mov_reg_v (MO_16 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EDX , s->T0);break ;default :tcg_abort ();
@@ -5197,7 +5198,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) val = (int8_t )insn_get (env, s,MO_8 );tcg_gen_movi_tl (s->T1, val); }else { -gen_op_mov_v_reg (ot, s->T1, reg); +gen_op_mov_v_reg (s, ot, s->T1, reg); }switch (ot) {#ifdef TARGET_X86_64
@@ -5227,7 +5228,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_ext16s_tl (s->tmp0, s->T0);tcg_gen_sub_tl (cpu_cc_src, s->T0, s->tmp0); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ; }set_cc_op (s,CC_OP_MULB + ot);
@@ -5238,13 +5239,13 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) modrm =x86_ldub_code (env, s); reg = ((modrm >>3 ) &7 ) | rex_r; mod = (modrm >>6 ) &3 ; -gen_op_mov_v_reg (ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T0, reg);if (mod ==3 ) { rm = (modrm &7 ) |REX_B (s); -gen_op_mov_v_reg (ot, s->T1, rm); +gen_op_mov_v_reg (s, ot, s->T1, rm);tcg_gen_add_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (ot, reg, s->T1); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T1); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {gen_lea_modrm (env, s, modrm);if (s->prefix &PREFIX_LOCK ) {
@@ -5256,7 +5257,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_add_tl (s->T0, s->T0, s->T1);gen_op_st_v (s, ot, s->T0, s->A0); } -gen_op_mov_reg_v (ot, reg, s->T1); +gen_op_mov_reg_v (s, ot, reg, s->T1); }gen_op_update2_cc (s);set_cc_op (s,CC_OP_ADDB + ot);
@@ -5273,7 +5274,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) oldv =tcg_temp_new (); newv =tcg_temp_new (); cmpv =tcg_temp_new (); -gen_op_mov_v_reg (ot, newv, reg); +gen_op_mov_v_reg (s, ot, newv, reg);tcg_gen_mov_tl (cmpv, cpu_regs[R_EAX ]);if (s->prefix &PREFIX_LOCK ) {
@@ -5283,11 +5284,11 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_lea_modrm (env, s, modrm);tcg_gen_atomic_cmpxchg_tl (oldv, s->A0, cmpv, newv, s->mem_index, ot |MO_LE ); -gen_op_mov_reg_v (ot,R_EAX , oldv); +gen_op_mov_reg_v (s, ot,R_EAX , oldv); }else {if (mod ==3 ) { rm = (modrm &7 ) |REX_B (s); -gen_op_mov_v_reg (ot, oldv, rm); +gen_op_mov_v_reg (s, ot, oldv, rm); }else {gen_lea_modrm (env, s, modrm);gen_op_ld_v (s, ot, oldv, s->A0);
@@ -5298,15 +5299,15 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)/* store value = (old == cmp ? new : old); */ tcg_gen_movcond_tl (TCG_COND_EQ , newv, oldv, cmpv, newv, oldv);if (mod ==3 ) { -gen_op_mov_reg_v (ot,R_EAX , oldv); -gen_op_mov_reg_v (ot, rm, newv); +gen_op_mov_reg_v (s, ot,R_EAX , oldv); +gen_op_mov_reg_v (s, ot, rm, newv); }else {/* Perform an unconditional store cycle like physical cpu; must be before changing accumulator to ensure idempotency if the store faults and the instruction is restarted */ gen_op_st_v (s, ot, newv, s->A0); -gen_op_mov_reg_v (ot,R_EAX , oldv); +gen_op_mov_reg_v (s, ot,R_EAX , oldv); } }tcg_gen_mov_tl (cpu_cc_src, oldv);
@@ -5351,14 +5352,14 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)/**************************/ /* push/pop */ case 0x50 ... 0x57: /* push */ -gen_op_mov_v_reg (MO_32 , s->T0, (b &7 ) |REX_B (s)); +gen_op_mov_v_reg (s,MO_32 , s->T0, (b &7 ) |REX_B (s));gen_push_v (s, s->T0);break ; case 0x58 ... 0x5f: /* pop */ ot =gen_pop_T0 (s);/* NOTE: order is important for pop %sp */ gen_pop_update (s, ot); -gen_op_mov_reg_v (ot, (b &7 ) |REX_B (s), s->T0); +gen_op_mov_reg_v (s, ot, (b &7 ) |REX_B (s), s->T0);break ;case 0x60 :/* pusha */ if (CODE64 (s))
@@ -5388,7 +5389,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)/* NOTE: order is important for pop %sp */ gen_pop_update (s, ot); rm = (modrm &7 ) |REX_B (s); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {/* NOTE: order is important too for MMU exceptions */ s->popl_esp_hack =1 << ot;
@@ -5478,7 +5479,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod !=3 ) {gen_op_st_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_reg_v (ot, (modrm &7 ) |REX_B (s), s->T0); +gen_op_mov_reg_v (s, ot, (modrm &7 ) |REX_B (s), s->T0); }break ;case 0x8a :
@@ -5488,7 +5489,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) reg = ((modrm >>3 ) &7 ) | rex_r;gen_ldst_modrm (env, s, modrm, ot,OR_TMP0 ,0 ); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0x8e :/* mov seg, Gv */ modrm =x86_ldub_code (env, s);
@@ -5540,10 +5541,10 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) rm = (modrm &7 ) |REX_B (s);if (mod ==3 ) { -if (s_ot ==MO_SB &&byte_reg_is_xH (rm)) { +if (s_ot ==MO_SB &&byte_reg_is_xH (s, rm)) {tcg_gen_sextract_tl (s->T0, cpu_regs[rm -4 ],8 ,8 ); }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm);switch (s_ot) {case MO_UB :tcg_gen_ext8u_tl (s->T0, s->T0);
@@ -5560,11 +5561,11 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)break ; } } -gen_op_mov_reg_v (d_ot, reg, s->T0); +gen_op_mov_reg_v (s, d_ot, reg, s->T0); }else {gen_lea_modrm (env, s, modrm);gen_op_ld_v (s, s_ot, s->T0, s->A0); -gen_op_mov_reg_v (d_ot, reg, s->T0); +gen_op_mov_reg_v (s, d_ot, reg, s->T0); } }break ;
@@ -5579,7 +5580,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)AddressParts a =gen_lea_modrm_0 (env, s, modrm);TCGv ea =gen_lea_modrm_1 (s, a);gen_lea_v_seg (s, s->aflag, ea,-1 ,-1 ); -gen_op_mov_reg_v (dflag, reg, s->A0); +gen_op_mov_reg_v (s, dflag, reg, s->A0); }break ;
@@ -5605,9 +5606,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_add_A0_ds_seg (s);if ((b &2 ) ==0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); -gen_op_mov_reg_v (ot,R_EAX , s->T0); +gen_op_mov_reg_v (s, ot,R_EAX , s->T0); }else { -gen_op_mov_v_reg (ot, s->T0,R_EAX ); +gen_op_mov_v_reg (s, ot, s->T0,R_EAX );gen_op_st_v (s, ot, s->T0, s->A0); } }
@@ -5619,12 +5620,12 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_extu (s->aflag, s->A0);gen_add_A0_ds_seg (s);gen_op_ld_v (s,MO_8 , s->T0, s->A0); -gen_op_mov_reg_v (MO_8 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_8 ,R_EAX , s->T0);break ; case 0xb0 ... 0xb7: /* mov R, Ib */ val =insn_get (env, s,MO_8 );tcg_gen_movi_tl (s->T0, val); -gen_op_mov_reg_v (MO_8 , (b &7 ) |REX_B (s), s->T0); +gen_op_mov_reg_v (s,MO_8 , (b &7 ) |REX_B (s), s->T0);break ; case 0xb8 ... 0xbf: /* mov R, Iv */#ifdef TARGET_X86_64
@@ -5634,7 +5635,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) tmp =x86_ldq_code (env, s); reg = (b &7 ) |REX_B (s);tcg_gen_movi_tl (s->T0, tmp); -gen_op_mov_reg_v (MO_64 , reg, s->T0); +gen_op_mov_reg_v (s,MO_64 , reg, s->T0); } else#endif {
@@ -5642,7 +5643,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) val =insn_get (env, s, ot); reg = (b &7 ) |REX_B (s);tcg_gen_movi_tl (s->T0, val); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0); }break ;
@@ -5661,17 +5662,17 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod ==3 ) { rm = (modrm &7 ) |REX_B (s); do_xchg_reg: -gen_op_mov_v_reg (ot, s->T0, reg); -gen_op_mov_v_reg (ot, s->T1, rm); -gen_op_mov_reg_v (ot, rm, s->T0); -gen_op_mov_reg_v (ot, reg, s->T1); +gen_op_mov_v_reg (s, ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T1, rm); +gen_op_mov_reg_v (s, ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T1); }else {gen_lea_modrm (env, s, modrm); -gen_op_mov_v_reg (ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T0, reg);/* for xchg, lock is implicit */ tcg_gen_atomic_xchg_tl (s->T1, s->A0, s->T0, s->mem_index, ot |MO_LE ); -gen_op_mov_reg_v (ot, reg, s->T1); +gen_op_mov_reg_v (s, ot, reg, s->T1); }break ;case 0xc4 :/* les Gv */
@@ -5704,7 +5705,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_ld_v (s,MO_16 , s->T0, s->A0);gen_movl_seg_T0 (s, op);/* then put the data */ -gen_op_mov_reg_v (ot, reg, s->T1); +gen_op_mov_reg_v (s, ot, reg, s->T1);if (s->base.is_jmp) {gen_jmp_im (s, s->pc - s->cs_base);gen_eob (s);
@@ -5783,7 +5784,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }else { opreg = rm; } -gen_op_mov_v_reg (ot, s->T1, reg); +gen_op_mov_v_reg (s, ot, s->T1, reg);if (shift) {TCGv imm =tcg_const_tl (x86_ldub_code (env, s));
@@ -6244,7 +6245,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)case 0 :gen_helper_fnstsw (s->tmp2_i32, cpu_env);tcg_gen_extu_i32_tl (s->T0, s->tmp2_i32); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);break ;default : goto unknown_op;
@@ -6397,7 +6398,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }tcg_gen_movi_i32 (s->tmp2_i32, val);gen_helper_in_func (ot, s->T1, s->tmp2_i32); -gen_op_mov_reg_v (ot,R_EAX , s->T1); +gen_op_mov_reg_v (s, ot,R_EAX , s->T1);gen_bpt_io (s, s->tmp2_i32, ot);if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_end ();
@@ -6411,7 +6412,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_movi_tl (s->T0, val);gen_check_io (s, ot, pc_start - s->cs_base,svm_is_rep (prefixes)); -gen_op_mov_v_reg (ot, s->T1,R_EAX ); +gen_op_mov_v_reg (s, ot, s->T1,R_EAX );if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_start ();
@@ -6436,7 +6437,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }tcg_gen_trunc_tl_i32 (s->tmp2_i32, s->T0);gen_helper_in_func (ot, s->T1, s->tmp2_i32); -gen_op_mov_reg_v (ot,R_EAX , s->T1); +gen_op_mov_reg_v (s, ot,R_EAX , s->T1);gen_bpt_io (s, s->tmp2_i32, ot);if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_end ();
@@ -6449,7 +6450,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_ext16u_tl (s->T0, cpu_regs[R_EDX ]);gen_check_io (s, ot, pc_start - s->cs_base,svm_is_rep (prefixes)); -gen_op_mov_v_reg (ot, s->T1,R_EAX ); +gen_op_mov_v_reg (s, ot, s->T1,R_EAX );if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_start ();
@@ -6708,7 +6709,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)case 0x9e :/* sahf */ if (CODE64 (s) && !(s->cpuid_ext3_features &CPUID_EXT3_LAHF_LM )) goto illegal_op; -gen_op_mov_v_reg (MO_8 , s->T0,R_AH ); +gen_op_mov_v_reg (s,MO_8 , s->T0,R_AH );gen_compute_eflags (s);tcg_gen_andi_tl (cpu_cc_src, cpu_cc_src,CC_O );tcg_gen_andi_tl (s->T0, s->T0,CC_S |CC_Z |CC_A |CC_P |CC_C );
@@ -6720,7 +6721,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_compute_eflags (s);/* Note: gen_compute_eflags() only gives the condition codes */ tcg_gen_ori_tl (s->T0, cpu_cc_src,0x02 ); -gen_op_mov_reg_v (MO_8 ,R_AH , s->T0); +gen_op_mov_reg_v (s,MO_8 ,R_AH , s->T0);break ;case 0xf5 :/* cmc */ gen_compute_eflags (s);
@@ -6758,7 +6759,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_ld_v (s, ot, s->T0, s->A0); } }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm); }/* load shift */ val =x86_ldub_code (env, s);
@@ -6784,7 +6785,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) reg = ((modrm >>3 ) &7 ) | rex_r; mod = (modrm >>6 ) &3 ; rm = (modrm &7 ) |REX_B (s); -gen_op_mov_v_reg (MO_32 , s->T1, reg); +gen_op_mov_v_reg (s,MO_32 , s->T1, reg);if (mod !=3 ) {AddressParts a =gen_lea_modrm_0 (env, s, modrm);/* specific case: we need to add a displacement */
@@ -6797,7 +6798,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_ld_v (s, ot, s->T0, s->A0); } }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm); } bt_op:tcg_gen_andi_tl (s->T1, s->T1, (1 << (3 + ot)) -1 );
@@ -6847,7 +6848,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod !=3 ) {gen_op_st_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); } } }
@@ -6930,7 +6931,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_ctz_tl (s->T0, s->T0, cpu_regs[reg]); } } -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;/************************/ /* bcd */
@@ -7070,7 +7071,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) mod = (modrm >>6 ) &3 ;if (mod ==3 ) goto illegal_op; -gen_op_mov_v_reg (ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T0, reg);gen_lea_modrm (env, s, modrm);tcg_gen_trunc_tl_i32 (s->tmp2_i32, s->T0);if (ot ==MO_16 ) {
@@ -7083,16 +7084,16 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) reg = (b &7 ) |REX_B (s);#ifdef TARGET_X86_64 if (dflag ==MO_64 ) { -gen_op_mov_v_reg (MO_64 , s->T0, reg); +gen_op_mov_v_reg (s,MO_64 , s->T0, reg);tcg_gen_bswap64_i64 (s->T0, s->T0); -gen_op_mov_reg_v (MO_64 , reg, s->T0); +gen_op_mov_reg_v (s,MO_64 , reg, s->T0); } else#endif { -gen_op_mov_v_reg (MO_32 , s->T0, reg); +gen_op_mov_v_reg (s,MO_32 , s->T0, reg);tcg_gen_ext32u_tl (s->T0, s->T0);tcg_gen_bswap32_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_32 , reg, s->T0); +gen_op_mov_reg_v (s,MO_32 , reg, s->T0); }break ;case 0xd6 :/* salc */
@@ -7100,7 +7101,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op;gen_compute_eflags_c (s, s->T0);tcg_gen_neg_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_8 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_8 ,R_EAX , s->T0);break ;case 0xe0 :/* loopnz */ case 0xe1 :/* loopz */
@@ -7661,16 +7662,16 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) rm = (modrm &7 ) |REX_B (s);if (mod ==3 ) { -gen_op_mov_v_reg (MO_32 , s->T0, rm); +gen_op_mov_v_reg (s,MO_32 , s->T0, rm);/* sign extend */ if (d_ot ==MO_64 ) {tcg_gen_ext32s_tl (s->T0, s->T0); } -gen_op_mov_reg_v (d_ot, reg, s->T0); +gen_op_mov_reg_v (s, d_ot, reg, s->T0); }else {gen_lea_modrm (env, s, modrm);gen_op_ld_v (s,MO_32 |MO_SIGN , s->T0, s->A0); -gen_op_mov_reg_v (d_ot, reg, s->T0); +gen_op_mov_reg_v (s, d_ot, reg, s->T0); } } else#endif
@@ -7694,10 +7695,10 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) a0 =tcg_temp_local_new ();tcg_gen_mov_tl (a0, s->A0); }else { -gen_op_mov_v_reg (ot, t0, rm); +gen_op_mov_v_reg (s, ot, t0, rm); a0 =NULL ; } -gen_op_mov_v_reg (ot, t1, reg); +gen_op_mov_v_reg (s, ot, t1, reg);tcg_gen_andi_tl (s->tmp0, t0,3 );tcg_gen_andi_tl (t1, t1,3 );tcg_gen_movi_tl (t2,0 );
@@ -7711,7 +7712,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_st_v (s, ot, t0, a0);tcg_temp_free (a0); }else { -gen_op_mov_reg_v (ot, rm, t0); +gen_op_mov_reg_v (s, ot, rm, t0); }gen_compute_eflags (s);tcg_gen_andi_tl (cpu_cc_src, cpu_cc_src, ~CC_Z );
@@ -7742,7 +7743,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_andi_tl (s->tmp0, cpu_cc_src,CC_Z ); label1 =gen_new_label ();tcg_gen_brcondi_tl (TCG_COND_EQ , s->tmp0,0 , label1); -gen_op_mov_reg_v (ot, reg, t0); +gen_op_mov_reg_v (s, ot, reg, t0);gen_set_label (label1);set_cc_op (s,CC_OP_EFLAGS );tcg_temp_free (t0);
@@ -7996,7 +7997,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_start (); } -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm);gen_helper_write_crN (cpu_env,tcg_const_i32 (reg), s->T0);if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {
@@ -8009,7 +8010,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_io_start (); }gen_helper_read_crN (s->T0, cpu_env,tcg_const_i32 (reg)); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0);if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_end (); }
@@ -8042,7 +8043,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }if (b &2 ) {gen_svm_check_intercept (s, pc_start,SVM_EXIT_WRITE_DR0 + reg); -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm);tcg_gen_movi_i32 (s->tmp2_i32, reg);gen_helper_set_dr (cpu_env, s->tmp2_i32, s->T0);gen_jmp_im (s, s->pc - s->cs_base);
@@ -8051,7 +8052,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_svm_check_intercept (s, pc_start,SVM_EXIT_READ_DR0 + reg);tcg_gen_movi_i32 (s->tmp2_i32, reg);gen_helper_get_dr (s->T0, cpu_env, s->tmp2_i32); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); } }break ;
@@ -8313,7 +8314,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_extu (ot, s->T0);tcg_gen_mov_tl (cpu_cc_src, s->T0);tcg_gen_ctpop_tl (s->T0, s->T0); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);set_cc_op (s,CC_OP_POPCNT );break ;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH v3 12/13] target/i386: move x86_64_hregs to DisasContext
Quoted 7 lines · Emilio G. Cota
And convert it to a bool to use an existing hole
in the struct.Signed-off-by Emilio G. Cota <[email protected]>--- target/i386/translate.c | 307 ++++++++++++++++++++-------------------- 1 file changed, 154 insertions(+), 153 deletions(-)
r~
Re: [Qemu-devel] [PATCH v3 12/13] target/i386: move x86_64_hregs to DisasContext
In reply to Emilio G. CotaQuoted 4 lines · Emilio G. Cota
And convert it to a bool to use an existing hole
in the struct.Signed-off-by Emilio G. Cota <[email protected]>
Quoted 1,131 lines
--- target/i386/translate.c | 307 ++++++++++++++++++++-------------------- 1 file changed, 154 insertions(+), 153 deletions(-)target/i386/translate.c +153
-152@@ -81,10 +81,6 @@ static TCGv_i64 cpu_bndu[4];#include "exec/gen-icount.h" -#ifdef TARGET_X86_64 -static int x86_64_hregs; -#endif - typedef struct DisasContext { DisasContextBase base;@@ -109,6 +105,9 @@ typedef struct DisasContext {int ss32;/* 32 bit stack segment */ CCOp cc_op;/* current CC operation */ bool cc_op_dirty; +#ifdef TARGET_X86_64 +bool x86_64_hregs; +#endif int addseg;/* non zero if either DS/ES/SS have a non zero base */ int f_st;/* currently unused */ int vm86;/* vm86 mode */ @@ -307,13 +306,13 @@ static void gen_update_cc_op(DisasContext *s)* [AH, CH, DH, BH], ie "bits 15..8 of register N-4". Return * true for this special case, false otherwise. */ -static inline bool byte_reg_is_xH (int reg) +static inline bool byte_reg_is_xH (DisasContext *s,int reg) {if (reg <4 ) {return false; }#ifdef TARGET_X86_64 -if (reg >=8 || x86_64_hregs) { +if (reg >=8 || s->x86_64_hregs) {return false; }#endif @@ -360,11 +359,11 @@ static inline TCGMemOp mo_b_d32(int b, TCGMemOp ot)return b &1 ? (ot ==MO_16 ?MO_16 :MO_32 ) :MO_8 ; } -static void gen_op_mov_reg_v (TCGMemOp ot,int reg,TCGv t0) +static void gen_op_mov_reg_v (DisasContext *s,TCGMemOp ot,int reg,TCGv t0) {switch (ot) {case MO_8 : -if (!byte_reg_is_xH (reg)) { +if (!byte_reg_is_xH (s, reg)) {tcg_gen_deposit_tl (cpu_regs[reg], cpu_regs[reg], t0,0 ,8 ); }else {tcg_gen_deposit_tl (cpu_regs[reg -4 ], cpu_regs[reg -4 ], t0,8 ,8 );@@ -388,9 +387,10 @@ static void gen_op_mov_reg_v(TCGMemOp ot, int reg, TCGv t0) } } -static inline void gen_op_mov_v_reg (TCGMemOp ot,TCGv t0,int reg) +static inline +void gen_op_mov_v_reg (DisasContext *s,TCGMemOp ot,TCGv t0,int reg) { -if (ot ==MO_8 &&byte_reg_is_xH (reg)) { +if (ot ==MO_8 &&byte_reg_is_xH (s, reg)) {tcg_gen_extract_tl (t0, cpu_regs[reg -4 ],8 ,8 ); }else {tcg_gen_mov_tl (t0, cpu_regs[reg]);@@ -414,13 +414,13 @@ static inlinevoid gen_op_add_reg_im (DisasContext *s,TCGMemOp size,int reg,int32_t val) {tcg_gen_addi_tl (s->tmp0, cpu_regs[reg], val); -gen_op_mov_reg_v (size, reg, s->tmp0); +gen_op_mov_reg_v (s, size, reg, s->tmp0); }static inline void gen_op_add_reg_T0 (DisasContext *s,TCGMemOp size,int reg) {tcg_gen_add_tl (s->tmp0, cpu_regs[reg], s->T0); -gen_op_mov_reg_v (size, reg, s->tmp0); +gen_op_mov_reg_v (s, size, reg, s->tmp0); }static inline void gen_op_ld_v (DisasContext *s,int idx,TCGv t0,TCGv a0)@@ -438,7 +438,7 @@ static inline void gen_op_st_rm_T0_A0(DisasContext *s, int idx, int d)if (d ==OR_TMP0 ) {gen_op_st_v (s, idx, s->T0, s->A0); }else { -gen_op_mov_reg_v (idx, d, s->T0); +gen_op_mov_reg_v (s, idx, d, s->T0); } }@@ -1077,7 +1077,7 @@ static TCGLabel *gen_jz_ecx_string(DisasContext *s, target_ulong next_eip)static inline void gen_stos (DisasContext *s,TCGMemOp ot) { -gen_op_mov_v_reg (MO_32 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_32 , s->T0,R_EAX );gen_string_movl_A0_EDI (s);gen_op_st_v (s, ot, s->T0, s->A0);gen_op_movl_T0_Dshift (s, ot);@@ -1088,7 +1088,7 @@ static inline void gen_lods(DisasContext *s, TCGMemOp ot) {gen_string_movl_A0_ESI (s);gen_op_ld_v (s, ot, s->T0, s->A0); -gen_op_mov_reg_v (ot,R_EAX , s->T0); +gen_op_mov_reg_v (s, ot,R_EAX , s->T0);gen_op_movl_T0_Dshift (s, ot);gen_op_add_reg_T0 (s, s->aflag,R_ESI ); }@@ -1272,7 +1272,7 @@ static void gen_helper_fp_arith_STN_ST0(int op, int opreg)static void gen_op (DisasContext *s1,int op,TCGMemOp ot,int d) {if (d !=OR_TMP0 ) { -gen_op_mov_v_reg (ot, s1->T0, d); +gen_op_mov_v_reg (s1, ot, s1->T0, d); }else if (!(s1->prefix &PREFIX_LOCK )) {gen_op_ld_v (s1, ot, s1->T0, s1->A0); }@@ -1383,7 +1383,7 @@ static void gen_inc(DisasContext *s1, TCGMemOp ot, int d, int c) s1->mem_index, ot | MO_LE); }else {if (d !=OR_TMP0 ) { -gen_op_mov_v_reg (ot, s1->T0, d); +gen_op_mov_v_reg (s1, ot, s1->T0, d); }else {gen_op_ld_v (s1, ot, s1->T0, s1->A0); }@@ -1450,7 +1450,7 @@ static void gen_shift_rm_T1(DisasContext *s, TCGMemOp ot, int op1,if (op1 ==OR_TMP0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); }tcg_gen_andi_tl (s->T1, s->T1, mask);@@ -1486,7 +1486,7 @@ static void gen_shift_rm_im(DisasContext *s, TCGMemOp ot, int op1, int op2,if (op1 ==OR_TMP0 )gen_op_ld_v (s, ot, s->T0, s->A0);else -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); op2 &= mask;if (op2 !=0 ) {@@ -1526,7 +1526,7 @@ static void gen_rot_rm_T1(DisasContext *s, TCGMemOp ot, int op1, int is_right)if (op1 ==OR_TMP0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); }tcg_gen_andi_tl (s->T1, s->T1, mask);@@ -1612,7 +1612,7 @@ static void gen_rot_rm_im(DisasContext *s, TCGMemOp ot, int op1, int op2,if (op1 ==OR_TMP0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); } op2 &= mask;@@ -1690,7 +1690,7 @@ static void gen_rotc_rm_T1(DisasContext *s, TCGMemOp ot, int op1,if (op1 ==OR_TMP0 )gen_op_ld_v (s, ot, s->T0, s->A0);else -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1);if (is_right) {switch (ot) {@@ -1746,7 +1746,7 @@ static void gen_shiftd_rm_T1(DisasContext *s, TCGMemOp ot, int op1,if (op1 ==OR_TMP0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, op1); +gen_op_mov_v_reg (s, ot, s->T0, op1); } count =tcg_temp_new ();@@ -1820,7 +1820,7 @@ static void gen_shiftd_rm_T1(DisasContext *s, TCGMemOp ot, int op1,static void gen_shift (DisasContext *s1,int op,TCGMemOp ot,int d,int s) {if (s !=OR_TMP1 ) -gen_op_mov_v_reg (ot, s1->T1, s); +gen_op_mov_v_reg (s1, ot, s1->T1, s);switch (op) {case OP_ROL :gen_rot_rm_T1 (s1, ot, d,0 );@@ -2133,23 +2133,23 @@ static void gen_ldst_modrm(CPUX86State *env, DisasContext *s, int modrm,if (mod ==3 ) {if (is_store) {if (reg !=OR_TMP0 ) -gen_op_mov_v_reg (ot, s->T0, reg); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_v_reg (s, ot, s->T0, reg); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm);if (reg !=OR_TMP0 ) -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0); } }else {gen_lea_modrm (env, s, modrm);if (is_store) {if (reg !=OR_TMP0 ) -gen_op_mov_v_reg (ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T0, reg);gen_op_st_v (s, ot, s->T0, s->A0); }else {gen_op_ld_v (s, ot, s->T0, s->A0);if (reg !=OR_TMP0 ) -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0); } } }@@ -2260,7 +2260,7 @@ static void gen_cmovcc1(CPUX86State *env, DisasContext *s, TCGMemOp ot, int b,tcg_gen_movcond_tl (cc.cond, s->T0, cc.reg, cc.reg2, s->T0, cpu_regs[reg]); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);if (cc.mask !=-1 ) {tcg_temp_free (cc.reg);@@ -2354,7 +2354,7 @@ static void gen_push_v(DisasContext *s, TCGv val) }gen_op_st_v (s, d_ot, val, s->A0); -gen_op_mov_reg_v (a_ot,R_ESP , new_esp); +gen_op_mov_reg_v (s, a_ot,R_ESP , new_esp); }/* two step pop is necessary for precise exceptions */ @@ -2409,7 +2409,7 @@ static void gen_popa(DisasContext *s)tcg_gen_addi_tl (s->A0, cpu_regs[R_ESP ], i * size);gen_lea_v_seg (s, s_ot, s->A0,R_SS ,-1 );gen_op_ld_v (s, d_ot, s->T0, s->A0); -gen_op_mov_reg_v (d_ot,7 - i, s->T0); +gen_op_mov_reg_v (s, d_ot,7 - i, s->T0); }gen_stack_update (s,8 * size);@@ -2448,11 +2448,11 @@ static void gen_enter(DisasContext *s, int esp_addend, int level) }/* Copy the FrameTemp value to EBP. */ -gen_op_mov_reg_v (a_ot,R_EBP , s->T1); +gen_op_mov_reg_v (s, a_ot,R_EBP , s->T1);/* Compute the final value of ESP. */ tcg_gen_subi_tl (s->T1, s->T1, esp_addend + size * level); -gen_op_mov_reg_v (a_ot,R_ESP , s->T1); +gen_op_mov_reg_v (s, a_ot,R_ESP , s->T1); }static void gen_leave (DisasContext *s)@@ -2465,8 +2465,8 @@ static void gen_leave(DisasContext *s)tcg_gen_addi_tl (s->T1, cpu_regs[R_EBP ],1 << d_ot); -gen_op_mov_reg_v (d_ot,R_EBP , s->T0); -gen_op_mov_reg_v (a_ot,R_ESP , s->T1); +gen_op_mov_reg_v (s, d_ot,R_EBP , s->T0); +gen_op_mov_reg_v (s, a_ot,R_ESP , s->T1); }static void gen_exception (DisasContext *s,int trapno,target_ulong cur_eip)@@ -3598,7 +3598,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, goto illegal_op;#endif } -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0xc4 :/* pinsrw */ case 0x1c4 :@@ -3633,7 +3633,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, offsetof(CPUX86State,fpregs[rm].mmx.MMX_W(val))); } reg = ((modrm >>3 ) &7 ) | rex_r; -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0x1d6 :/* movq ea, xmm */ if (mod !=3 ) {@@ -3787,7 +3787,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, s->T0, tcg_const_i32(8 << ot)); ot =mo_64_32 (s->dflag); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0x1f0 :/* crc32 or movbe */ @@ -3814,7 +3814,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,if ((b &1 ) ==0 ) {tcg_gen_qemu_ld_tl (s->T0, s->A0, s->mem_index, ot |MO_BE ); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0); }else {tcg_gen_qemu_st_tl (cpu_regs[reg], s->A0, s->mem_index, ot |MO_BE );@@ -3830,7 +3830,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, ot =mo_64_32 (s->dflag);gen_ldst_modrm (env, s, modrm, ot,OR_TMP0 ,0 );tcg_gen_andc_tl (s->T0, s->T0, cpu_regs[s->vex_v]); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);gen_op_update1_cc (s);set_cc_op (s,CC_OP_LOGICB + ot);break ;@@ -3868,7 +3868,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_subi_tl (s->T1, s->T1,1 );tcg_gen_and_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);gen_op_update1_cc (s);set_cc_op (s,CC_OP_LOGICB + ot); }@@ -3896,7 +3896,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_movi_tl (s->A0,-1 );tcg_gen_shl_tl (s->A0, s->A0, s->T1);tcg_gen_andc_tl (s->T0, s->T0, s->A0); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);gen_op_update1_cc (s);set_cc_op (s,CC_OP_BMILGB + ot);break ;@@ -4071,7 +4071,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, }tcg_gen_shr_tl (s->T0, s->T0, s->T1); } -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0x0f3 :@@ -4104,7 +4104,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, goto unknown_op; }tcg_gen_mov_tl (cpu_cc_dst, s->T0); -gen_op_mov_reg_v (ot, s->vex_v, s->T0); +gen_op_mov_reg_v (s, ot, s->vex_v, s->T0);set_cc_op (s,CC_OP_BMILGB + ot);break ;@@ -4145,7 +4145,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_ld8u_tl (s->T0, cpu_env, offsetof(CPUX86State , xmm_regs[reg].ZMM_B(val & 15)));if (mod ==3 ) { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {tcg_gen_qemu_st_tl (s->T0, s->A0, s->mem_index,MO_UB );@@ -4155,7 +4155,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_ld16u_tl (s->T0, cpu_env, offsetof(CPUX86State , xmm_regs[reg].ZMM_W(val & 7)));if (mod ==3 ) { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {tcg_gen_qemu_st_tl (s->T0, s->A0, s->mem_index,MO_LEUW );@@ -4192,7 +4192,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_ld32u_tl (s->T0, cpu_env, offsetof(CPUX86State , xmm_regs[reg].ZMM_L(val & 3)));if (mod ==3 ) { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {tcg_gen_qemu_st_tl (s->T0, s->A0, s->mem_index,MO_LEUL );@@ -4200,7 +4200,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,break ;case 0x20 :/* pinsrb */ if (mod ==3 ) { -gen_op_mov_v_reg (MO_32 , s->T0, rm); +gen_op_mov_v_reg (s,MO_32 , s->T0, rm); }else {tcg_gen_qemu_ld_tl (s->T0, s->A0, s->mem_index,MO_UB );@@ -4251,7 +4251,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, }else {/* pinsrq */ #ifdef TARGET_X86_64 if (mod ==3 ) { -gen_op_mov_v_reg (ot, s->tmp1_i64, rm); +gen_op_mov_v_reg (s, ot, s->tmp1_i64, rm); }else {tcg_gen_qemu_ld_i64 (s->tmp1_i64, s->A0, s->mem_index,MO_LEQ );@@ -4326,7 +4326,7 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,tcg_gen_rotri_i32 (s->tmp2_i32, s->tmp2_i32, b &31 );tcg_gen_extu_i32_tl (s->T0, s->tmp2_i32); } -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;default :@@ -4489,7 +4489,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)#ifdef TARGET_X86_64 s->rex_x =0 ; s->rex_b =0 ; - x86_64_hregs =0 ; + s->x86_64_hregs = false;#endif s->rip_offset =0 ;/* for relative ip address */ s->vex_l =0 ;@@ -4548,7 +4548,8 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) rex_r = (b &0x4 ) <<1 ; s->rex_x = (b &0x2 ) <<2 ;REX_B (s) = (b &0x1 ) <<3 ; - x86_64_hregs =1 ;/* select uniform byte register addressing */ +/* select uniform byte register addressing */ + s->x86_64_hregs = true; goto next_byte; }break ;@@ -4576,7 +4577,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op; }#ifdef TARGET_X86_64 -if (x86_64_hregs) { +if (s->x86_64_hregs) { goto illegal_op; }#endif @@ -4681,12 +4682,12 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)/* xor reg, reg optimisation */ set_cc_op (s,CC_OP_CLR );tcg_gen_movi_tl (s->T0,0 ); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ; }else { opreg = rm; } -gen_op_mov_v_reg (ot, s->T1, reg); +gen_op_mov_v_reg (s, ot, s->T1, reg);gen_op (s, op, ot, opreg);break ;case 1 :/* OP Gv, Ev */ @@ -4700,7 +4701,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }else if (op ==OP_XORL && rm == reg) { goto xor_zero; }else { -gen_op_mov_v_reg (ot, s->T1, rm); +gen_op_mov_v_reg (s, ot, s->T1, rm); }gen_op (s, op, ot, reg);break ;@@ -4786,7 +4787,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_ld_v (s, ot, s->T0, s->A0); } }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm); }switch (op) {@@ -4809,7 +4810,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod !=3 ) {gen_op_st_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); } }break ;@@ -4847,7 +4848,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod !=3 ) {gen_op_st_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); } }gen_op_update_neg_cc (s);@@ -4856,26 +4857,26 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)case 4 :/* mul */ switch (ot) {case MO_8 : -gen_op_mov_v_reg (MO_8 , s->T1,R_EAX ); +gen_op_mov_v_reg (s,MO_8 , s->T1,R_EAX );tcg_gen_ext8u_tl (s->T0, s->T0);tcg_gen_ext8u_tl (s->T1, s->T1);/* XXX: use 32 bit mul which could be faster */ tcg_gen_mul_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_andi_tl (cpu_cc_src, s->T0,0xff00 );set_cc_op (s,CC_OP_MULB );break ;case MO_16 : -gen_op_mov_v_reg (MO_16 , s->T1,R_EAX ); +gen_op_mov_v_reg (s,MO_16 , s->T1,R_EAX );tcg_gen_ext16u_tl (s->T0, s->T0);tcg_gen_ext16u_tl (s->T1, s->T1);/* XXX: use 32 bit mul which could be faster */ tcg_gen_mul_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_shri_tl (s->T0, s->T0,16 ); -gen_op_mov_reg_v (MO_16 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EDX , s->T0);tcg_gen_mov_tl (cpu_cc_src, s->T0);set_cc_op (s,CC_OP_MULW );break ;@@ -4905,29 +4906,29 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)case 5 :/* imul */ switch (ot) {case MO_8 : -gen_op_mov_v_reg (MO_8 , s->T1,R_EAX ); +gen_op_mov_v_reg (s,MO_8 , s->T1,R_EAX );tcg_gen_ext8s_tl (s->T0, s->T0);tcg_gen_ext8s_tl (s->T1, s->T1);/* XXX: use 32 bit mul which could be faster */ tcg_gen_mul_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_ext8s_tl (s->tmp0, s->T0);tcg_gen_sub_tl (cpu_cc_src, s->T0, s->tmp0);set_cc_op (s,CC_OP_MULB );break ;case MO_16 : -gen_op_mov_v_reg (MO_16 , s->T1,R_EAX ); +gen_op_mov_v_reg (s,MO_16 , s->T1,R_EAX );tcg_gen_ext16s_tl (s->T0, s->T0);tcg_gen_ext16s_tl (s->T1, s->T1);/* XXX: use 32 bit mul which could be faster */ tcg_gen_mul_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_ext16s_tl (s->tmp0, s->T0);tcg_gen_sub_tl (cpu_cc_src, s->T0, s->tmp0);tcg_gen_shri_tl (s->T0, s->T0,16 ); -gen_op_mov_reg_v (MO_16 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EDX , s->T0);set_cc_op (s,CC_OP_MULW );break ;default :@@ -5026,7 +5027,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (op >=2 && op !=3 && op !=5 )gen_op_ld_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm); }switch (op) {@@ -5115,7 +5116,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) reg = ((modrm >>3 ) &7 ) | rex_r;gen_ldst_modrm (env, s, modrm, ot,OR_TMP0 ,0 ); -gen_op_mov_v_reg (ot, s->T1, reg); +gen_op_mov_v_reg (s, ot, s->T1, reg);gen_op_testl_T0_T1_cc (s);set_cc_op (s,CC_OP_LOGICB + ot);break ;@@ -5125,7 +5126,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) ot =mo_b_d (b, dflag); val =insn_get (env, s, ot); -gen_op_mov_v_reg (ot, s->T0,OR_EAX ); +gen_op_mov_v_reg (s, ot, s->T0,OR_EAX );tcg_gen_movi_tl (s->T1, val);gen_op_testl_T0_T1_cc (s);set_cc_op (s,CC_OP_LOGICB + ot);@@ -5135,20 +5136,20 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)switch (dflag) {#ifdef TARGET_X86_64 case MO_64 : -gen_op_mov_v_reg (MO_32 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_32 , s->T0,R_EAX );tcg_gen_ext32s_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_64 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_64 ,R_EAX , s->T0);break ;#endif case MO_32 : -gen_op_mov_v_reg (MO_16 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_16 , s->T0,R_EAX );tcg_gen_ext16s_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_32 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_32 ,R_EAX , s->T0);break ;case MO_16 : -gen_op_mov_v_reg (MO_8 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_8 , s->T0,R_EAX );tcg_gen_ext8s_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);break ;default :tcg_abort ();@@ -5158,22 +5159,22 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)switch (dflag) {#ifdef TARGET_X86_64 case MO_64 : -gen_op_mov_v_reg (MO_64 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_64 , s->T0,R_EAX );tcg_gen_sari_tl (s->T0, s->T0,63 ); -gen_op_mov_reg_v (MO_64 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_64 ,R_EDX , s->T0);break ;#endif case MO_32 : -gen_op_mov_v_reg (MO_32 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_32 , s->T0,R_EAX );tcg_gen_ext32s_tl (s->T0, s->T0);tcg_gen_sari_tl (s->T0, s->T0,31 ); -gen_op_mov_reg_v (MO_32 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_32 ,R_EDX , s->T0);break ;case MO_16 : -gen_op_mov_v_reg (MO_16 , s->T0,R_EAX ); +gen_op_mov_v_reg (s,MO_16 , s->T0,R_EAX );tcg_gen_ext16s_tl (s->T0, s->T0);tcg_gen_sari_tl (s->T0, s->T0,15 ); -gen_op_mov_reg_v (MO_16 ,R_EDX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EDX , s->T0);break ;default :tcg_abort ();@@ -5197,7 +5198,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) val = (int8_t )insn_get (env, s,MO_8 );tcg_gen_movi_tl (s->T1, val); }else { -gen_op_mov_v_reg (ot, s->T1, reg); +gen_op_mov_v_reg (s, ot, s->T1, reg); }switch (ot) {#ifdef TARGET_X86_64 @@ -5227,7 +5228,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_mov_tl (cpu_cc_dst, s->T0);tcg_gen_ext16s_tl (s->tmp0, s->T0);tcg_gen_sub_tl (cpu_cc_src, s->T0, s->tmp0); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ; }set_cc_op (s,CC_OP_MULB + ot);@@ -5238,13 +5239,13 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) modrm =x86_ldub_code (env, s); reg = ((modrm >>3 ) &7 ) | rex_r; mod = (modrm >>6 ) &3 ; -gen_op_mov_v_reg (ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T0, reg);if (mod ==3 ) { rm = (modrm &7 ) |REX_B (s); -gen_op_mov_v_reg (ot, s->T1, rm); +gen_op_mov_v_reg (s, ot, s->T1, rm);tcg_gen_add_tl (s->T0, s->T0, s->T1); -gen_op_mov_reg_v (ot, reg, s->T1); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T1); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {gen_lea_modrm (env, s, modrm);if (s->prefix &PREFIX_LOCK ) {@@ -5256,7 +5257,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_add_tl (s->T0, s->T0, s->T1);gen_op_st_v (s, ot, s->T0, s->A0); } -gen_op_mov_reg_v (ot, reg, s->T1); +gen_op_mov_reg_v (s, ot, reg, s->T1); }gen_op_update2_cc (s);set_cc_op (s,CC_OP_ADDB + ot);@@ -5273,7 +5274,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) oldv =tcg_temp_new (); newv =tcg_temp_new (); cmpv =tcg_temp_new (); -gen_op_mov_v_reg (ot, newv, reg); +gen_op_mov_v_reg (s, ot, newv, reg);tcg_gen_mov_tl (cmpv, cpu_regs[R_EAX ]);if (s->prefix &PREFIX_LOCK ) {@@ -5283,11 +5284,11 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_lea_modrm (env, s, modrm);tcg_gen_atomic_cmpxchg_tl (oldv, s->A0, cmpv, newv, s->mem_index, ot |MO_LE ); -gen_op_mov_reg_v (ot,R_EAX , oldv); +gen_op_mov_reg_v (s, ot,R_EAX , oldv); }else {if (mod ==3 ) { rm = (modrm &7 ) |REX_B (s); -gen_op_mov_v_reg (ot, oldv, rm); +gen_op_mov_v_reg (s, ot, oldv, rm); }else {gen_lea_modrm (env, s, modrm);gen_op_ld_v (s, ot, oldv, s->A0);@@ -5298,15 +5299,15 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)/* store value = (old == cmp ? new : old); */ tcg_gen_movcond_tl (TCG_COND_EQ , newv, oldv, cmpv, newv, oldv);if (mod ==3 ) { -gen_op_mov_reg_v (ot,R_EAX , oldv); -gen_op_mov_reg_v (ot, rm, newv); +gen_op_mov_reg_v (s, ot,R_EAX , oldv); +gen_op_mov_reg_v (s, ot, rm, newv); }else {/* Perform an unconditional store cycle like physical cpu; must be before changing accumulator to ensure idempotency if the store faults and the instruction is restarted */ gen_op_st_v (s, ot, newv, s->A0); -gen_op_mov_reg_v (ot,R_EAX , oldv); +gen_op_mov_reg_v (s, ot,R_EAX , oldv); } }tcg_gen_mov_tl (cpu_cc_src, oldv);@@ -5351,14 +5352,14 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)/**************************/ /* push/pop */ case 0x50 ... 0x57: /* push */ -gen_op_mov_v_reg (MO_32 , s->T0, (b &7 ) |REX_B (s)); +gen_op_mov_v_reg (s,MO_32 , s->T0, (b &7 ) |REX_B (s));gen_push_v (s, s->T0);break ; case 0x58 ... 0x5f: /* pop */ ot =gen_pop_T0 (s);/* NOTE: order is important for pop %sp */ gen_pop_update (s, ot); -gen_op_mov_reg_v (ot, (b &7 ) |REX_B (s), s->T0); +gen_op_mov_reg_v (s, ot, (b &7 ) |REX_B (s), s->T0);break ;case 0x60 :/* pusha */ if (CODE64 (s))@@ -5388,7 +5389,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)/* NOTE: order is important for pop %sp */ gen_pop_update (s, ot); rm = (modrm &7 ) |REX_B (s); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); }else {/* NOTE: order is important too for MMU exceptions */ s->popl_esp_hack =1 << ot;@@ -5478,7 +5479,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod !=3 ) {gen_op_st_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_reg_v (ot, (modrm &7 ) |REX_B (s), s->T0); +gen_op_mov_reg_v (s, ot, (modrm &7 ) |REX_B (s), s->T0); }break ;case 0x8a :@@ -5488,7 +5489,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) reg = ((modrm >>3 ) &7 ) | rex_r;gen_ldst_modrm (env, s, modrm, ot,OR_TMP0 ,0 ); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;case 0x8e :/* mov seg, Gv */ modrm =x86_ldub_code (env, s);@@ -5540,10 +5541,10 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) rm = (modrm &7 ) |REX_B (s);if (mod ==3 ) { -if (s_ot ==MO_SB &&byte_reg_is_xH (rm)) { +if (s_ot ==MO_SB &&byte_reg_is_xH (s, rm)) {tcg_gen_sextract_tl (s->T0, cpu_regs[rm -4 ],8 ,8 ); }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm);switch (s_ot) {case MO_UB :tcg_gen_ext8u_tl (s->T0, s->T0);@@ -5560,11 +5561,11 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)break ; } } -gen_op_mov_reg_v (d_ot, reg, s->T0); +gen_op_mov_reg_v (s, d_ot, reg, s->T0); }else {gen_lea_modrm (env, s, modrm);gen_op_ld_v (s, s_ot, s->T0, s->A0); -gen_op_mov_reg_v (d_ot, reg, s->T0); +gen_op_mov_reg_v (s, d_ot, reg, s->T0); } }break ;@@ -5579,7 +5580,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)AddressParts a =gen_lea_modrm_0 (env, s, modrm);TCGv ea =gen_lea_modrm_1 (s, a);gen_lea_v_seg (s, s->aflag, ea,-1 ,-1 ); -gen_op_mov_reg_v (dflag, reg, s->A0); +gen_op_mov_reg_v (s, dflag, reg, s->A0); }break ;@@ -5605,9 +5606,9 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_add_A0_ds_seg (s);if ((b &2 ) ==0 ) {gen_op_ld_v (s, ot, s->T0, s->A0); -gen_op_mov_reg_v (ot,R_EAX , s->T0); +gen_op_mov_reg_v (s, ot,R_EAX , s->T0); }else { -gen_op_mov_v_reg (ot, s->T0,R_EAX ); +gen_op_mov_v_reg (s, ot, s->T0,R_EAX );gen_op_st_v (s, ot, s->T0, s->A0); } }@@ -5619,12 +5620,12 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_extu (s->aflag, s->A0);gen_add_A0_ds_seg (s);gen_op_ld_v (s,MO_8 , s->T0, s->A0); -gen_op_mov_reg_v (MO_8 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_8 ,R_EAX , s->T0);break ; case 0xb0 ... 0xb7: /* mov R, Ib */ val =insn_get (env, s,MO_8 );tcg_gen_movi_tl (s->T0, val); -gen_op_mov_reg_v (MO_8 , (b &7 ) |REX_B (s), s->T0); +gen_op_mov_reg_v (s,MO_8 , (b &7 ) |REX_B (s), s->T0);break ; case 0xb8 ... 0xbf: /* mov R, Iv */#ifdef TARGET_X86_64 @@ -5634,7 +5635,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) tmp =x86_ldq_code (env, s); reg = (b &7 ) |REX_B (s);tcg_gen_movi_tl (s->T0, tmp); -gen_op_mov_reg_v (MO_64 , reg, s->T0); +gen_op_mov_reg_v (s,MO_64 , reg, s->T0); } else#endif {@@ -5642,7 +5643,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) val =insn_get (env, s, ot); reg = (b &7 ) |REX_B (s);tcg_gen_movi_tl (s->T0, val); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0); }break ;@@ -5661,17 +5662,17 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod ==3 ) { rm = (modrm &7 ) |REX_B (s); do_xchg_reg: -gen_op_mov_v_reg (ot, s->T0, reg); -gen_op_mov_v_reg (ot, s->T1, rm); -gen_op_mov_reg_v (ot, rm, s->T0); -gen_op_mov_reg_v (ot, reg, s->T1); +gen_op_mov_v_reg (s, ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T1, rm); +gen_op_mov_reg_v (s, ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T1); }else {gen_lea_modrm (env, s, modrm); -gen_op_mov_v_reg (ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T0, reg);/* for xchg, lock is implicit */ tcg_gen_atomic_xchg_tl (s->T1, s->A0, s->T0, s->mem_index, ot |MO_LE ); -gen_op_mov_reg_v (ot, reg, s->T1); +gen_op_mov_reg_v (s, ot, reg, s->T1); }break ;case 0xc4 :/* les Gv */ @@ -5704,7 +5705,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_ld_v (s,MO_16 , s->T0, s->A0);gen_movl_seg_T0 (s, op);/* then put the data */ -gen_op_mov_reg_v (ot, reg, s->T1); +gen_op_mov_reg_v (s, ot, reg, s->T1);if (s->base.is_jmp) {gen_jmp_im (s, s->pc - s->cs_base);gen_eob (s);@@ -5783,7 +5784,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }else { opreg = rm; } -gen_op_mov_v_reg (ot, s->T1, reg); +gen_op_mov_v_reg (s, ot, s->T1, reg);if (shift) {TCGv imm =tcg_const_tl (x86_ldub_code (env, s));@@ -6244,7 +6245,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)case 0 :gen_helper_fnstsw (s->tmp2_i32, cpu_env);tcg_gen_extu_i32_tl (s->T0, s->tmp2_i32); -gen_op_mov_reg_v (MO_16 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_16 ,R_EAX , s->T0);break ;default : goto unknown_op;@@ -6397,7 +6398,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }tcg_gen_movi_i32 (s->tmp2_i32, val);gen_helper_in_func (ot, s->T1, s->tmp2_i32); -gen_op_mov_reg_v (ot,R_EAX , s->T1); +gen_op_mov_reg_v (s, ot,R_EAX , s->T1);gen_bpt_io (s, s->tmp2_i32, ot);if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_end ();@@ -6411,7 +6412,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_movi_tl (s->T0, val);gen_check_io (s, ot, pc_start - s->cs_base,svm_is_rep (prefixes)); -gen_op_mov_v_reg (ot, s->T1,R_EAX ); +gen_op_mov_v_reg (s, ot, s->T1,R_EAX );if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_start ();@@ -6436,7 +6437,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }tcg_gen_trunc_tl_i32 (s->tmp2_i32, s->T0);gen_helper_in_func (ot, s->T1, s->tmp2_i32); -gen_op_mov_reg_v (ot,R_EAX , s->T1); +gen_op_mov_reg_v (s, ot,R_EAX , s->T1);gen_bpt_io (s, s->tmp2_i32, ot);if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_end ();@@ -6449,7 +6450,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_ext16u_tl (s->T0, cpu_regs[R_EDX ]);gen_check_io (s, ot, pc_start - s->cs_base,svm_is_rep (prefixes)); -gen_op_mov_v_reg (ot, s->T1,R_EAX ); +gen_op_mov_v_reg (s, ot, s->T1,R_EAX );if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_start ();@@ -6708,7 +6709,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)case 0x9e :/* sahf */ if (CODE64 (s) && !(s->cpuid_ext3_features &CPUID_EXT3_LAHF_LM )) goto illegal_op; -gen_op_mov_v_reg (MO_8 , s->T0,R_AH ); +gen_op_mov_v_reg (s,MO_8 , s->T0,R_AH );gen_compute_eflags (s);tcg_gen_andi_tl (cpu_cc_src, cpu_cc_src,CC_O );tcg_gen_andi_tl (s->T0, s->T0,CC_S |CC_Z |CC_A |CC_P |CC_C );@@ -6720,7 +6721,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_compute_eflags (s);/* Note: gen_compute_eflags() only gives the condition codes */ tcg_gen_ori_tl (s->T0, cpu_cc_src,0x02 ); -gen_op_mov_reg_v (MO_8 ,R_AH , s->T0); +gen_op_mov_reg_v (s,MO_8 ,R_AH , s->T0);break ;case 0xf5 :/* cmc */ gen_compute_eflags (s);@@ -6758,7 +6759,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_ld_v (s, ot, s->T0, s->A0); } }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm); }/* load shift */ val =x86_ldub_code (env, s);@@ -6784,7 +6785,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) reg = ((modrm >>3 ) &7 ) | rex_r; mod = (modrm >>6 ) &3 ; rm = (modrm &7 ) |REX_B (s); -gen_op_mov_v_reg (MO_32 , s->T1, reg); +gen_op_mov_v_reg (s,MO_32 , s->T1, reg);if (mod !=3 ) {AddressParts a =gen_lea_modrm_0 (env, s, modrm);/* specific case: we need to add a displacement */ @@ -6797,7 +6798,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_ld_v (s, ot, s->T0, s->A0); } }else { -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm); } bt_op:tcg_gen_andi_tl (s->T1, s->T1, (1 << (3 + ot)) -1 );@@ -6847,7 +6848,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (mod !=3 ) {gen_op_st_v (s, ot, s->T0, s->A0); }else { -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); } } }@@ -6930,7 +6931,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_ctz_tl (s->T0, s->T0, cpu_regs[reg]); } } -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);break ;/************************/ /* bcd */ @@ -7070,7 +7071,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) mod = (modrm >>6 ) &3 ;if (mod ==3 ) goto illegal_op; -gen_op_mov_v_reg (ot, s->T0, reg); +gen_op_mov_v_reg (s, ot, s->T0, reg);gen_lea_modrm (env, s, modrm);tcg_gen_trunc_tl_i32 (s->tmp2_i32, s->T0);if (ot ==MO_16 ) {@@ -7083,16 +7084,16 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) reg = (b &7 ) |REX_B (s);#ifdef TARGET_X86_64 if (dflag ==MO_64 ) { -gen_op_mov_v_reg (MO_64 , s->T0, reg); +gen_op_mov_v_reg (s,MO_64 , s->T0, reg);tcg_gen_bswap64_i64 (s->T0, s->T0); -gen_op_mov_reg_v (MO_64 , reg, s->T0); +gen_op_mov_reg_v (s,MO_64 , reg, s->T0); } else#endif { -gen_op_mov_v_reg (MO_32 , s->T0, reg); +gen_op_mov_v_reg (s,MO_32 , s->T0, reg);tcg_gen_ext32u_tl (s->T0, s->T0);tcg_gen_bswap32_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_32 , reg, s->T0); +gen_op_mov_reg_v (s,MO_32 , reg, s->T0); }break ;case 0xd6 :/* salc */ @@ -7100,7 +7101,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op;gen_compute_eflags_c (s, s->T0);tcg_gen_neg_tl (s->T0, s->T0); -gen_op_mov_reg_v (MO_8 ,R_EAX , s->T0); +gen_op_mov_reg_v (s,MO_8 ,R_EAX , s->T0);break ;case 0xe0 :/* loopnz */ case 0xe1 :/* loopz */ @@ -7661,16 +7662,16 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) rm = (modrm &7 ) |REX_B (s);if (mod ==3 ) { -gen_op_mov_v_reg (MO_32 , s->T0, rm); +gen_op_mov_v_reg (s,MO_32 , s->T0, rm);/* sign extend */ if (d_ot ==MO_64 ) {tcg_gen_ext32s_tl (s->T0, s->T0); } -gen_op_mov_reg_v (d_ot, reg, s->T0); +gen_op_mov_reg_v (s, d_ot, reg, s->T0); }else {gen_lea_modrm (env, s, modrm);gen_op_ld_v (s,MO_32 |MO_SIGN , s->T0, s->A0); -gen_op_mov_reg_v (d_ot, reg, s->T0); +gen_op_mov_reg_v (s, d_ot, reg, s->T0); } } else#endif @@ -7694,10 +7695,10 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) a0 =tcg_temp_local_new ();tcg_gen_mov_tl (a0, s->A0); }else { -gen_op_mov_v_reg (ot, t0, rm); +gen_op_mov_v_reg (s, ot, t0, rm); a0 =NULL ; } -gen_op_mov_v_reg (ot, t1, reg); +gen_op_mov_v_reg (s, ot, t1, reg);tcg_gen_andi_tl (s->tmp0, t0,3 );tcg_gen_andi_tl (t1, t1,3 );tcg_gen_movi_tl (t2,0 );@@ -7711,7 +7712,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_op_st_v (s, ot, t0, a0);tcg_temp_free (a0); }else { -gen_op_mov_reg_v (ot, rm, t0); +gen_op_mov_reg_v (s, ot, rm, t0); }gen_compute_eflags (s);tcg_gen_andi_tl (cpu_cc_src, cpu_cc_src, ~CC_Z );@@ -7742,7 +7743,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)tcg_gen_andi_tl (s->tmp0, cpu_cc_src,CC_Z ); label1 =gen_new_label ();tcg_gen_brcondi_tl (TCG_COND_EQ , s->tmp0,0 , label1); -gen_op_mov_reg_v (ot, reg, t0); +gen_op_mov_reg_v (s, ot, reg, t0);gen_set_label (label1);set_cc_op (s,CC_OP_EFLAGS );tcg_temp_free (t0);@@ -7996,7 +7997,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_start (); } -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm);gen_helper_write_crN (cpu_env,tcg_const_i32 (reg), s->T0);if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {@@ -8009,7 +8010,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_io_start (); }gen_helper_read_crN (s->T0, cpu_env,tcg_const_i32 (reg)); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0);if (tb_cflags (s->base.tb) &CF_USE_ICOUNT ) {gen_io_end (); }@@ -8042,7 +8043,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) }if (b &2 ) {gen_svm_check_intercept (s, pc_start,SVM_EXIT_WRITE_DR0 + reg); -gen_op_mov_v_reg (ot, s->T0, rm); +gen_op_mov_v_reg (s, ot, s->T0, rm);tcg_gen_movi_i32 (s->tmp2_i32, reg);gen_helper_set_dr (cpu_env, s->tmp2_i32, s->T0);gen_jmp_im (s, s->pc - s->cs_base);@@ -8051,7 +8052,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_svm_check_intercept (s, pc_start,SVM_EXIT_READ_DR0 + reg);tcg_gen_movi_i32 (s->tmp2_i32, reg);gen_helper_get_dr (s->T0, cpu_env, s->tmp2_i32); -gen_op_mov_reg_v (ot, rm, s->T0); +gen_op_mov_reg_v (s, ot, rm, s->T0); } }break ;
target/i386/translate.c static target_ulong disas_insn(DisasContext *s, CPUState *cpu) · line 8320
Quoted 8 lines
target/i386/translate.c +1
-1@@ -8313,7 +8314,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)gen_extu (ot, s->T0);tcg_gen_mov_tl (cpu_cc_src, s->T0);tcg_gen_ctpop_tl (s->T0, s->T0); -gen_op_mov_reg_v (ot, reg, s->T0); +gen_op_mov_reg_v (s, ot, reg, s->T0);set_cc_op (s,CC_OP_POPCNT );break ;
--
Alex Bennée
PATCH v3 13/13 configure: enable mttcg for i386 and x86_64
In reply to Emilio G. Cota--- configure | 2 ++ 1 file changed, 2 insertions(+)
configure +2 -0
@@ -7025,12 +7025,14 @@ TARGET_ABI_DIR="" case "$target_name" in i386) + mttcg="yes" gdb_xml_files="i386-32bit.xml i386-32bit-core.xml i386-32bit-sse.xml" target_compiler=$cross_cc_i386 target_compiler_cflags=$cross_cc_ccflags_i386 ;; x86_64) TARGET_BASE_ARCH=i386 + mttcg="yes" gdb_xml_files="i386-64bit.xml i386-64bit-core.xml i386-64bit-sse.xml" target_compiler=$cross_cc_x86_64 ;;
Signature · 1 line
2.17.1
Quoted 14 lines · Emilio G. Cota
v2: https://lists.gnu.org/archive/html/qemu-devel/2018-09/msg01122.html
Changes since v2:
- Add rth's R-b tag to the last patch
- Drop v2's first 10 patches, since Paolo already picked those up
- Move TCG temps +x86_64_hregsto DisasContext
+ While at it, drop thecpu_prefix from the TCG temps,e.g. cpu_A0 -> s->A0+ Split the conversion into separate patches to ease review. The patches are quite boring and long because the temps are everywhere, and I had to add DisasContext *s to quite a few functions
Quoted 4 lines
The series is checkpatch-clean.
You can fetch these patches from:
https://github.com/cota/qemu/tree/i386-mttcg-v3
Great, thanks!
Paolo