--- gforth/engine/engine.c	2004/12/31 13:24:03	1.75
+++ gforth/engine/engine.c	2005/01/23 13:56:13	1.79
@@ -151,6 +151,9 @@ extern int gforth_memcmp(const char * s1
 #ifndef LPREG
 #define LPREG
 #endif
+#ifndef CAREG
+#define CAREG
+#endif
 #ifndef CFAREG
 #define CFAREG
 #endif
@@ -228,7 +231,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
@@ -236,7 +239,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
@@ -245,13 +248,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
@@ -268,6 +272,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 CAREG;
 #ifdef MORE_VARS
   MORE_VARS
 #endif
@@ -303,7 +308,13 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #define INST_ADDR(name) ((Label)&&J_##name)
 #include PRIM_LAB_I
 #undef INST_ADDR
-    (Label)&&after_last
+    (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
   };
 #ifdef CPU_DEP2
   CPU_DEP2
@@ -344,10 +355,13 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 /*  prep_terminal(); */
 #ifdef NO_IP
   goto *(*(Label *)ip0);
+  before_goto:
+  goto *real_ca;
+  after_goto:;
 #else
   SET_IP(ip);
   SUPER_END; /* count the first block, too */
-  NEXT;
+  FIRST_NEXT;
 #endif
 
 #ifdef CPU_DEP3
@@ -357,4 +371,6 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #include PRIM_I
   after_last: return (Label *)0;
   /*needed only to get the length of the last primitive */
+
+  return (Label *)0;
 }