--- gforth/Attic/engine.c	1994/08/25 15:25:21	1.12
+++ gforth/Attic/engine.c	1994/10/03 18:24:01	1.18
@@ -1,5 +1,4 @@
 /*
-  $Id: engine.c,v 1.12 1994/08/25 15:25:21 anton Exp $
   Copyright 1992 by the ANSI figForth Development Group
 */
 
@@ -41,20 +40,34 @@ typedef struct F83Name {
 #define F83NAME_SMUDGE(np)	(((np)->countetc & 0x40) != 0)
 #define F83NAME_IMMEDIATE(np)	(((np)->countetc & 0x20) != 0)
 
-/* 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 */
+#ifdef CISC_NEXT
+#define NEXT1_P1
+#define NEXT_P1
+#define DEF_CA
 #ifdef DIRECT_THREADED
-#	define NEXT1_P1 
-#	define NEXT1_P2 ({goto *cfa;})
-#	define DEF_CA
-#else
-#	define NEXT1_P1 ({ca = *cfa;})
-#	define NEXT1_P2 ({goto *ca;})
-#	define DEF_CA	Label ca;
-#endif
-#define NEXT_P1 ({cfa = *ip++; NEXT1_P1;})
+#define NEXT1_P2 ({goto *cfa;})
+#else
+#define NEXT1_P2 ({goto **cfa;})
+#endif /* DIRECT_THREADED */
+#define NEXT_P2 ({cfa = *ip++; NEXT1_P2;})
+#else /* CISC_NEXT */
+#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 */
+#define NEXT_P1 ({cfa=*ip++; NEXT1_P1;})
+#define NEXT_P2 NEXT1_P2
+#endif /* CISC_NEXT */
 
 #define NEXT1 ({DEF_CA NEXT1_P1; NEXT1_P2;})
-#define NEXT ({DEF_CA NEXT_P1; NEXT1_P2;})
+#define NEXT ({DEF_CA NEXT_P1; NEXT_P2;})
 
 #ifdef USE_TOS
 #define IF_TOS(x) x
@@ -73,22 +86,85 @@ typedef struct F83Name {
 int emitcounter;
 #define NULLC '\0'
 
-#define cstr(to,from,size)\
-	{	memcpy(to,from,size);\
-		to[size]=NULLC;}
+char *cstr(Char *from, UCell size, int clear)
+/* if clear is true, scratch can be reused, otherwise we want more of
+   the same */
+{
+  static char *scratch=NULL;
+  static unsigned scratchsize=0;
+  static char *nextscratch;
+  char *oldnextscratch;
+
+  if (clear)
+    nextscratch=scratch;
+  if (scratch==NULL) {
+    scratch=malloc(size+1);
+    nextscratch=scratch;
+    scratchsize=size;
+  }
+  else if (nextscratch+size>scratch+scratchsize) {
+    char *oldscratch=scratch;
+    scratch = realloc(scratch, (nextscratch-scratch)+size+1);
+    nextscratch=scratch+(nextscratch-oldscratch);
+    scratchsize=size;
+  }
+  memcpy(nextscratch,from,size);
+  nextscratch[size]='\0';
+  oldnextscratch = nextscratch;
+  nextscratch += size+1;
+  return oldnextscratch;
+}
+
 #define NEWLINE	'\n'
 
+
 static char* fileattr[6]={"r","rb","r+","r+b","w+","w+b"};
 
 static Address up0=NULL;
 
-Label *engine(Xt *ip, Cell *sp, Cell *rp, Float *fp, Address lp)
+/* if machine.h has not defined explicit registers, define them as implicit */
+#ifndef IPREG
+#define IPREG
+#endif
+#ifndef SPREG
+#define SPREG
+#endif
+#ifndef RPREG
+#define RPREG
+#endif
+#ifndef FPREG
+#define FPREG
+#endif
+#ifndef LPREG
+#define LPREG
+#endif
+#ifndef CFAREG
+#define CFAREG
+#endif
+#ifndef UPREG
+#define UPREG
+#endif
+#ifndef TOSREG
+#define TOSREG
+#endif
+#ifndef FTOSREG
+#define FTOSREG
+#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
 */
 {
-  Xt cfa;
-  Address up=up0;
+  register Xt *ip IPREG = ip0;
+  register Cell *sp SPREG = sp0;
+  register Cell *rp RPREG = rp0;
+  register Float *fp FPREG = fp0;
+  register Address lp LPREG = lp0;
+  register Xt cfa CFAREG;
+  register Address up UPREG = up0;
+  IF_TOS(register Cell TOS TOSREG;)
+  IF_FTOS(register Float FTOS FTOSREG;)
   static Label symbols[]= {
     &&docol,
     &&docon,
@@ -99,12 +175,15 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
     &&dodoes,  /* dummy for does handler address */
 #include "prim_labels.i"
   };
-  IF_TOS(register Cell TOS;)
-  IF_FTOS(Float FTOS;)
 #ifdef CPU_DEP
   CPU_DEP;
 #endif
 
+#ifdef DEBUG
+  fprintf(stderr,"ip=%x, sp=%x, rp=%x, fp=%x, lp=%x, up=%x\n",
+          ip,sp,rp,fp,lp,up);
+#endif
+
   if (ip == NULL)
     return symbols;
 
@@ -115,14 +194,14 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
   
  docol:
 #ifdef DEBUG
-  printf("%08x: col: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+  fprintf(stderr,"%08x: col: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
-#ifdef undefined
+#ifdef CISC_NEXT
   /* this is the simple version */
   *--rp = (Cell)ip;
   ip = (Xt *)PFA1(cfa);
   NEXT;
-#endif
+#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
@@ -136,10 +215,11 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
     ip = current_ip+1;
     NEXT1_P2;
   }
+#endif
   
  docon:
 #ifdef DEBUG
-  printf("%08x: con: %08x\n",(Cell)ip,*(Cell*)PFA1(cfa));
+  fprintf(stderr,"%08x: con: %08x\n",(Cell)ip,*(Cell*)PFA1(cfa));
 #endif
 #ifdef USE_TOS
   *sp-- = TOS;
@@ -151,7 +231,7 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
   
  dovar:
 #ifdef DEBUG
-  printf("%08x: var: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+  fprintf(stderr,"%08x: var: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
   *sp-- = TOS;
@@ -165,7 +245,7 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
   
  douser:
 #ifdef DEBUG
-  printf("%08x: user: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+  fprintf(stderr,"%08x: user: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
 #ifdef USE_TOS
   *sp-- = TOS;
@@ -177,7 +257,7 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
   
  dodefer:
 #ifdef DEBUG
-  printf("%08x: defer: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
+  fprintf(stderr,"%08x: defer: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
   cfa = *(Xt *)PFA1(cfa);
   NEXT1;
@@ -201,19 +281,19 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
      
      */
 #ifdef DEBUG
-  printf("%08x/%08x: does: %08x\n",(Cell)ip,(Cell)cfa,*(Cell)PFA(cfa));
-  fflush(stdout);
+  fprintf(stderr,"%08x/%08x: does: %08x\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);
 #ifdef USE_TOS
   *sp-- = TOS;
   TOS = (Cell)PFA(cfa);
 #else
   *--sp = (Cell)PFA(cfa);
 #endif
-  ip = DOES_CODE1(cfa);
   NEXT;
-  
+
 #include "primitives.i"
 }