--- gforth/arch/generic/machine.h	2001/03/18 22:20:27	1.13
+++ gforth/arch/generic/machine.h	2002/08/28 17:50:28	1.18
@@ -25,18 +25,6 @@
 #define THREADING_SCHEME 6
 #endif
 
-#ifdef GFORTH_DEBUGGING
-/* schedule the ip update after the rest of the primitive;
-   never mind speed */
-#undef THREADING_SCHEME
-#ifdef DIRECT_THREADED
-#define THREADING_SCHEME 10
-#else
-#define THREADING_SCHEME 8
-#endif /* DIRECT_THREADED */
-#endif /* GFORTH_DEBUGGING */
-
-
 /* define SYSCALL */
 
 #ifndef SYSCALL
@@ -60,10 +48,10 @@
    loses on processors with few registers. USE_TOS might be defined in
    the processor-specific files */
 
-#ifdef DIRECT_THREADED
-/* If you want direct threading, write a .h file for your processor! */
-/* We could put some stuff here that causes a compile error, but then
-   we could not use this file in the other machine.h files */
+#ifndef INDIRECT_THREADED
+#ifndef DIRECT_THREADED
+#define DIRECT_THREADED
+#endif
 #endif
 
 /* Types: these types are used as Forth's internal types */
@@ -90,7 +78,7 @@ typedef void **Label;
 typedef void *Label;
 #endif /* !defined(DOUBLY_INDIRECT) */
 
-/* feature defines */
+/* feature defines, these setting should be identical to the ones in machpc.fs */
 
 #define HAS_DCOMPS
 #define HAS_FILE
@@ -101,6 +89,8 @@ typedef void *Label;
 #define HAS_XCONDS
 #define HAS_STANDARDTHREADING
 #define HAS_DEBUG
+#ifndef HAS_PEEPHOLE
 #define HAS_PEEPHOLE
+#endif
 
 #define RELINFOBITS	8