From 09bf2988be423f6da789c97423b76c0ac74fefde Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sun, 28 Aug 2022 18:05:45 -0700 Subject: [PATCH] Convert from LADDR_from_68k to LAddrFromNative in gcr.c --- src/gcr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gcr.c b/src/gcr.c index c89c624..d0ea8b9 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, LADDR_from_68k +#include "adr68k.h" // for Addr68k_from_LADDR, LAddrFromNative #include "commondefs.h" // for error #include "dspsubrsdefs.h" // for flip_cursor #include "emlglob.h" @@ -93,7 +93,7 @@ struct interruptstate { void gcarrangementstack(void) { LispPTR tmpnextblock; PushCStack; - tmpnextblock = LADDR_from_68k(CurrentStackPTR += DLWORDSPER_CELL); + tmpnextblock = LAddrFromNative(CurrentStackPTR += DLWORDSPER_CELL); CURRENTFX->nextblock = LOLOC(tmpnextblock); if ((UNSIGNED)EndSTKP == (UNSIGNED)CurrentStackPTR) error("creating 0-long stack block."); GETWORD(CurrentStackPTR) = STK_FSB_WORD; @@ -141,8 +141,8 @@ void disablegc1(int noerror) { gcinterruptstate = (struct interruptstate *)Addr68k_from_LADDR(*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(LADDR_from_68k(MDStypetbl) + i)); - GETWORD((DLword *)Addr68k_from_LADDR(LADDR_from_68k(MDStypetbl) + i)) = (typeword | TT_NOREF); + typeword = GETWORD((DLword *)Addr68k_from_LADDR(LAddrFromNative(MDStypetbl) + i)); + GETWORD((DLword *)Addr68k_from_LADDR(LAddrFromNative(MDStypetbl) + i)) = (typeword | TT_NOREF); } *Reclaim_cnt_word = NIL; *ReclaimMin_word = NIL;