From 4755f118df4dbb1e1f034900e2d6a111c9aae1b7 Mon Sep 17 00:00:00 2001 From: gbeauche <> Date: Fri, 5 Dec 2003 12:38:44 +0000 Subject: [PATCH] Revert 32-bit EA load/stores workaround, problem was 0xffffffff read from [PgChk]+4 which yields to 3 on 32-bit arches and something > 32-bit on AMD64 --- .../kpx_cpu/src/cpu/jit/basic-dyngen-ops.cpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/SheepShaver/src/kpx_cpu/src/cpu/jit/basic-dyngen-ops.cpp b/SheepShaver/src/kpx_cpu/src/cpu/jit/basic-dyngen-ops.cpp index b30dd2e7..cc881cbb 100644 --- a/SheepShaver/src/kpx_cpu/src/cpu/jit/basic-dyngen-ops.cpp +++ b/SheepShaver/src/kpx_cpu/src/cpu/jit/basic-dyngen-ops.cpp @@ -301,22 +301,22 @@ DEFINE_OP(fsubs_F0_F1, fsub, (F0, F1)); /** - * Load/Store instructions on 32-bit EA + * Load/Store instructions **/ #define im PARAM1 -#define DEFINE_OP(BITS,REG,SIZE,OFFSET) \ -void OPPROTO op_load_u##BITS##_##REG##_A0_##OFFSET(void) \ -{ \ - REG = (uint32)(uint##BITS)vm_read_memory_##SIZE((uint32)(A0 + OFFSET)); \ -} \ -void OPPROTO op_load_s##BITS##_##REG##_A0_##OFFSET(void) \ -{ \ - REG = (int32)(int##BITS)vm_read_memory_##SIZE((uint32)(A0 + OFFSET)); \ -} \ -void OPPROTO op_store_##BITS##_##REG##_A0_##OFFSET(void) \ -{ \ - vm_write_memory_##SIZE((uint32)(A0 + OFFSET), REG); \ +#define DEFINE_OP(BITS,REG,SIZE,OFFSET) \ +void OPPROTO op_load_u##BITS##_##REG##_A0_##OFFSET(void) \ +{ \ + REG = (uint32)(uint##BITS)vm_read_memory_##SIZE(A0 + OFFSET); \ +} \ +void OPPROTO op_load_s##BITS##_##REG##_A0_##OFFSET(void) \ +{ \ + REG = (int32)(int##BITS)vm_read_memory_##SIZE(A0 + OFFSET); \ +} \ +void OPPROTO op_store_##BITS##_##REG##_A0_##OFFSET(void) \ +{ \ + vm_write_memory_##SIZE(A0 + OFFSET, REG); \ } DEFINE_OP(32,T0,4,0);