--- gforth/engine/engine.c	2002/01/20 19:04:11	1.39
+++ gforth/engine/engine.c	2002/11/24 13:54:01	1.46
@@ -215,39 +215,45 @@ static int ufileattr[6]= {
 
 /* conversion on fetch */
 
-#define vm_Cell2f(x)		((Bool)(x))
-#define vm_Cell2c(x)		((Char)(x))
-#define vm_Cell2n(x)		((Cell)x)
-#define vm_Cell2w(x)		((Cell)x)
-#define vm_Cell2u(x)		((UCell)(x))
-#define vm_Cell2a_(x)		((Cell *)(x))
-#define vm_Cell2c_(x)		((Char *)(x))
-#define vm_Cell2f_(x)		((Float *)(x))
-#define vm_Cell2df_(x)		((DFloat *)(x))
-#define vm_Cell2sf_(x)		((SFloat *)(x))
-#define vm_Cell2xt(x)		((Xt)(x))
-#define vm_Cell2f83name(x)	((struct F83Name *)(x))
-#define vm_Cell2longname(x)	((struct Longname *)(x))
-#define vm_Float2r(x)	(x)
+#define vm_Cell2f(_cell,_x)		((_x)=(Bool)(_cell))
+#define vm_Cell2c(_cell,_x)		((_x)=(Char)(_cell))
+#define vm_Cell2n(_cell,_x)		((_x)=(Cell)(_cell))
+#define vm_Cell2w(_cell,_x)		((_x)=(Cell)(_cell))
+#define vm_Cell2u(_cell,_x)		((_x)=(UCell)(_cell))
+#define vm_Cell2a_(_cell,_x)		((_x)=(Cell *)(_cell))
+#define vm_Cell2c_(_cell,_x)		((_x)=(Char *)(_cell))
+#define vm_Cell2f_(_cell,_x)		((_x)=(Float *)(_cell))
+#define vm_Cell2df_(_cell,_x)		((_x)=(DFloat *)(_cell))
+#define vm_Cell2sf_(_cell,_x)		((_x)=(SFloat *)(_cell))
+#define vm_Cell2xt(_cell,_x)		((_x)=(Xt)(_cell))
+#define vm_Cell2f83name(_cell,_x)	((_x)=(struct F83Name *)(_cell))
+#define vm_Cell2longname(_cell,_x)	((_x)=(struct Longname *)(_cell))
+#define vm_Float2r(_float,_x)		(_x=_float)
 
 /* conversion on store */
 
-#define vm_f2Cell(x)		((Cell)(x))
-#define vm_c2Cell(x)		((Cell)(x))
-#define vm_n2Cell(x)		((Cell)(x))
-#define vm_w2Cell(x)		((Cell)(x))
-#define vm_u2Cell(x)		((Cell)(x))
-#define vm_a_2Cell(x)		((Cell)(x))
-#define vm_c_2Cell(x)		((Cell)(x))
-#define vm_f_2Cell(x)		((Cell)(x))
-#define vm_df_2Cell(x)		((Cell)(x))
-#define vm_sf_2Cell(x)		((Cell)(x))
-#define vm_xt2Cell(x)		((Cell)(x))
-#define vm_f83name2Cell(x)	((Cell)(x))
-#define vm_longname2Cell(x)	((Cell)(x))
-#define vm_r2Float(x)	(x)
+#define vm_f2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_c2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_n2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_w2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_u2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_a_2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_c_2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_f_2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_df_2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_sf_2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_xt2Cell(_x,_cell)		((_cell)=(Cell)(_x))
+#define vm_f83name2Cell(_x,_cell)	((_cell)=(Cell)(_x))
+#define vm_longname2Cell(_x,_cell)	((_cell)=(Cell)(_x))
+#define vm_r2Float(_x,_float)		(_float=_x)
 
-#define vm_Cell2Cell(x)		(x)
+#define vm_Cell2Cell(_x,_y)		(_y=_x)
+
+#ifdef NO_IP
+#define IMM_ARG(access,value)		(VARIANT(value))
+#else
+#define IMM_ARG(access,value)		(access)
+#endif
 
 /* if machine.h has not defined explicit registers, define them as implicit */
 #ifndef IPREG
@@ -300,10 +306,14 @@ static int ufileattr[6]= {
 /* define some VM registers as global variables, so they survive exceptions;
    global register variables are not up to the task (according to the 
    GNU C manual) */
-Xt *ip;
+Xt *saved_ip;
 Cell *rp;
 #endif
 
+#ifdef NO_IP
+static Label next_code;
+#endif
+
 #ifdef DEBUG
 #define CFA_TO_NAME(__cfa) \
       Cell len, i; \
@@ -321,19 +331,14 @@ Cell *rp;
 Xt *primtable(Label symbols[], Cell size)
      /* used in primitive primtable for peephole optimization */
 {
-#ifdef DIRECT_THREADED
-  return symbols;
-#else /* !defined(DIRECT_THREADED) */
   Xt *xts = (Xt *)malloc(size*sizeof(Xt));
   Cell i;
 
   for (i=0; i<size; i++)
     xts[i] = &symbols[i];
   return xts;
-#endif /* !defined(DIRECT_THREADED) */
 }
 
-
 define(enginerest,
 `(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
@@ -341,9 +346,11 @@ define(enginerest,
 */
 {
 #ifndef GFORTH_DEBUGGING
-  register Xt *ip IPREG;
   register Cell *rp RPREG;
 #endif
+#ifndef NO_IP
+  register Xt *ip IPREG = ip0;
+#endif
   register Cell *sp SPREG = sp0;
   register Float *fp FPREG = fp0;
   register Address lp LPREG = lp0;
@@ -377,6 +384,9 @@ define(enginerest,
 #undef INST_ADDR
     (Label)&&after_last,
     (Label)0,
+#define INST_ADDR(name) (Label)&&K_##name
+#include "prim_lab.i"
+#undef INST_ADDR
 #ifdef IN_ENGINE2
 #define INST_ADDR(name) (Label)&&J_##name
 #include "prim_lab.i"
@@ -387,15 +397,14 @@ define(enginerest,
   CPU_DEP2
 #endif
 
-  ip = ip0;
   rp = rp0;
 #ifdef DEBUG
   fprintf(stderr,"ip=%x, sp=%x, rp=%x, fp=%x, lp=%x, up=%x\n",
-          (unsigned)ip,(unsigned)sp,(unsigned)rp,
+          (unsigned)ip0,(unsigned)sp,(unsigned)rp,
 	  (unsigned)fp,(unsigned)lp,(unsigned)up);
 #endif
 
-  if (ip == NULL) {
+  if (ip0 == NULL) {
 #if defined(DOUBLY_INDIRECT)
 #define CODE_OFFSET (26*sizeof(Cell))
 #define XT_OFFSET (22*sizeof(Cell))
@@ -421,10 +430,13 @@ define(enginerest,
   IF_spTOS(spTOS = sp[0]);
   IF_fpTOS(fpTOS = fp[0]);
 /*  prep_terminal(); */
+#ifdef NO_IP
+  goto *(*(Label *)ip0);
+#else
   SET_IP(ip);
   SUPER_END; /* count the first block, too */
   NEXT;
-
+#endif
 
 #ifdef CPU_DEP3
   CPU_DEP3
@@ -432,6 +444,10 @@ define(enginerest,
   
  docol:
   {
+#ifdef NO_IP
+    *--rp = next_code;
+    goto **(Label *)PFA1(cfa);
+#else
 #ifdef DEBUG
     {
       CFA_TO_NAME(cfa);
@@ -457,6 +473,7 @@ define(enginerest,
       NEXT_P2;
     }
 #endif
+#endif
   }
 
  docon:
@@ -471,8 +488,12 @@ define(enginerest,
     *--sp = *(Cell *)PFA1(cfa);
 #endif
   }
+#ifdef NO_IP
+  goto *next_code;
+#else
   NEXT_P0;
   NEXT;
+#endif
   
  dovar:
   {
@@ -486,8 +507,12 @@ define(enginerest,
     *--sp = (Cell)PFA1(cfa);
 #endif
   }
+#ifdef NO_IP
+  goto *next_code;
+#else
   NEXT_P0;
   NEXT;
+#endif
   
  douser:
   {
@@ -501,8 +526,12 @@ define(enginerest,
     *--sp = (Cell)(up+*(Cell*)PFA1(cfa));
 #endif
   }
+#ifdef NO_IP
+  goto *next_code;
+#else
   NEXT_P0;
   NEXT;
+#endif
   
  dodefer:
   {
@@ -520,8 +549,12 @@ define(enginerest,
 #endif
     spTOS += *(Cell*)PFA1(cfa);
   }
+#ifdef NO_IP
+  goto *next_code;
+#else
   NEXT_P0;
   NEXT;
+#endif
 
  dodoes:
   /* this assumes the following structure:
@@ -541,6 +574,13 @@ define(enginerest,
      pfa:
      
      */
+#ifdef NO_IP
+  *--rp = next_code;
+  IF_spTOS(spTOS = sp[0]);
+  sp--;
+  spTOS = (Cell)PFA(cfa);
+  goto **(Label *)DOES_CODE1(cfa);
+#else
   {
     /*    fprintf(stderr, "Got CFA %08lx at doescode %08lx/%08lx: does: %08lx\n",cfa,(Cell)ip,(Cell)PFA(cfa),(Cell)DOES_CODE1(cfa));*/
 #ifdef DEBUG
@@ -560,12 +600,14 @@ define(enginerest,
     /*    fprintf(stderr,"TOS = %08lx, IP=%08lx\n", spTOS, IP);*/
   }
   NEXT;
+#endif
 
 #ifndef IN_ENGINE2
-#define LABEL(name) I_##name
+#define LABEL(name) I_##name:
 #else
-#define LABEL(name) J_##name: asm(".skip 16"); I_##name
+#define LABEL(name) J_##name: asm(".skip 16"); I_##name:
 #endif
+#define LABEL2(name) K_##name:
 #include "prim.i"
 #undef LABEL
   after_last: return (Label *)0;
@@ -573,8 +615,25 @@ define(enginerest,
 }'
 )
 
+#define VARIANT(v)	(v)
+#define JUMP(target)	goto I_noop
+
 Label *engine enginerest
 
+#ifndef NO_DYNAMIC
+
+#ifdef NO_IP
+#undef VARIANT
+#define VARIANT(v)	((v)^0xffffffff)
+#undef JUMP
+#define JUMP(target)	goto K_lit
+Label *engine3 enginerest
+#endif
+
+#undef VARIANT
+#define VARIANT(v)	(v)
+#undef JUMP
+#define JUMP(target)	goto I_noop
 #define IN_ENGINE2
 Label *engine2 enginerest
-
+#endif