--- gforth/engine/engine.c	2003/10/16 18:48:03	1.70
+++ gforth/engine/engine.c	2005/01/23 09:55:12	1.78
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -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"
@@ -156,12 +160,12 @@ extern int gforth_memcmp(const char * s1
 #ifndef TOSREG
 #define TOSREG
 #endif
-#ifndef spaREG
-#define spaREG
-#endif
 #ifndef spbREG
 #define spbREG
 #endif
+#ifndef spcREG
+#define spcREG
+#endif
 #ifndef FTOSREG
 #define FTOSREG
 #endif
@@ -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
@@ -224,7 +228,7 @@ extern int gforth_memcmp(const char * s1
 /* normal engine */
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
-#define LABEL(name) J_##name: asm(""); I_##name:
+#define LABEL(name) H_##name: I_##name:
 
 #elif ENGINE==2
 /* variant with padding between VM instructions for finding out
@@ -232,7 +236,7 @@ extern int gforth_memcmp(const char * s1
 #define engine engine2
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
-#define LABEL(name) J_##name: SKIP16; I_##name:
+#define LABEL(name) H_##name: SKIP16; I_##name:
 #define IN_ENGINE2
 
 #elif ENGINE==3
@@ -241,13 +245,14 @@ extern int gforth_memcmp(const char * s1
 #define engine engine3
 #define VARIANT(v)	((v)^0xffffffff)
 #define JUMP(target)	goto K_lit
-#define LABEL(name) J_##name: asm(""); I_##name:
+#define LABEL(name) H_##name: I_##name:
 #else
 #error illegal ENGINE value
 #endif /* ENGINE */
 
 /* the asm(""); is there to get a stop compiled on Itanium */
 #define LABEL2(name) K_##name: asm("");
+#define LABEL3(name) J_##name: asm("");
 
 Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
@@ -264,6 +269,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   register Float *fp FPREG = fp0;
   register Address lp LPREG = lp0;
   register Xt cfa CFAREG;
+  register Label real_ca;
 #ifdef MORE_VARS
   MORE_VARS
 #endif
@@ -277,9 +283,9 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   void * prv;
 #endif
   register Address up UPREG = UP;
-  register Cell MAYBE_UNUSED spa TOSREG;
-  register Cell MAYBE_UNUSED spb spaREG;
-  register Cell MAYBE_UNUSED spc spbREG;
+  IF_spTOS(register Cell MAYBE_UNUSED spTOS TOSREG;)
+  register Cell MAYBE_UNUSED spb spbREG;
+  register Cell MAYBE_UNUSED spc spcREG;
   IF_fpTOS(register Float fpTOS FTOSREG;)
 #if defined(DOUBLY_INDIRECT)
   static Label *symbols;
@@ -290,16 +296,22 @@ 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,
+    (Label)&&before_goto,
+    (Label)&&after_goto,
+/* just mention the H_ labels, so the SKIP16s are not optimized away */
+#define INST_ADDR(name) ((Label)&&H_##name)
+#include PRIM_LAB_I
 #undef INST_ADDR
-    (Label)&&after_last
   };
 #ifdef CPU_DEP2
   CPU_DEP2
@@ -350,7 +362,12 @@ 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 */
+
+  before_goto:
+  goto *real_ca;
+  after_goto:
+  return (Label *)0;
 }