--- gforth/prim	2003/09/14 21:16:48	1.144
+++ gforth/prim	2003/11/06 09:47:49	1.148
@@ -136,6 +136,10 @@
 \ throw execute, cfa and NEXT1 out?
 \ macroize *ip, ip++, *ip++ (pipelining)?
 
+\ Stack caching setup
+
+ifdef(`M4_ENGINE_FAST', `include(cache1.vmg)', `include(cache0.vmg)')
+
 \ these m4 macros would collide with identifiers
 undefine(`index')
 undefine(`shift')
@@ -148,36 +152,67 @@ undefine(`symbols')
 
 (docol)	( -- R:a_retaddr )	gforth-internal	paren_docol
 ""run-time routine for colon definitions""
+#ifdef NO_IP
+a_retaddr = next_code;
+INST_TAIL;
+goto **(Label *)PFA(CFA);
+#else /* !defined(NO_IP) */
 a_retaddr = (Cell *)IP;
 SET_IP((Xt *)PFA(CFA));
+#endif /* !defined(NO_IP) */
 
 (docon) ( -- w )	gforth-internal	paren_docon
 ""run-time routine for constants""
 w = *(Cell *)PFA(CFA);
+#ifdef NO_IP
+INST_TAIL;
+goto *next_code;
+#endif /* defined(NO_IP) */
 
 (dovar) ( -- a_body )	gforth-internal	paren_dovar
 ""run-time routine for variables and CREATEd words""
 a_body = PFA(CFA);
+#ifdef NO_IP
+INST_TAIL;
+goto *next_code;
+#endif /* defined(NO_IP) */
 
 (douser) ( -- a_user )	gforth-internal	paren_douser
 ""run-time routine for constants""
 a_user = (Cell *)(up+*(Cell *)PFA(CFA));
+#ifdef NO_IP
+INST_TAIL;
+goto *next_code;
+#endif /* defined(NO_IP) */
 
 (dodefer) ( -- )	gforth-internal	paren_dodefer
 ""run-time routine for deferred words""
+#ifndef NO_IP
 ip=IP; /* undo any ip updating that may have been performed by NEXT_P0 */
+#endif /* !defined(NO_IP) */
 SUPER_END; /* !! probably unnecessary and may lead to measurement errors */
 EXEC(*(Xt *)PFA(CFA));
 
 (dofield) ( n1 -- n2 )	gforth-internal	paren_field
 ""run-time routine for fields""
 n2 = n1 + *(Cell *)PFA(CFA);
+#ifdef NO_IP
+INST_TAIL;
+goto *next_code;
+#endif /* defined(NO_IP) */
 
 (dodoes) ( -- a_body R:a_retaddr )	gforth-internal	paren_dodoes
 ""run-time routine for @code{does>}-defined words""
+#ifdef NO_IP
+a_retaddr = next_code;
+a_body = PFA(CFA);
+INST_TAIL;
+goto **(Label *)DOES_CODE1(CFA);
+#else /* !defined(NO_IP) */
 a_retaddr = (Cell *)IP;
 a_body = PFA(CFA);
 SET_IP(DOES_CODE1(CFA));
+#endif /* !defined(NO_IP) */
 
 (does-handler) ( -- )	gforth-internal	paren_does_handler
 ""just a slot to have an encoding for the DOESJUMP, 
@@ -194,6 +229,7 @@ noop	( -- )		gforth
 call	( #a_callee -- R:a_retaddr )	new
 ""Call callee (a variant of docol with inline argument).""
 #ifdef NO_IP
+assert(0);
 INST_TAIL;
 JUMP(a_callee);
 #else
@@ -2525,10 +2561,7 @@ a_addr = groups;
 
 \g static_super
 
-\C #if !defined(GFORTH_DEBUGGING) && !defined(INDIRECT_THREADED) && !defined(DOUBLY_INDIRECT) && !defined(VM_PROFILING)
-
-include(peeprules.vmg)
-
-\C #endif
+ifdef(`M4_ENGINE_FAST',
+`include(peeprules.vmg)')
 
 \g end