--- gforth/engine/engine.c 2002/12/19 20:14:57 1.48 +++ gforth/engine/engine.c 2003/08/15 14:07:04 1.64 @@ -1,6 +1,6 @@ /* Gforth virtual machine (aka inner interpreter) - Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. This file is part of Gforth. @@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ -undefine(`symbols') - #include "config.h" #include "forth.h" #include @@ -61,37 +59,24 @@ undefine(`symbols') #include #endif +#ifdef HAS_FFCALL +#include +#include +#endif + #ifndef SEEK_SET /* should be defined in stdio.h, but some systems don't have it */ #define SEEK_SET 0 #endif -#define IOR(flag) ((flag)? -512-errno : 0) +#ifndef HAVE_FSEEKO +#define fseeko fseek +#endif -struct F83Name { - struct F83Name *next; /* the link field for old hands */ - char countetc; - char name[0]; -}; - -#define F83NAME_COUNT(np) ((np)->countetc & 0x1f) - -struct Longname { - struct Longname *next; /* the link field for old hands */ - Cell countetc; - char name[0]; -}; - -#define LONGNAME_COUNT(np) ((np)->countetc & (((~((UCell)0))<<3)>>3)) - -Cell *SP; -Float *FP; -Address UP=NULL; - -#if 0 -/* not used currently */ -int emitcounter; +#ifndef HAVE_FTELLO +#define ftello ftell #endif + #define NULLC '\0' #ifdef MEMCMP_AS_SUBROUTINE @@ -101,23 +86,6 @@ extern int gforth_memcmp(const char * s1 #define NEWLINE '\n' -#ifdef HAS_FILE -static char* fileattr[6]={"rb","rb","r+b","r+b","wb","wb"}; -static char* pfileattr[6]={"r","r","r+","r+","w","w"}; - -#ifndef O_BINARY -#define O_BINARY 0 -#endif -#ifndef O_TEXT -#define O_TEXT 0 -#endif - -static int ufileattr[6]= { - O_RDONLY|O_BINARY, O_RDONLY|O_BINARY, - O_RDWR |O_BINARY, O_RDWR |O_BINARY, - O_WRONLY|O_BINARY, O_WRONLY|O_BINARY }; -#endif - /* conversion on fetch */ #define vm_Cell2f(_cell,_x) ((_x)=(Bool)(_cell)) @@ -193,7 +161,7 @@ static int ufileattr[6]= { # define CPU_DEP1 0 #endif -/* instructions containing these must be the last instruction of a +/* instructions containing SUPER_END must be the last instruction of a super-instruction (e.g., branches, EXECUTE, and other instructions ending the basic block). Instructions containing SET_IP get this automatically, so you usually don't have to write it. If you have @@ -207,18 +175,6 @@ static int ufileattr[6]= { #endif #define SUPER_CONTINUE -#ifdef GFORTH_DEBUGGING -/* define some VM registers as global variables, so they survive exceptions; - global register variables are not up to the task (according to the - GNU C manual) */ -Xt *saved_ip; -Cell *rp; -#endif - -#ifdef NO_IP -static Label next_code; -#endif - #ifdef DEBUG #define CFA_TO_NAME(__cfa) \ Cell len, i; \ @@ -233,8 +189,40 @@ static Label next_code; } #endif -define(enginerest, -`(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0) +#ifdef HAS_FFCALL +#define SAVE_REGS IF_spTOS(sp[0]=spTOS); IF_fpTOS(fp[0]=fpTOS); SP=sp; FP=fp; RP=rp; LP=lp; +#define REST_REGS sp=SP; fp=FP; rp=RP; lp=LP; IF_spTOS(spTOS=sp[0]); IF_fpTOS(fpTOS=fp[0]); +#endif + +#if !defined(ENGINE) +/* normal engine */ +#define VARIANT(v) (v) +#define JUMP(target) goto I_noop +#define LABEL(name) J_##name: asm(""); I_##name: + +#elif ENGINE==2 +/* variant with padding between VM instructions for finding out + cross-inst jumps (for dynamic code) */ +#define engine engine2 +#define VARIANT(v) (v) +#define JUMP(target) goto I_noop +#define LABEL(name) J_##name: SKIP16; I_##name: +#define IN_ENGINE2 + +#elif ENGINE==3 +/* variant with different immediate arguments for finding out + immediate arguments (for native code) */ +#define engine engine3 +#define VARIANT(v) ((v)^0xffffffff) +#define JUMP(target) goto K_lit +#define LABEL(name) J_##name: asm(""); I_##name: +#else +#error illegal ENGINE value +#endif /* ENGINE */ + +#define LABEL2(name) K_##name: + +Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0) /* executes code at ip, if ip!=NULL returns array of machine code labels (for use in a loader), if ip==NULL */ @@ -252,6 +240,15 @@ define(enginerest, #ifdef MORE_VARS MORE_VARS #endif +#ifdef HAS_FFCALL + av_alist alist; + extern va_alist clist; + float frv; + int irv; + double drv; + long long llrv; + void * prv; +#endif register Address up UPREG = UP; IF_spTOS(register Cell spTOS TOSREG;) IF_fpTOS(register Float fpTOS FTOSREG;) @@ -273,19 +270,18 @@ define(enginerest, /* 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 +#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 +#define INST_ADDR(name) ((Label)&&K_##name) #include "prim_lab.i" #undef INST_ADDR -#ifdef IN_ENGINE2 -#define INST_ADDR(name) (Label)&&J_##name +#define INST_ADDR(name) ((Label)&&J_##name) #include "prim_lab.i" #undef INST_ADDR -#endif + (Label)&&after_last }; #ifdef CPU_DEP2 CPU_DEP2 @@ -312,7 +308,7 @@ define(enginerest, xts[i] = symbols[i] = (Label)routines[i]; for (; routines[i]!=0; i++) { if (i>=MAX_SYMBOLS) { - fprintf(stderr,"gforth-ditc: more than %d primitives\n",MAX_SYMBOLS); + fprintf(stderr,"gforth-ditc: more than %ld primitives\n",(long)MAX_SYMBOLS); exit(1); } xts[i] = symbols[i] = &routines[i]; @@ -496,38 +492,7 @@ define(enginerest, NEXT; #endif -#ifndef IN_ENGINE2 -#define LABEL(name) I_##name: -#else -#define LABEL(name) J_##name: asm(".skip 16"); I_##name: -#endif -#define LABEL2(name) K_##name: #include "prim.i" -#undef LABEL after_last: return (Label *)0; /*needed only to get the length of the last primitive */ -}' -) - -#define VARIANT(v) (v) -#define JUMP(target) goto I_noop - -Label *engine enginerest - -#ifndef NO_DYNAMIC - -#ifdef NO_IP -#undef VARIANT -#define VARIANT(v) ((v)^0xffffffff) -#undef JUMP -#define JUMP(target) goto K_lit -Label *engine3 enginerest -#endif - -#undef VARIANT -#define VARIANT(v) (v) -#undef JUMP -#define JUMP(target) goto I_noop -#define IN_ENGINE2 -Label *engine2 enginerest -#endif +}