--- gforth/engine/engine.c 2007/07/07 21:46:05 1.103 +++ gforth/engine/engine.c 2012/07/23 13:27:47 1.120 @@ -1,12 +1,12 @@ /* Gforth virtual machine (aka inner interpreter) - Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2010,2011 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) @@ -45,7 +44,9 @@ #include #include #include +#ifdef HAVE_WCHAR_H #include +#endif #include #ifdef HAVE_FNMATCH_H #include @@ -71,10 +72,6 @@ #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,7 +89,13 @@ #ifdef MEMCMP_AS_SUBROUTINE extern int gforth_memcmp(const char * s1, const char * s2, size_t n); +extern Char *gforth_memmove(Char * dest, const Char* src, Cell n); +extern Char *gforth_memset(Char * s, Cell c, UCell n); +extern Char *gforth_memcpy(Char * dest, const Char* src, Cell n); #define memcmp(s1,s2,n) gforth_memcmp(s1,s2,n) +#define memmove(a,b,c) gforth_memmove(a,b,c) +#define memset(a,b,c) gforth_memset(a,b,c) +#define memcpy(a,b,c) gforth_memcpy(a,b,c) #endif #define NEWLINE '\n' @@ -205,6 +208,9 @@ extern int gforth_memcmp(const char * s1 #ifndef FTOSREG #define FTOSREG #endif +#ifndef OPREG +#define OPREG +#endif #ifndef CPU_DEP1 # define CPU_DEP1 0 @@ -233,9 +239,10 @@ extern int gforth_memcmp(const char * s1 #define asmcomment(string) asm("") #endif +#define DEPTHOFF 4 #ifdef GFORTH_DEBUGGING #if DEBUG -#define NAME(string) { saved_ip=ip; asmcomment(string); fprintf(stderr,"%08lx depth=%3ld tos=%016lx: "string"\n",(Cell)ip,sp0+3-sp,sp[0]);} +#define NAME(string) { saved_ip=ip; asmcomment(string); fprintf(stderr,"%08lx depth=%3ld tos=%016lx: "string"\n",(Cell)ip,sp0+DEPTHOFF-sp,sp[0]);} #else /* !DEBUG */ #define NAME(string) { saved_ip=ip; asm(""); } /* the asm here is to avoid reordering of following stuff above the @@ -245,7 +252,7 @@ extern int gforth_memcmp(const char * s1 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); } +# define NAME(string) {Cell __depth=sp0+DEPTHOFF-sp; int i; fprintf(stderr,"%08lx depth=%3ld: "string,(Cell)ip,sp0+DEPTHOFF-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 @@ -265,11 +272,11 @@ extern int gforth_memcmp(const char * s1 #endif #ifdef STANDALONE -jmp_buf throw_jmp_buf; +jmp_buf * throw_jmp_handler; void throw(int code) { - longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */ + longjmp(*throw_jmp_handler,code); /* !! or use siglongjmp ? */ } #endif @@ -313,22 +320,29 @@ void throw(int code) /* the asm(""); is there to get a stop compiled on Itanium */ #define LABEL2(name) K_##name: asm(""); -Label *gforth_engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0) +Label *gforth_engine(Xt *ip0 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 - register Cell *sp SPREG = sp0; - register Float *fp FPREG = fp0; - register Address lp LPREG = lp0; + register Cell *sp SPREG = gforth_SP; + register Float *fp FPREG = gforth_FP; + register Address lp LPREG = gforth_LP; register Xt cfa CFAREG; register Label real_ca CAREG; +#ifdef HAS_OBJECTS + register Char * op OPREG = NULL; +#endif #ifdef MORE_VARS MORE_VARS #endif @@ -341,21 +355,18 @@ Label *gforth_engine(Xt *ip0, Cell *sp0, 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; +#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 speREG; - register Cell MAYBE_UNUSED spg speREG; - register Cell MAYBE_UNUSED sph 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[]= { @@ -391,7 +402,7 @@ Label *gforth_engine(Xt *ip0, Cell *sp0, CPU_DEP2 #endif - rp = rp0; + rp = gforth_RP; #ifdef DEBUG fprintf(stderr,"ip=%x, sp=%x, rp=%x, fp=%x, lp=%x, up=%x\n", (unsigned)ip0,(unsigned)sp,(unsigned)rp, @@ -408,7 +419,7 @@ Label *gforth_engine(Xt *ip0, Cell *sp0, 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) { @@ -425,7 +436,7 @@ Label *gforth_engine(Xt *ip0, Cell *sp0, #endif } -#if !(defined(GFORTH_DEBUGGING) || defined(INDIRECT_THREADED) || defined(DOUBLY_INDIRECT) || defined(VM_PROFILING)) +#ifdef USE_TOS sp += STACK_CACHE_DEFAULT-1; /* some of those registers are dead, but its simpler to initialize them all */ spTOS = sp[0]; spb = sp[-1];