github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-15 07:54:13 +00:00
Code Issues Projects Releases Wiki Activity

Convert from Addr68k_from_LADDR/LADDR_from_68k to NativeAligned4FromLAddr/LAddrFromNative in xc.c

Browse Source
This commit is contained in:
Nick Briggs 2022-08-28 18:00:57 -07:00
parent 78f0d3c511
commit 9239fb3c29
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xc.c
View File

@ -243,7 +243,7 @@ op_ufn : {
nextopcode:
#ifdef MYOPTRACE
if ((struct fnhead *)Addr68k_from_LADDR(0x2ed600) == FuncObj) {
if ((struct fnhead *)NativeAligned4FromLAddr(0x2ed600) == FuncObj) {
quick_stack_check();
#endif /* MYOPTRACE */
OPTPRINT(("PC= %p (fn+%td) op= %02x TOS= 0x%x\n", (void *)PCMAC, PCMAC - (char *)FuncObj, Get_BYTE_PCMAC0, TOPOFSTACK));
@ -254,7 +254,7 @@ nextopcode:
#ifdef PCTRACE
/* Tracing PC/Function/Opcode in a ring buffer */
pc_table[pccounter] = (int)PCMAC - (int)FuncObj;
fn_table[pccounter] = (LispPTR)LADDR_from_68k(FuncObj);
fn_table[pccounter] = (LispPTR)LAddrFromNative(FuncObj);
op_table[pccounter] = Get_BYTE_PCMAC0;
if (99 == pccounter++) pccounter = 0;
#endif /* PCTRACE */
@ -1199,7 +1199,7 @@ check_interrupt:
*Reclaim_cnt_word = NIL;
cause_interruptcall(DORECLAIM_index);
} else if (*PENDINGINTERRUPT68k != NIL) {
INTSTAT2 *intstate = ((INTSTAT2 *)Addr68k_from_LADDR(*INTERRUPTSTATE_word));
INTSTAT2 *intstate = ((INTSTAT2 *)NativeAligned4FromLAddr(*INTERRUPTSTATE_word));
/*unsigned char newints = (intstate->pendingmask) & ~(intstate->handledmask);
if (newints) */
{
@ -1208,7 +1208,7 @@ check_interrupt:
cause_interruptcall(INTERRUPTFRAME_index);
}
} else if (ETHEREventCount > 0) {
INTSTAT *intstate = ((INTSTAT *)Addr68k_from_LADDR(*INTERRUPTSTATE_word));
INTSTAT *intstate = ((INTSTAT *)NativeAligned4FromLAddr(*INTERRUPTSTATE_word));
if (!(intstate->ETHERInterrupt) && !(((INTSTAT2 *)intstate)->handledmask & 0x40)) {
intstate->ETHERInterrupt = 1;
((INTSTAT2 *)intstate)->handledmask |= ((INTSTAT2 *)intstate)->pendingmask;