--- gforth/prim	2001/06/16 22:53:36	1.83
+++ gforth/prim	2002/02/10 14:02:25	1.92
@@ -181,6 +181,7 @@ $1 ( `#'ndisp $2 ) $3
 $4	SET_IP((Xt *)(((Cell)(IP-1))+ndisp));
 TAIL;
 }
+SUPER_CONTINUE;
 $5
 
 \+glocals
@@ -190,6 +191,7 @@ $4    lp += nlocals;
 SET_IP((Xt *)(((Cell)(IP-2))+ndisp));
 TAIL;
 }
+SUPER_CONTINUE;
 
 \+
 )
@@ -216,6 +218,7 @@ if (f==0) {
   SET_IP((Xt *)(((Cell)(IP-1))+ndisp));
   TAIL;
 }
+SUPER_CONTINUE;
 
 ?dup-0=-?branch	( #ndisp f -- )	new	question_dupe_zero_equals_question_branch
 ""The run-time procedure compiled by @code{?DUP-0=-IF}.""
@@ -228,6 +231,7 @@ if (f!=0) {
   SET_IP((Xt *)(((Cell)(IP-1))+ndisp));
   NEXT;
 }
+SUPER_CONTINUE;
 
 \+
 \f[THEN]
@@ -309,6 +313,7 @@ if (nstart == nlimit) {
     SET_IP((Xt *)(((Cell)(IP-1))+ndisp));
     TAIL;
 }
+SUPER_CONTINUE;
 :
   2dup =
   IF   r> swap rot >r >r
@@ -324,6 +329,7 @@ if (nstart >= nlimit) {
     SET_IP((Xt *)(((Cell)(IP-1))+ndisp));
     TAIL;
 }
+SUPER_CONTINUE;
 :
  swap 2dup
  r> swap >r swap >r
@@ -339,6 +345,7 @@ if (ustart >= ulimit) {
     SET_IP((Xt *)(((Cell)(IP-1))+ndisp));
     TAIL;
 }
+SUPER_CONTINUE;
 :
  swap 2dup
  r> swap >r swap >r
@@ -354,6 +361,7 @@ if (nstart <= nlimit) {
     SET_IP((Xt *)(((Cell)(IP-1))+ndisp));
     TAIL;
 }
+SUPER_CONTINUE;
 :
  swap 2dup
  r> swap >r swap >r
@@ -369,6 +377,7 @@ if (ustart <= ulimit) {
     SET_IP((Xt *)(((Cell)(IP-1))+ndisp));
     TAIL;
 }
+SUPER_CONTINUE;
 :
  swap 2dup
  r> swap >r swap >r
@@ -1347,7 +1356,6 @@ a_addr = (Cell *)DOES_CODE(xt);
 code-address!	( c_addr xt -- )		gforth	code_address_store
 ""Create a code field with code address @i{c-addr} at @i{xt}.""
 MAKE_CF(xt, c_addr);
-CACHE_FLUSH(xt,(size_t)PFA(0));
 :
     ! ;
 
@@ -1355,7 +1363,6 @@ does-code!	( a_addr xt -- )		gforth	does
 ""Create a code field at @i{xt} for a child of a @code{DOES>}-word;
 @i{a-addr} is the start of the Forth code after @code{DOES>}.""
 MAKE_DOES_CF(xt, a_addr);
-CACHE_FLUSH(xt,(size_t)PFA(0));
 :
     dodoes: over ! cell+ ! ;
 
@@ -1363,7 +1370,6 @@ does-handler!	( a_addr -- )	gforth	does_
 ""Create a @code{DOES>}-handler at address @i{a-addr}. Normally,
 @i{a-addr} points just behind a @code{DOES>}.""
 MAKE_DOES_HANDLER(a_addr);
-CACHE_FLUSH((caddr_t)a_addr,DOES_HANDLER_SIZE);
 :
     drop ;
 
@@ -1466,7 +1472,7 @@ c_addr2 = getenv(cstr(c_addr1,u1,1));
 u2 = (c_addr2 == NULL ? 0 : strlen(c_addr2));
 
 open-pipe	( c_addr u wfam -- wfileid wior )	gforth	open_pipe
-wfileid=(Cell)popen(cstr(c_addr,u,1),fileattr[wfam]); /* ~ expansion of 1st arg? */
+wfileid=(Cell)popen(cstr(c_addr,u,1),pfileattr[wfam]); /* ~ expansion of 1st arg? */
 wior = IOR(wfileid==0); /* !! the man page says that errno is not set reliably */
 
 close-pipe	( wfileid -- wretval wior )		gforth	close_pipe
@@ -1608,7 +1614,7 @@ if (wior)
   clearerr((FILE *)wfileid);
 
 read-line	( c_addr u1 wfileid -- u2 flag wior )	file	read_line
-""this is only for backward compatibility""
+/* this may one day be replaced with : read-line (read-line) nip ; */
 Cell c;
 flag=-1;
 for(u2=0; u2<u1; u2++)
@@ -2385,14 +2391,46 @@ peephole-opt	( xt1 xt2 wpeeptable -- xt
 they cannot be combined, xt is 0.""
 xt = peephole_opt(xt1, xt2, wpeeptable);
 
-call	( #a_callee -- R:a_retaddr )
+call	( #a_callee -- R:a_retaddr )	new
 ""Call callee (a variant of docol with inline argument).""
+#ifdef DEBUG
+    {
+      CFA_TO_NAME((((Cell *)a_callee)-2));
+      fprintf(stderr,"%08lx: call %08lx %.*s\n",(Cell)ip,(Cell)a_callee,
+	      len,name);
+    }
+#endif
 a_retaddr = (Cell *)IP;
 SET_IP((Xt *)a_callee);
 
-useraddr	( #u -- a_addr )
+useraddr	( #u -- a_addr )	new
 a_addr = (Cell *)(up+u);
 
+compile-prim ( xt1 -- xt2 )	new	compile_prim
+xt2 = (Xt)compile_prim((Label)xt1);
+
+lit@ / lit_fetch = lit @
+
+lit-perform	( #a_addr -- )	new	lit_perform
+ip=IP;
+SUPER_END;
+EXEC(*(Xt *)a_addr);
+
+lit+ / lit_plus = lit +
+
+does-exec ( #a_cfa -- R:nest a_pfa )	new	does_exec
+a_pfa = PFA(a_cfa);
+nest = (Cell)ip;
+IF_spTOS(spTOS = sp[0]);
+#ifdef DEBUG
+    {
+      CFA_TO_NAME(a_cfa);
+      fprintf(stderr,"%08lx: does %08lx %.*s\n",
+	      (Cell)ip,(Cell)a_cfa,len,name);
+    }
+#endif
+SET_IP(DOES_CODE1(a_cfa));
+
 include(peeprules.vmg)
 
 \+