--- gforth/Attic/engine.c	1995/09/06 21:00:13	1.28
+++ gforth/Attic/engine.c	1995/12/10 19:02:07	1.32
@@ -1,5 +1,22 @@
-/*
-  Copyright 1992 by the ANSI figForth Development Group
+/* Gforth virtual machine (aka inner interpreter)
+
+  Copyright (C) 1995 Free Software Foundation, Inc.
+
+  This file is part of Gforth.
+
+  Gforth is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include <ctype.h>
@@ -18,6 +35,7 @@
 #include <pwd.h>
 #include "forth.h"
 #include "io.h"
+#include "threading.h"
 
 #ifndef SEEK_SET
 /* should be defined in stdio.h, but some systems don't have it */
@@ -50,69 +68,6 @@ typedef struct F83Name {
 #define F83NAME_SMUDGE(np)	(((np)->countetc & 0x40) != 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,
-   unless CISC_NEXT is defined */
-#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 NEXT_P1
-#define DEF_CA
-#ifdef DIRECT_THREADED
-#define NEXT1_P2 ({goto *cfa;})
-#else
-#define NEXT1_P2 ({goto **cfa;})
-#endif /* DIRECT_THREADED */
-#define NEXT_P2 ({cfa = *ip++; NEXT1_P2;})
-#else /* defined(CISC_NEXT) && !defined(LONG_LATENCY) */
-#ifdef DIRECT_THREADED
-#define NEXT1_P1
-#define NEXT1_P2 ({goto *cfa;})
-#define DEF_CA
-#else /* DIRECT_THREADED */
-#define NEXT1_P1 ({ca = *cfa;})
-#define NEXT1_P2 ({goto *ca;})
-#define DEF_CA	Label ca;
-#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;})
-#endif /* LONG_LATENCY */
-#define NEXT_P2 NEXT1_P2
-#endif /* defined(CISC_NEXT) && !defined(LONG_LATENCY) */
-
-#define NEXT1 ({DEF_CA NEXT1_P1; NEXT1_P2;})
-#define NEXT ({DEF_CA NEXT_P1; NEXT_P2;})
-
 #ifdef USE_TOS
 #define IF_TOS(x) x
 #else
@@ -241,6 +196,14 @@ static Address up0=NULL;
 #define FTOSREG
 #endif
 
+/* declare and compute cfa for certain threading variants */
+/* warning: this is nonsyntactical; it will not work in place of a statement */
+#ifdef CFA_NEXT
+#define DOCFA
+#else
+#define DOCFA	Xt cfa; GETCFA(cfa)
+#endif
+
 Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
    returns array of machine code labels (for use in a loader), if ip==NULL
@@ -251,7 +214,9 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   register Cell *rp RPREG = rp0;
   register Float *fp FPREG = fp0;
   register Address lp LPREG = lp0;
+#ifdef CFA_NEXT
   register Xt cfa CFAREG;
+#endif
   register Address up UPREG = up0;
   IF_TOS(register Cell TOS TOSREG;)
   IF_FTOS(register Float FTOS FTOSREG;)
@@ -261,13 +226,19 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     &&dovar,
     &&douser,
     &&dodefer,
-    &&dostruc,
+    &&dofield,
     &&dodoes,
-    &&dodoes,  /* dummy for does handler address */
+    /* the following entry is normally unused;
+       it's there because its index indicates a does-handler */
+#ifdef CPU_DEP1
+    CPU_DEP1,
+#else
+    (Label)0,
+#endif
 #include "prim_labels.i"
   };
-#ifdef CPU_DEP
-  CPU_DEP;
+#ifdef CPU_DEP2
+  CPU_DEP2
 #endif
 
 #ifdef DEBUG
@@ -284,84 +255,105 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 /*  prep_terminal(); */
   NEXT_P0;
   NEXT;
+
+#ifdef CPU_DEP3
+  CPU_DEP3
+#endif
   
  docol:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: col: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: col: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef CISC_NEXT
-  /* this is the simple version */
-  *--rp = (Cell)ip;
-  ip = (Xt *)PFA1(cfa);
-  NEXT_P0;
-  NEXT;
-#else
-  /* this one is important, so we help the compiler optimizing
-     The following version may be better (for scheduling), but probably has
-     problems with code fields employing calls and delay slots
-  */
-  {
-    DEF_CA
-    Xt *current_ip = (Xt *)PFA1(cfa);
-    cfa = *current_ip;
-    NEXT1_P1;
+    /* this is the simple version */
     *--rp = (Cell)ip;
-    ip = current_ip+1;
-    NEXT1_P2;
-  }
+    ip = (Xt *)PFA1(cfa);
+    NEXT_P0;
+    NEXT;
+#else
+    /* this one is important, so we help the compiler optimizing
+       The following version may be better (for scheduling), but probably has
+       problems with code fields employing calls and delay slots
+       */
+    {
+      DEF_CA
+      Xt *current_ip = (Xt *)PFA1(cfa);
+      cfa = *current_ip;
+      NEXT1_P1;
+      *--rp = (Cell)ip;
+      ip = current_ip+1;
+      NEXT1_P2;
+    }
 #endif
+  }
 
  docon:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: con: %08x\n",(Cell)ip,*(Cell*)PFA1(cfa));
+    fprintf(stderr,"%08lx: con: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-  *sp-- = TOS;
-  TOS = *(Cell *)PFA1(cfa);
+    *sp-- = TOS;
+    TOS = *(Cell *)PFA1(cfa);
 #else
-  *--sp = *(Cell *)PFA1(cfa);
+    *--sp = *(Cell *)PFA1(cfa);
 #endif
+  }
   NEXT_P0;
   NEXT;
   
  dovar:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: var: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: var: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-  *sp-- = TOS;
-  TOS = (Cell)PFA1(cfa);
+    *sp-- = TOS;
+    TOS = (Cell)PFA1(cfa);
 #else
-  *--sp = (Cell)PFA1(cfa);
+    *--sp = (Cell)PFA1(cfa);
 #endif
+  }
   NEXT_P0;
   NEXT;
   
  douser:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: user: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: user: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
-  *sp-- = TOS;
-  TOS = (Cell)(up+*(Cell*)PFA1(cfa));
+    *sp-- = TOS;
+    TOS = (Cell)(up+*(Cell*)PFA1(cfa));
 #else
-  *--sp = (Cell)(up+*(Cell*)PFA1(cfa));
+    *--sp = (Cell)(up+*(Cell*)PFA1(cfa));
 #endif
+  }
   NEXT_P0;
   NEXT;
   
  dodefer:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: defer: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: defer: %08lx\n",(Cell)ip,*(Cell*)PFA1(cfa));
 #endif
-  cfa = *(Xt *)PFA1(cfa);
-  NEXT1;
+    EXEC(*(Xt *)PFA1(cfa));
+  }
 
- dostruc:
+ dofield:
+  {
+    DOCFA;
 #ifdef DEBUG
-  fprintf(stderr,"%08x: struc: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+    fprintf(stderr,"%08lx: field: %08lx\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
-  TOS += *(Cell*)PFA1(cfa); 
+    TOS += *(Cell*)PFA1(cfa); 
+  }
   NEXT_P0;
   NEXT;
 
@@ -383,19 +375,25 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
      pfa:
      
      */
+  {
+    DOCFA;
+
+    /*    fprintf(stderr, "Got CFA %08lx at doescode %08lx/%08lx: does: %08lx\n",cfa,(Cell)ip,(Cell)PFA(cfa),(Cell)DOES_CODE1(cfa));*/
 #ifdef DEBUG
-  fprintf(stderr,"%08x/%08x: does: %08x\n",(Cell)ip,(Cell)PFA(cfa),(Cell)DOES_CODE1(cfa));
-  fflush(stderr);
+    fprintf(stderr,"%08lx/%08lx: does: %08lx\n",(Cell)ip,(Cell)PFA(cfa),(Cell)DOES_CODE1(cfa));
+    fflush(stderr);
 #endif
-  *--rp = (Cell)ip;
-  /* PFA1 might collide with DOES_CODE1 here, so we use PFA */
-  ip = DOES_CODE1(cfa);
+    *--rp = (Cell)ip;
+    /* PFA1 might collide with DOES_CODE1 here, so we use PFA */
+    ip = DOES_CODE1(cfa);
 #ifdef USE_TOS
-  *sp-- = TOS;
-  TOS = (Cell)PFA(cfa);
+    *sp-- = TOS;
+    TOS = (Cell)PFA(cfa);
 #else
-  *--sp = (Cell)PFA(cfa);
+    *--sp = (Cell)PFA(cfa);
 #endif
+    /*    fprintf(stderr,"TOS = %08lx, IP=%08lx\n", TOS, IP);*/
+  }
   NEXT_P0;
   NEXT;