From 2a42cd8e52bbfb439207ed06d331881e6925820c Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Thu, 1 Sep 2022 14:15:36 -0700 Subject: [PATCH] Replace Addr68k related macros with NativeAligned inline functions --- src/gcr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gcr.c b/src/gcr.c index d0ea8b9..59e6515 100644 --- a/src/gcr.c +++ b/src/gcr.c @@ -53,7 +53,7 @@ #include "version.h" #include "address.h" // for LOLOC -#include "adr68k.h" // for Addr68k_from_LADDR, LAddrFromNative +#include "adr68k.h" // for NativeAligned4FromLAddr, LAddrFromNative #include "commondefs.h" // for error #include "dspsubrsdefs.h" // for flip_cursor #include "emlglob.h" @@ -138,11 +138,11 @@ void disablegc1(int noerror) { struct interruptstate *gcinterruptstate; int count, i; DLword typeword; - gcinterruptstate = (struct interruptstate *)Addr68k_from_LADDR(*INTERRUPTSTATE_word); + gcinterruptstate = (struct interruptstate *)NativeAligned4FromLAddr(*INTERRUPTSTATE_word); count = (128) * 256; /* This is test value. 128 is *MdsTTsize(\MDSTTsize) */ for (i = 0; i < count; i++) { - typeword = GETWORD((DLword *)Addr68k_from_LADDR(LAddrFromNative(MDStypetbl) + i)); - GETWORD((DLword *)Addr68k_from_LADDR(LAddrFromNative(MDStypetbl) + i)) = (typeword | TT_NOREF); + typeword = GETWORD((DLword *)NativeAligned2FromLAddr(LAddrFromNative(MDStypetbl) + i)); + GETWORD((DLword *)NativeAligned2FromLAddr(LAddrFromNative(MDStypetbl) + i)) = (typeword | TT_NOREF); } *Reclaim_cnt_word = NIL; *ReclaimMin_word = NIL;