1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-26 03:51:32 +00:00

Wholesale removal of deprecated register attribute from all source files

This commit is contained in:
Nick Briggs
2022-08-15 15:04:07 -07:00
parent 5c0349cc69
commit 873d4927ce
107 changed files with 777 additions and 777 deletions

View File

@@ -1,6 +1,6 @@
#ifndef ALLOCMDSDEFS_H
#define ALLOCMDSDEFS_H 1
#include "lispemul.h" /* for LispPTR, DLword */
LispPTR initmdspage(register LispPTR *base, register DLword size, register LispPTR prev);
LispPTR *alloc_mdspage(register short int type);
LispPTR initmdspage(LispPTR *base, DLword size, LispPTR prev);
LispPTR *alloc_mdspage(short int type);
#endif

View File

@@ -80,7 +80,7 @@ static inline LispPTR GetPosSmallp(unsigned long x) {
switch (GetTypeNumber(sour)) { \
case TYPE_FIXP: (dest) = FIXP_VALUE(sour); break; \
case TYPE_FLOATP: { \
register float temp; \
float temp; \
temp = FLOATP_VALUE(sour); \
/* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \
if ((temp > ((float)0x7fffffff)) || (temp < ((float)0x80000000))) goto label; \

View File

@@ -389,7 +389,7 @@
do_partial_transfer \
dst32addr++; \
switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner { DestGetsF(=) } break; \
case op_fn_and: ForInner { DestGetsF(&=) } break; \
case op_fn_or: ForInner { DestGetsF(|=) } break; \
@@ -416,14 +416,14 @@
if (aligned_loop) \
{ \
if (src_comp) switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner {*dst32addr++ = ~*src32addr++;} break; \
case op_fn_and: ForInner {*dst32addr++ &= ~*src32addr++;} break; \
case op_fn_or: ForInner {*dst32addr++ |= ~*src32addr++;} break; \
case op_fn_xor: ForInner {*dst32addr++ ^= ~*src32addr++;} break; \
} \
else switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner {*dst32addr++ = *src32addr++;} break; \
case op_fn_and: ForInner {*dst32addr++ &= *src32addr++;} break; \
case op_fn_or: ForInner {*dst32addr++ |= *src32addr++;} break; \
@@ -433,14 +433,14 @@
else \
{ \
if (src_comp) switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner {GetSrcCF DestGetsF(=) } break; \
case op_fn_and: ForInner {GetSrcCF DestGetsF(&=) } break; \
case op_fn_or: ForInner {GetSrcCF DestGetsF(|=) } break; \
case op_fn_xor: ForInner {GetSrcCF DestGetsF(^=) } break; \
} \
else switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner {GetSrcF DestGetsF(=) } break; \
case op_fn_and: ForInner {GetSrcF DestGetsF(&=) } break; \
case op_fn_or: ForInner {GetSrcF DestGetsF(|=) } break; \
@@ -470,14 +470,14 @@
if (aligned_loop) \
{ \
if (src_comp) switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner {*dst32addr-- = ~*src32addr--;} break; \
case op_fn_and: ForInner {*dst32addr-- &= ~*src32addr--;} break; \
case op_fn_or: ForInner {*dst32addr-- |= ~*src32addr--;} break; \
case op_fn_xor: ForInner {*dst32addr-- ^= ~*src32addr--;} break; \
} \
else switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner {*dst32addr-- = *src32addr--;} break; \
case op_fn_and: ForInner {*dst32addr-- &= *src32addr--;} break; \
case op_fn_or: ForInner {*dst32addr-- |= *src32addr--;} break; \
@@ -487,14 +487,14 @@
else \
{ \
if (src_comp) switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner {GetSrcCB DestGetsB(=) } break; \
case op_fn_and: ForInner {GetSrcCB DestGetsB(&=) } break; \
case op_fn_or: ForInner {GetSrcCB DestGetsB(|=) } break; \
case op_fn_xor: ForInner {GetSrcCB DestGetsB(^=) } break; \
} \
else switch (op) \
{ register int cnt; \
{ int cnt; \
case op_repl_src: ForInner {GetSrcB DestGetsB(=) } break; \
case op_fn_and: ForInner {GetSrcB DestGetsB(&=) } break; \
case op_fn_or: ForInner {GetSrcB DestGetsB(|=) } break; \
@@ -698,7 +698,7 @@
/* However, YOU must set up the control variables that are used */
/* as "arguments" to the bitblt code: */
/* */
/* register DLword *srcbase, *dstbase; */
/* DLword *srcbase, *dstbase; */
/* int sx, dx, w, h, srcbpl, dstbpl, backwardflg; */
/* int src_comp, op, gray, num_gray, curr_gray_line; */
/* */
@@ -713,9 +713,9 @@ int abc, dst32rbit, src32rbit, fwd; \
unsigned int *OrigSrcAddr, *OrigDstAddr; \
int bb_fast; \
unsigned int preloop_mask, postloop_mask, sdw_mask; \
register unsigned int *dst32addr, *src32addr; \
register unsigned int shS, savedS, newS; \
register int srcRshift;
unsigned int *dst32addr, *src32addr; \
unsigned int shS, savedS, newS; \
int srcRshift;

View File

@@ -1,7 +1,7 @@
#ifndef BINDSDEFS_H
#define BINDSDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR *N_OP_bind(register LispPTR *stack_pointer, register LispPTR tos, int byte1, int byte2);
LispPTR *N_OP_unbind(register LispPTR *stack_pointer);
LispPTR *N_OP_dunbind(register LispPTR *stack_pointer, register LispPTR tos);
LispPTR *N_OP_bind(LispPTR *stack_pointer, LispPTR tos, int byte1, int byte2);
LispPTR *N_OP_unbind(LispPTR *stack_pointer);
LispPTR *N_OP_dunbind(LispPTR *stack_pointer, LispPTR tos);
#endif

View File

@@ -1,6 +1,6 @@
#ifndef BLTDEFS_H
#define BLTDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_blt(LispPTR destptr, LispPTR sourceptr, register LispPTR wordcount);
LispPTR N_OP_blt(LispPTR destptr, LispPTR sourceptr, LispPTR wordcount);
#endif

View File

@@ -2,13 +2,13 @@
#define CAR_CDRDEFS_H 1
#include "cell.h" /* for ConsCell */
#include "lispemul.h" /* for LispPTR */
LispPTR car(register LispPTR datum);
LispPTR cdr(register LispPTR datum);
LispPTR rplaca(register LispPTR x, register LispPTR y);
LispPTR rplacd(LispPTR x, register LispPTR y);
LispPTR N_OP_car(register LispPTR tos);
LispPTR N_OP_cdr(register LispPTR tos);
LispPTR N_OP_rplaca(register LispPTR tosm1, register LispPTR tos);
LispPTR N_OP_rplacd(register LispPTR tosm1, register LispPTR tos);
LispPTR car(LispPTR datum);
LispPTR cdr(LispPTR datum);
LispPTR rplaca(LispPTR x, LispPTR y);
LispPTR rplacd(LispPTR x, LispPTR y);
LispPTR N_OP_car(LispPTR tos);
LispPTR N_OP_cdr(LispPTR tos);
LispPTR N_OP_rplaca(LispPTR tosm1, LispPTR tos);
LispPTR N_OP_rplacd(LispPTR tosm1, LispPTR tos);
ConsCell *find_close_prior_cell(struct conspage *page, LispPTR oldcell);
#endif

2
inc/cell.h Executable file → Normal file
View File

@@ -417,7 +417,7 @@ struct cadr_cell {
#define S_N_CHECKANDCADR(sour, dest, tos) \
{ \
register LispPTR parm = sour; \
LispPTR parm = sour; \
if (GetTypeNumber(parm) != TYPE_LISTP) { \
ERROR_EXIT(tos); \
} else \

View File

@@ -2,6 +2,6 @@
#define CONSPAGEDEFS_H 1
#include "lispemul.h" /* for LispPTR */
struct conspage *next_conspage(void);
LispPTR N_OP_cons(register int cons_car, register int cons_cdr);
LispPTR N_OP_cons(int cons_car, int cons_cdr);
LispPTR cons(LispPTR cons_car, LispPTR cons_cdr);
#endif

View File

@@ -67,7 +67,7 @@ int make_old_version(char *old, char *file);
void print_finfo(FINFO *fp);
#endif
int init_finfo(void);
LispPTR COM_gen_files(register LispPTR *args);
LispPTR COM_next_file(register LispPTR *args);
LispPTR COM_finish_finfo(register LispPTR *args);
LispPTR COM_gen_files(LispPTR *args);
LispPTR COM_next_file(LispPTR *args);
LispPTR COM_finish_finfo(LispPTR *args);
#endif

View File

@@ -6,20 +6,20 @@ void separate_host(char *lfname, char *host, char *drive);
#else
void separate_host(char *lfname, char *host);
#endif
LispPTR COM_openfile(register LispPTR *args);
LispPTR COM_closefile(register LispPTR *args);
LispPTR DSK_getfilename(register LispPTR *args);
LispPTR DSK_deletefile(register LispPTR *args);
LispPTR DSK_renamefile(register LispPTR *args);
LispPTR DSK_directorynamep(register LispPTR *args);
LispPTR COM_getfileinfo(register LispPTR *args);
LispPTR COM_setfileinfo(register LispPTR *args);
LispPTR COM_readpage(register LispPTR *args);
LispPTR COM_writepage(register LispPTR *args);
LispPTR COM_truncatefile(register LispPTR *args);
LispPTR COM_changedir(register LispPTR *args);
LispPTR COM_getfreeblock(register LispPTR *args);
LispPTR COM_openfile(LispPTR *args);
LispPTR COM_closefile(LispPTR *args);
LispPTR DSK_getfilename(LispPTR *args);
LispPTR DSK_deletefile(LispPTR *args);
LispPTR DSK_renamefile(LispPTR *args);
LispPTR DSK_directorynamep(LispPTR *args);
LispPTR COM_getfileinfo(LispPTR *args);
LispPTR COM_setfileinfo(LispPTR *args);
LispPTR COM_readpage(LispPTR *args);
LispPTR COM_writepage(LispPTR *args);
LispPTR COM_truncatefile(LispPTR *args);
LispPTR COM_changedir(LispPTR *args);
LispPTR COM_getfreeblock(LispPTR *args);
void separate_version(char *name, char *ver, int checkp);
int unpack_filename(char *file, char *dir, char *name, char *ver, int checkp);
int true_name(register char *path);
int true_name(char *path);
#endif

View File

@@ -5,7 +5,7 @@ void DSP_dspbout(LispPTR *args);
void DSP_showdisplay(LispPTR *args);
LispPTR DSP_VideoColor(LispPTR *args);
void DSP_Cursor(LispPTR *args, int argnum);
void DSP_SetMousePos(register LispPTR *args);
void DSP_SetMousePos(LispPTR *args);
LispPTR DSP_ScreenWidth(LispPTR *args);
LispPTR DSP_ScreenHight(LispPTR *args);
void flip_cursor(void);

View File

@@ -1,8 +1,8 @@
#ifndef EQFDEFS_H
#define EQFDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_clequal(register int arg1, register int arg2);
LispPTR N_OP_eqlop(register int arg1, register int arg2);
LispPTR N_OP_equal(register int arg1, register int arg2);
LispPTR N_OP_eqq(register int arg1, register int arg2);
LispPTR N_OP_clequal(int arg1, int arg2);
LispPTR N_OP_eqlop(int arg1, int arg2);
LispPTR N_OP_equal(int arg1, int arg2);
LispPTR N_OP_eqq(int arg1, int arg2);
#endif

View File

@@ -13,5 +13,5 @@ int *ether_debug(void);
LispPTR check_ether(void);
void init_ifpage_ether(void);
void init_ether(void);
LispPTR check_sum(register LispPTR *args);
LispPTR check_sum(LispPTR *args);
#endif

View File

@@ -1,5 +1,5 @@
#ifndef FINDKEYDEFS_H
#define FINDKEYDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_findkey(register LispPTR tos, register int byte);
LispPTR N_OP_findkey(LispPTR tos, int byte);
#endif

View File

@@ -2,10 +2,10 @@
#define FVARDEFS_H 1
#include "lispemul.h" /* for LispPTR, DLword */
#include "stack.h" /* for fnhead, frameex1 */
LispPTR N_OP_fvarn(register int n);
LispPTR N_OP_fvarn(int n);
LispPTR N_OP_stkscan(LispPTR tos);
LispPTR N_OP_fvar_(register LispPTR tos, register int n);
void nnewframe(register struct frameex1 *newpfra2, register DLword *achain, register int name);
void nfvlookup(struct frameex1 *apframe1, register DLword *achain, register struct fnhead *apfnhead1);
LispPTR N_OP_fvar_(LispPTR tos, int n);
void nnewframe(struct frameex1 *newpfra2, DLword *achain, int name);
void nfvlookup(struct frameex1 *apframe1, DLword *achain, struct fnhead *apfnhead1);
LispPTR native_newframe(int slot);
#endif

View File

@@ -1,6 +1,6 @@
#ifndef GCSCANDEFS_H
#define GCSCANDEFS_H 1
#include "lispemul.h" /* for DLword */
DLword gcscan1(register int probe);
DLword gcscan2(register int probe);
DLword gcscan1(int probe);
DLword gcscan2(int probe);
#endif

View File

@@ -1,6 +1,6 @@
#ifndef GVAR2DEFS_H
#define GVAR2DEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_gvar_(register LispPTR tos, unsigned int atom_index);
LispPTR N_OP_rplptr(register LispPTR tos_m_1, register LispPTR tos, unsigned int alpha);
LispPTR N_OP_gvar_(LispPTR tos, unsigned int atom_index);
LispPTR N_OP_rplptr(LispPTR tos_m_1, LispPTR tos, unsigned int alpha);
#endif

View File

@@ -101,7 +101,7 @@
#define OPCAR \
do { \
if (Listp(TOPOFSTACK)) { \
register ConsCell *DATUM68K = (ConsCell *)(Addr68k_from_LADDR(TOPOFSTACK)); \
ConsCell *DATUM68K = (ConsCell *)(Addr68k_from_LADDR(TOPOFSTACK)); \
if (DATUM68K->cdr_code == CDR_INDIRECT) { \
TOPOFSTACK = ((LispPTR)((ConsCell *)Addr68k_from_LADDR(DATUM68K->car_field))->car_field); \
nextop1; \
@@ -122,8 +122,8 @@
#define OPCDR \
do { \
if (Listp(TOPOFSTACK)) { \
register ConsCell *DATUM68K = (ConsCell *)(Addr68k_from_LADDR(TOPOFSTACK)); \
register int CDRCODEX = DATUM68K->cdr_code; \
ConsCell *DATUM68K = (ConsCell *)(Addr68k_from_LADDR(TOPOFSTACK)); \
int CDRCODEX = DATUM68K->cdr_code; \
if (CDRCODEX == CDR_NIL) { \
/* cdr-nil */ \
TOPOFSTACK = (NIL_PTR); \
@@ -152,8 +152,8 @@
#define OPCDR \
do { \
if (Listp(TOPOFSTACK)) { \
register ConsCell *DATUM68K = (ConsCell *)(Addr68k_from_LADDR(TOPOFSTACK)); \
register int CDRCODEX = DATUM68K->cdr_code; \
ConsCell *DATUM68K = (ConsCell *)(Addr68k_from_LADDR(TOPOFSTACK)); \
int CDRCODEX = DATUM68K->cdr_code; \
if (CDRCODEX == CDR_NIL) { \
/* cdr-nil */ \
TOPOFSTACK = (NIL_PTR); \
@@ -250,8 +250,8 @@
} while (0)
#define PUTBASEBYTE \
do { \
register int byteoffset; \
register char *p_data; \
int byteoffset; \
char *p_data; \
if (((SEGMASK & TOPOFSTACK) != S_POSITIVE) || ((unsigned short)TOPOFSTACK >= 256)) \
goto op_ufn; \
byteoffset = GET_TOS_1; \
@@ -290,7 +290,7 @@
#define PUTBASEPTR_N(n) \
do { \
register int base; \
int base; \
base = POINTERMASK & POP_TOS_1; \
*((LispPTR *)Addr68k_from_LADDR(base + (n))) = TOPOFSTACK; \
TOPOFSTACK = base; \
@@ -299,7 +299,7 @@
#define PUTBASE_N(n) \
do { \
register int base; \
int base; \
if (GetHiWord(TOPOFSTACK) != (S_POSITIVE >> 16)) goto op_ufn; \
base = POINTERMASK & POP_TOS_1; \
GETWORD((DLword *)Addr68k_from_LADDR(base + (n))) = GetLoWord(TOPOFSTACK); \
@@ -337,7 +337,7 @@
#elif defined(BIGVM)
#define GVAR(x) \
do { \
register int tx = x; \
int tx = x; \
if (tx & SEGMASK) { \
PUSH(GetLongWord(Addr68k_from_LADDR((tx) + NEWATOM_VALUE_OFFSET))); \
} else \
@@ -348,7 +348,7 @@
#else
#define GVAR(x) \
do { \
register int tx = x; \
int tx = x; \
if (tx & SEGMASK) { \
PUSH(GetLongWord(Addr68k_from_LADDR((tx) + NEWATOM_VALUE_OFFSET))); \
} else \
@@ -366,7 +366,7 @@
#define SWAP \
do { \
register LispPTR temp; \
LispPTR temp; \
temp = GET_TOS_1; \
GET_TOS_1 = TOPOFSTACK; \
TOPOFSTACK = temp; \
@@ -421,8 +421,8 @@
#define BIN \
do { \
register Stream *stream68k; /* stream instance on TOS */ \
register char *buff68k; /* pointer to BUFF */ \
Stream *stream68k; /* stream instance on TOS */ \
char *buff68k; /* pointer to BUFF */ \
\
if (GetTypeNumber(TOPOFSTACK) == TYPE_STREAM) { \
stream68k = (Stream *)Addr68k_from_LADDR(TOPOFSTACK); \
@@ -496,11 +496,11 @@
#define BIND \
do { \
register int byte = Get_BYTE_PCMAC1; \
register unsigned n1; \
register unsigned n2; \
register LispPTR *ppvar; \
register int i; \
int byte = Get_BYTE_PCMAC1; \
unsigned n1; \
unsigned n2; \
LispPTR *ppvar; \
int i; \
n1 = byte >> 4; \
n2 = byte & 0xf; \
ppvar = (LispPTR *)PVAR + 1 + Get_BYTE_PCMAC2; \
@@ -517,10 +517,10 @@
#define UNBIND \
do { \
register int num; \
register LispPTR *ppvar; \
register int i; \
register LispPTR value; \
int num; \
LispPTR *ppvar; \
int i; \
LispPTR value; \
for (; (((int)*--CSTKPTRL) >= 0);) \
; \
value = *CSTKPTR; \
@@ -532,10 +532,10 @@
#define DUNBIND \
do { \
register int num; \
register LispPTR *ppvar; \
register int i; \
register LispPTR value; \
int num; \
LispPTR *ppvar; \
int i; \
LispPTR value; \
if ((int)TOPOFSTACK < 0) { \
num = (~TOPOFSTACK) >> 16; \
if (num != 0) { \
@@ -567,7 +567,7 @@
#define GETBITS_N_M(a, b) \
do { \
register int temp, bb = b; \
int temp, bb = b; \
temp = 0xF & bb; \
TOPOFSTACK = S_POSITIVE | (((GETWORD(Addr68k_from_LADDR(POINTERMASK & (TOPOFSTACK + (a))))) >> \
(16 - ((0xF & (bb >> 4)) + temp + 1))) & \
@@ -578,9 +578,9 @@
#define PUTBITS_N_M(a, b) \
do { \
int base; \
register int bb = b; \
register DLword *pword; \
register int shift_size, field_size, fmask; \
int bb = b; \
DLword *pword; \
int shift_size, field_size, fmask; \
if ((SEGMASK & TOPOFSTACK) != S_POSITIVE) { goto op_ufn; }; \
base = POINTERMASK & POP_TOS_1; \
pword = (DLword *)Addr68k_from_LADDR(base + (a)); \
@@ -606,7 +606,7 @@
#define MYARGCOUNT \
do { \
register UNSIGNED arg_num; \
UNSIGNED arg_num; \
if ((CURRENTFX->alink & 1) == 0) \
arg_num = (UNSIGNED)((LispPTR *)(CURRENTFX)-1); \
else \
@@ -671,7 +671,7 @@
#define CLARITHEQUAL \
do { \
register int arg2; \
int arg2; \
SV; \
arg2 = POP_TOS_1; \
if ((TOPOFSTACK & SEGMASK) == S_POSITIVE) { \
@@ -690,9 +690,9 @@
#define AREF1 \
do { \
LispPTR arrayarg; \
register LispPTR baseL; \
register int index; \
register OneDArray *arrayblk; \
LispPTR baseL; \
int index; \
OneDArray *arrayblk; \
SV; \
arrayarg = POP_TOS_1; \
if (GetTypeNumber(arrayarg) != TYPE_ONED_ARRAY) goto aref_ufn; \
@@ -723,7 +723,7 @@
case 0: TOPOFSTACK |= S_POSITIVE; break; \
case (unsigned)0xFFFF0000: TOPOFSTACK &= S_NEGATIVE; break; \
default: { \
register DLword *wordp; \
DLword *wordp; \
wordp = createcell68k(TYPE_FIXP); \
*((int *)wordp) = TOPOFSTACK; \
TOPOFSTACK = (LispPTR)LADDR_from_68k(wordp); \
@@ -744,7 +744,7 @@
S_POSITIVE | ((GETWORD(((DLword *)Addr68k_from_LADDR(baseL)) + index)) & 0xFFFF); \
nextop1; \
case 54: /* Float : 32 bits */ { \
register DLword *wordp; \
DLword *wordp; \
wordp = createcell68k(TYPE_FLOATP); \
*((int *)wordp) = *(((int *)Addr68k_from_LADDR(baseL)) + index); \
TOPOFSTACK = (LispPTR)LADDR_from_68k(wordp); \
@@ -766,8 +766,8 @@
#ifdef BIGVM
#define DTEST(n) \
do { \
register int atom_index; \
register struct dtd *dtd68k; \
int atom_index; \
struct dtd *dtd68k; \
atom_index = n; \
for (dtd68k = (struct dtd *)GetDTD(GetTypeNumber(TOPOFSTACK)); atom_index != dtd68k->dtd_name; \
dtd68k = (struct dtd *)GetDTD(dtd68k->dtd_supertype)) { \
@@ -778,8 +778,8 @@
#else /* BIGVM */
#define DTEST(n) \
do { \
register int atom_index; \
register struct dtd *dtd68k; \
int atom_index; \
struct dtd *dtd68k; \
atom_index = n; \
for (dtd68k = (struct dtd *)GetDTD(GetTypeNumber(TOPOFSTACK)); \
atom_index != dtd68k->dtd_namelo + ((int)(dtd68k->dtd_namehi) << 16); \
@@ -792,7 +792,7 @@
#define FVAR(n) \
do { \
register LispPTR *chain; \
LispPTR *chain; \
chain = (LispPTR *)(PVar + (n)); \
if (WBITSPTR(chain)->LSB) { \
PUSH(GetLongWord(Addr68k_from_LADDR(POINTERMASK &swapx(native_newframe((n) >> 1))))); \
@@ -804,8 +804,8 @@
#define FVARX(n) \
do { \
register int nn = n; \
register LispPTR *chain; \
int nn = n; \
LispPTR *chain; \
chain = (LispPTR *)(PVar + nn); \
if (WBITSPTR(chain)->LSB) { \
PUSH(GetLongWord(Addr68k_from_LADDR(POINTERMASK &swapx(native_newframe(nn >> 1))))); \
@@ -835,7 +835,7 @@
#elif defined(BIGVM)
#define ATOMCELL_N(n) \
do { \
register int nn = n; \
int nn = n; \
if (0 == ((unsigned int)(TOPOFSTACK &= POINTERMASK) & SEGMASK)) { \
/* old-symbol case; just add cell-number arg */ \
switch (nn) { \
@@ -879,7 +879,7 @@
#define ATOMCELL_N(n) \
do { \
register int nn = n; \
int nn = n; \
if (0 == ((unsigned int)TOPOFSTACK & SEGMASK)) { \
/* old-symbol case; just add cell-number arg */ \
TOPOFSTACK = (nn << 16) + (TOPOFSTACK << 1); \

28
inc/inlnPS2.h Executable file → Normal file
View File

@@ -39,8 +39,8 @@
/* */
/* R E G I S T E R C O N V E N T I O N S */
/* */
/* The following register conventions hold in the dispatch loop, */
/* and are set up by register ... asm("...") decls in xc.c: */
/* The following conventions hold in the dispatch loop, */
/* and are set up by ... asm("...") decls in xc.c: */
/* */
/* esi pccache - the current PC */
/* edi cspcache - the current lisp stack ptr. */
@@ -60,7 +60,7 @@
/* */
/* G E N E R A L - P U R P O S E I N L I N E F U N C T I O N S */
/* */
/* These functions don't rely on register conventions. */
/* These functions don't rely on conventions. */
/* */
/************************************************************************/
@@ -88,7 +88,7 @@
extern inline const unsigned int Get_BYTE_PCMAC0fn (pccache)
unsigned int pccache;
{
register unsigned int word;
unsigned int word;
asm("leal -1(%1),%0 \n\
xorl $3,%0 \n\
movzbl (%0),%0 \n\
@@ -99,7 +99,7 @@ unsigned int pccache;
extern inline const unsigned int Get_BYTE_PCMAC1fn (pccache)
unsigned int pccache;
{
register unsigned int word;
unsigned int word;
asm("movl %1,%0 \n\
xorl $3,%0 \n\
movzbl (%0),%0 \n\
@@ -110,7 +110,7 @@ unsigned int pccache;
extern inline const unsigned int Get_BYTE_PCMAC2fn (pccache)
unsigned int pccache;
{
register unsigned int word;
unsigned int word;
asm("leal 1(%1),%0 \n\
xorl $3,%0 \n\
movzbl (%0),%0 \n\
@@ -121,7 +121,7 @@ unsigned int pccache;
extern inline const unsigned int Get_BYTE_PCMAC3fn (pccache)
unsigned int pccache;
{
register unsigned int word;
unsigned int word;
asm("leal 2(%1),%0 \n\
xorl $3,%0 \n\
movzbl (%0),%0 \n\
@@ -144,7 +144,7 @@ unsigned int pccache;
extern inline const unsigned int Get_DLword_PCMAC0fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("movl %1,%%edx \n\
xorb $3,%%dl \n\
movzbl (%%edx),%%eax \n\
@@ -158,7 +158,7 @@ unsigned int pccache;
extern inline const unsigned int Get_DLword_PCMAC1fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("leal 1(%1),%%edx \n\
xorb $3,%%dl \n\
movzbl (%%edx),%%eax \n\
@@ -173,7 +173,7 @@ unsigned int pccache;
extern inline const unsigned int Get_DLword_PCMAC2fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("leal 2(%1),%%edx \n\
xorb $3,%%dl \n\
movzbl (%%edx),%%eax \n\
@@ -187,7 +187,7 @@ unsigned int pccache;
extern inline const unsigned int Get_DLword_PCMAC3fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("leal 3(%1),%%edx \n\
xorb $3,%%dl \n\
movzbl (%%edx),%%eax \n\
@@ -211,7 +211,7 @@ unsigned int pccache;
extern inline const unsigned int Get_Pointer_PCMAC0fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("leal -1(%1),%%edx \n\
xorb $3,%%dl \n\
movzbl (%%edx),%%eax \n\
@@ -229,7 +229,7 @@ unsigned int pccache;
extern inline const unsigned int Get_Pointer_PCMAC1fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("leal (%1),%%edx \n\
xorb $3,%%dl \n\
movzbl (%%edx),%%eax \n\
@@ -248,7 +248,7 @@ unsigned int pccache;
extern inline const unsigned int Get_Pointer_PCMAC2fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("leal 1(%1),%%edx \n\
xorb $3,%%dl \n\
movzbl (%%edx),%%eax \n\

16
inc/inlnSPARC.h Executable file → Normal file
View File

@@ -26,7 +26,7 @@
/*
Get_BYTE(PCMAC+1); \
xc.c: #define PCMAC pccache
xc.c: register InstPtr pccache;
xc.c: InstPtr pccache;
xc.c: typedef ByteCode *InstPtr; CHANGED TO
xc.c: typedef BYTECODE *InstPtr;
lispemul.h: typedef char ByteCode;
@@ -51,7 +51,7 @@ lispemul.h: typedef struct {unsigned code : 8;} BYTECODE;
#define BOX_INTO(result, dest){ \
if (NSMALLP_RANGE(result))/* dest = box_fixp(result);*/ \
{register LispPTR *wordp; \
{LispPTR *wordp; \
wordp = (LispPTR *) createcell68k(TYPE_FIXP); \
*((int *)wordp) = result; \
dest = (LADDR_from_68k(wordp)); } \
@@ -59,7 +59,7 @@ lispemul.h: typedef struct {unsigned code : 8;} BYTECODE;
#define ARITH_OP(op, exceptions, handler) \
{register int arg1, arg2, result; \
{int arg1, arg2, result; \
arg1 = GET_TOS_1; /* w/o side effect */ \
if(!NSMALLP(TOPOFSTACK) && !NSMALLP(arg1)) { \
arg2 = UNBOX_SMALLP(TOPOFSTACK); \
@@ -71,7 +71,7 @@ lispemul.h: typedef struct {unsigned code : 8;} BYTECODE;
N_OP_CALL_2(handler); }
#define BINARY_OP(exp, exceptions) { \
register int arg1, arg2, result; \
int arg1, arg2, result; \
arg1 = GET_TOS_1; /* w/o side effect */ \
UNBOX_ELSE_UFN(TOPOFSTACK, arg2); \
UNBOX_ELSE_UFN(arg1, arg1); \
@@ -84,7 +84,7 @@ lispemul.h: typedef struct {unsigned code : 8;} BYTECODE;
#undef IGREATERP
#define GREATERP { \
register int arg1, arg2, result; \
int arg1, arg2, result; \
arg1 = GET_TOS_1; /* w/o side effect */ \
UNBOX_ELSE_UFN(TOPOFSTACK, arg2); \
UNBOX_ELSE_UFN(arg1, arg1); \
@@ -92,7 +92,7 @@ lispemul.h: typedef struct {unsigned code : 8;} BYTECODE;
POP_TOS_1; nextop1;}
#define IGREATERP { \
register int arg1, arg2, result; \
int arg1, arg2, result; \
arg1 = GET_TOS_1; /* w/o side effect */ \
UNBOX_ELSE_UFN(TOPOFSTACK, arg2); \
UNBOX_ELSE_UFN(arg1, arg1); \
@@ -122,7 +122,7 @@ lispemul.h: typedef struct {unsigned code : 8;} BYTECODE;
#define LOGXOR BINARY_OP(arg1 ^ arg2, 0)
#define UNARY_OP(exp, exceptions) { \
register int arg, result; \
int arg, result; \
UNBOX_ELSE_UFN(TOPOFSTACK, arg); \
result = exp; \
if (exceptions) goto op_ufn; \
@@ -141,7 +141,7 @@ lispemul.h: typedef struct {unsigned code : 8;} BYTECODE;
#undef ADDBASE
#define ADDBASE { \
register int arg1, arg2; \
int arg1, arg2; \
UNBOX_ELSE_UFN(TOPOFSTACK, arg2); \
TOPOFSTACK = POP_TOS_1 + arg2; \
nextop1;}

28
inc/inlndos.h Executable file → Normal file
View File

@@ -39,8 +39,8 @@
/* */
/* R E G I S T E R C O N V E N T I O N S */
/* */
/* The following register conventions hold in the dispatch loop, */
/* and are set up by register ... asm("...") decls in xc.c: */
/* The following conventions hold in the dispatch loop, */
/* and are set up by ... asm("...") decls in xc.c: */
/* */
/* esi pccache - the current PC */
/* edi cspcache - the current lisp stack ptr. */
@@ -60,7 +60,7 @@
/* */
/* G E N E R A L - P U R P O S E I N L I N E F U N C T I O N S */
/* */
/* These functions don't rely on register conventions. */
/* These functions don't rely on conventions. */
/* */
/************************************************************************/
@@ -88,7 +88,7 @@
extern inline unsigned int Get_BYTE_PCMAC0fn (pccache)
unsigned int pccache;
{
register unsigned int word;
unsigned int word;
asm("lea %0,-1[%1] \n\
xor %0,3 \n\
movzx %0,BYTE PTR [%0] \n\
@@ -99,7 +99,7 @@ unsigned int pccache;
extern inline unsigned int Get_BYTE_PCMAC1fn (pccache)
unsigned int pccache;
{
register unsigned int word;
unsigned int word;
asm("lea %0,[%1] \n\
xor %0,3 \n\
movzx %0,BYTE PTR [%0] \n\
@@ -110,7 +110,7 @@ unsigned int pccache;
extern inline unsigned int Get_BYTE_PCMAC2fn (pccache)
unsigned int pccache;
{
register unsigned int word;
unsigned int word;
asm("lea %0,1[%1] \n\
xor %0,3 \n\
movzx %0,BYTE PTR [%0] \n\
@@ -121,7 +121,7 @@ unsigned int pccache;
extern inline unsigned int Get_BYTE_PCMAC3fn (pccache)
unsigned int pccache;
{
register unsigned int word;
unsigned int word;
asm("lea %0,2[%1] \n\
xor %0,3 \n\
movzx %0,BYTE PTR [%0] \n\
@@ -144,7 +144,7 @@ unsigned int pccache;
extern inline unsigned int Get_DLword_PCMAC0fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("mov edx,%1 \n\
xor dl,3 \n\
movzx eax, byte ptr [edx] \n\
@@ -158,7 +158,7 @@ unsigned int pccache;
extern inline unsigned int Get_DLword_PCMAC1fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("lea edx,1[%1] \n\
xor dl,3 \n\
movzx eax, byte ptr [edx] \n\
@@ -173,7 +173,7 @@ unsigned int pccache;
extern inline unsigned int Get_DLword_PCMAC2fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("lea edx,2[%1] \n\
xor dl,3 \n\
movzx eax, byte ptr [edx] \n\
@@ -187,7 +187,7 @@ unsigned int pccache;
extern inline unsigned int Get_DLword_PCMAC3fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("lea edx,3[%1] \n\
xor dl,3 \n\
movzx eax, byte ptr [edx] \n\
@@ -211,7 +211,7 @@ unsigned int pccache;
extern inline const unsigned int Get_Pointer_PCMAC0fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("lea edx,-1[%1] \n\
xor dl,3 \n\
movzx eax,byte ptr [edx] \n\
@@ -229,7 +229,7 @@ unsigned int pccache;
extern inline const unsigned int Get_Pointer_PCMAC1fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("lea edx,[%1] \n\
xor dl,3 \n\
movzx eax,byte ptr [edx] \n\
@@ -248,7 +248,7 @@ unsigned int pccache;
extern inline const unsigned int Get_Pointer_PCMAC2fn(pccache)
unsigned int pccache;
{
register unsigned int word asm("ax");
unsigned int word asm("ax");
asm("lea edx,1[%1] \n\
xor dl,3 \n\
movzx eax,byte ptr [edx] \n\

View File

@@ -1,4 +1,4 @@
#ifndef INTCALLDEFS_H
#define INTCALLDEFS_H 1
void cause_interruptcall(register unsigned int atom_index);
void cause_interruptcall(unsigned int atom_index);
#endif

View File

@@ -2,6 +2,6 @@
#define LINEBLT8DEFS_H 1
#include <sys/types.h> /* for u_char */
#include "lispemul.h" /* for LispPTR, DLword */
void lineBlt8(DLword *srcbase, register int offset, register u_char *destl, register int width,
void lineBlt8(DLword *srcbase, int offset, u_char *destl, int width,
u_char color0, u_char color1, LispPTR sourcetype, LispPTR operation);
#endif

View File

@@ -6,8 +6,8 @@
#define LispVersionToUnixVersion(pathname, ver) \
{ \
\
register char *cp; \
register char *vp; \
char *cp; \
char *vp; \
char ver_buf[VERSIONLEN]; \
\
cp = pathname; \

View File

@@ -6,9 +6,9 @@
#define LispVersionToUnixVersion(pathname){ \
\
register char *lv_cp; \
register char *lv_vp; \
register unsigned lv_ver; \
char *lv_cp; \
char *lv_vp; \
unsigned lv_ver; \
char lv_ver_buf[VERSIONLEN]; \
\
lv_cp = pathname; \

View File

@@ -4,9 +4,9 @@
#include "stack.h" /* for FX, StackWord, Bframe */
int do_stackoverflow(int incallp);
DLword *freestackblock(DLword n, StackWord *start68k, int align);
void decusecount68k(register FX *frame68k);
void decusecount68k(FX *frame68k);
void flip_cursorbar(int n);
void blt(register DLword *dest68k, register DLword *source68k, int nw);
void blt(DLword *dest68k, DLword *source68k, int nw);
void stack_check(StackWord *start68k);
void walk_stack(StackWord *start68k);
int quick_stack_check(void);

View File

@@ -1,12 +1,12 @@
#ifndef LOOPSOPSDEFS_H
#define LOOPSOPSDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR lcfuncall(register unsigned int atom_index, register int argnum, register int bytenum);
LispPTR lcfuncall(unsigned int atom_index, int argnum, int bytenum);
LispPTR LCinit(void);
LispPTR LCFetchMethod(register LispPTR class, register LispPTR selector);
LispPTR LCFetchMethodOrHelp(register LispPTR object, register LispPTR selector);
LispPTR LCFindVarIndex(register LispPTR iv, register LispPTR object);
LispPTR LCGetIVValue(register LispPTR object, register LispPTR iv);
LispPTR LCPutIVValue(register LispPTR object, register LispPTR iv, register LispPTR val);
LispPTR lcfuncall(register unsigned int atom_index, register int argnum, register int bytenum);
LispPTR LCFetchMethod(LispPTR class, LispPTR selector);
LispPTR LCFetchMethodOrHelp(LispPTR object, LispPTR selector);
LispPTR LCFindVarIndex(LispPTR iv, LispPTR object);
LispPTR LCGetIVValue(LispPTR object, LispPTR iv);
LispPTR LCPutIVValue(LispPTR object, LispPTR iv, LispPTR val);
LispPTR lcfuncall(unsigned int atom_index, int argnum, int bytenum);
#endif

View File

@@ -1,8 +1,8 @@
#ifndef LOWLEV1DEFS_H
#define LOWLEV1DEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_putbitsnfd(register LispPTR base, register LispPTR data, int word_offset, register int beta);
LispPTR N_OP_getbitsnfd(int base_addr, register int word_offset, int beta);
LispPTR N_OP_putbasen(register LispPTR base, register LispPTR tos, int n);
LispPTR N_OP_putbaseptrn(register LispPTR base, register LispPTR tos, int n);
LispPTR N_OP_putbitsnfd(LispPTR base, LispPTR data, int word_offset, int beta);
LispPTR N_OP_getbitsnfd(int base_addr, int word_offset, int beta);
LispPTR N_OP_putbasen(LispPTR base, LispPTR tos, int n);
LispPTR N_OP_putbaseptrn(LispPTR base, LispPTR tos, int n);
#endif

View File

@@ -1,7 +1,7 @@
#ifndef LSTHANDLDEFS_H
#define LSTHANDLDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_fmemb(register LispPTR item, register LispPTR tos);
LispPTR fmemb(register LispPTR item, register LispPTR list);
LispPTR N_OP_listget(register LispPTR plist, register LispPTR tos);
LispPTR N_OP_fmemb(LispPTR item, LispPTR tos);
LispPTR fmemb(LispPTR item, LispPTR list);
LispPTR N_OP_listget(LispPTR plist, LispPTR tos);
#endif

View File

@@ -3,7 +3,7 @@
#include "lispemul.h" /* for LispPTR, DLword */
DLword compute_hash(const char *char_base, DLword offset, DLword length);
DLword compute_lisp_hash(const char *char_base, DLword offset, DLword length, DLword fatp);
LispPTR compare_chars(register const char *char1, register const char *char2, register DLword length);
LispPTR compare_lisp_chars(register const char *char1, register const char *char2, register DLword length, DLword fat1, DLword fat2);
LispPTR compare_chars(const char *char1, const char *char2, DLword length);
LispPTR compare_lisp_chars(const char *char1, const char *char2, DLword length, DLword fat1, DLword fat2);
LispPTR make_atom(const char *char_base, DLword offset, DLword length);
#endif

View File

@@ -1,6 +1,6 @@
#ifndef MKCELLDEFS_H
#define MKCELLDEFS_H 1
#include "lispemul.h" /* for LispPTR, DLword */
LispPTR N_OP_createcell(register LispPTR tos);
LispPTR N_OP_createcell(LispPTR tos);
DLword *createcell68k(unsigned int type);
#endif

View File

@@ -4,6 +4,6 @@
#include "stack.h" /* for FX2 */
LispPTR make_value_list(int argcount, LispPTR *argarray);
void simulate_unbind(FX2 *frame, int unbind_count, FX2 *returner);
LispPTR values(int arg_count, register LispPTR *args);
LispPTR values_list(int arg_count, register LispPTR *args);
LispPTR values(int arg_count, LispPTR *args);
LispPTR values_list(int arg_count, LispPTR *args);
#endif

View File

@@ -67,7 +67,7 @@
/** in CONTEXTSW , for exchanging context **/
#define Midpunt(fxnum) \
{ register DLword midpunt; \
{ DLword midpunt; \
midpunt = LOLOC(LADDR_from_68k(CURRENTFX)); \
PVar=(DLword *) \
Addr68k_from_StkOffset( \
@@ -98,7 +98,7 @@
#define AFTER_CONTEXTSW \
{ register DLword *ac_ptr68k,*ac_freeptr; \
{ DLword *ac_ptr68k,*ac_freeptr; \
ac_ptr68k = (DLword*)Addr68k_from_StkOffset(CURRENTFX->nextblock); \
if(GETWORD(ac_ptr68k) != STK_FSB_WORD) error("pre_moveframe: MP9316"); \
CHECK_FX(CURRENTFX); \

View File

@@ -2,5 +2,5 @@
#define RETURNDEFS_H 1
#include "lispemul.h" /* for DLword */
void OP_contextsw(void);
void contextsw(register DLword fxnum, register DLword bytenum, register DLword flags);
void contextsw(DLword fxnum, DLword bytenum, DLword flags);
#endif

View File

@@ -1,5 +1,5 @@
#ifndef RPLCONSDEFS_H
#define RPLCONSDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_rplcons(register LispPTR list, register LispPTR item);
LispPTR N_OP_rplcons(LispPTR list, LispPTR item);
#endif

View File

@@ -1,7 +1,7 @@
#ifndef STORAGEDEFS_H
#define STORAGEDEFS_H 1
#include "lispemul.h" /* for LispPTR */
void checkfor_storagefull(register unsigned int npages);
void checkfor_storagefull(unsigned int npages);
LispPTR newpage(LispPTR base);
void init_storage(void);
#endif

View File

@@ -183,9 +183,9 @@
#define OPFN(argcount, num_args_fn, fn_xna_args, fn_native) \
do { /* argcount is a number of the arguments on stack */ \
register struct fnhead *LOCFNCELL; \
register int defcell_word; \
register int NEXTBLOCK; \
struct fnhead *LOCFNCELL; \
int defcell_word; \
int NEXTBLOCK; \
FNTRACER(Trace_FNCall(argcount, Get_AtomNo_PCMAC1, TOPOFSTACK, CSTKPTR - 1)); \
FNCHECKER(if (quick_stack_check()) \
Trace_FNCall(argcount, Get_AtomNo_PCMAC1, TOPOFSTACK, CSTKPTR - 1)); \
@@ -202,13 +202,13 @@
BCE_CURRENTFX->pc = ((UNSIGNED)PCMAC - (UNSIGNED)FuncObj) + FN_OPCODE_SIZE; \
FN_STACK_CHECK; \
{ \
register UNSIGNED newivar; \
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) { \
register int RESTARGS; \
int RESTARGS; \
RESTARGS = (argcount) - LOCFNCELL->na; \
while (RESTARGS < 0) { \
HARD_PUSH(NIL_PTR); \
@@ -238,9 +238,9 @@
/*************** OPFNX *************/
#define OPFNX \
do { \
register struct fnhead *LOCFNCELL; \
register DefCell *defcell; /* this reg is not allocated */ \
register int NEXTBLOCK; \
struct fnhead *LOCFNCELL; \
DefCell *defcell; /* this reg is not allocated */ \
int NEXTBLOCK; \
int num_args = Get_BYTE_PCMAC1; \
defcell = (DefCell *)GetDEFCELL68k(Get_AtomNo_PCMAC2); \
FNTRACER(Trace_FNCall(num_args, Get_AtomNo_PCMAC2, TOPOFSTACK, CSTKPTR - 1)); \
@@ -258,13 +258,13 @@
BCE_CURRENTFX->pc = ((UNSIGNED)PCMAC - (UNSIGNED)FuncObj) + FNX_OPCODE_SIZE; \
FN_STACK_CHECK; \
{ \
register UNSIGNED newivar; \
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) { \
register int RESTARGS; \
int RESTARGS; \
RESTARGS = num_args - LOCFNCELL->na; \
while (RESTARGS < 0) { \
HARD_PUSH(NIL_PTR); \
@@ -296,7 +296,7 @@
#ifdef BIGATOMS
#define OPCHECKAPPLY \
do { \
register DefCell *defcell; \
DefCell *defcell; \
defcell = (DefCell *)GetDEFCELL68k(TOPOFSTACK & POINTERMASK); \
if (!(defcell->ccodep && \
(((TOPOFSTACK & SEGMASK) == 0) || (GetTypeNumber(TOPOFSTACK) == TYPE_NEWATOM)) && \
@@ -306,7 +306,7 @@
#else
#define OPCHECKAPPLY \
do { \
register DefCell *defcell; \
DefCell *defcell; \
defcell = (DefCell *)GetDEFCELL68k(TOPOFSTACK & POINTERMASK); \
if (!(defcell->ccodep && ((TOPOFSTACK & SEGMASK) == 0)) && \
((defcell->argtype == 0) || (defcell->argtype == 2))) \
@@ -322,7 +322,7 @@
#define UFN_COMMON \
op_ufn: \
use code in XC.c { \
register UFN *entry68k; \
UFN *entry68k; \
entry68k = (UFN *)GetUFNEntry(Get_BYTE_PCMAC0); \
fn_num_args = entry68k->arg_num; \
fn_opcode_size = entry68k->byte_num + 1; \
@@ -346,12 +346,12 @@
#define needpush NEXTBLOCK
#define OP_FN_COMMON \
op_fn_common : { \
register struct fnhead *LOCFNCELL; \
register DefCell *defcell; /* this reg is not allocated */ \
struct fnhead *LOCFNCELL; \
DefCell *defcell; /* this reg is not allocated */ \
CClosure *closure; \
LispPTR closure_env = (LispPTR)0xffffffff; \
{ \
register int NEXTBLOCK = NIL; \
int NEXTBLOCK = NIL; \
defcell = fn_defcell; \
if (defcell->ccodep == 0) { \
if (GetTypeNumber(defcell->defpointer) == TYPE_COMPILED_CLOSURE) { /* setup closure */ \
@@ -372,13 +372,13 @@
FN_STACK_CHECK; \
APPLY_POP_PUSH_TEST; \
{ \
register UNSIGNED newivar; \
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) { \
register int RESTARGS; \
int RESTARGS; \
RESTARGS = fn_num_args - LOCFNCELL->na; \
while (RESTARGS < 0) { \
HARD_PUSH(NIL_PTR); \
@@ -394,8 +394,8 @@
CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE); \
PVARL = (DLword *)CSTKPTR; \
{ \
register int result; \
register LispPTR unboundval; \
int result; \
LispPTR unboundval; \
unboundval = (LispPTR)0xffffffff; \
result = LOCFNCELL->pv; \
HARD_PUSH(closure_env); \
@@ -428,11 +428,11 @@
#define OP_ENVCALL \
do { \
register struct fnhead *LOCFNCELL; \
register int NEXTBLOCK; \
register LispPTR closure_env = TOPOFSTACK; \
register int num_args; \
register LispPTR Fn_DefCell = GET_TOS_1; \
struct fnhead *LOCFNCELL; \
int NEXTBLOCK; \
LispPTR closure_env = TOPOFSTACK; \
int num_args; \
LispPTR Fn_DefCell = GET_TOS_1; \
LOCFNCELL = (struct fnhead *)Addr68k_from_LADDR(Fn_DefCell); \
FNTPRINT(("ENVCall.\n")); \
FNCHECKER(if (quick_stack_check()) printf("In ENVCALL.\n")); \
@@ -441,12 +441,12 @@
FN_STACK_CHECK; \
CSTKPTRL -= 2; \
{ \
register UNSIGNED newivar; \
UNSIGNED newivar; \
newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR - num_args)); \
BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar); \
} \
if (LOCFNCELL->na >= 0) { \
register int RESTARGS; \
int RESTARGS; \
RESTARGS = num_args - LOCFNCELL->na; \
while (RESTARGS < 0) { \
HARD_PUSH(NIL_PTR); \
@@ -461,10 +461,10 @@
CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE); \
PVARL = (DLword *)CSTKPTR; \
{ \
register int result; \
int result; \
result = LOCFNCELL->pv; \
if (result >= 0) { \
register LispPTR unboundval; \
LispPTR unboundval; \
unboundval = (LispPTR)0xffffffff; \
if (closure_env == NIL_PTR) \
HARD_PUSH(unboundval); \

View File

@@ -23,8 +23,8 @@
/************************************************************************/
#define OPRETURN { \
register struct frameex2 *returnFX ; \
register int alink; \
struct frameex2 *returnFX ; \
int alink; \
FNCHECKER(struct frameex2 *old_bce_fx = (struct frameex2 *) BCE_CURRENTFX); \
alink = ((struct frameex2 *) BCE_CURRENTFX)->alink; \
FNTPRINT(("RETURN = 0x%x, ", TOPOFSTACK)); \

View File

@@ -1,6 +1,6 @@
#ifndef TYPEOFDEFS_H
#define TYPEOFDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_dtest(register LispPTR tos, register int atom_index);
LispPTR N_OP_instancep(register LispPTR tos, register int atom_index);
LispPTR N_OP_dtest(LispPTR tos, int atom_index);
LispPTR N_OP_instancep(LispPTR tos, int atom_index);
#endif

View File

@@ -1,7 +1,7 @@
#ifndef UNIXCOMMDEFS_H
#define UNIXCOMMDEFS_H 1
#include "lispemul.h" /* for LispPTR */
int find_process_slot(register int pid);
int find_process_slot(int pid);
void wait_for_comm_processes(void);
char *build_socket_pathname(int desc);
void close_unix_descriptors(void);

View File

@@ -1,5 +1,5 @@
#ifndef UNWINDDEFS_H
#define UNWINDDEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR *N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep);
LispPTR *N_OP_unwind(LispPTR *cstkptr, LispPTR tos, int n, int keep);
#endif

View File

@@ -3,6 +3,6 @@
#include "cell.h" /* for cadr_cell */
#include "lispemul.h" /* for LispPTR */
struct cadr_cell cadr(LispPTR cell_adr);
LispPTR N_OP_arg0(register LispPTR tos);
LispPTR N_OP_assoc(register LispPTR key, register LispPTR list);
LispPTR N_OP_arg0(LispPTR tos);
LispPTR N_OP_assoc(LispPTR key, LispPTR list);
#endif

View File

@@ -2,6 +2,6 @@
#define Z2DEFS_H 1
#include "lispemul.h" /* for LispPTR */
LispPTR N_OP_classoc(LispPTR key, LispPTR list);
LispPTR N_OP_clfmemb(register LispPTR item, register LispPTR list);
LispPTR N_OP_restlist(register LispPTR tail, register int last, register int skip);
LispPTR N_OP_clfmemb(LispPTR item, LispPTR list);
LispPTR N_OP_restlist(LispPTR tail, int last, int skip);
#endif