--- gforth/engine/engine.c 2002/12/28 17:18:27 1.54 +++ gforth/engine/engine.c 2007/03/18 21:46:17 1.99 @@ -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,2004,2005,2006 Free Software Foundation, Inc. This file is part of Gforth. @@ -19,6 +19,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ +#if defined(GFORTH_DEBUGGING) || defined(INDIRECT_THREADED) || defined(DOUBLY_INDIRECT) || defined(VM_PROFILING) +#define USE_NO_TOS +#else +#define USE_TOS +#endif +#define USE_NO_FTOS + #include "config.h" #include "forth.h" #include @@ -39,6 +46,7 @@ #include #include #include +#include #include #ifdef HAVE_FNMATCH_H #include @@ -46,7 +54,7 @@ #include "fnmatch.h" #endif #else -#include "systypes.h" +/* #include */ #endif #if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) /* what else? */ @@ -59,6 +67,15 @@ #include #endif +#ifdef HAS_FFCALL +#include +#include +#endif + +#ifdef HAS_LIBFFI +#include +#endif + #ifndef SEEK_SET /* should be defined in stdio.h, but some systems don't have it */ #define SEEK_SET 0 @@ -72,24 +89,6 @@ #define ftello ftell #endif -#define IOR(flag) ((flag)? -512-errno : 0) - -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)) - #define NULLC '\0' #ifdef MEMCMP_AS_SUBROUTINE @@ -99,6 +98,20 @@ extern int gforth_memcmp(const char * s1 #define NEWLINE '\n' +/* These two flags control whether divisions are checked by software. + The CHECK_DIVISION_SW is for those cases where the event is a + division by zero or overflow on the C level, and might be reported + by hardware; we might check forr that in autoconf and set the + switch appropriately, but currently don't. The CHECK_DIVISION flag + is for the other cases. */ +#ifdef GFORTH_DEBUGGING +#define CHECK_DIVISION_SW 1 +#define CHECK_DIVISION 1 +#else +#define CHECK_DIVISION_SW 0 +#define CHECK_DIVISION 0 +#endif + /* conversion on fetch */ #define vm_Cell2f(_cell,_x) ((_x)=(Bool)(_cell)) @@ -157,6 +170,9 @@ extern int gforth_memcmp(const char * s1 #ifndef LPREG #define LPREG #endif +#ifndef CAREG +#define CAREG +#endif #ifndef CFAREG #define CFAREG #endif @@ -166,6 +182,27 @@ extern int gforth_memcmp(const char * s1 #ifndef TOSREG #define TOSREG #endif +#ifndef spbREG +#define spbREG +#endif +#ifndef spcREG +#define spcREG +#endif +#ifndef spdREG +#define spdREG +#endif +#ifndef speREG +#define speREG +#endif +#ifndef spfREG +#define spfREG +#endif +#ifndef spgREG +#define spgREG +#endif +#ifndef sphREG +#define sphREG +#endif #ifndef FTOSREG #define FTOSREG #endif @@ -174,7 +211,7 @@ extern int gforth_memcmp(const char * s1 # 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 @@ -188,6 +225,32 @@ extern int gforth_memcmp(const char * s1 #endif #define SUPER_CONTINUE +#ifdef ASMCOMMENT +/* an individualized asm statement so that (hopefully) gcc's optimizer + does not do cross-jumping */ +#define asmcomment(string) asm(ASMCOMMENT string) +#else +/* we don't know how to do an asm comment, so we just do an empty asm */ +#define asmcomment(string) asm("") +#endif + +#ifdef GFORTH_DEBUGGING +#if DEBUG +#define NAME(string) { saved_ip=ip; asmcomment(string); 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) {Cell __depth=sp0+3-sp; int i; fprintf(stderr,"%08lx depth=%3ld: "string,(Cell)ip,sp0+3-sp); for (i=__depth-1; i>0; i--) fprintf(stderr, " $%lx",sp[i]); fprintf(stderr, " $%lx\n",spTOS); } +#else +# define NAME(string) asmcomment(string); +#endif + #ifdef DEBUG #define CFA_TO_NAME(__cfa) \ Cell len, i; \ @@ -202,36 +265,41 @@ extern int gforth_memcmp(const char * s1 } #endif +#if defined(HAS_FFCALL) || defined(HAS_LIBFFI) +#define SAVE_REGS IF_fpTOS(fp[0]=fpTOS); gforth_SP=sp; gforth_FP=fp; gforth_RP=rp; gforth_LP=lp; +#define REST_REGS sp=gforth_SP; fp=gforth_FP; rp=gforth_RP; lp=gforth_LP; 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: +#define LABEL(name) H_##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 gforth_engine gforth_engine2 #define VARIANT(v) (v) #define JUMP(target) goto I_noop -#define LABEL(name) J_##name: SKIP16; I_##name: -#define IN_ENGINE2 +#define LABEL(name) H_##name: SKIP16; I_##name: #elif ENGINE==3 /* variant with different immediate arguments for finding out immediate arguments (for native code) */ -#define engine engine3 +#define gforth_engine gforth_engine3 #define VARIANT(v) ((v)^0xffffffff) #define JUMP(target) goto K_lit -#define LABEL(name) J_##name: asm(""); I_##name: +#define LABEL(name) H_##name: asm(""); I_##name: #else #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(""); +#define LABEL3(name) J_##name: asm(""); -Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0) +Label *gforth_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 */ @@ -246,11 +314,33 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * register Float *fp FPREG = fp0; register Address lp LPREG = lp0; register Xt cfa CFAREG; + register Label real_ca CAREG; #ifdef MORE_VARS MORE_VARS #endif - register Address up UPREG = UP; - IF_spTOS(register Cell spTOS TOSREG;) +#ifdef HAS_FFCALL + av_alist alist; + extern va_alist gforth_clist; + float frv; + int irv; + double drv; + long long llrv; + void * prv; +#endif +#ifdef HAS_LIBFFI + extern void * gforth_ritem; + extern void ** gforth_clist; + extern void ffi_callback(ffi_cif * cif, void * resp, void ** args, Xt * ip); +#endif + register Address up UPREG = gforth_UP; + register Cell MAYBE_UNUSED spTOS TOSREG; + register Cell MAYBE_UNUSED spb spbREG; + register Cell MAYBE_UNUSED spc spcREG; + register Cell MAYBE_UNUSED spd spdREG; + register Cell MAYBE_UNUSED spe speREG; + register Cell MAYBE_UNUSED spf speREG; + register Cell MAYBE_UNUSED spg speREG; + register Cell MAYBE_UNUSED sph speREG; IF_fpTOS(register Float fpTOS FTOSREG;) #if defined(DOUBLY_INDIRECT) static Label *symbols; @@ -260,28 +350,29 @@ 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" +#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" +#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" +#define INST_ADDR(name) ((Label)&&J_##name) +#include PRIM_LAB_I +#undef INST_ADDR + (Label)&&after_last, + (Label)&&before_goto, + (Label)&&after_goto, +/* just mention the H_ labels, so the SKIP16s are not optimized away */ +#define INST_ADDR(name) ((Label)&&H_##name) +#include PRIM_LAB_I #undef INST_ADDR }; +#ifdef STANDALONE +#define INST_ADDR(name) ((Label)&&I_##name) +#include "image.i" +#undef INST_ADDR +#endif #ifdef CPU_DEP2 CPU_DEP2 #endif @@ -307,191 +398,51 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * 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]; } #endif /* defined(DOUBLY_INDIRECT) */ +#ifdef STANDALONE + return image; +#else return symbols; +#endif } - IF_spTOS(spTOS = sp[0]); +#if !(defined(GFORTH_DEBUGGING) || defined(INDIRECT_THREADED) || defined(DOUBLY_INDIRECT) || defined(VM_PROFILING)) + sp += STACK_CACHE_DEFAULT-1; + /* some of those registers are dead, but its simpler to initialize them all */ spTOS = sp[0]; + spb = sp[-1]; + spc = sp[-2]; + spd = sp[-3]; + spe = sp[-4]; + spf = sp[-5]; + spg = sp[-6]; + sph = sp[-7]; +#endif + IF_fpTOS(fpTOS = fp[0]); /* prep_terminal(); */ #ifdef NO_IP goto *(*(Label *)ip0); + before_goto: + goto *real_ca; + after_goto:; #else SET_IP(ip); SUPER_END; /* count the first block, too */ - NEXT; + FIRST_NEXT; #endif #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" +#include PRIM_I after_last: return (Label *)0; /*needed only to get the length of the last primitive */ + + return (Label *)0; }