diff options
author | Pekka Enberg <penberg@kernel.org> | 2012-04-27 22:10:46 +0300 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-04-27 22:11:28 +0300 |
commit | 2b10fe992afefa39b1c83d118f6e1147cd157ec2 (patch) | |
tree | c8f5e97203896edad154a44ed14122de15362023 | |
parent | 9e32134c546465ac20e58c3851094cabe298d0a1 (diff) | |
download | jato-2b10fe992afefa39b1c83d118f6e1147cd157ec2.tar.gz |
x86-64: Fix int to pointer cast GCC warnings
CC arch/x86/inline-cache.o
arch/x86/inline-cache.c: In function ‘is_valid_ic’:
arch/x86/inline-cache.c:47:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
arch/x86/inline-cache.c:49:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
arch/x86/inline-cache.c: In function ‘ic_set_to_monomorphic’:
arch/x86/inline-cache.c:112:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
arch/x86/inline-cache.c:113:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
arch/x86/inline-cache.c:113:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
arch/x86/inline-cache.c: In function ‘ic_set_to_megamorphic’:
arch/x86/inline-cache.c:131:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
arch/x86/inline-cache.c:132:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
Signed-off-by: Pekka Enberg <penberg@kernel.org>
-rw-r--r-- | arch/x86/inline-cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/inline-cache.c b/arch/x86/inline-cache.c index bd213470..2fc6934a 100644 --- a/arch/x86/inline-cache.c +++ b/arch/x86/inline-cache.c @@ -23,14 +23,14 @@ #define X86_MOV_EAX_OPC 0xb8 struct x86_ic { - uint32_t fn; - uint32_t imm; + unsigned long fn; + unsigned long imm; }; static pthread_mutex_t ic_patch_lock = PTHREAD_MUTEX_INITIALIZER; -static void ic_from_callsite(struct x86_ic *ic, uint32_t callsite) +static void ic_from_callsite(struct x86_ic *ic, unsigned long callsite) { ic->fn = callsite - X86_CALL_INSN_SIZE + X86_CALL_DISP_OFFSET; @@ -110,7 +110,7 @@ void ic_set_to_monomorphic(struct vm_class *vmc, struct vm_method *vmm, void *ca die("Failed to lock ic_patch_lock\n"); cpu_write_u32((void *) ic.fn, x86_call_disp(callsite, ic_entry_point)); - cpu_write_u32((void *) ic.imm, (uint32_t)vmc); + cpu_write_u32((void *) ic.imm, (unsigned long) vmc); if (pthread_mutex_unlock(&ic_patch_lock) != 0) die("Failed to unlock ic_patch_lock\n"); |