From 483506234bc5287117c96aa0d30c06841e5b12b7 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/keyevent.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/keyevent.c b/src/keyevent.c index b7773ae..0e25335 100644 --- a/src/keyevent.c +++ b/src/keyevent.c @@ -272,7 +272,7 @@ void process_io_events() if (LogFileFd >= 0 && FD_ISSET(LogFileFd, &rfds)) { /* There's info in the log file. Tell Lisp to print it. */ flush_pty(); /* move the msg(s) to the log file */ - ((INTSTAT *)Addr68k_from_LADDR(*INTERRUPTSTATE_word))->LogFileIO = 1; + ((INTSTAT *)NativeAligned4FromLAddr(*INTERRUPTSTATE_word))->LogFileIO = 1; *PENDINGINTERRUPT68k = ATOM_T; Irq_Stk_End = Irq_Stk_Check = 0; @@ -283,10 +283,10 @@ void process_io_events() if (FD_ISSET(i, &rfds) & FD_ISSET(i, &LispIOFds)) iflags |= 1 << i; if (iflags) { /* There's activity on a Lisp-opened FD. Tell Lisp. */ u_int *flags; - flags = (u_int *)Addr68k_from_LADDR(*IOINTERRUPTFLAGS_word); + flags = (u_int *)NativeAligned4FromLAddr(*IOINTERRUPTFLAGS_word); *flags = iflags; - ((INTSTAT *)Addr68k_from_LADDR(*INTERRUPTSTATE_word))->IOInterrupt = 1; + ((INTSTAT *)NativeAligned4FromLAddr(*INTERRUPTSTATE_word))->IOInterrupt = 1; *PENDINGINTERRUPT68k = ATOM_T; Irq_Stk_End = Irq_Stk_Check = 0; @@ -501,9 +501,9 @@ void copy_cursor(int newx, int newy) srcbpl = HARD_CURSORWIDTH; dstbpl = displaywidth; } else { - cursor68k = (CURSOR *)Addr68k_from_LADDR(*CURRENTCURSOR68k); - bitmap68k = (BITMAP *)Addr68k_from_LADDR(cursor68k->CUIMAGE); - srcbase = (DLword *)Addr68k_from_LADDR(bitmap68k->bmbase); + cursor68k = (CURSOR *)NativeAligned4FromLAddr(*CURRENTCURSOR68k); + bitmap68k = (BITMAP *)NativeAligned4FromLAddr(cursor68k->CUIMAGE); + srcbase = (DLword *)NativeAligned2FromLAddr(bitmap68k->bmbase); dstbase = ColorDisplayRegion68k + (newy * DLWORD_PERLINE * COLOR_BITSPER_PIXEL); sx = 0; dx = newx * COLOR_BITSPER_PIXEL;