--- gforth/Attic/engine.c	1994/04/20 17:12:00	1.2
+++ gforth/Attic/engine.c	1994/08/31 19:42:44	1.13
@@ -1,5 +1,5 @@
 /*
-  $Id: engine.c,v 1.2 1994/04/20 17:12:00 pazsan Exp $
+  $Id: engine.c,v 1.13 1994/08/31 19:42:44 pazsan Exp $
   Copyright 1992 by the ANSI figForth Development Group
 */
 
@@ -13,12 +13,10 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <time.h>
+#include <sys/time.h>
 #include "forth.h"
 #include "io.h"
 
-extern unlink(char *);
-extern ftruncate(int, int);
-
 typedef union {
   struct {
 #ifdef BIG_ENDIAN
@@ -45,16 +43,27 @@ typedef struct F83Name {
 
 /* NEXT and NEXT1 are split into several parts to help scheduling */
 #ifdef DIRECT_THREADED
-#define NEXT1_P1 
-#define NEXT1_P2 ({goto *cfa;})
+#	define NEXT1_P1
+#	ifdef i386
+#		define NEXT1_P2 ({cfa=*ip++; goto *cfa;})
+#	else
+#		define NEXT1_P2 ({goto *cfa;})
+#	endif
+#	define DEF_CA
+#else
+#	define NEXT1_P1 ({ca = *cfa;})
+#	define NEXT1_P2 ({goto *ca;})
+#	define DEF_CA	Label ca;
+#endif
+#if defined(i386) && defined(DIRECT_THREADED)
+#	define NEXT_P1
+#	define NEXT1 ({goto *cfa;})
 #else
-#define NEXT1_P1 ({ca = *cfa;})
-#define NEXT1_P2 ({goto *ca;})
+#	define NEXT_P1 ({cfa = *ip++; NEXT1_P1;})
+#	define NEXT1 ({DEF_CA NEXT1_P1; NEXT1_P2;})
 #endif
-#define NEXT_P1 ({cfa = *ip++; NEXT1_P1;})
 
-#define NEXT1 ({NEXT1_P1; NEXT1_P2;})
-#define NEXT ({NEXT_P1; NEXT1_P2;})
+#define NEXT ({DEF_CA NEXT_P1; NEXT1_P2;})
 
 #ifdef USE_TOS
 #define IF_TOS(x) x
@@ -70,36 +79,76 @@ typedef struct F83Name {
 #define FTOS (fp[0])
 #endif
 
-#define DODOES	(symbols[3])
-
 int emitcounter;
 #define NULLC '\0'
 
-#define cstr(to, from, size)\
-	{	memcpy(to, from, size);\
+#ifdef copycstr
+#   define cstr(to,from,size)\
+	{	memcpy(to,from,size);\
 		to[size]=NULLC;}
+#else
+char scratch[1024];
+int soffset;
+#   define cstr(from,size) \
+           ({ char * to = scratch; \
+	      memcpy(to,from,size); \
+	      to[size] = NULLC; \
+	      soffset = size+1; \
+	      to; \
+	   })
+#   define cstr1(from,size) \
+           ({ char * to = scratch+soffset; \
+	      memcpy(to,from,size); \
+	      to[size] = NULLC; \
+	      soffset += size+1; \
+	      to; \
+	   })
+#endif
+
 #define NEWLINE	'\n'
 
+
 static char* fileattr[6]={"r","rb","r+","r+b","w+","w+b"};
 
-Label *engine(Xt *ip, Cell *sp, Cell *rp, Float *fp)
+static Address up0=NULL;
+
+#if defined(i386) && defined(FORCE_REG)
+#  define REG(reg) __asm__(reg)
+
+Label *engine(Xt *ip0, Cell *sp0, Cell *rp, Float *fp, Address lp)
+{
+   register Xt *ip REG("%esi")=ip0;
+   register Cell *sp REG("%edi")=sp0;
+
+#else
+#  define REG(reg)
+
+Label *engine(Xt *ip, Cell *sp, Cell *rp, Float *fp, Address lp)
+{
+#endif
 /* executes code at ip, if ip!=NULL
    returns array of machine code labels (for use in a loader), if ip==NULL
-   This is very preliminary, as the bootstrap architecture is not yet decided
 */
-{
-  Xt cfa;
-  Address lp=NULL;
+  register Xt cfa
+#ifdef i386
+#  ifdef USE_TOS
+   REG("%ecx")
+#  else
+   REG("%edx")
+#  endif
+#endif
+   ;
+  Address up=up0;
   static Label symbols[]= {
     &&docol,
     &&docon,
     &&dovar,
+    &&douser,
+    &&dodefer,
     &&dodoes,
+    &&dodoes,  /* dummy for does handler address */
 #include "prim_labels.i"
   };
-#ifndef DIRECT_THREADED
-  Label ca;
-#endif
   IF_TOS(register Cell TOS;)
   IF_FTOS(Float FTOS;)
 #ifdef CPU_DEP
@@ -108,7 +157,7 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
 
   if (ip == NULL)
     return symbols;
-  
+
   IF_TOS(TOS = sp[0]);
   IF_FTOS(FTOS = fp[0]);
   prep_terminal();
@@ -116,9 +165,9 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
   
  docol:
 #ifdef DEBUG
-  printf("col: %x\n",(Cell)PFA1(cfa));
+  printf("%08x: col: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
-#ifdef undefined
+#ifdef i386
   /* this is the simple version */
   *--rp = (Cell)ip;
   ip = (Xt *)PFA1(cfa);
@@ -129,17 +178,18 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
      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;
   }
-  NEXT1_P2;
   
  docon:
 #ifdef DEBUG
-  printf("con: %x\n",*(Cell*)PFA1(cfa));
+  printf("%08x: con: %08x\n",(Cell)ip,*(Cell*)PFA1(cfa));
 #endif
 #ifdef USE_TOS
   *sp-- = TOS;
@@ -151,7 +201,7 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
   
  dovar:
 #ifdef DEBUG
-  printf("var: %x\n",(Cell)PFA1(cfa));
+  printf("%08x: var: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
   *sp-- = TOS;
@@ -163,6 +213,25 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
   
   /* !! user? */
   
+ douser:
+#ifdef DEBUG
+  printf("%08x: user: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+#endif
+#ifdef USE_TOS
+  *sp-- = TOS;
+  TOS = (Cell)(up+*(Cell*)PFA1(cfa));
+#else
+  *--sp = (Cell)(up+*(Cell*)PFA1(cfa));
+#endif
+  NEXT;
+  
+ dodefer:
+#ifdef DEBUG
+  printf("%08x: defer: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+#endif
+  cfa = *(Xt *)PFA1(cfa);
+  NEXT1;
+
  dodoes:
   /* this assumes the following structure:
      defining-word:
@@ -182,17 +251,18 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
      
      */
 #ifdef DEBUG
-  printf("does: %x\n",(Cell)PFA(cfa));
+  printf("%08x/%08x: does: %08x\n",(Cell)ip,(Cell)cfa,*(Cell)PFA(cfa));
+  fflush(stdout);
 #endif
   *--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);
 #else
   *--sp = (Cell)PFA(cfa);
 #endif
-  ip = DOES_CODE1(cfa);
   NEXT;
   
 #include "primitives.i"