From 0d62ce78027153e08ab185caae475211302ce0f4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 4 May 2009 07:11:00 -0500 Subject: [PATCH] Attempt to fix gcc 4.5.0 compile error --- vm/code_block.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vm/code_block.cpp b/vm/code_block.cpp index 403d9c33d1..5ebb162f7e 100644 --- a/vm/code_block.cpp +++ b/vm/code_block.cpp @@ -48,21 +48,21 @@ void iterate_relocations(code_block *compiled, relocation_iterator iter) } /* Store a 32-bit value into a PowerPC LIS/ORI sequence */ -static void store_address_2_2(cell *cell, cell value) +static void store_address_2_2(cell *ptr, cell value) { - cell[-1] = ((cell[-1] & ~0xffff) | ((value >> 16) & 0xffff)); - cell[ 0] = ((cell[ 0] & ~0xffff) | (value & 0xffff)); + ptr[-1] = ((ptr[-1] & ~0xffff) | ((value >> 16) & 0xffff)); + ptr[ 0] = ((ptr[ 0] & ~0xffff) | (value & 0xffff)); } /* Store a value into a bitfield of a PowerPC instruction */ -static void store_address_masked(cell *cell, fixnum value, cell mask, fixnum shift) +static void store_address_masked(cell *ptr, fixnum value, cell mask, fixnum shift) { /* This is unaccurate but good enough */ fixnum test = (fixnum)mask >> 1; if(value <= -test || value >= test) critical_error("Value does not fit inside relocation",0); - *cell = ((*cell & ~mask) | ((value >> shift) & mask)); + *ptr = ((*ptr & ~mask) | ((value >> shift) & mask)); } /* Perform a fixup on a code block */