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

version 1.73, 2004/01/05 22:25:03 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 160  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 spaREG  
 #define spaREG  
 #endif  
 #ifndef spbREG  #ifndef spbREG
 #define spbREG  #define spbREG
 #endif  #endif
   #ifndef spcREG
   #define spcREG
   #endif
 #ifndef FTOSREG  #ifndef FTOSREG
 #define FTOSREG  #define FTOSREG
 #endif  #endif
Line 228  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 236  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 245  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 */
   
 /* 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 268  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 282  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 284  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #endif  #endif
   register Address up UPREG = UP;    register Address up UPREG = UP;
   IF_spTOS(register Cell MAYBE_UNUSED spTOS TOSREG;)    IF_spTOS(register Cell MAYBE_UNUSED spTOS TOSREG;)
   register Cell MAYBE_UNUSED spb spaREG;    register Cell MAYBE_UNUSED spb spbREG;
   register Cell MAYBE_UNUSED spc 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 303  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 305  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #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  #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 CPU_DEP2  #ifdef CPU_DEP2
   CPU_DEP2    CPU_DEP2
Line 357  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 365  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #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.73  
changed lines
  Added in v.1.78


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