From 419ff4a5491490fbb21ad0641cc0e1f1b8205844 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/testtool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/testtool.c b/src/testtool.c index 9bca9de..37c0cf4 100644 --- a/src/testtool.c +++ b/src/testtool.c @@ -294,7 +294,7 @@ lp: } if ((linking == T) && (base->next_page != NIL_PTR)) { - base = (struct conspage *)Addr68k_from_LPAGE(base->next_page); + base = (struct conspage *)NativeAligned4FromLPage(base->next_page); goto lp; } @@ -306,7 +306,7 @@ lp: void trace_listpDTD(void) { extern struct dtd *ListpDTD; printf("Dump conspages from ListpDTD chain\n"); - dump_conspage((struct conspage *)Addr68k_from_LPAGE(ListpDTD->dtd_nextpage), T); + dump_conspage((struct conspage *)NativeAligned4FromLPage(ListpDTD->dtd_nextpage), T); } /************************************************************************/ @@ -1004,9 +1004,9 @@ int get_framename(struct frameex1 *fx_addr68k) { FX *get_nextFX(FX *fx) { if (URaid_scanlink == URSCAN_ALINK) - return ((FX *)Addr68k_from_StkOffset(GETALINK(fx))); + return ((FX *)NativeAligned4FromStackOffset(GETALINK(fx))); else - return ((FX *)Addr68k_from_StkOffset(GETCLINK(fx))); + return ((FX *)NativeAligned4FromStackOffset(GETCLINK(fx))); } /* get_nextFX end */ @@ -1175,7 +1175,7 @@ void all_stack_dump(DLword start, DLword end, DLword silent) goto incptr; } } else { - if (BFRAMEPTR(stkptr)->ivar != StkOffset_from_68K(orig68k)) { + if (BFRAMEPTR(stkptr)->ivar != StackOffsetFromNative(orig68k)) { printf("\n$$$BF doesn't point TopIVAR:0x%x\n", LAddrFromNative(stkptr)); goto incptr; }