mirror of
https://github.com/Interlisp/maiko.git
synced 2026-03-22 00:50:05 +00:00
Compare commits
1 Commits
maiko-2209
...
build-201
| Author | SHA1 | Date | |
|---|---|---|---|
|
bc390c511f |
@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O1 -g
|
||||
DEBUGFLAGS = # -DDEBUG -DOPTRACE
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=201 # was 351
|
||||
|
||||
LDFLAGS = -L/opt/X11/lib -lX11 -lm
|
||||
LDELDFLAGS = -L/opt/X11/lib -lX11 -lm
|
||||
|
||||
@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
|
||||
# OPTFLAGS is normally -O2.
|
||||
OPTFLAGS = -O0 -g
|
||||
DEBUGFLAGS = # -DDEBUG -DOPTRACE
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
|
||||
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=201 -DNOVERSION -DINIT
|
||||
|
||||
LDFLAGS = -L/opt/X11/lib -lX11 -lm
|
||||
LDELDFLAGS = -L/opt/X11/lib -lX11 -lm
|
||||
|
||||
22
inc/adr68k.h
22
inc/adr68k.h
@@ -86,4 +86,26 @@ static inline LispPTR LPageFromNative(void *NAddr)
|
||||
}
|
||||
return (((DLword *)NAddr) - Lisp_world) >> 8;
|
||||
}
|
||||
/* translate 68k ptr to Lisp DLword address */
|
||||
#define LADDR_from_68k(ptr68k) ((LispPTR)(((UNSIGNED)(ptr68k) - (UNSIGNED)Lisp_world) >>1))
|
||||
|
||||
|
||||
/* translate 68k ptr to Lisp Page number */
|
||||
#define LPAGE_from_68k(ptr68k) (LADDR_from_68k(ptr68k) >> 8)
|
||||
|
||||
|
||||
/* Translate Lisp_address to 68K address */
|
||||
/* Lisp_addr: word offset */
|
||||
#define Addr68k_from_LADDR(Lisp_addr) (Lisp_world + (Lisp_addr))
|
||||
|
||||
|
||||
/* translate LispPage to 68k address */
|
||||
#define Addr68k_from_LPAGE(Lisp_page) (Addr68k_from_LADDR(((Lisp_page) << 8) ))
|
||||
/* Stack Offset Macros */
|
||||
|
||||
#define StkOffset_from_68K(ptr68k)\
|
||||
((LispPTR)(((UNSIGNED)(ptr68k) - (UNSIGNED)Stackspace) >>1))
|
||||
|
||||
#define Addr68k_from_StkOffset(stkoffset)\
|
||||
(Stackspace + (stkoffset))
|
||||
#endif /* ADR68K_H */
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
{ DLword midpunt; \
|
||||
midpunt = LOLOC(LAddrFromNative(CURRENTFX)); \
|
||||
PVar=(DLword *) \
|
||||
NativeAligned2FromStackOffset( \
|
||||
Addr68k_from_StkOffset( \
|
||||
(GETWORD(((DLword *)InterfacePage) + (fxnum)))) \
|
||||
+ FRAMESIZE; \
|
||||
GETWORD(((DLword *)InterfacePage) + (fxnum)) = midpunt ; \
|
||||
@@ -88,7 +88,7 @@
|
||||
|
||||
#define BEFORE_CONTEXTSW \
|
||||
{ CurrentStackPTR += 2; \
|
||||
CURRENTFX->nextblock=StackOffsetFromNative(CurrentStackPTR); \
|
||||
CURRENTFX->nextblock=StkOffset_from_68K(CurrentStackPTR); \
|
||||
GETWORD(CurrentStackPTR)=STK_FSB_WORD; \
|
||||
GETWORD(CurrentStackPTR+1)= (((UNSIGNED)EndSTKP-(UNSIGNED)(CurrentStackPTR))>>1); \
|
||||
if (GETWORD(CurrentStackPTR+1) == 0) error("0-long free block."); \
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
#define AFTER_CONTEXTSW \
|
||||
{ DLword *ac_ptr68k,*ac_freeptr; \
|
||||
ac_ptr68k = (DLword*)NativeAligned2FromStackOffset(CURRENTFX->nextblock); \
|
||||
ac_ptr68k = (DLword*)Addr68k_from_StkOffset(CURRENTFX->nextblock); \
|
||||
if(GETWORD(ac_ptr68k) != STK_FSB_WORD) error("pre_moveframe: MP9316"); \
|
||||
CHECK_FX(CURRENTFX); \
|
||||
ac_freeptr=ac_ptr68k; \
|
||||
|
||||
@@ -307,7 +307,7 @@ typedef struct stackp {
|
||||
#define SET_FASTP_NIL(fx68k) \
|
||||
{ \
|
||||
if (FASTP(fx68k)) { \
|
||||
((FX *)(fx68k))->blink = StackOffsetFromNative(DUMMYBF(fx68k)); \
|
||||
((FX *)(fx68k))->blink = StkOffset_from_68K(DUMMYBF(fx68k)); \
|
||||
((FX *)(fx68k))->clink = ((FX *)(fx68k))->alink; \
|
||||
SLOWP(fx68k) = T; \
|
||||
} \
|
||||
@@ -411,7 +411,7 @@ typedef struct stackp {
|
||||
if (check_stack_rooms(fx68k) > 1000) { \
|
||||
warn("moveframe:there is more than 100 words SPACE for FX"); \
|
||||
printf("# When calling "); \
|
||||
tos_on_stack = (LispPTR *)NativeAligned4FromStackOffset((fx68k)->nextblock - 2); \
|
||||
tos_on_stack = (LispPTR *)Addr68k_from_StkOffset((fx68k)->nextblock - 2); \
|
||||
print_atomname(*tos_on_stack); \
|
||||
printf("\n"); \
|
||||
stack_check(0); \
|
||||
|
||||
28
inc/tosfns.h
28
inc/tosfns.h
@@ -202,8 +202,9 @@
|
||||
BCE_CURRENTFX->pc = ((UNSIGNED)PCMAC - (UNSIGNED)FuncObj) + FN_OPCODE_SIZE; \
|
||||
FN_STACK_CHECK; \
|
||||
{ \
|
||||
IVARL = (DLword *)(CSTKPTR - (argcount) + 1); \
|
||||
BCE_CURRENTFX->nextblock = NEXTBLOCK = StackOffsetFromNative(IVARL); \
|
||||
UNSIGNED newivar; \
|
||||
newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR - (argcount) + 1)); \
|
||||
BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar); \
|
||||
} \
|
||||
HARD_PUSH(TOPOFSTACK); /* save TOS */ \
|
||||
if (LOCFNCELL->na >= 0) { \
|
||||
@@ -217,7 +218,7 @@
|
||||
} /* if end */ \
|
||||
/* Set up BF */ \
|
||||
HARD_PUSH(BF_MARK32 | NEXTBLOCK); \
|
||||
*((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StackOffsetFromNative(PVAR)); \
|
||||
*((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StkOffset_from_68K(PVAR)); \
|
||||
((struct frameex2 *)CSTKPTR)->fnheader = SWAP_FNHEAD(defcell_word); \
|
||||
CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE); \
|
||||
PVARL = (DLword *)CSTKPTR; \
|
||||
@@ -257,8 +258,9 @@
|
||||
BCE_CURRENTFX->pc = ((UNSIGNED)PCMAC - (UNSIGNED)FuncObj) + FNX_OPCODE_SIZE; \
|
||||
FN_STACK_CHECK; \
|
||||
{ \
|
||||
IVARL = (DLword *)(CSTKPTR - num_args + 1); \
|
||||
BCE_CURRENTFX->nextblock = NEXTBLOCK = StackOffsetFromNative(IVARL); \
|
||||
UNSIGNED newivar; \
|
||||
newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR - num_args + 1)); \
|
||||
BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar); \
|
||||
} \
|
||||
HARD_PUSH(TOPOFSTACK); /* save TOS */ \
|
||||
if (LOCFNCELL->na >= 0) { \
|
||||
@@ -272,7 +274,7 @@
|
||||
} /* if end */ \
|
||||
/* Set up BF */ \
|
||||
HARD_PUSH(BF_MARK32 | NEXTBLOCK); \
|
||||
*((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StackOffsetFromNative(PVAR)); \
|
||||
*((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StkOffset_from_68K(PVAR)); \
|
||||
((struct frameex2 *)CSTKPTR)->fnheader = SWAP_FNHEAD(defcell->defpointer); \
|
||||
CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE); \
|
||||
PVARL = (DLword *)CSTKPTR; \
|
||||
@@ -370,8 +372,9 @@
|
||||
FN_STACK_CHECK; \
|
||||
APPLY_POP_PUSH_TEST; \
|
||||
{ \
|
||||
IVARL = (DLword *)(CSTKPTR + (1 - fn_num_args - needpush)); \
|
||||
BCE_CURRENTFX->nextblock = NEXTBLOCK = StackOffsetFromNative(IVARL); \
|
||||
UNSIGNED newivar; \
|
||||
newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR + (1 - fn_num_args - needpush))); \
|
||||
BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar); \
|
||||
} \
|
||||
HARD_PUSH(TOPOFSTACK); /* save TOS */ \
|
||||
if (LOCFNCELL->na >= 0) { \
|
||||
@@ -386,7 +389,7 @@
|
||||
/* Set up BF */ \
|
||||
HARD_PUSH(BF_MARK32 | NEXTBLOCK); \
|
||||
} /* NEXTBLOCK BLOCK */ \
|
||||
*((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StackOffsetFromNative(PVAR)); \
|
||||
*((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StkOffset_from_68K(PVAR)); \
|
||||
((struct frameex2 *)CSTKPTR)->fnheader = SWAP_FNHEAD(defcell->defpointer); \
|
||||
CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE); \
|
||||
PVARL = (DLword *)CSTKPTR; \
|
||||
@@ -438,8 +441,9 @@
|
||||
FN_STACK_CHECK; \
|
||||
CSTKPTRL -= 2; \
|
||||
{ \
|
||||
IVARL = (DLword *)(CSTKPTR - num_args); \
|
||||
BCE_CURRENTFX->nextblock = NEXTBLOCK = StackOffsetFromNative(IVARL);\
|
||||
UNSIGNED newivar; \
|
||||
newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR - num_args)); \
|
||||
BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar); \
|
||||
} \
|
||||
if (LOCFNCELL->na >= 0) { \
|
||||
int RESTARGS; \
|
||||
@@ -452,7 +456,7 @@
|
||||
} /* if end */ \
|
||||
/* Set up BF */ \
|
||||
HARD_PUSH(BF_MARK32 | NEXTBLOCK); \
|
||||
*((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StackOffsetFromNative(PVAR)); \
|
||||
*((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StkOffset_from_68K(PVAR)); \
|
||||
((struct frameex2 *)CSTKPTR)->fnheader = SWAP_FNHEAD(Fn_DefCell); \
|
||||
CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE); \
|
||||
PVARL = (DLword *)CSTKPTR; \
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
/************************************************************************/
|
||||
|
||||
#include "adr68k.h" // for NativeAligned4FromLAddr
|
||||
#ifdef RESWAPPEDCODESTREAM
|
||||
#include "byteswapdefs.h" // for byte_swap_code_block
|
||||
#if defined(RESWAPPEDCODESTREAM) | !defined(BIGVM)
|
||||
#include "byteswapdefs.h" // for byte_swap_code_block, swapx
|
||||
#endif
|
||||
#include "car-cdrdefs.h" // for car
|
||||
#include "conspagedefs.h" // for cons
|
||||
|
||||
@@ -22,6 +22,10 @@
|
||||
*/
|
||||
/**********************************************************************/
|
||||
|
||||
#if !defined(NEWCDRCODING)
|
||||
#include "address.h"
|
||||
#include "gcdata.h"
|
||||
#endif
|
||||
#include "car-cdrdefs.h" // for N_OP_rplacd
|
||||
#include "conspagedefs.h" // for cons
|
||||
#include "emlglob.h"
|
||||
|
||||
Reference in New Issue
Block a user