Diff for /gforth/engine/engine.c between versions 1.66 and 1.78

version 1.66, 2003/08/22 08:08:46 version 1.78, 2005/01/23 09:55:12
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 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
   #else
   #define USE_TOS
   #endif
   #define USE_NO_FTOS
   
 #include "config.h"  #include "config.h"
 #include "forth.h"  #include "forth.h"
 #include <ctype.h>  #include <ctype.h>
Line 153  extern int gforth_memcmp(const char * s1 Line 160  extern int gforth_memcmp(const char * s1
 #ifndef TOSREG  #ifndef TOSREG
 #define TOSREG  #define TOSREG
 #endif  #endif
   #ifndef spbREG
   #define spbREG
   #endif
   #ifndef spcREG
   #define spcREG
   #endif
 #ifndef FTOSREG  #ifndef FTOSREG
 #define FTOSREG  #define FTOSREG
 #endif  #endif
Line 176  extern int gforth_memcmp(const char * s1 Line 189  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 228  extern int gforth_memcmp(const char * s1
 /* 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: 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 219  extern int gforth_memcmp(const char * s1 Line 236  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  #define IN_ENGINE2
   
 #elif ENGINE==3  #elif ENGINE==3
Line 228  extern int gforth_memcmp(const char * s1 Line 245  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: I_##name:
 #else  #else
 #error illegal ENGINE value  #error illegal ENGINE value
 #endif /* ENGINE */  #endif /* ENGINE */
   
 #define LABEL2(name) K_##name:  /* 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 *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 250  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 269  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;
 #ifdef MORE_VARS  #ifdef MORE_VARS
   MORE_VARS    MORE_VARS
 #endif  #endif
Line 263  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 283  Label *engine(Xt *ip0, Cell *sp0, Cell *
   void * prv;    void * prv;
 #endif  #endif
   register Address up UPREG = UP;    register Address up UPREG = UP;
   IF_spTOS(register Cell spTOS TOSREG;)    IF_spTOS(register Cell MAYBE_UNUSED spTOS TOSREG;)
     register Cell MAYBE_UNUSED spb spbREG;
     register Cell MAYBE_UNUSED spc spcREG;
   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 274  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 296  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 334  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 362  Label *engine(Xt *ip0, Cell *sp0, Cell *
   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 */
   
     before_goto:
     goto *real_ca;
     after_goto:
     return (Label *)0;
 }  }

Removed from v.1.66  
changed lines
  Added in v.1.78


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