--- gforth/engine/engine.c 1999/02/06 22:28:24 1.11 +++ gforth/engine/engine.c 2003/11/02 18:18:35 1.71 @@ -1,6 +1,6 @@ /* Gforth virtual machine (aka inner interpreter) - Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. This file is part of Gforth. @@ -16,10 +16,14 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + 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 #include #include @@ -27,7 +31,6 @@ #include #include #include -#include "forth.h" #include "io.h" #include "threaded.h" #ifndef STANDALONE @@ -38,6 +41,13 @@ #include #include #include +#include +#include +#ifdef HAVE_FNMATCH_H +#include +#else +#include "fnmatch.h" +#endif #else #include "systypes.h" #endif @@ -52,130 +62,73 @@ #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]; -}; - -/* are macros for setting necessary? */ -#define F83NAME_COUNT(np) ((np)->countetc & 0x1f) -#define F83NAME_SMUDGE(np) (((np)->countetc & 0x40) != 0) -#define F83NAME_IMMEDIATE(np) (((np)->countetc & 0x20) != 0) - -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 HAS_FILE -char *cstr(Char *from, UCell size, int clear) -/* return a C-string corresponding to the Forth string ( FROM SIZE ). - the C-string lives until the next call of cstr with CLEAR being true */ -{ - static struct cstr_buffer { - char *buffer; - size_t size; - } *buffers=NULL; - static int nbuffers=0; - static int used=0; - struct cstr_buffer *b; - - if (buffers==NULL) - buffers=malloc(0); - if (clear) - used=0; - if (used>=nbuffers) { - buffers=realloc(buffers,sizeof(struct cstr_buffer)*(used+1)); - buffers[used]=(struct cstr_buffer){malloc(0),0}; - nbuffers=used+1; - } - b=&buffers[used]; - if (size+1 > b->size) { - b->buffer = realloc(b->buffer,size+1); - b->size = size+1; - } - memcpy(b->buffer,from,size); - b->buffer[size]='\0'; - used++; - return b->buffer; -} +#define NULLC '\0' -char *tilde_cstr(Char *from, UCell size, int clear) -/* like cstr(), but perform tilde expansion on the string */ -{ - char *s1,*s2; - int s1_len, s2_len; - struct passwd *getpwnam (), *user_entry; - - if (size<1 || from[0]!='~') - return cstr(from, size, clear); - if (size<2 || from[1]=='/') { - s1 = (char *)getenv ("HOME"); - if(s1 == NULL) - s1 = ""; - s2 = from+1; - s2_len = size-1; - } else { - UCell i; - for (i=1; ipw_dir; - s2 = from+i; - s2_len = size-i; - } - s1_len = strlen(s1); - if (s1_len>1 && s1[s1_len-1]=='/') - s1_len--; - { - char path[s1_len+s2_len]; - memcpy(path,s1,s1_len); - memcpy(path+s1_len,s2,s2_len); - return cstr(path,s1_len+s2_len,clear); - } -} +#ifdef MEMCMP_AS_SUBROUTINE +extern int gforth_memcmp(const char * s1, const char * s2, size_t n); +#define memcmp(s1,s2,n) gforth_memcmp(s1,s2,n) #endif #define NEWLINE '\n' -#ifndef HAVE_RINT -#define rint(x) floor((x)+0.5) -#endif +/* conversion on fetch */ -#ifdef HAS_FILE -static char* fileattr[6]={"r","rb","r+","r+b","w","wb"}; +#define vm_Cell2f(_cell,_x) ((_x)=(Bool)(_cell)) +#define vm_Cell2c(_cell,_x) ((_x)=(Char)(_cell)) +#define vm_Cell2n(_cell,_x) ((_x)=(Cell)(_cell)) +#define vm_Cell2w(_cell,_x) ((_x)=(Cell)(_cell)) +#define vm_Cell2u(_cell,_x) ((_x)=(UCell)(_cell)) +#define vm_Cell2a_(_cell,_x) ((_x)=(Cell *)(_cell)) +#define vm_Cell2c_(_cell,_x) ((_x)=(Char *)(_cell)) +#define vm_Cell2f_(_cell,_x) ((_x)=(Float *)(_cell)) +#define vm_Cell2df_(_cell,_x) ((_x)=(DFloat *)(_cell)) +#define vm_Cell2sf_(_cell,_x) ((_x)=(SFloat *)(_cell)) +#define vm_Cell2xt(_cell,_x) ((_x)=(Xt)(_cell)) +#define vm_Cell2f83name(_cell,_x) ((_x)=(struct F83Name *)(_cell)) +#define vm_Cell2longname(_cell,_x) ((_x)=(struct Longname *)(_cell)) +#define vm_Float2r(_float,_x) (_x=_float) + +/* conversion on store */ + +#define vm_f2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_c2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_n2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_w2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_u2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_a_2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_c_2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_f_2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_df_2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_sf_2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_xt2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_f83name2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_longname2Cell(_x,_cell) ((_cell)=(Cell)(_x)) +#define vm_r2Float(_x,_float) (_float=_x) -#ifndef O_BINARY -#define O_BINARY 0 -#endif -#ifndef O_TEXT -#define O_TEXT 0 -#endif +#define vm_Cell2Cell(_x,_y) (_y=_x) -static int ufileattr[6]= { - O_RDONLY|O_TEXT, O_RDONLY|O_BINARY, - O_RDWR |O_TEXT, O_RDWR |O_BINARY, - O_WRONLY|O_TEXT, O_WRONLY|O_BINARY }; +#ifdef NO_IP +#define IMM_ARG(access,value) (VARIANT(value)) +#else +#define IMM_ARG(access,value) (access) #endif /* if machine.h has not defined explicit registers, define them as implicit */ @@ -203,6 +156,12 @@ static int ufileattr[6]= { #ifndef TOSREG #define TOSREG #endif +#ifndef spaREG +#define spaREG +#endif +#ifndef spbREG +#define spbREG +#endif #ifndef FTOSREG #define FTOSREG #endif @@ -211,236 +170,187 @@ static int ufileattr[6]= { # define CPU_DEP1 0 #endif -/* declare and compute cfa for certain threading variants */ -/* warning: this is nonsyntactical; it will not work in place of a statement */ -#ifdef CFA_NEXT -#define DOCFA +/* 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 + to write it, write it after IP points to the next instruction. + Used for profiling. Don't write it in a word containing SET_IP, or + the following block will be counted twice. */ +#ifdef VM_PROFILING +#define SUPER_END vm_count_block(IP) #else -#define DOCFA Xt cfa; GETCFA(cfa) +#define SUPER_END #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 *ip; -Cell *rp; +#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; \ + char * name = __cfa; \ + for(i=0; i<32; i+=sizeof(Cell)) { \ + len = ((Cell*)name)[-1]; \ + if(len < 0) { \ + len &= 0x1F; \ + if((len+sizeof(Cell)) > i) break; \ + } len = 0; \ + name -= sizeof(Cell); \ + } +#endif + +#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 */ + +/* 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 returns array of machine code labels (for use in a loader), if ip==NULL */ { #ifndef GFORTH_DEBUGGING - register Xt *ip IPREG; register Cell *rp RPREG; #endif +#ifndef NO_IP + register Xt *ip IPREG = ip0; +#endif register Cell *sp SPREG = sp0; register Float *fp FPREG = fp0; register Address lp LPREG = lp0; -#ifdef CFA_NEXT register Xt cfa CFAREG; -#endif #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_TOS(register Cell TOS TOSREG;) - IF_FTOS(register Float FTOS FTOSREG;) + 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; static void *routines[]= { +#define MAX_SYMBOLS (sizeof(routines)/sizeof(routines[0])) #else /* !defined(DOUBLY_INDIRECT) */ 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's there because its index indicates a does-handler */ - CPU_DEP1, -#include "prim_lab.i" - (Label)0 +#define INST_ADDR(name) ((Label)&&I_##name) +#include PRIM_LAB_I +#undef INST_ADDR + (Label)0, +#define INST_ADDR(name) ((Label)&&K_##name) +#include PRIM_LAB_I +#undef INST_ADDR +#define INST_ADDR(name) ((Label)&&J_##name) +#include PRIM_LAB_I +#undef INST_ADDR + (Label)&&after_last }; #ifdef CPU_DEP2 CPU_DEP2 #endif - ip = ip0; rp = rp0; #ifdef DEBUG fprintf(stderr,"ip=%x, sp=%x, rp=%x, fp=%x, lp=%x, up=%x\n", - (unsigned)ip,(unsigned)sp,(unsigned)rp, + (unsigned)ip0,(unsigned)sp,(unsigned)rp, (unsigned)fp,(unsigned)lp,(unsigned)up); #endif - if (ip == NULL) { + if (ip0 == NULL) { #if defined(DOUBLY_INDIRECT) -#define MAX_SYMBOLS (sizeof(routines)/sizeof(routines[0])) -#define CODE_OFFSET (22*sizeof(Cell)) +#define CODE_OFFSET (26*sizeof(Cell)) +#define XT_OFFSET (22*sizeof(Cell)) int i; Cell code_offset = offset_image? CODE_OFFSET : 0; + Cell xt_offset = offset_image? XT_OFFSET : 0; symbols = (Label *)(malloc(MAX_SYMBOLS*sizeof(Cell)+CODE_OFFSET)+code_offset); + xts = (Label *)(malloc(MAX_SYMBOLS*sizeof(Cell)+XT_OFFSET)+xt_offset); for (i=0; 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]; } - symbols[i] = &routines[i]; - } #endif /* defined(DOUBLY_INDIRECT) */ - return symbols; -} + return symbols; + } - IF_TOS(TOS = sp[0]); - IF_FTOS(FTOS = fp[0]); + IF_spTOS(spTOS = sp[0]); + IF_fpTOS(fpTOS = fp[0]); /* prep_terminal(); */ +#ifdef NO_IP + goto *(*(Label *)ip0); +#else SET_IP(ip); + SUPER_END; /* count the first block, too */ NEXT; - +#endif #ifdef CPU_DEP3 CPU_DEP3 #endif - - docol: - { - DOCFA; -#ifdef DEBUG - fprintf(stderr,"%08lx: col: %08lx\n",(Cell)ip,(Cell)PFA1(cfa)); -#endif -#ifdef CISC_NEXT - /* this is the simple version */ - *--rp = (Cell)ip; - SET_IP((Xt *)PFA1(cfa)); - NEXT; -#else - /* this one is important, so we help the compiler optimizing */ - { - DEF_CA - rp[-1] = (Cell)ip; - SET_IP((Xt *)PFA1(cfa)); - NEXT_P1; - rp--; - NEXT_P2; - } -#endif - } - - docon: - { - DOCFA; -#ifdef DEBUG - fprintf(stderr,"%08lx: con: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa)); -#endif -#ifdef USE_TOS - *sp-- = TOS; - TOS = *(Cell *)PFA1(cfa); -#else - *--sp = *(Cell *)PFA1(cfa); -#endif - } - NEXT_P0; - NEXT; - - dovar: - { - DOCFA; -#ifdef DEBUG - fprintf(stderr,"%08lx: var: %08lx\n",(Cell)ip,(Cell)PFA1(cfa)); -#endif -#ifdef USE_TOS - *sp-- = TOS; - TOS = (Cell)PFA1(cfa); -#else - *--sp = (Cell)PFA1(cfa); -#endif - } - NEXT_P0; - NEXT; - - douser: - { - DOCFA; -#ifdef DEBUG - fprintf(stderr,"%08lx: user: %08lx\n",(Cell)ip,(Cell)PFA1(cfa)); -#endif -#ifdef USE_TOS - *sp-- = TOS; - TOS = (Cell)(up+*(Cell*)PFA1(cfa)); -#else - *--sp = (Cell)(up+*(Cell*)PFA1(cfa)); -#endif - } - NEXT_P0; - NEXT; - - dodefer: - { - DOCFA; -#ifdef DEBUG - fprintf(stderr,"%08lx: defer: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa)); -#endif - EXEC(*(Xt *)PFA1(cfa)); - } - - dofield: - { - DOCFA; -#ifdef DEBUG - fprintf(stderr,"%08lx: field: %08lx\n",(Cell)ip,(Cell)PFA1(cfa)); -#endif - TOS += *(Cell*)PFA1(cfa); - } - NEXT_P0; - NEXT; - - 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: - - */ - { - DOCFA; - - /* 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-- = TOS; - TOS = (Cell)PFA(cfa); -#else - *--sp = (Cell)PFA(cfa); -#endif - SET_IP(DOES_CODE1(cfa)); - /* fprintf(stderr,"TOS = %08lx, IP=%08lx\n", TOS, IP);*/ - } - NEXT; -#include "prim.i" +#include PRIM_I + after_last: return (Label *)0; + /*needed only to get the length of the last primitive */ }