--- gforth/engine/engine.c	2003/08/20 09:23:46	1.65
+++ gforth/engine/engine.c	2003/11/02 18:18:35	1.71
@@ -19,6 +19,9 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 */
 
+#define USE_NO_TOS
+#define USE_NO_FTOS
+
 #include "config.h"
 #include "forth.h"
 #include <ctype.h>
@@ -153,6 +156,12 @@ extern int gforth_memcmp(const char * s1
 #ifndef TOSREG
 #define TOSREG
 #endif
+#ifndef spaREG
+#define spaREG
+#endif
+#ifndef spbREG
+#define spbREG
+#endif
 #ifndef FTOSREG
 #define FTOSREG
 #endif
@@ -175,6 +184,23 @@ extern int gforth_memcmp(const char * s1
 #endif
 #define SUPER_CONTINUE
 
+#ifdef GFORTH_DEBUGGING
+#if DEBUG
+#define NAME(string) { saved_ip=ip; asm(""); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);}
+#else /* !DEBUG */
+#define NAME(string) { saved_ip=ip; asm(""); }
+/* the asm here is to avoid reordering of following stuff above the
+   assignment; this is an old-style asm (no operands), and therefore
+   is treated like "asm volatile ..."; i.e., it prevents most
+   reorderings across itself.  We want the assignment above first,
+   because the stack loads may already cause a stack underflow. */
+#endif /* !DEBUG */
+#elif DEBUG
+#       define  NAME(string)    fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);
+#else
+#	define	NAME(string)
+#endif
+
 #ifdef DEBUG
 #define CFA_TO_NAME(__cfa) \
       Cell len, i; \
@@ -220,7 +246,8 @@ extern int gforth_memcmp(const char * s1
 #error illegal ENGINE value
 #endif /* ENGINE */
 
-#define LABEL2(name) K_##name:
+/* the asm(""); is there to get a stop compiled on Itanium */
+#define LABEL2(name) K_##name: asm("");
 
 Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
@@ -250,7 +277,9 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   void * prv;
 #endif
   register Address up UPREG = UP;
-  IF_spTOS(register Cell spTOS TOSREG;)
+  register Cell MAYBE_UNUSED spa TOSREG;
+  register Cell MAYBE_UNUSED spb spaREG;
+  register Cell MAYBE_UNUSED spc spbREG;
   IF_fpTOS(register Float fpTOS FTOSREG;)
 #if defined(DOUBLY_INDIRECT)
   static Label *symbols;
@@ -261,14 +290,14 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #define MAX_SYMBOLS (sizeof(symbols)/sizeof(symbols[0]))
 #endif /* !defined(DOUBLY_INDIRECT) */
 #define INST_ADDR(name) ((Label)&&I_##name)
-#include "prim_lab.i"
+#include PRIM_LAB_I
 #undef INST_ADDR
     (Label)0,
 #define INST_ADDR(name) ((Label)&&K_##name)
-#include "prim_lab.i"
+#include PRIM_LAB_I
 #undef INST_ADDR
 #define INST_ADDR(name) ((Label)&&J_##name)
-#include "prim_lab.i"
+#include PRIM_LAB_I
 #undef INST_ADDR
     (Label)&&after_last
   };
@@ -321,7 +350,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   CPU_DEP3
 #endif
 
-#include "prim.i"
+#include PRIM_I
   after_last: return (Label *)0;
   /*needed only to get the length of the last primitive */
 }