Diff for /gforth/engine/engine.c between versions 1.76 and 1.84

version 1.76, 2005/01/22 21:06:03 version 1.84, 2005/08/21 22:09:14
Line 71 Line 71
 #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 151  extern int gforth_memcmp(const char * s1 Line 155  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 166  extern int gforth_memcmp(const char * s1 Line 173  extern int gforth_memcmp(const char * s1
 #ifndef spcREG  #ifndef spcREG
 #define spcREG  #define spcREG
 #endif  #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 220  extern int gforth_memcmp(const char * s1 Line 242  extern int gforth_memcmp(const char * s1
 #endif  #endif
   
 #ifdef HAS_FFCALL  #ifdef HAS_FFCALL
 #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); SP=sp; FP=fp; RP=rp; 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=SP; fp=FP; rp=RP; lp=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 236  extern int gforth_memcmp(const char * s1 Line 258  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 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 268  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;    register Label real_ca CAREG;
 #ifdef MORE_VARS  #ifdef MORE_VARS
   MORE_VARS    MORE_VARS
 #endif  #endif
Line 281  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
   #ifdef HAS_LIBFFI
     extern void * ritem;
     extern void ** clist;
     extern void ffi_callback(ffi_cif * cif, void * resp, void ** args, Xt * ip);
   #endif
   register Address up UPREG = UP;    register Address up UPREG = UP;
   IF_spTOS(register Cell MAYBE_UNUSED spTOS TOSREG;)    register Cell MAYBE_UNUSED spTOS TOSREG;
   register Cell MAYBE_UNUSED spb spbREG;    register Cell MAYBE_UNUSED spb spbREG;
   register Cell MAYBE_UNUSED spc spcREG;    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 306  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 339  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #undef INST_ADDR  #undef INST_ADDR
     (Label)&&after_last,      (Label)&&after_last,
     (Label)&&before_goto,      (Label)&&before_goto,
     (Label)&&after_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 342  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
   
   before_goto:  
   goto *real_ca;  
   after_goto:  
   
 #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.76  
changed lines
  Added in v.1.84


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