SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386: Add cpu_eip

Browse Source 
Create a tcg global temp for this, and use it instead of explicit stores.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221001140935.465607-25-richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Richard Henderson 2022-10-01 07:09:33 -07:00 committed by Paolo Bonzini
parent 75ec746a07
commit f771ca6a61
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/i386/tcg/translate.c
View File

@ -64,6 +64,7 @@
/* global register indexes */ /* global register indexes */
static TCGv cpu_cc_dst, cpu_cc_src, cpu_cc_src2; static TCGv cpu_cc_dst, cpu_cc_src, cpu_cc_src2;
static TCGv cpu_eip;
static TCGv_i32 cpu_cc_op; static TCGv_i32 cpu_cc_op;
static TCGv cpu_regs[CPU_NB_REGS]; static TCGv cpu_regs[CPU_NB_REGS];
static TCGv cpu_seg_base[6]; static TCGv cpu_seg_base[6];
@ -481,7 +482,7 @@ static void gen_add_A0_im(DisasContext *s, int val)
static inline void gen_op_jmp_v(TCGv dest) static inline void gen_op_jmp_v(TCGv dest)
{ {
tcg_gen_st_tl(dest, cpu_env, offsetof(CPUX86State, eip)); tcg_gen_mov_tl(cpu_eip, dest);
} }
static inline static inline
@ -518,7 +519,7 @@ static inline void gen_op_st_rm_T0_A0(DisasContext *s, int idx, int d)
static void gen_jmp_im(DisasContext *s, target_ulong pc) static void gen_jmp_im(DisasContext *s, target_ulong pc)
{ {
gen_op_jmp_v(tcg_constant_tl(pc)); tcg_gen_movi_tl(cpu_eip, pc);
} }
static void gen_update_eip_cur(DisasContext *s) static void gen_update_eip_cur(DisasContext *s)
@ -8614,6 +8615,13 @@ void tcg_x86_init(void)
[R_EDI] = "edi", [R_EDI] = "edi",
[R_EBP] = "ebp", [R_EBP] = "ebp",
[R_ESP] = "esp", [R_ESP] = "esp",
#endif
};
static const char eip_name[] = {
#ifdef TARGET_X86_64
"rip"
#else
"eip"
#endif #endif
}; };
static const char seg_base_names[6][8] = { static const char seg_base_names[6][8] = {
@ -8640,6 +8648,7 @@ void tcg_x86_init(void)
"cc_src"); "cc_src");
cpu_cc_src2 = tcg_global_mem_new(cpu_env, offsetof(CPUX86State, cc_src2), cpu_cc_src2 = tcg_global_mem_new(cpu_env, offsetof(CPUX86State, cc_src2),
"cc_src2"); "cc_src2");
cpu_eip = tcg_global_mem_new(cpu_env, offsetof(CPUX86State, eip), eip_name);
for (i = 0; i < CPU_NB_REGS; ++i) { for (i = 0; i < CPU_NB_REGS; ++i) {
cpu_regs[i] = tcg_global_mem_new(cpu_env, cpu_regs[i] = tcg_global_mem_new(cpu_env,