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

---
 src/vars3.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vars3.c b/src/vars3.c
index 825031b..8de5e6c 100644
--- a/src/vars3.c
+++ b/src/vars3.c
@@ -9,7 +9,7 @@
 
 #include "version.h"
 
-#include "adr68k.h"       // for Addr68k_from_LADDR
+#include "adr68k.h"       // for NativeAligned4FromLAddr
 #include "car-cdrdefs.h"  // for car, cdr
 #include "cell.h"         // for cadr_cell, CDR_NIL, CDR_INDIRECT, S_N_CHECK...
 #include "emlglob.h"
@@ -47,11 +47,11 @@ struct cadr_cell cadr(LispPTR cell_adr)
       return (cadr1);
     }
   }
-  pcons = (ConsCell *)Addr68k_from_LADDR(cell_adr);
+  pcons = (ConsCell *)NativeAligned4FromLAddr(cell_adr);
   while (pcons->cdr_code == CDR_INDIRECT) {
     /* CDR indirect */
     cell_adr = pcons->car_field;
-    pcons = (ConsCell *)Addr68k_from_LADDR(pcons->car_field);
+    pcons = (ConsCell *)NativeAligned4FromLAddr(pcons->car_field);
   } /* skip CDR_INDIRECT cell */
 
   cadr1.car_cell = pcons->car_field;
@@ -68,7 +68,7 @@ struct cadr_cell cadr(LispPTR cell_adr)
     cadr1.cdr_cell = cell_adr + offset;
   } else {
     /* CDR different page */
-    pcons = (ConsCell *)Addr68k_from_LADDR((cell_adr) + offset);
+    pcons = (ConsCell *)NativeAligned4FromLAddr((cell_adr) + offset);
     cadr1.cdr_cell = pcons->car_field;
   }
 #else
@@ -78,7 +78,7 @@ struct cadr_cell cadr(LispPTR cell_adr)
     cadr1.cdr_cell = (mPAGEMASK & cell_adr) | offset;
   } else {
     /* CDR different page */
-    pcons = (ConsCell *)Addr68k_from_LADDR(((mPAGEMASK & cell_adr) | offset));
+    pcons = (ConsCell *)NativeAligned4FromLAddr(((mPAGEMASK & cell_adr) | offset));
     cadr1.cdr_cell = pcons->car_field;
   }
 #endif /* NEWCDRCODING */