--- gforth/engine/engine.c 2003/10/16 18:48:03 1.70 +++ gforth/engine/engine.c 2005/12/11 20:08:09 1.85 @@ -1,6 +1,6 @@ /* Gforth virtual machine (aka inner interpreter) - Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc. This file is part of Gforth. @@ -19,7 +19,11 @@ 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" @@ -67,6 +71,10 @@ #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 @@ -147,6 +155,9 @@ extern int gforth_memcmp(const char * s1 #ifndef LPREG #define LPREG #endif +#ifndef CAREG +#define CAREG +#endif #ifndef CFAREG #define CFAREG #endif @@ -156,12 +167,27 @@ extern int gforth_memcmp(const char * s1 #ifndef TOSREG #define TOSREG #endif -#ifndef spaREG -#define spaREG -#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 @@ -186,7 +212,7 @@ extern int gforth_memcmp(const char * s1 #ifdef GFORTH_DEBUGGING #if DEBUG -#define NAME(string) { saved_ip=ip; asm(""); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);} +#define NAME(string) { saved_ip=ip; asm("# "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 @@ -196,9 +222,9 @@ extern int gforth_memcmp(const char * s1 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); +# 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) +# define NAME(string) asm("# "string); #endif #ifdef DEBUG @@ -215,16 +241,16 @@ extern int gforth_memcmp(const char * s1 } #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]); +#if defined(HAS_FFCALL) || defined(HAS_LIBFFI) +#define SAVE_REGS 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_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 @@ -232,7 +258,7 @@ extern int gforth_memcmp(const char * s1 #define engine engine2 #define VARIANT(v) (v) #define JUMP(target) goto I_noop -#define LABEL(name) J_##name: SKIP16; I_##name: +#define LABEL(name) H_##name: SKIP16; I_##name: #define IN_ENGINE2 #elif ENGINE==3 @@ -241,13 +267,14 @@ extern int gforth_memcmp(const char * s1 #define engine 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 */ /* 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) /* executes code at ip, if ip!=NULL @@ -264,6 +291,7 @@ 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 @@ -276,10 +304,20 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * long long llrv; void * prv; #endif +#ifdef HAS_LIBFFI + extern void * ritem; + extern void ** clist; + extern void ffi_callback(ffi_cif * cif, void * resp, void ** args, Xt * ip); +#endif register Address up UPREG = UP; - register Cell MAYBE_UNUSED spa TOSREG; - register Cell MAYBE_UNUSED spb spaREG; - register Cell MAYBE_UNUSED spc spbREG; + 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; @@ -290,16 +328,22 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * #define MAX_SYMBOLS (sizeof(symbols)/sizeof(symbols[0])) #endif /* !defined(DOUBLY_INDIRECT) */ #define INST_ADDR(name) ((Label)&&I_##name) -#include "prim_lab.i" +#include PRIM_LAB_I #undef INST_ADDR (Label)0, #define INST_ADDR(name) ((Label)&&K_##name) -#include "prim_lab.i" +#include PRIM_LAB_I #undef INST_ADDR #define INST_ADDR(name) ((Label)&&J_##name) -#include "prim_lab.i" +#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 - (Label)&&after_last }; #ifdef CPU_DEP2 CPU_DEP2 @@ -335,22 +379,38 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * return symbols; } - 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 -#include "prim.i" +#include PRIM_I after_last: return (Label *)0; /*needed only to get the length of the last primitive */ + + return (Label *)0; }