--- gforth/engine/engine.c	2002/12/19 20:14:57	1.48
+++ gforth/engine/engine.c	2002/12/23 22:14:06	1.52
@@ -19,8 +19,6 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 */
 
-undefine(`symbols')
-
 #include "config.h"
 #include "forth.h"
 #include <ctype.h>
@@ -84,14 +82,6 @@ struct Longname {
 
 #define LONGNAME_COUNT(np)	((np)->countetc & (((~((UCell)0))<<3)>>3))
 
-Cell *SP;
-Float *FP;
-Address UP=NULL;
-
-#if 0
-/* not used currently */
-int emitcounter;
-#endif
 #define NULLC '\0'
 
 #ifdef MEMCMP_AS_SUBROUTINE
@@ -101,23 +91,6 @@ extern int gforth_memcmp(const char * s1
 
 #define NEWLINE	'\n'
 
-#ifdef HAS_FILE
-static char* fileattr[6]={"rb","rb","r+b","r+b","wb","wb"};
-static char* pfileattr[6]={"r","r","r+","r+","w","w"};
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-#ifndef O_TEXT
-#define O_TEXT 0
-#endif
-
-static int ufileattr[6]= {
-  O_RDONLY|O_BINARY, O_RDONLY|O_BINARY,
-  O_RDWR  |O_BINARY, O_RDWR  |O_BINARY,
-  O_WRONLY|O_BINARY, O_WRONLY|O_BINARY };
-#endif
-
 /* conversion on fetch */
 
 #define vm_Cell2f(_cell,_x)		((_x)=(Bool)(_cell))
@@ -207,18 +180,6 @@ static int ufileattr[6]= {
 #endif
 #define SUPER_CONTINUE
 
-#ifdef GFORTH_DEBUGGING
-/* 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 *saved_ip;
-Cell *rp;
-#endif
-
-#ifdef NO_IP
-static Label next_code;
-#endif
-
 #ifdef DEBUG
 #define CFA_TO_NAME(__cfa) \
       Cell len, i; \
@@ -233,8 +194,36 @@ static Label next_code;
       }
 #endif
 
-define(enginerest,
-`(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
+#if !defined(ENGINE)
+/* normal engine */
+#define VARIANT(v)	(v)
+#define JUMP(target)	goto I_noop
+#define LABEL(name) J_##name: asm(""); I_##name:
+
+#elif ENGINE==2
+/* variant with padding between VM instructions for finding out
+   cross-inst jumps (for dynamic code) */
+#define engine engine2
+#define VARIANT(v)	(v)
+#define JUMP(target)	goto I_noop
+#define LABEL(name) J_##name: SKIP16; I_##name:
+#define IN_ENGINE2
+
+#elif ENGINE==3
+/* variant with different immediate arguments for finding out
+   immediate arguments (for native code) */
+#define engine engine3
+#define VARIANT(v)	((v)^0xffffffff)
+#define JUMP(target)	goto K_lit
+#define LABEL(name) J_##name: asm(""); I_##name:
+#else
+#error illegal ENGINE value
+#endif /* ENGINE */
+
+#define LABEL2(name) K_##name:
+
+
+Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
    returns array of machine code labels (for use in a loader), if ip==NULL
 */
@@ -281,11 +270,9 @@ define(enginerest,
 #define INST_ADDR(name) (Label)&&K_##name
 #include "prim_lab.i"
 #undef INST_ADDR
-#ifdef IN_ENGINE2
 #define INST_ADDR(name) (Label)&&J_##name
 #include "prim_lab.i"
 #undef INST_ADDR
-#endif
   };
 #ifdef CPU_DEP2
   CPU_DEP2
@@ -496,38 +483,7 @@ define(enginerest,
   NEXT;
 #endif
 
-#ifndef IN_ENGINE2
-#define LABEL(name) I_##name:
-#else
-#define LABEL(name) J_##name: asm(".skip 16"); I_##name:
-#endif
-#define LABEL2(name) K_##name:
 #include "prim.i"
-#undef LABEL
   after_last: return (Label *)0;
   /*needed only to get the length of the last primitive */
-}'
-)
-
-#define VARIANT(v)	(v)
-#define JUMP(target)	goto I_noop
-
-Label *engine enginerest
-
-#ifndef NO_DYNAMIC
-
-#ifdef NO_IP
-#undef VARIANT
-#define VARIANT(v)	((v)^0xffffffff)
-#undef JUMP
-#define JUMP(target)	goto K_lit
-Label *engine3 enginerest
-#endif
-
-#undef VARIANT
-#define VARIANT(v)	(v)
-#undef JUMP
-#define JUMP(target)	goto I_noop
-#define IN_ENGINE2
-Label *engine2 enginerest
-#endif
+}