From b7b364359b9f6324c33f9f64c87148f6a3419ce5 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Thu, 1 Sep 2022 14:15:37 -0700 Subject: [PATCH] Replace Addr68k related macros with NativeAligned inline functions --- src/mvs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mvs.c b/src/mvs.c index 8d1f0e8..ad34b64 100644 --- a/src/mvs.c +++ b/src/mvs.c @@ -18,7 +18,7 @@ /* */ /************************************************************************/ -#include "adr68k.h" // for Addr68k_from_LADDR +#include "adr68k.h" // for NativeAligned4FromLAddr #ifdef RESWAPPEDCODESTREAM #include "byteswapdefs.h" // for byte_swap_code_block #endif @@ -63,7 +63,7 @@ newframe: fnhead = (struct fnhead *)FuncObj; pc = (ByteCode *)PC + 3; /* to skip the miscn opcode we're in now */ } else { - fnhead = (struct fnhead *)Addr68k_from_LADDR(POINTERMASK & SWA_FNHEAD((int)caller->fnheader)); + fnhead = (struct fnhead *)NativeAligned4FromLAddr(POINTERMASK & SWA_FNHEAD((int)caller->fnheader)); pc = (ByteCode *)fnhead + (caller->pc); } #ifdef RESWAPPEDCODESTREAM @@ -159,7 +159,7 @@ newframe: fnhead = (struct fnhead *)FuncObj; pc = (ByteCode *)PC + 3; /* Skip over the miscn opcode we're in now */ } else { - fnhead = (struct fnhead *)Addr68k_from_LADDR(POINTERMASK & SWA_FNHEAD((int)caller->fnheader)); + fnhead = (struct fnhead *)NativeAligned4FromLAddr(POINTERMASK & SWA_FNHEAD((int)caller->fnheader)); pc = (ByteCode *)fnhead + (caller->pc); }