From 9d7437dc2137a9f1d10c0e7323259cc8fa0d9f80 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Mon, 22 Jun 2020 00:28:58 +0200 Subject: [PATCH] Fixed 64-bit JIT natmem_offset setting --- src/jit/codegen_armA64.cpp.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jit/codegen_armA64.cpp.in b/src/jit/codegen_armA64.cpp.in index 43880761..475f131f 100644 --- a/src/jit/codegen_armA64.cpp.in +++ b/src/jit/codegen_armA64.cpp.in @@ -213,7 +213,7 @@ LENDFUNC(WRITE,RMW,1,compemu_raw_inc_opcount,(IM16 op)) LOWFUNC(WRITE,READ,1,compemu_raw_cmp_pc,(IMPTR s)) { - /* s is always >= NATMEM_OFFSETX and < NATMEM_OFFSETX + max. Amiga mem */ + /* s is always >= NATMEM_OFFSET and < NATMEM_OFFSET + max. Amiga mem */ clobber_flags(); uintptr idx = (uintptr) &(regs.pc_p) - (uintptr) ®s; @@ -520,7 +520,7 @@ STATIC_INLINE void compemu_raw_maybe_do_nothing(IM32 cycles) LOWFUNC(NONE,NONE,1,compemu_raw_init_r_regstruct,(IMPTR s)) { LOAD_U64(R_REGSTRUCT, s); - uintptr offsmem = (uintptr)&NATMEM_OFFSETX - (uintptr) ®s; + uintptr offsmem = (uintptr)&NATMEM_OFFSET - (uintptr) ®s; LDR_xXi(R_MEMSTART, R_REGSTRUCT, offsmem); } LENDFUNC(NONE,NONE,1,compemu_raw_init_r_regstruct,(IMPTR s)) @@ -554,7 +554,7 @@ LENDFUNC(NONE,NONE,2,compemu_raw_endblock_pc_inreg,(RR4 rr_pc, IM32 cycles)) STATIC_INLINE uae_u32* compemu_raw_endblock_pc_isconst(IM32 cycles, IMPTR v) { - /* v is always >= NATMEM_OFFSETX and < NATMEM_OFFSETX + max. Amiga mem */ + /* v is always >= NATMEM_OFFSET and < NATMEM_OFFSET + max. Amiga mem */ uae_u32* tba; // countdown -= scaled_cycles(totcycles); uintptr offs = (uintptr)&countdown - (uintptr)®s;