--- gforth/engine/engine.c	2003/11/02 18:18:35	1.71
+++ gforth/engine/engine.c	2004/01/05 22:25:03	1.73
@@ -19,7 +19,11 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 */
 
+#if defined(GFORTH_DEBUGGING) || defined(INDIRECT_THREADED) || defined(DOUBLY_INDIRECT) || defined(VM_PROFILING)
 #define USE_NO_TOS
+#else
+#define USE_TOS
+#endif
 #define USE_NO_FTOS
 
 #include "config.h"
@@ -186,7 +190,7 @@ extern int gforth_memcmp(const char * s1
 
 #ifdef GFORTH_DEBUGGING
 #if DEBUG
-#define NAME(string) { saved_ip=ip; asm(""); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);}
+#define NAME(string) { saved_ip=ip; asm("# "string); 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
@@ -196,9 +200,9 @@ extern int gforth_memcmp(const char * s1
    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);
+#       define  NAME(string)    {Cell __depth=sp0+3-sp; int i; fprintf(stderr,"%08lx depth=%3ld: "string,(Cell)ip,sp0+3-sp); for (i=__depth-1; i>0; i--) fprintf(stderr, " $%lx",sp[i]); fprintf(stderr, " $%lx\n",spTOS); }
 #else
-#	define	NAME(string)
+#	define	NAME(string) asm("# "string);
 #endif
 
 #ifdef DEBUG
@@ -277,7 +281,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   void * prv;
 #endif
   register Address up UPREG = UP;
-  register Cell MAYBE_UNUSED spa TOSREG;
+  IF_spTOS(register Cell MAYBE_UNUSED spTOS TOSREG;)
   register Cell MAYBE_UNUSED spb spaREG;
   register Cell MAYBE_UNUSED spc spbREG;
   IF_fpTOS(register Float fpTOS FTOSREG;)