github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-04-30 21:59:15 +00:00
Code Issues Projects Releases Wiki Activity

Replace Addr68k related macros with NativeAligned inline functions

Browse Source
This commit is contained in:
Nick Briggs
2022-09-01 14:15:35 -07:00
parent 2c4ccf54c3
commit 94a41d2a5b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
inc/tosret.h
View File

@@ -39,14 +39,14 @@
CSTKPTRL = (LispPTR *) IVAR; \ CSTKPTRL = (LispPTR *) IVAR; \
returnFX = (struct frameex2 *) \ returnFX = (struct frameex2 *) \
((DLword *) \ ((DLword *) \
(PVARL = (DLword *) Addr68k_from_StkOffset(alink)) \ (PVARL = (DLword *) NativeAligned2FromStackOffset(alink)) \
- FRAMESIZE); \ - FRAMESIZE); \
IVARL = (DLword *) \ IVARL = (DLword *) \
Addr68k_from_StkOffset(GETWORD((DLword *)returnFX -1)); \ NativeAligned2FromStackOffset(GETWORD((DLword *)returnFX -1));\
/* Get PC from Returnee's pc slot in FX */ \ /* Get PC from Returnee's pc slot in FX */ \
PCMACL = returnFX->pc + (ByteCode *) \ PCMACL = returnFX->pc + (ByteCode *) \
(FuncObj = (struct fnhead *) \ (FuncObj = (struct fnhead *) \
Addr68k_from_LADDR(SWAP_FNHEAD(returnFX->fnheader) & POINTERMASK)) + 1;\ NativeAligned4FromLAddr(SWAP_FNHEAD(returnFX->fnheader) & POINTERMASK)) + 1;\
Irq_Stk_Check = STK_END_COMPUTE(EndSTKP,FuncObj); \ Irq_Stk_Check = STK_END_COMPUTE(EndSTKP,FuncObj); \
FNCHECKER(if (quick_stack_check()) printf("In RETURN.\n")); \ FNCHECKER(if (quick_stack_check()) printf("In RETURN.\n")); \
if (((UNSIGNED)(CSTKPTR) >= Irq_Stk_Check) || (Irq_Stk_End <= 0)) \ if (((UNSIGNED)(CSTKPTR) >= Irq_Stk_Check) || (Irq_Stk_End <= 0)) \