summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2011-05-14 23:38:04 +0000
committerAlexander Graf <agraf@suse.de>2011-05-20 17:56:03 +0200
commit6d42fb313bc517f1b23daea867efb9968874745e (patch)
treef65c54c9b7f6166ab70715be374f3f20ad42da18
parent1fddfba129f5435c80eda14e8bc23fdb888c7187 (diff)
downloadfocaccia-qemu-6d42fb313bc517f1b23daea867efb9968874745e.tar.gz
focaccia-qemu-6d42fb313bc517f1b23daea867efb9968874745e.zip
w32: Fix compilation and replace non-portable usage of ulong
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>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--target-ppc/cpu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 7a6a7dfa57..8e4582f6ab 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]);
 }