--- gforth/engine/engine.c 2005/08/21 22:09:14 1.84 +++ gforth/engine/engine.c 2007/03/19 12:54:41 1.100 @@ -1,6 +1,6 @@ /* Gforth virtual machine (aka inner interpreter) - Copyright (C) 1995,1996,1997,1998,2000,2003,2004 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. @@ -46,6 +46,7 @@ #include #include #include +#include #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? */ @@ -97,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)) @@ -210,9 +225,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("# "string); 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: "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 @@ -224,7 +248,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) asm("# "string); +# define NAME(string) asmcomment(string); #endif #ifdef DEBUG @@ -241,9 +265,9 @@ extern int gforth_memcmp(const char * s1 } #endif -#ifdef HAS_FFCALL -#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]); +#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) @@ -251,32 +275,37 @@ extern int gforth_memcmp(const char * s1 #define VARIANT(v) (v) #define JUMP(target) goto I_noop #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) H_##name: SKIP16; I_##name: -#define IN_ENGINE2 +/* 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) H_##name: asm(""); I_##name: +#define LABEL3(name) J_##name: asm(""); #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 */ @@ -297,7 +326,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * #endif #ifdef HAS_FFCALL av_alist alist; - extern va_alist clist; + extern va_alist gforth_clist; float frv; int irv; double drv; @@ -305,11 +334,11 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * void * prv; #endif #ifdef HAS_LIBFFI - extern void * ritem; - extern void ** clist; + 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 = UP; + register Address up UPREG = gforth_UP; register Cell MAYBE_UNUSED spTOS TOSREG; register Cell MAYBE_UNUSED spb spbREG; register Cell MAYBE_UNUSED spc spcREG; @@ -345,6 +374,11 @@ Label *engine(Xt *ip0, Cell *sp0, Cell * #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 @@ -376,7 +410,11 @@ 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 !(defined(GFORTH_DEBUGGING) || defined(INDIRECT_THREADED) || defined(DOUBLY_INDIRECT) || defined(VM_PROFILING))