github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-04 15:26:16 +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 94a41d2a5b
commit 166d54e938
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/allocmds.c
View File

@@ -26,7 +26,7 @@
/**********************************************************************/ /**********************************************************************/
#include "address.h" // for LOLOC #include "address.h" // for LOLOC
#include "adr68k.h" // for LAddrFromNative, LPAGE_from_68k, Addr68k_fr... #include "adr68k.h" // for LAddrFromNative, LPageFromNative, Addr68k_fr...
#include "allocmdsdefs.h" // for alloc_mdspage, initmdspage #include "allocmdsdefs.h" // for alloc_mdspage, initmdspage
#include "commondefs.h" // for error #include "commondefs.h" // for error
#include "lispemul.h" // for DLword, LispPTR, DLWORDSPER_PAGE, MDSINCRE... #include "lispemul.h" // for DLword, LispPTR, DLWORDSPER_PAGE, MDSINCRE...
@@ -131,10 +131,10 @@ LispPTR *alloc_mdspage(short int type) {
LispPTR *ptr; /* points Top 32 bit of the MDS page */ LispPTR *ptr; /* points Top 32 bit of the MDS page */
LispPTR next_page; LispPTR next_page;
/* Next_Array=(DLword *)Addr68k_from_LADDR(((*Next_Array_word)& 0xffff ) << 8); */ /* Next_Array=(DLword *)NativeAligned2FromLAddr(((*Next_Array_word)& 0xffff ) << 8); */
if (LOLOC(*MDS_free_page_word) != NIL) { if (LOLOC(*MDS_free_page_word) != NIL) {
ptr = (LispPTR *)Addr68k_from_LPAGE(LOLOC(*MDS_free_page_word)); ptr = (LispPTR *)NativeAligned4FromLPage(LOLOC(*MDS_free_page_word));
if (((next_page = LOLOC(*ptr)) != 0) && (GetTypeNumber((*ptr)) != TYPE_SMALLP)) if (((next_page = LOLOC(*ptr)) != 0) && (GetTypeNumber((*ptr)) != TYPE_SMALLP))
error("alloc_mdspage: Bad Free Page Link"); error("alloc_mdspage: Bad Free Page Link");
@@ -145,20 +145,20 @@ LispPTR *alloc_mdspage(short int type) {
/* I guess Next_MDSpage is redundant */ /* I guess Next_MDSpage is redundant */
checkfor_storagefull(NIL); checkfor_storagefull(NIL);
#ifdef BIGVM #ifdef BIGVM
Next_MDSpage = (DLword *)Addr68k_from_LADDR(((*Next_MDSpage_word)) << 8); Next_MDSpage = (DLword *)NativeAligned2FromLAddr(((*Next_MDSpage_word)) << 8);
#else #else
Next_MDSpage = (DLword *)Addr68k_from_LADDR(((*Next_MDSpage_word) & 0xffff) << 8); Next_MDSpage = (DLword *)NativeAligned2FromLAddr(((*Next_MDSpage_word) & 0xffff) << 8);
#endif #endif
ptr = (LispPTR *)Next_MDSpage; /* Get Pointer to First Page */ ptr = (LispPTR *)Next_MDSpage; /* Get Pointer to First Page */
Next_MDSpage -= DLWORDSPER_PAGE * 2; /* decrement MDS count */ Next_MDSpage -= DLWORDSPER_PAGE * 2; /* decrement MDS count */
#ifdef BIGVM #ifdef BIGVM
*Next_MDSpage_word = LPAGE_from_68k(Next_MDSpage); *Next_MDSpage_word = LPageFromNative(Next_MDSpage);
#else #else
*Next_MDSpage_word = S_POSITIVE | LPAGE_from_68k(Next_MDSpage); *Next_MDSpage_word = S_POSITIVE | LPageFromNative(Next_MDSpage);
#endif #endif
newpage(newpage(LAddrFromNative(ptr)) + DLWORDSPER_PAGE); newpage(newpage(LAddrFromNative(ptr)) + DLWORDSPER_PAGE);
} }
Make_MDSentry(LPAGE_from_68k(ptr), type); Make_MDSentry(LPageFromNative(ptr), type);
return (ptr); return (ptr);
} /* alloc_mdspage end */ } /* alloc_mdspage end */