Diff for /gforth/Attic/engine.c between versions 1.19 and 1.24

version 1.19, 1994/10/24 19:15:56 version 1.24, 1995/02/23 20:17:18
Line 13 Line 13
 #include <stdlib.h>  #include <stdlib.h>
 #include <time.h>  #include <time.h>
 #include <sys/time.h>  #include <sys/time.h>
   #include <unistd.h>
 #include "forth.h"  #include "forth.h"
 #include "io.h"  #include "io.h"
   
   #ifndef SEEK_SET
   /* should be defined in stdio.h, but some systems don't have it */
   #define SEEK_SET 0
   #endif
   
 typedef union {  typedef union {
   struct {    struct {
 #ifdef BIG_ENDIAN  #ifdef WORDS_BIGENDIAN
     Cell high;      Cell high;
     Cell low;      Cell low;
 #else  #else
Line 40  typedef struct F83Name { Line 46  typedef struct F83Name {
 #define F83NAME_SMUDGE(np)      (((np)->countetc & 0x40) != 0)  #define F83NAME_SMUDGE(np)      (((np)->countetc & 0x40) != 0)
 #define F83NAME_IMMEDIATE(np)   (((np)->countetc & 0x20) != 0)  #define F83NAME_IMMEDIATE(np)   (((np)->countetc & 0x20) != 0)
   
   /* !!someone should organize this ifdef chaos */
   #if defined(LONG_LATENCY)
   #if defined(AUTO_INCREMENT)
   #define NEXT_P0         (cfa=*ip++)
   #define IP              (ip-1)
   #else /* AUTO_INCREMENT */
   #define NEXT_P0         (cfa=*ip)
   #define IP              ip
   #endif /* AUTO_INCREMENT */
   #define NEXT_INST       (cfa)
   #define INC_IP(const_inc)       ({cfa=IP[const_inc]; ip+=(const_inc);})
   #else /* LONG_LATENCY */
 /* NEXT and NEXT1 are split into several parts to help scheduling,  /* NEXT and NEXT1 are split into several parts to help scheduling,
    unless CISC_NEXT is defined */     unless CISC_NEXT is defined */
 #ifdef CISC_NEXT  #define NEXT_P0
   /* in order for execute to work correctly, NEXT_P0 (or other early
      fetches) should not update the ip (or should we put
      compensation-code into execute? */
   #define NEXT_INST       (*ip)
   /* the next instruction (or what is in its place, e.g., an immediate
      argument */
   #define INC_IP(const_inc)       (ip+=(const_inc))
   /* increment the ip by const_inc and perform NEXT_P0 (or prefetching) again */
   #define IP              ip
   /* the pointer to the next instruction (i.e., NEXT_INST could be
      defined as *IP) */
   #endif /* LONG_LATENCY */
   
   #if defined(CISC_NEXT) && !defined(LONG_LATENCY)
 #define NEXT1_P1  #define NEXT1_P1
 #define NEXT_P1  #define NEXT_P1
 #define DEF_CA  #define DEF_CA
Line 52  typedef struct F83Name { Line 84  typedef struct F83Name {
 #define NEXT1_P2 ({goto **cfa;})  #define NEXT1_P2 ({goto **cfa;})
 #endif /* DIRECT_THREADED */  #endif /* DIRECT_THREADED */
 #define NEXT_P2 ({cfa = *ip++; NEXT1_P2;})  #define NEXT_P2 ({cfa = *ip++; NEXT1_P2;})
 #else /* CISC_NEXT */  #else /* defined(CISC_NEXT) && !defined(LONG_LATENCY) */
 #ifdef DIRECT_THREADED  #ifdef DIRECT_THREADED
 #define NEXT1_P1  #define NEXT1_P1
 #define NEXT1_P2 ({goto *cfa;})  #define NEXT1_P2 ({goto *cfa;})
Line 62  typedef struct F83Name { Line 94  typedef struct F83Name {
 #define NEXT1_P2 ({goto *ca;})  #define NEXT1_P2 ({goto *ca;})
 #define DEF_CA  Label ca;  #define DEF_CA  Label ca;
 #endif /* DIRECT_THREADED */  #endif /* DIRECT_THREADED */
   #if defined(LONG_LATENCY)
   #if defined(AUTO_INCREMENT)
   #define NEXT_P1 NEXT1_P1
   #else /* AUTO_INCREMENT */
   #define NEXT_P1 ({ip++; NEXT1_P1;})
   #endif /* AUTO_INCREMENT */
   #else /* LONG_LATENCY */
 #define NEXT_P1 ({cfa=*ip++; NEXT1_P1;})  #define NEXT_P1 ({cfa=*ip++; NEXT1_P1;})
   #endif /* LONG_LATENCY */
 #define NEXT_P2 NEXT1_P2  #define NEXT_P2 NEXT1_P2
 #endif /* CISC_NEXT */  #endif /* defined(CISC_NEXT) && !defined(LONG_LATENCY) */
   
 #define NEXT1 ({DEF_CA NEXT1_P1; NEXT1_P2;})  #define NEXT1 ({DEF_CA NEXT1_P1; NEXT1_P2;})
 #define NEXT ({DEF_CA NEXT_P1; NEXT_P2;})  #define NEXT ({DEF_CA NEXT_P1; NEXT_P2;})
Line 117  char *cstr(Char *from, UCell size, int c Line 157  char *cstr(Char *from, UCell size, int c
   
 #define NEWLINE '\n'  #define NEWLINE '\n'
   
   #ifndef HAVE_RINT
   #define rint(x) floor((x)+0.5)
   #endif
   
 static char* fileattr[6]={"r","rb","r+","r+b","w+","w+b"};  static char* fileattr[6]={"r","rb","r+","r+b","w+","w+b"};
   
Line 171  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 214  Label *engine(Xt *ip0, Cell *sp0, Cell *
     &&dovar,      &&dovar,
     &&douser,      &&douser,
     &&dodefer,      &&dodefer,
       &&dostruc,
     &&dodoes,      &&dodoes,
     &&dodoes,  /* dummy for does handler address */      &&dodoes,  /* dummy for does handler address */
 #include "prim_labels.i"  #include "prim_labels.i"
Line 191  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 235  Label *engine(Xt *ip0, Cell *sp0, Cell *
   IF_TOS(TOS = sp[0]);    IF_TOS(TOS = sp[0]);
   IF_FTOS(FTOS = fp[0]);    IF_FTOS(FTOS = fp[0]);
   prep_terminal();    prep_terminal();
     NEXT_P0;
   NEXT;    NEXT;
       
  docol:   docol:
Line 201  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 246  Label *engine(Xt *ip0, Cell *sp0, Cell *
   /* this is the simple version */    /* this is the simple version */
   *--rp = (Cell)ip;    *--rp = (Cell)ip;
   ip = (Xt *)PFA1(cfa);    ip = (Xt *)PFA1(cfa);
     NEXT_P0;
   NEXT;    NEXT;
 #else  #else
   /* this one is important, so we help the compiler optimizing    /* this one is important, so we help the compiler optimizing
Line 217  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 263  Label *engine(Xt *ip0, Cell *sp0, Cell *
     NEXT1_P2;      NEXT1_P2;
   }    }
 #endif  #endif
     
  docon:   docon:
 #ifdef DEBUG  #ifdef DEBUG
   fprintf(stderr,"%08x: con: %08x\n",(Cell)ip,*(Cell*)PFA1(cfa));    fprintf(stderr,"%08x: con: %08x\n",(Cell)ip,*(Cell*)PFA1(cfa));
Line 228  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 274  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #else  #else
   *--sp = *(Cell *)PFA1(cfa);    *--sp = *(Cell *)PFA1(cfa);
 #endif  #endif
     NEXT_P0;
   NEXT;    NEXT;
       
  dovar:   dovar:
Line 240  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 287  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #else  #else
   *--sp = (Cell)PFA1(cfa);    *--sp = (Cell)PFA1(cfa);
 #endif  #endif
     NEXT_P0;
   NEXT;    NEXT;
       
   /* !! user? */  
     
  douser:   douser:
 #ifdef DEBUG  #ifdef DEBUG
   fprintf(stderr,"%08x: user: %08x\n",(Cell)ip,(Cell)PFA1(cfa));    fprintf(stderr,"%08x: user: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
Line 254  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 300  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #else  #else
   *--sp = (Cell)(up+*(Cell*)PFA1(cfa));    *--sp = (Cell)(up+*(Cell*)PFA1(cfa));
 #endif  #endif
     NEXT_P0;
   NEXT;    NEXT;
       
  dodefer:   dodefer:
Line 263  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 310  Label *engine(Xt *ip0, Cell *sp0, Cell *
   cfa = *(Xt *)PFA1(cfa);    cfa = *(Xt *)PFA1(cfa);
   NEXT1;    NEXT1;
   
    dostruc:
   #ifdef DEBUG
     fprintf(stderr,"%08x: struc: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
   #endif
     TOS += *(Cell*)PFA1(cfa); 
     NEXT_P0;
     NEXT;
   
  dodoes:   dodoes:
   /* this assumes the following structure:    /* this assumes the following structure:
      defining-word:       defining-word:
Line 294  Label *engine(Xt *ip0, Cell *sp0, Cell * Line 349  Label *engine(Xt *ip0, Cell *sp0, Cell *
 #else  #else
   *--sp = (Cell)PFA(cfa);    *--sp = (Cell)PFA(cfa);
 #endif  #endif
     NEXT_P0;
   NEXT;    NEXT;
   
 #include "primitives.i"  #include "primitives.i"

Removed from v.1.19  
changed lines
  Added in v.1.24


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