* [Qemu-devel] [PATCH] target-arm: Fix compilation failure for 64 bit hosts
@ 2011-05-26 11:03 Peter Maydell
2011-05-26 17:57 ` Stefan Weil
2011-06-03 16:19 ` Aurelien Jarno
0 siblings, 2 replies; 4+ messages in thread
From: Peter Maydell @ 2011-05-26 11:03 UTC (permalink / raw)
To: qemu-devel; +Cc: Anthony Liguori, patches
Use the correct _ptr aliases for manipulating the pointer to
the fp_status; this fixes a compilation failure on 64 bit hosts.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Apologies for the build breakage.
target-arm/translate.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 1501db1..f5507ec 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -980,20 +980,20 @@ static inline void gen_vfp_F1_ld0(int dp)
#define VFP_GEN_ITOF(name) \
static inline void gen_vfp_##name(int dp, int neon) \
{ \
- TCGv statusptr = tcg_temp_new_i32(); \
+ TCGv_ptr statusptr = tcg_temp_new_ptr(); \
int offset; \
if (neon) { \
offset = offsetof(CPUState, vfp.standard_fp_status); \
} else { \
offset = offsetof(CPUState, vfp.fp_status); \
} \
- tcg_gen_addi_i32(statusptr, cpu_env, offset); \
+ tcg_gen_addi_ptr(statusptr, cpu_env, offset); \
if (dp) { \
gen_helper_vfp_##name##d(cpu_F0d, cpu_F0s, statusptr); \
} else { \
gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, statusptr); \
} \
- tcg_temp_free_i32(statusptr); \
+ tcg_temp_free_ptr(statusptr); \
}
VFP_GEN_ITOF(uito)
@@ -1003,20 +1003,20 @@ VFP_GEN_ITOF(sito)
#define VFP_GEN_FTOI(name) \
static inline void gen_vfp_##name(int dp, int neon) \
{ \
- TCGv statusptr = tcg_temp_new_i32(); \
+ TCGv_ptr statusptr = tcg_temp_new_ptr(); \
int offset; \
if (neon) { \
offset = offsetof(CPUState, vfp.standard_fp_status); \
} else { \
offset = offsetof(CPUState, vfp.fp_status); \
} \
- tcg_gen_addi_i32(statusptr, cpu_env, offset); \
+ tcg_gen_addi_ptr(statusptr, cpu_env, offset); \
if (dp) { \
gen_helper_vfp_##name##d(cpu_F0s, cpu_F0d, statusptr); \
} else { \
gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, statusptr); \
} \
- tcg_temp_free_i32(statusptr); \
+ tcg_temp_free_ptr(statusptr); \
}
VFP_GEN_FTOI(toui)
@@ -1029,21 +1029,21 @@ VFP_GEN_FTOI(tosiz)
static inline void gen_vfp_##name(int dp, int shift, int neon) \
{ \
TCGv tmp_shift = tcg_const_i32(shift); \
- TCGv statusptr = tcg_temp_new_i32(); \
+ TCGv_ptr statusptr = tcg_temp_new_ptr(); \
int offset; \
if (neon) { \
offset = offsetof(CPUState, vfp.standard_fp_status); \
} else { \
offset = offsetof(CPUState, vfp.fp_status); \
} \
- tcg_gen_addi_i32(statusptr, cpu_env, offset); \
+ tcg_gen_addi_ptr(statusptr, cpu_env, offset); \
if (dp) { \
gen_helper_vfp_##name##d(cpu_F0d, cpu_F0d, tmp_shift, statusptr); \
} else { \
gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, tmp_shift, statusptr); \
} \
tcg_temp_free_i32(tmp_shift); \
- tcg_temp_free_i32(statusptr); \
+ tcg_temp_free_ptr(statusptr); \
}
VFP_GEN_FIX(tosh)
VFP_GEN_FIX(tosl)
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] target-arm: Fix compilation failure for 64 bit hosts
2011-05-26 11:03 [Qemu-devel] [PATCH] target-arm: Fix compilation failure for 64 bit hosts Peter Maydell
@ 2011-05-26 17:57 ` Stefan Weil
2011-06-02 10:28 ` Peter Maydell
2011-06-03 16:19 ` Aurelien Jarno
1 sibling, 1 reply; 4+ messages in thread
From: Stefan Weil @ 2011-05-26 17:57 UTC (permalink / raw)
To: Peter Maydell; +Cc: Anthony Liguori, qemu-devel, patches
Am 26.05.2011 13:03, schrieb Peter Maydell:
> Use the correct _ptr aliases for manipulating the pointer to
> the fp_status; this fixes a compilation failure on 64 bit hosts.
>
> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>
> ---
> Apologies for the build breakage.
>
> target-arm/translate.c | 18 +++++++++---------
> 1 files changed, 9 insertions(+), 9 deletions(-)
>
>
Acked-by: Stefan Weil <weil@mail.berlios.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] target-arm: Fix compilation failure for 64 bit hosts
2011-05-26 17:57 ` Stefan Weil
@ 2011-06-02 10:28 ` Peter Maydell
0 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2011-06-02 10:28 UTC (permalink / raw)
To: Stefan Weil; +Cc: Anthony Liguori, qemu-devel, patches
Ping?
thanks
-- PMM
On 26 May 2011 18:57, Stefan Weil <weil@mail.berlios.de> wrote:
> Am 26.05.2011 13:03, schrieb Peter Maydell:
>>
>> Use the correct _ptr aliases for manipulating the pointer to
>> the fp_status; this fixes a compilation failure on 64 bit hosts.
>>
>> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>
>> ---
>> Apologies for the build breakage.
>>
>> target-arm/translate.c | 18 +++++++++---------
>> 1 files changed, 9 insertions(+), 9 deletions(-)
>>
>>
>
> Acked-by: Stefan Weil <weil@mail.berlios.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] target-arm: Fix compilation failure for 64 bit hosts
2011-05-26 11:03 [Qemu-devel] [PATCH] target-arm: Fix compilation failure for 64 bit hosts Peter Maydell
2011-05-26 17:57 ` Stefan Weil
@ 2011-06-03 16:19 ` Aurelien Jarno
1 sibling, 0 replies; 4+ messages in thread
From: Aurelien Jarno @ 2011-06-03 16:19 UTC (permalink / raw)
To: Peter Maydell; +Cc: Anthony Liguori, qemu-devel, patches
On Thu, May 26, 2011 at 12:03:36PM +0100, Peter Maydell wrote:
> Use the correct _ptr aliases for manipulating the pointer to
> the fp_status; this fixes a compilation failure on 64 bit hosts.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Apologies for the build breakage.
>
> target-arm/translate.c | 18 +++++++++---------
> 1 files changed, 9 insertions(+), 9 deletions(-)
Thanks, applied.
> diff --git a/target-arm/translate.c b/target-arm/translate.c
> index 1501db1..f5507ec 100644
> --- a/target-arm/translate.c
> +++ b/target-arm/translate.c
> @@ -980,20 +980,20 @@ static inline void gen_vfp_F1_ld0(int dp)
> #define VFP_GEN_ITOF(name) \
> static inline void gen_vfp_##name(int dp, int neon) \
> { \
> - TCGv statusptr = tcg_temp_new_i32(); \
> + TCGv_ptr statusptr = tcg_temp_new_ptr(); \
> int offset; \
> if (neon) { \
> offset = offsetof(CPUState, vfp.standard_fp_status); \
> } else { \
> offset = offsetof(CPUState, vfp.fp_status); \
> } \
> - tcg_gen_addi_i32(statusptr, cpu_env, offset); \
> + tcg_gen_addi_ptr(statusptr, cpu_env, offset); \
> if (dp) { \
> gen_helper_vfp_##name##d(cpu_F0d, cpu_F0s, statusptr); \
> } else { \
> gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, statusptr); \
> } \
> - tcg_temp_free_i32(statusptr); \
> + tcg_temp_free_ptr(statusptr); \
> }
>
> VFP_GEN_ITOF(uito)
> @@ -1003,20 +1003,20 @@ VFP_GEN_ITOF(sito)
> #define VFP_GEN_FTOI(name) \
> static inline void gen_vfp_##name(int dp, int neon) \
> { \
> - TCGv statusptr = tcg_temp_new_i32(); \
> + TCGv_ptr statusptr = tcg_temp_new_ptr(); \
> int offset; \
> if (neon) { \
> offset = offsetof(CPUState, vfp.standard_fp_status); \
> } else { \
> offset = offsetof(CPUState, vfp.fp_status); \
> } \
> - tcg_gen_addi_i32(statusptr, cpu_env, offset); \
> + tcg_gen_addi_ptr(statusptr, cpu_env, offset); \
> if (dp) { \
> gen_helper_vfp_##name##d(cpu_F0s, cpu_F0d, statusptr); \
> } else { \
> gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, statusptr); \
> } \
> - tcg_temp_free_i32(statusptr); \
> + tcg_temp_free_ptr(statusptr); \
> }
>
> VFP_GEN_FTOI(toui)
> @@ -1029,21 +1029,21 @@ VFP_GEN_FTOI(tosiz)
> static inline void gen_vfp_##name(int dp, int shift, int neon) \
> { \
> TCGv tmp_shift = tcg_const_i32(shift); \
> - TCGv statusptr = tcg_temp_new_i32(); \
> + TCGv_ptr statusptr = tcg_temp_new_ptr(); \
> int offset; \
> if (neon) { \
> offset = offsetof(CPUState, vfp.standard_fp_status); \
> } else { \
> offset = offsetof(CPUState, vfp.fp_status); \
> } \
> - tcg_gen_addi_i32(statusptr, cpu_env, offset); \
> + tcg_gen_addi_ptr(statusptr, cpu_env, offset); \
> if (dp) { \
> gen_helper_vfp_##name##d(cpu_F0d, cpu_F0d, tmp_shift, statusptr); \
> } else { \
> gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, tmp_shift, statusptr); \
> } \
> tcg_temp_free_i32(tmp_shift); \
> - tcg_temp_free_i32(statusptr); \
> + tcg_temp_free_ptr(statusptr); \
> }
> VFP_GEN_FIX(tosh)
> VFP_GEN_FIX(tosl)
> --
> 1.7.1
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-03 16:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-26 11:03 [Qemu-devel] [PATCH] target-arm: Fix compilation failure for 64 bit hosts Peter Maydell
2011-05-26 17:57 ` Stefan Weil
2011-06-02 10:28 ` Peter Maydell
2011-06-03 16:19 ` Aurelien Jarno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).