--- gforth/Attic/engine.c	1994/08/31 19:42:44	1.13
+++ gforth/Attic/engine.c	1994/09/09 16:27:18	1.15
@@ -1,5 +1,5 @@
 /*
-  $Id: engine.c,v 1.13 1994/08/31 19:42:44 pazsan Exp $
+  $Id: engine.c,v 1.15 1994/09/09 16:27:18 anton Exp $
   Copyright 1992 by the ANSI figForth Development Group
 */
 
@@ -41,29 +41,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
-#	ifdef i386
-#		define NEXT1_P2 ({cfa=*ip++; goto *cfa;})
-#	else
-#		define NEXT1_P2 ({goto *cfa;})
-#	endif
-#	define DEF_CA
+#define NEXT1_P2 ({goto *cfa;})
 #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 NEXT_P1 ({cfa = *ip++; NEXT1_P1;})
-#	define NEXT1 ({DEF_CA NEXT1_P1; NEXT1_P2;})
-#endif
+#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 NEXT ({DEF_CA NEXT_P1; NEXT1_P2;})
+#define NEXT1 ({DEF_CA NEXT1_P1; NEXT1_P2;})
+#define NEXT ({DEF_CA NEXT_P1; NEXT_P2;})
 
 #ifdef USE_TOS
 #define IF_TOS(x) x
@@ -82,28 +87,34 @@ typedef struct F83Name {
 int emitcounter;
 #define NULLC '\0'
 
-#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
+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'
 
@@ -112,33 +123,49 @@ static char* fileattr[6]={"r","rb","r+",
 
 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)
-{
+/* 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
 */
-  register Xt cfa
-#ifdef i386
-#  ifdef USE_TOS
-   REG("%ecx")
-#  else
-   REG("%edx")
-#  endif
-#endif
-   ;
-  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,
@@ -149,8 +176,6 @@ 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
@@ -167,12 +192,12 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
 #ifdef DEBUG
   printf("%08x: col: %08x\n",(Cell)ip,(Cell)PFA1(cfa));
 #endif
-#ifdef i386
+#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
@@ -186,6 +211,7 @@ Label *engine(Xt *ip, Cell *sp, Cell *rp
     ip = current_ip+1;
     NEXT1_P2;
   }
+#endif
   
  docon:
 #ifdef DEBUG