| Message ID | 1305452284-32003-1-git-send-email-weil@mail.berlios.de |
|---|---|
| State | Accepted |
| Headers | show |
On Sun, May 15, 2011 at 11:38:04AM +0200, Stefan Weil wrote: > ulong is undefined for w32 (and maybe other) compilations. > Replace it by uintptr_t (which also fixes compilation for w64 > and is a better choice for pointer to integer conversions). > > Cc: Aurelien Jarno <aurelien@aurel32.net> > Signed-off-by: Stefan Weil <weil@mail.berlios.de> > --- > target-ppc/cpu.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> > diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h > index 7a6a7df..8e4582f 100644 > --- a/target-ppc/cpu.h > +++ b/target-ppc/cpu.h > @@ -1929,8 +1929,8 @@ static inline void cpu_set_tls(CPUState *env, target_ulong newtls) > #if !defined(CONFIG_USER_ONLY) > static inline int booke206_tlbe_id(CPUState *env, ppcemb_tlb_t *tlbe) > { > - ulong tlbel = (ulong)tlbe; > - ulong tlbl = (ulong)env->tlb; > + uintptr_t tlbel = (uintptr_t)tlbe; > + uintptr_t tlbl = (uintptr_t)env->tlb; > > return (tlbel - tlbl) / sizeof(env->tlb[0]); > } > -- > 1.5.6.5 > >
Am 15.05.2011 um 12:36 schrieb Aurelien Jarno: > On Sun, May 15, 2011 at 11:38:04AM +0200, Stefan Weil wrote: >> ulong is undefined for w32 (and maybe other) compilations. Darwin >> Replace it by uintptr_t (which also fixes compilation for w64 >> and is a better choice for pointer to integer conversions). >> >> Cc: Aurelien Jarno <aurelien@aurel32.net> >> Signed-off-by: Stefan Weil <weil@mail.berlios.de> >> --- >> target-ppc/cpu.h | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) > > Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Matches the patch I came up with for Mac OS X. Acked-by: Andreas Färber <andreas.faerber@web.de> >> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h >> index 7a6a7df..8e4582f 100644 >> --- a/target-ppc/cpu.h >> +++ b/target-ppc/cpu.h >> @@ -1929,8 +1929,8 @@ static inline void cpu_set_tls(CPUState *env, >> target_ulong newtls) >> #if !defined(CONFIG_USER_ONLY) >> static inline int booke206_tlbe_id(CPUState *env, ppcemb_tlb_t *tlbe) >> { >> - ulong tlbel = (ulong)tlbe; >> - ulong tlbl = (ulong)env->tlb; >> + uintptr_t tlbel = (uintptr_t)tlbe; >> + uintptr_t tlbl = (uintptr_t)env->tlb; >> >> return (tlbel - tlbl) / sizeof(env->tlb[0]); >> } >> -- >> 1.5.6.5 >> >> > > -- > Aurelien Jarno GPG: 1024D/F1BCDB73 > aurelien@aurel32.net http://www.aurel32.net >
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 7a6a7df..8e4582f 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1929,8 +1929,8 @@ static inline void cpu_set_tls(CPUState *env, target_ulong newtls) #if !defined(CONFIG_USER_ONLY) static inline int booke206_tlbe_id(CPUState *env, ppcemb_tlb_t *tlbe) { - ulong tlbel = (ulong)tlbe; - ulong tlbl = (ulong)env->tlb; + uintptr_t tlbel = (uintptr_t)tlbe; + uintptr_t tlbl = (uintptr_t)env->tlb; return (tlbel - tlbl) / sizeof(env->tlb[0]); }
ulong is undefined for w32 (and maybe other) compilations. Replace it by uintptr_t (which also fixes compilation for w64 and is a better choice for pointer to integer conversions). Cc: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- target-ppc/cpu.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)