target-sparc: fix --enable-debug build
PATCH v2 1/1 target-sparc: fix --enable-debug build
Use 32-bit arithmetic for the address offset calculation to fix a build failure on 32-bit hosts.
--- target-sparc/translate.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
target-sparc/translate.c +0 -0
@@ -1663,27 +1663,27 @@ static inline TCGv get_src2(unsigned int insn, TCGv def)#ifdef TARGET_SPARC64 static inline void gen_load_trap_state_at_tl(TCGv_ptr r_tsptr,
TCGv_ptr cpu_env)
{
- TCGv r_tl = tcg_temp_new();
+ TCGv_i32 r_tl = tcg_temp_new_i32();
/* load env->tl into r_tl */
- {
- TCGv_i32 r_tl_tmp = tcg_temp_new_i32();
- tcg_gen_ld_i32(r_tl_tmp, cpu_env, offsetof(CPUSPARCState, tl));
- tcg_gen_ext_i32_tl(r_tl, r_tl_tmp);
- tcg_temp_free_i32(r_tl_tmp);- }
+ tcg_gen_ld_i32(r_tl, cpu_env, offsetof(CPUSPARCState, tl));
/* tl = [0 ... MAXTL_MASK] where MAXTL_MASK must be power of 2 */
- tcg_gen_andi_tl(r_tl, r_tl, MAXTL_MASK);
+ tcg_gen_andi_i32(r_tl, r_tl, MAXTL_MASK);
/* calculate offset to current trap state from env->ts, reuse r_tl */
- tcg_gen_muli_tl(r_tl, r_tl, sizeof (trap_state));
+ tcg_gen_muli_i32(r_tl, r_tl, sizeof (trap_state));
tcg_gen_addi_ptr(r_tsptr, cpu_env, offsetof(CPUState, ts));
/* tsptr = env->ts[env->tl & MAXTL_MASK] */
- tcg_gen_add_ptr(r_tsptr, r_tsptr, r_tl);
+ {
+ TCGv_ptr r_tl_tmp = tcg_temp_new_ptr();
+ tcg_gen_ext_i32_ptr(r_tl_tmp, r_tl);
+ tcg_gen_add_ptr(r_tsptr, r_tsptr, r_tl_tmp);
+ tcg_temp_free_i32(r_tl_tmp);+ }
- tcg_temp_free(r_tl);
+ tcg_temp_free_i32(r_tl);
}
#endif
Blue Swirl
AppliedThanks, applied.
Quoted 54 lines · Jay Foad
Use 32-bit arithmetic for the address offset calculation to fix a
build failure on 32-bit hosts.Signed-off-by Jay Foad <[email protected]>---
target-sparc/translate.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)diff --git
a/target-sparc/translate.cb/target-sparc/translate.cindex 7e9f0cf..b7d2a32 100644
---a/target-sparc/translate.c
+++b/target-sparc/translate.c
@@ -1663,27 +1663,27 @@ static inline TCGvget_src2(unsigned int insn, TCGv def)
#ifdefTARGET_SPARC64
static inline void gen_load_trap_state_at_tl(TCGv_ptrr_tsptr,
TCGv_ptrcpu_env)
{
- TCGvr_tl=tcg_temp_new();
+TCGv_i32r_tl=tcg_temp_new_i32();/* load env->tl into r_tl */ - { - TCGv_i32 r_tl_tmp = tcg_temp_new_i32(); - tcg_gen_ld_i32(r_tl_tmp, cpu_env, offsetof(CPUSPARCState, tl)); - tcg_gen_ext_i32_tl(r_tl, r_tl_tmp); - tcg_temp_free_i32(r_tl_tmp);- }
+tcg_gen_ld_i32(r_tl, cpu_env, offsetof(CPUSPARCState, tl));/* tl = [0 ... MAXTL_MASK] where MAXTL_MASK must be power of 2 */-
tcg_gen_andi_tl(r_tl, r_tl, MAXTL_MASK);
+tcg_gen_andi_i32(r_tl, r_tl, MAXTL_MASK);/* calculate offset to current trap state from env->ts, reuse r_tl */ - tcg_gen_muli_tl(r_tl, r_tl, sizeof (trap_state)); + tcg_gen_muli_i32(r_tl, r_tl, sizeof (trap_state)); tcg_gen_addi_ptr(r_tsptr, cpu_env, offsetof(CPUState, ts)); /* tsptr = env->ts[env->tl & MAXTL_MASK] */ - tcg_gen_add_ptr(r_tsptr, r_tsptr, r_tl); + { + TCGv_ptr r_tl_tmp = tcg_temp_new_ptr(); + tcg_gen_ext_i32_ptr(r_tl_tmp, r_tl); + tcg_gen_add_ptr(r_tsptr, r_tsptr, r_tl_tmp); + tcg_temp_free_i32(r_tl_tmp);+ }
-
tcg_temp_free(r_tl);
+tcg_temp_free_i32(r_tl);
}
#endif
PATCH 1/1 target-sparc: fix --enable-debug build for 64 bit host
b551ec04ca45d1925417dd2ec7c1b7f115c84f1d fixed
the compilation for 32 bit hosts, but introduced
a new error for 64 bit hosts:
tcg_temp_new_ptr needs a matching tcg_temp_free_ptr.
--- target-sparc/translate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
target-sparc/translate.c +1 -1
@@ -1681,7 +1681,7 @@ static inline void gen_load_trap_state_at_tl(TCGv_ptr r_tsptr, TCGv_ptr cpu_env)TCGv_ptr r_tl_tmp =tcg_temp_new_ptr ();tcg_gen_ext_i32_ptr (r_tl_tmp, r_tl);tcg_gen_add_ptr (r_tsptr, r_tsptr, r_tl_tmp); -tcg_temp_free_i32 (r_tl_tmp); +tcg_temp_free_ptr (r_tl_tmp); }tcg_temp_free_i32 (r_tl);
Signature · 1 line
1.5.6.5
[Qemu-devel] Re: [PATCH] target-sparc: fix --enable-debug build for 64 bit host
Quoted 3 lines · Stefan Weil
b551ec04ca45d1925417dd2ec7c1b7f115c84f1dfixed
the compilation for 32 bit hosts, but introduced
a new error for 64 bit hosts:
Sorry. Thanks for fixing it.
Jay.
Blue Swirl
Applied[Qemu-devel] Re: [PATCH] target-sparc: fix --enable-debug build for 64 bit host
In reply to Stefan WeilThanks, applied.
Quoted 29 lines · Stefan Weil
b551ec04ca45d1925417dd2ec7c1b7f115c84f1dfixed
the compilation for 32 bit hosts, but introduced
a new error for 64 bit hosts:
tcg_temp_new_ptrneeds a matchingtcg_temp_free_ptr.Signed-off-by Stefan Weil <[email protected]>---
target-sparc/translate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)diff --git
a/target-sparc/translate.cb/target-sparc/translate.c
index 18ec65a..9d1ceea 100644
---a/target-sparc/translate.c
+++b/target-sparc/translate.c
@@ -1681,7 +1681,7 @@ static inline voidgen_load_trap_state_at_tl(TCGv_ptr r_tsptr, TCGv_ptr cpu_env)TCGv_ptr r_tl_tmp = tcg_temp_new_ptr(); tcg_gen_ext_i32_ptr(r_tl_tmp, r_tl); tcg_gen_add_ptr(r_tsptr, r_tsptr, r_tl_tmp); - tcg_temp_free_i32(r_tl_tmp); + tcg_temp_free_ptr(r_tl_tmp); } tcg_temp_free_i32(r_tl);--
1.5.6.5