--- gforth/engine/engine.c	2002/08/09 09:42:36	1.42
+++ gforth/engine/engine.c	2002/11/10 11:24:08	1.45
@@ -300,7 +300,7 @@ 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
 
@@ -337,9 +337,9 @@ define(enginerest,
 */
 {
 #ifndef GFORTH_DEBUGGING
-  register Xt *ip IPREG;
   register Cell *rp RPREG;
 #endif
+  register Xt *ip IPREG;
   register Cell *sp SPREG = sp0;
   register Float *fp FPREG = fp0;
   register Address lp LPREG = lp0;
@@ -558,9 +558,9 @@ define(enginerest,
   NEXT;
 
 #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)
 #include "prim.i"
@@ -572,6 +572,7 @@ define(enginerest,
 
 Label *engine enginerest
 
+#ifndef NO_DYNAMIC
 #define IN_ENGINE2
 Label *engine2 enginerest
-
+#endif