Diff for /gforth/engine/engine.c between versions 1.69 and 1.89

version 1.69, 2003/10/09 20:25:59 version 1.89, 2006/03/11 22:22:40
Line 1 Line 1
 /* Gforth virtual machine (aka inner interpreter)  /* 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.    This file is part of Gforth.
   
Line 19 Line 19
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.    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  #define USE_NO_TOS
   #else
   #define USE_TOS
   #endif
 #define USE_NO_FTOS  #define USE_NO_FTOS
   
 #include "config.h"  #include "config.h"
Line 42 Line 46
 #include <unistd.h>  #include <unistd.h>
 #include <pwd.h>  #include <pwd.h>
 #include <dirent.h>  #include <dirent.h>
   #include <wchar.h>
 #include <sys/resource.h>  #include <sys/resource.h>
 #ifdef HAVE_FNMATCH_H  #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>  #include <fnmatch.h>
Line 67 Line 72
 #include <callback.h>  #include <callback.h>
 #endif  #endif
   
   #ifdef HAS_LIBFFI
   #include <ffi.h>
   #endif
   
 #ifndef SEEK_SET  #ifndef SEEK_SET
 /* should be defined in stdio.h, but some systems don't have it */  /* should be defined in stdio.h, but some systems don't have it */
 #define SEEK_SET 0  #define SEEK_SET 0
Line 147  extern int gforth_memcmp(const char * s1 Line 156  extern int gforth_memcmp(const char * s1
 #ifndef LPREG  #ifndef LPREG
 #define LPREG  #define LPREG
 #endif  #endif
   #ifndef CAREG
   #define CAREG
   #endif
 #ifndef CFAREG  #ifndef CFAREG
 #define CFAREG  #define CFAREG
 #endif  #endif
Line 156  extern int gforth_memcmp(const char * s1 Line 168  extern int gforth_memcmp(const char * s1
 #ifndef TOSREG  #ifndef TOSREG
 #define TOSREG  #define TOSREG
 #endif  #endif
 #ifndef spaREG  
 #define spaREG  
 #endif  
 #ifndef spbREG  #ifndef spbREG
 #define spbREG  #define spbREG
 #endif  #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  #ifndef FTOSREG
 #define FTOSREG  #define FTOSREG
 #endif  #endif
Line 185  extern int gforth_memcmp(const char * s1 Line 212  extern int gforth_memcmp(const char * s1
 #define SUPER_CONTINUE  #define SUPER_CONTINUE
   
 #ifdef GFORTH_DEBUGGING  #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);}
   #else /* !DEBUG */
 #define NAME(string) { saved_ip=ip; asm(""); }  #define NAME(string) { saved_ip=ip; asm(""); }
 /* the asm here is to avoid reordering of following stuff above the  /* the asm here is to avoid reordering of following stuff above the
    assignment; this is an old-style asm (no operands), and therefore     assignment; this is an old-style asm (no operands), and therefore
    is treated like "asm volatile ..."; i.e., it prevents most     is treated like "asm volatile ..."; i.e., it prevents most
    reorderings across itself.  We want the assignment above first,     reorderings across itself.  We want the assignment above first,
    because the stack loads may already cause a stack underflow. */     because the stack loads may already cause a stack underflow. */
   #endif /* !DEBUG */
 #elif 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  #else
 #       define  NAME(string)  #       define  NAME(string) asm("# "string);
 #endif  #endif
   
 #ifdef DEBUG  #ifdef DEBUG
Line 211  extern int gforth_memcmp(const char * s1 Line 242  extern int gforth_memcmp(const char * s1
       }        }
 #endif  #endif
   
 #ifdef HAS_FFCALL  #if defined(HAS_FFCALL) || defined(HAS_LIBFFI)
 #define SAVE_REGS IF_spTOS(sp[0]=spTOS); IF_fpTOS(fp[0]=fpTOS); SP=sp; FP=fp; RP=rp; LP=lp;  #define SAVE_REGS IF_fpTOS(fp[0]=fpTOS); gforth_SP=sp; gforth_FP=fp; gforth_RP=rp; gforth_LP=lp;
 #define REST_REGS sp=SP; fp=FP; rp=RP; lp=LP; IF_spTOS(spTOS=sp[0]); IF_fpTOS(fpTOS=fp[0]);  #define REST_REGS sp=gforth_SP; fp=gforth_FP; rp=gforth_RP; lp=gforth_LP; IF_fpTOS(fpTOS=fp[0]);
 #endif  #endif
   
 #if !defined(ENGINE)  #if !defined(ENGINE)
 /* normal engine */  /* normal engine */
 #define VARIANT(v)      (v)  #define VARIANT(v)      (v)
 #define JUMP(target)    goto I_noop  #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  #elif ENGINE==2
 /* variant with padding between VM instructions for finding out  /* variant with padding between VM instructions for finding out
Line 228  extern int gforth_memcmp(const char * s1 Line 259  extern int gforth_memcmp(const char * s1
 #define engine engine2  #define engine engine2
 #define VARIANT(v)      (v)  #define VARIANT(v)      (v)
 #define JUMP(target)    goto I_noop  #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  #elif ENGINE==3
 /* variant with different immediate arguments for finding out  /* variant with different immediate arguments for finding out
Line 237  extern int gforth_memcmp(const char * s1 Line 267  extern int gforth_memcmp(const char * s1
 #define engine engine3  #define engine engine3
 #define VARIANT(v)      ((v)^0xffffffff)  #define VARIANT(v)      ((v)^0xffffffff)
 #define JUMP(target)    goto K_lit  #define JUMP(target)    goto K_lit
 #define LABEL(name) J_##name: asm(""); I_##name:  #define LABEL(name) H_##name: asm(""); I_##name:
 #else  #else
 #error illegal ENGINE value  #error illegal ENGINE value
 #endif /* ENGINE */  #endif /* ENGINE */
   
 /* the asm(""); is there to get a stop compiled on Itanium */  /* the asm(""); is there to get a stop compiled on Itanium */
 #define LABEL2(name) K_##name: asm("");  #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 *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL  /* executes code at ip, if ip!=NULL
Line 260  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 291  Label *engine(Xt *ip0, Cell *sp0, Cell *
   register Float *fp FPREG = fp0;    register Float *fp FPREG = fp0;
   register Address lp LPREG = lp0;    register Address lp LPREG = lp0;
   register Xt cfa CFAREG;    register Xt cfa CFAREG;
     register Label real_ca CAREG;
 #ifdef MORE_VARS  #ifdef MORE_VARS
   MORE_VARS    MORE_VARS
 #endif  #endif
Line 272  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 304  Label *engine(Xt *ip0, Cell *sp0, Cell *
   long long llrv;    long long llrv;
   void * prv;    void * prv;
 #endif  #endif
   register Address up UPREG = UP;  #ifdef HAS_LIBFFI
   register Cell MAYBE_UNUSED spa TOSREG;    extern void * ritem;
   register Cell MAYBE_UNUSED spb spaREG;    extern void ** clist;
   register Cell MAYBE_UNUSED spc spbREG;    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_fpTOS(register Float fpTOS FTOSREG;)
 #if defined(DOUBLY_INDIRECT)  #if defined(DOUBLY_INDIRECT)
   static Label *symbols;    static Label *symbols;
Line 286  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 328  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #define MAX_SYMBOLS (sizeof(symbols)/sizeof(symbols[0]))  #define MAX_SYMBOLS (sizeof(symbols)/sizeof(symbols[0]))
 #endif /* !defined(DOUBLY_INDIRECT) */  #endif /* !defined(DOUBLY_INDIRECT) */
 #define INST_ADDR(name) ((Label)&&I_##name)  #define INST_ADDR(name) ((Label)&&I_##name)
 #include "prim_lab.i"  #include PRIM_LAB_I
 #undef INST_ADDR  #undef INST_ADDR
     (Label)0,      (Label)0,
 #define INST_ADDR(name) ((Label)&&K_##name)  #define INST_ADDR(name) ((Label)&&K_##name)
 #include "prim_lab.i"  #include PRIM_LAB_I
 #undef INST_ADDR  #undef INST_ADDR
 #define INST_ADDR(name) ((Label)&&J_##name)  #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  #undef INST_ADDR
     (Label)&&after_last  
   };    };
 #ifdef CPU_DEP2  #ifdef CPU_DEP2
   CPU_DEP2    CPU_DEP2
Line 331  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 379  Label *engine(Xt *ip0, Cell *sp0, Cell *
     return symbols;      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]);    IF_fpTOS(fpTOS = fp[0]);
 /*  prep_terminal(); */  /*  prep_terminal(); */
 #ifdef NO_IP  #ifdef NO_IP
   goto *(*(Label *)ip0);    goto *(*(Label *)ip0);
     before_goto:
     goto *real_ca;
     after_goto:;
 #else  #else
   SET_IP(ip);    SET_IP(ip);
   SUPER_END; /* count the first block, too */    SUPER_END; /* count the first block, too */
   NEXT;    FIRST_NEXT;
 #endif  #endif
   
 #ifdef CPU_DEP3  #ifdef CPU_DEP3
   CPU_DEP3    CPU_DEP3
 #endif  #endif
   
 #include "prim.i"  #include PRIM_I
   after_last: return (Label *)0;    after_last: return (Label *)0;
   /*needed only to get the length of the last primitive */    /*needed only to get the length of the last primitive */
   
     return (Label *)0;
 }  }

Removed from v.1.69  
changed lines
  Added in v.1.89


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>