--- gforth/engine/engine.c 2003/08/15 14:07:04 1.64 +++ gforth/engine/engine.c 2003/10/16 18:48:03 1.70 @@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ +#define USE_NO_TOS +#define USE_NO_FTOS + #include "config.h" #include "forth.h" #include @@ -153,6 +156,12 @@ extern int gforth_memcmp(const char * s1 #ifndef TOSREG #define TOSREG #endif +#ifndef spaREG +#define spaREG +#endif +#ifndef spbREG +#define spbREG +#endif #ifndef FTOSREG #define FTOSREG #endif @@ -175,6 +184,23 @@ extern int gforth_memcmp(const char * s1 #endif #define SUPER_CONTINUE +#ifdef GFORTH_DEBUGGING +#if DEBUG +#define NAME(string) { saved_ip=ip; asm(""); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);} +#else /* !DEBUG */ +#define NAME(string) { saved_ip=ip; asm(""); } +/* the asm here is to avoid reordering of following stuff above the + assignment; this is an old-style asm (no operands), and therefore + is treated like "asm volatile ..."; i.e., it prevents most + reorderings across itself. We want the assignment above first, + because the stack loads may already cause a stack underflow. */ +#endif /* !DEBUG */ +#elif DEBUG +# define NAME(string) fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp); +#else +# define NAME(string) +#endif + #ifdef DEBUG #define CFA_TO_NAME(__cfa) \ Cell len, i; \ @@ -220,7 +246,8 @@ extern int gforth_memcmp(const char * s1 #error illegal ENGINE value #endif /* ENGINE */ -#define LABEL2(name) K_##name: +/* the asm(""); is there to get a stop compiled on Itanium */ +#define LABEL2(name) K_##name: asm(""); Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0) /* executes code at ip, if ip!=NULL @@ -250,7 +277,9 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * void * prv; #endif register Address up UPREG = UP; - IF_spTOS(register Cell spTOS TOSREG;) + register Cell MAYBE_UNUSED spa TOSREG; + register Cell MAYBE_UNUSED spb spaREG; + register Cell MAYBE_UNUSED spc spbREG; IF_fpTOS(register Float fpTOS FTOSREG;) #if defined(DOUBLY_INDIRECT) static Label *symbols; @@ -260,20 +289,9 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * static Label symbols[]= { #define MAX_SYMBOLS (sizeof(symbols)/sizeof(symbols[0])) #endif /* !defined(DOUBLY_INDIRECT) */ - (Label)&&docol, - (Label)&&docon, - (Label)&&dovar, - (Label)&&douser, - (Label)&&dodefer, - (Label)&&dofield, - (Label)&&dodoes, - /* the following entry is normally unused; - it is there because its index indicates a does-handler */ - CPU_DEP1, #define INST_ADDR(name) ((Label)&&I_##name) #include "prim_lab.i" #undef INST_ADDR - (Label)&&after_last, (Label)0, #define INST_ADDR(name) ((Label)&&K_##name) #include "prim_lab.i" @@ -331,166 +349,6 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * #ifdef CPU_DEP3 CPU_DEP3 #endif - - docol: - { -#ifdef NO_IP - *--rp = next_code; - goto **(Label *)PFA1(cfa); -#else -#ifdef DEBUG - { - CFA_TO_NAME(cfa); - fprintf(stderr,"%08lx: col: %08lx %.*s\n",(Cell)ip,(Cell)PFA1(cfa), - len,name); - } -#endif -#ifdef CISC_NEXT - /* this is the simple version */ - *--rp = (Cell)ip; - SET_IP((Xt *)PFA1(cfa)); - SUPER_END; - NEXT; -#else - /* this one is important, so we help the compiler optimizing */ - { - DEF_CA - rp[-1] = (Cell)ip; - SET_IP((Xt *)PFA1(cfa)); - SUPER_END; - NEXT_P1; - rp--; - NEXT_P2; - } -#endif -#endif - } - - docon: - { -#ifdef DEBUG - fprintf(stderr,"%08lx: con: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa)); -#endif -#ifdef USE_TOS - *sp-- = spTOS; - spTOS = *(Cell *)PFA1(cfa); -#else - *--sp = *(Cell *)PFA1(cfa); -#endif - } -#ifdef NO_IP - goto *next_code; -#else - NEXT_P0; - NEXT; -#endif - - dovar: - { -#ifdef DEBUG - fprintf(stderr,"%08lx: var: %08lx\n",(Cell)ip,(Cell)PFA1(cfa)); -#endif -#ifdef USE_TOS - *sp-- = spTOS; - spTOS = (Cell)PFA1(cfa); -#else - *--sp = (Cell)PFA1(cfa); -#endif - } -#ifdef NO_IP - goto *next_code; -#else - NEXT_P0; - NEXT; -#endif - - douser: - { -#ifdef DEBUG - fprintf(stderr,"%08lx: user: %08lx\n",(Cell)ip,(Cell)PFA1(cfa)); -#endif -#ifdef USE_TOS - *sp-- = spTOS; - spTOS = (Cell)(up+*(Cell*)PFA1(cfa)); -#else - *--sp = (Cell)(up+*(Cell*)PFA1(cfa)); -#endif - } -#ifdef NO_IP - goto *next_code; -#else - NEXT_P0; - NEXT; -#endif - - dodefer: - { -#ifdef DEBUG - fprintf(stderr,"%08lx: defer: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa)); -#endif - SUPER_END; - EXEC(*(Xt *)PFA1(cfa)); - } - - dofield: - { -#ifdef DEBUG - fprintf(stderr,"%08lx: field: %08lx\n",(Cell)ip,(Cell)PFA1(cfa)); -#endif - spTOS += *(Cell*)PFA1(cfa); - } -#ifdef NO_IP - goto *next_code; -#else - NEXT_P0; - NEXT; -#endif - - dodoes: - /* this assumes the following structure: - defining-word: - - ... - DOES> - (possible padding) - possibly handler: jmp dodoes - (possible branch delay slot(s)) - Forth code after DOES> - - defined word: - - cfa: address of or jump to handler OR - address of or jump to dodoes, address of DOES-code - pfa: - - */ -#ifdef NO_IP - *--rp = next_code; - IF_spTOS(spTOS = sp[0]); - sp--; - spTOS = (Cell)PFA(cfa); - goto **(Label *)DOES_CODE1(cfa); -#else - { - /* fprintf(stderr, "Got CFA %08lx at doescode %08lx/%08lx: does: %08lx\n",cfa,(Cell)ip,(Cell)PFA(cfa),(Cell)DOES_CODE1(cfa));*/ -#ifdef DEBUG - fprintf(stderr,"%08lx/%08lx: does: %08lx\n",(Cell)ip,(Cell)PFA(cfa),(Cell)DOES_CODE1(cfa)); - fflush(stderr); -#endif - *--rp = (Cell)ip; - /* PFA1 might collide with DOES_CODE1 here, so we use PFA */ -#ifdef USE_TOS - *sp-- = spTOS; - spTOS = (Cell)PFA(cfa); -#else - *--sp = (Cell)PFA(cfa); -#endif - SET_IP(DOES_CODE1(cfa)); - SUPER_END; - /* fprintf(stderr,"TOS = %08lx, IP=%08lx\n", spTOS, IP);*/ - } - NEXT; -#endif #include "prim.i" after_last: return (Label *)0;