From 9941356250503ebe1a21e23ff6189b055890a289 Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Thu, 1 Sep 2022 14:15:36 -0700
Subject: [PATCH] Replace Addr68k related macros with NativeAligned inline
 functions

---
 src/conspage.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/conspage.c b/src/conspage.c
index d721e5e..561bcfb 100644
--- a/src/conspage.c
+++ b/src/conspage.c
@@ -16,7 +16,7 @@
 
 #include <stddef.h>        // for NULL
 #include "address.h"       // for POINTER_PAGE
-#include "adr68k.h"        // for Addr68k_from_LPAGE, LPAGE_from_68k, LADDR_...
+#include "adr68k.h"        // for NativeAligned4FromLPage, LPageFromNative, ...
 #include "allocmdsdefs.h"  // for alloc_mdspage
 #include "car-cdrdefs.h"   // for find_close_prior_cell
 #include "cell.h"          // for conspage, freecons, FREECONS, CDR_NIL, CON...
@@ -128,21 +128,21 @@ struct conspage *next_conspage(void) {
   page2 = (struct conspage *)((DLword *)page1 + DLWORDSPER_PAGE);
 
   init_conspage(page2, 0); /* No next page */
-  init_conspage(page1, LPAGE_from_68k(page2));
+  init_conspage(page1, LPageFromNative(page2));
 
   priorpg = NULL;
   prior = 0;
-  for (pg = (struct conspage *)Addr68k_from_LPAGE(next = ListpDTD->dtd_nextpage);
+  for (pg = (struct conspage *)NativeAligned4FromLPage(next = ListpDTD->dtd_nextpage);
        next && (next != CONSPAGE_LAST);
-       pg = (struct conspage *)Addr68k_from_LPAGE(next = pg->next_page)) {
+       pg = (struct conspage *)NativeAligned4FromLPage(next = pg->next_page)) {
     priorpg = pg;
     prior = next;
   }
 
   if (prior)
-    priorpg->next_page = LPAGE_from_68k(page1);
+    priorpg->next_page = LPageFromNative(page1);
   else
-    ListpDTD->dtd_nextpage = LPAGE_from_68k(page1);
+    ListpDTD->dtd_nextpage = LPageFromNative(page1);
 
   if (page2->next_page) error("page2 has a next page??");
   if (page2 == priorpg) error("loop in conspage next_pages");
@@ -160,12 +160,12 @@ struct conspage *next_conspage(void) {
        * when it was previously commented as "Doesn't exist next page"
        */
       init_conspage(page2, ListpDTD->dtd_nextpage);
-      init_conspage(page1, LPAGE_from_68k(page2));
+      init_conspage(page1, LPageFromNative(page2));
 
-      ListpDTD->dtd_nextpage = LPAGE_from_68k(page1);
+      ListpDTD->dtd_nextpage = LPageFromNative(page1);
       goto ex; /* replaced break */
     } else {
-      page1 = (struct conspage *)Addr68k_from_LPAGE(next); /*Jan-21*/
+      page1 = (struct conspage *)NativeAligned4FromLPage(next); /*Jan-21*/
     }
 
     if (page1->count > 1) break;
@@ -252,8 +252,8 @@ static ConsCell *find_cdrcodable_pair(LispPTR cdrval) {
   struct conspage *pg;
   unsigned pgno = ListpDTD->dtd_nextpage;
 
-  for (pg = (struct conspage *)Addr68k_from_LPAGE(pgno); pgno;
-       pg = (struct conspage *)Addr68k_from_LPAGE(pgno = pg->next_page))
+  for (pg = (struct conspage *)NativeAligned4FromLPage(pgno); pgno;
+       pg = (struct conspage *)NativeAligned4FromLPage(pgno = pg->next_page))
     if ((cell = find_pair_in_page(pg, cdrval))) return (cell);
 
   pg = next_conspage();
@@ -266,8 +266,8 @@ static ConsCell *find_free_cons_cell(void) {
   struct conspage *pg;
   unsigned pgno = ListpDTD->dtd_nextpage;
 
-  for (pg = (struct conspage *)Addr68k_from_LPAGE(pgno); pgno;
-       pg = (struct conspage *)Addr68k_from_LPAGE(pgno))
+  for (pg = (struct conspage *)NativeAligned4FromLPage(pgno); pgno;
+       pg = (struct conspage *)NativeAligned4FromLPage(pgno))
     if (pg->count) {
       pg->count--;
       cell = (ConsCell *)(((DLword *)pg) + (pg->next_cell));
@@ -312,7 +312,7 @@ LispPTR N_OP_cons(int cons_car, int cons_cdr) {
     if ((ListpDTD->dtd_nextpage != 0) &&
         (GetCONSCount(ListpDTD->dtd_nextpage) > 0)) { /* next page has 1 or more free cells */
       new_page = ListpDTD->dtd_nextpage;
-      new_conspage = (struct conspage *)Addr68k_from_LPAGE(new_page);
+      new_conspage = (struct conspage *)NativeAligned4FromLPage(new_page);
       if (new_conspage->next_cell == 0) error("count ne 0, but nothing on free chain.");
       new_cell = GetNewCell_68k(new_conspage); /* get new cell */
 
@@ -346,7 +346,7 @@ LispPTR N_OP_cons(int cons_car, int cons_cdr) {
   else /* cons_cdr != NIL */
   {
     new_page = POINTER_PAGE(cons_cdr); /* Y's page num */
-    new_conspage = (struct conspage *)Addr68k_from_LPAGE(new_page);
+    new_conspage = (struct conspage *)NativeAligned4FromLPage(new_page);
 #ifdef NEWCDRCODING
     if (Listp(cons_cdr) && (new_conspage->count > 0) &&
         (new_cell = find_close_prior_cell(new_conspage, cons_cdr)))