From 2c46a9473a1a303324e09817d3e56528797aa27a Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sat, 19 Jul 2025 12:26:29 -0700 Subject: [PATCH] Cleans up and makes static arrayblockmerger implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses --- inc/gcfinaldefs.h | 1 - src/gcfinal.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/inc/gcfinaldefs.h b/inc/gcfinaldefs.h index 257a095..198b9bf 100644 --- a/inc/gcfinaldefs.h +++ b/inc/gcfinaldefs.h @@ -5,7 +5,6 @@ void printarrayblock(LispPTR base); LispPTR releasingvmempage(LispPTR ptr); LispPTR checkarrayblock(LispPTR base, LispPTR free, LispPTR onfreelist); LispPTR makefreearrayblock(LispPTR block, DLword length); -LispPTR arrayblockmerger(LispPTR base, LispPTR nbase); LispPTR mergebackward(LispPTR base); LispPTR mergeforward(LispPTR base); LispPTR reclaimarrayblock(LispPTR ptr); diff --git a/src/gcfinal.c b/src/gcfinal.c index d459b7f..763a777 100644 --- a/src/gcfinal.c +++ b/src/gcfinal.c @@ -51,7 +51,7 @@ #include "gccodedefs.h" // for reclaimcodeblock #include "gcdata.h" // for DELREF, REC_GCLOOKUP #include "gchtfinddefs.h" // for htfind, rec_htfind -#include "gcfinaldefs.h" // for arrayblockmerger, checkarrayblock +#include "gcfinaldefs.h" // for checkarrayblock #include "lispemul.h" // for LispPTR, NIL, T, POINTERMASK, DLword, ATOM_T #include "llstkdefs.h" // for decusecount68k #include "lspglob.h" // for FreeBlockBuckets_word, ArrayMerging_word @@ -374,13 +374,13 @@ LispPTR makefreearrayblock(LispPTR block, DLword length) { /* */ /* */ /************************************************************************/ -LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) { +static LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) { DLword arlens, narlens, secondbite, minblocksize, shaveback; - struct arrayblock *bbase, *bnbase; - bbase = (struct arrayblock *)NativeAligned4FromLAddr(base); - bnbase = (struct arrayblock *)NativeAligned4FromLAddr(nbase); - arlens = bbase->arlen; - narlens = bnbase->arlen; + struct arrayblock *base_np, *nbase_np; + base_np = (struct arrayblock *)NativeAligned4FromLAddr(base); + nbase_np = (struct arrayblock *)NativeAligned4FromLAddr(nbase); + arlens = base_np->arlen; + narlens = nbase_np->arlen; secondbite = MAXARRAYBLOCKSIZE - arlens; /* There are three cases for merging the blocks * (1) the total size of the two blocks is less than max: