--- gforth/engine/engine.c 2003/11/03 20:13:36 1.72 +++ gforth/engine/engine.c 2010/12/31 18:09:02 1.113 @@ -1,12 +1,12 @@ /* 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,2006,2007,2008,2010 Free Software Foundation, Inc. This file is part of Gforth. Gforth is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 + as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ GNU General Public License for more details. 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + along with this program; if not, see http://www.gnu.org/licenses/. */ #if defined(GFORTH_DEBUGGING) || defined(INDIRECT_THREADED) || defined(DOUBLY_INDIRECT) || defined(VM_PROFILING) @@ -24,7 +23,6 @@ #else #define USE_TOS #endif -#define USE_NO_FTOS #include "config.h" #include "forth.h" @@ -46,6 +44,9 @@ #include #include #include +#ifdef HAVE_WCHAR_H +#include +#endif #include #ifdef HAVE_FNMATCH_H #include @@ -53,7 +54,7 @@ #include "fnmatch.h" #endif #else -#include "systypes.h" +/* #include */ #endif #if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) /* what else? */ @@ -93,6 +94,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)) @@ -151,6 +166,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 +178,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 @@ -188,9 +221,18 @@ 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; asm(""); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);} +#define NAME(string) { saved_ip=ip; asmcomment(string); fprintf(stderr,"%08lx depth=%3ld tos=%016lx: "string"\n",(Cell)ip,sp0+3-sp,sp[0]);} #else /* !DEBUG */ #define NAME(string) { saved_ip=ip; asm(""); } /* the asm here is to avoid reordering of following stuff above the @@ -202,7 +244,7 @@ extern int gforth_memcmp(const char * s1 #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) +# define NAME(string) asmcomment(string); #endif #ifdef DEBUG @@ -219,33 +261,48 @@ 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]); +#ifdef STANDALONE +jmp_buf throw_jmp_buf; + +void throw(int code) +{ + longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */ +} +#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: +#define LABEL3(name) J_##name: asm(""); #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: +/* the SKIP16 after LABEL3 is there, because the ARM gcc may place + some constants after the final branch, and may refer to them from + the code before label3. Since we don't copy the constants, we have + to make sure that such code is recognized as non-relocatable. */ +#define LABEL3(name) J_##name: SKIP16; #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: +#define LABEL3(name) J_##name: asm(""); #else #error illegal ENGINE value #endif /* ENGINE */ @@ -253,14 +310,18 @@ extern int gforth_memcmp(const char * s1 /* 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) +Label *gforth_engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0 sr_proto) /* executes code at ip, if ip!=NULL returns array of machine code labels (for use in a loader), if ip==NULL */ { -#ifndef GFORTH_DEBUGGING +#if defined(GFORTH_DEBUGGING) +#if defined(GLOBALS_NONRELOC) + register saved_regs *saved_regs_p TOSREG = saved_regs_p0; +#endif /* defined(GLOBALS_NONRELOC) */ +#else /* !defined(GFORTH_DEBUGGING) */ register Cell *rp RPREG; -#endif +#endif /* !defined(GFORTH_DEBUGGING) */ #ifndef NO_IP register Xt *ip IPREG = ip0; #endif @@ -268,23 +329,31 @@ 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; + register Address up UPREG = gforth_UP; +#if !defined(GFORTH_DEBUGGING) + 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 spfREG; + register Cell MAYBE_UNUSED spg spgREG; + register Cell MAYBE_UNUSED sph sphREG; IF_fpTOS(register Float fpTOS FTOSREG;) +#endif /* !defined(GFORTH_DEBUGGING) */ #if defined(DOUBLY_INDIRECT) static Label *symbols; static void *routines[]= { @@ -303,8 +372,19 @@ 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 STANDALONE +#define INST_ADDR(name) ((Label)&&I_##name) +#include "image.i" +#undef INST_ADDR +#endif #ifdef CPU_DEP2 CPU_DEP2 #endif @@ -326,7 +406,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * 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) { @@ -336,18 +416,36 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * 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 @@ -357,4 +455,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; }