--- gforth/engine/engine.c 2004/01/05 22:25:03 1.73 +++ gforth/engine/engine.c 2006/10/22 20:45:34 1.93 @@ -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,2005 Free Software Foundation, Inc. This file is part of Gforth. @@ -46,6 +46,7 @@ #include #include #include +#include #include #ifdef HAVE_FNMATCH_H #include @@ -71,6 +72,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 @@ -92,6 +97,13 @@ extern int gforth_memcmp(const char * s1 #endif #define NEWLINE '\n' +/* set CHECK_DIVISION to 0 if the hardware checks division by zero and + division overflow. Note that not all checks are controlled by + CHECK_DIVISION, in particular not overflow checks in mixed-size + words implemented by C's double-by-double division, because that + division does not signal such overflows. !! make an autoconf test + that sets CHECK_DIVISION */ +#define CHECK_DIVISION 1 /* conversion on fetch */ @@ -151,6 +163,9 @@ extern int gforth_memcmp(const char * s1 #ifndef LPREG #define LPREG #endif +#ifndef CAREG +#define CAREG +#endif #ifndef CFAREG #define CFAREG #endif @@ -160,12 +175,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 @@ -219,41 +249,41 @@ 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); 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 */ /* 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 */ @@ -268,22 +298,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 #ifdef HAS_FFCALL av_alist alist; - extern va_alist clist; + extern va_alist gforth_clist; float frv; int irv; double drv; long long llrv; void * prv; #endif - register Address up UPREG = UP; - IF_spTOS(register Cell MAYBE_UNUSED spTOS TOSREG;) - register Cell MAYBE_UNUSED spb spaREG; - register Cell MAYBE_UNUSED spc spbREG; +#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; @@ -303,7 +344,13 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * #define INST_ADDR(name) ((Label)&&J_##name) #include PRIM_LAB_I #undef INST_ADDR - (Label)&&after_last + (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 CPU_DEP2 CPU_DEP2 @@ -339,15 +386,29 @@ 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 @@ -357,4 +418,6 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * #include PRIM_I after_last: return (Label *)0; /*needed only to get the length of the last primitive */ + + return (Label *)0; }