--- gforth/prim	2001/01/27 20:14:55	1.71
+++ gforth/prim	2001/05/01 13:35:42	1.82
@@ -72,9 +72,12 @@
 \ df_.*		DFloat *
 \ sf_.*		SFloat *
 \ xt.*		XT
-\ wid.*		WID
 \ f83name.*	F83Name *
 
+\E stack data-stack   sp Cell
+\E stack fp-stack     fp Float
+\E stack return-stack rp Cell
+\E
 \E get-current prefixes set-current
 \E 
 \E s" Bool"		single data-stack type-prefix f
@@ -91,7 +94,6 @@
 \E s" DFloat *"		single data-stack type-prefix df_
 \E s" SFloat *"		single data-stack type-prefix sf_
 \E s" Xt"		single data-stack type-prefix xt
-\E s" WID"		single data-stack type-prefix wid
 \E s" struct F83Name *"	single data-stack type-prefix f83name
 \E s" struct Longname *" single data-stack type-prefix longname
 \E 
@@ -128,6 +130,7 @@
 \ these m4 macros would collide with identifiers
 undefine(`index')
 undefine(`shift')
+undefine(`symbols')
 
 noop	( -- )		gforth
 :
@@ -141,6 +144,7 @@ execute	( xt -- )		core
 ""Perform the semantics represented by the execution token, @i{xt}.""
 ip=IP;
 IF_spTOS(spTOS = sp[0]);
+SUPER_END;
 EXEC(xt);
 
 perform	( a_addr -- )	gforth
@@ -148,6 +152,7 @@ perform	( a_addr -- )	gforth
 /* and pfe */
 ip=IP;
 IF_spTOS(spTOS = sp[0]);
+SUPER_END;
 EXEC(*(Xt *)a_addr);
 :
  @ execute ;
@@ -1187,7 +1192,7 @@ f83name2=f83name1;
 	r> @
     REPEAT  THEN  nip nip ;
 : (find-samelen) ( u f83name1 -- u f83name2/0 )
-    BEGIN  2dup cell+ c@ $1F and <> WHILE  @  dup 0= UNTIL  THEN ;
+    BEGIN  2dup cell+ c@ $1F and <> WHILE  @  dup 0= UNTIL THEN ;
 
 \+hash
 
@@ -1424,6 +1429,7 @@ cache.""
 FLUSH_ICACHE(c_addr,u);
 
 (bye)	( n -- )	gforth	paren_bye
+SUPER_END;
 return (Label *)n;
 
 (system)	( c_addr u -- wretval wior )	gforth	peren_system
@@ -2137,7 +2143,7 @@ Variable UP
 wcall	( u -- )	gforth
 IF_fpTOS(fp[0]=fpTOS);
 FP=fp;
-sp=(SYSCALL(Cell(*)(Cell *, void *))u)(sp, &FP);
+sp=(Cell*)(SYSCALL(Cell(*)(Cell *, void *))u)(sp, &FP);
 fp=FP;
 IF_spTOS(spTOS=sp[0];)
 IF_fpTOS(fpTOS=fp[0]);
@@ -2288,13 +2294,13 @@ for (; longname1 != NULL; longname1 = (s
     break;
 longname2=longname1;
 :
-    BEGIN  dup WHILE  (find-samelen)  dup  WHILE
-	>r 2dup r@ cell+ char+ capscomp  0=
+    BEGIN  dup WHILE  (findl-samelen)  dup  WHILE
+	>r 2dup r@ cell+ cell+ capscomp  0=
 	IF  2drop r>  EXIT  THEN
 	r> @
     REPEAT  THEN  nip nip ;
-: (find-samelen) ( u longname1 -- u longname2/0 )
-    BEGIN  2dup cell+ c@ $1F and <> WHILE  @  dup 0= UNTIL  THEN ;
+: (findl-samelen) ( u longname1 -- u longname2/0 )
+    BEGIN  2dup cell+ @ lcount-mask and <> WHILE  @  dup 0= UNTIL  THEN ;
 
 \+hash
 
@@ -2314,8 +2320,8 @@ while(a_addr != NULL)
 }
 :
  BEGIN  dup  WHILE
-        2@ >r >r dup r@ cell+ c@ $1F and =
-        IF  2dup r@ cell+ char+ capscomp 0=
+        2@ >r >r dup r@ cell+ @ lcount-mask and =
+        IF  2dup r@ cell+ cell+ capscomp 0=
 	    IF  2drop r> rdrop  EXIT  THEN  THEN
 	rdrop r>
  REPEAT nip nip ;
@@ -2337,10 +2343,40 @@ while(a_addr != NULL)
 }
 :
  BEGIN  dup  WHILE
-        2@ >r >r dup r@ cell+ c@ $1F and =
-        IF  2dup r@ cell+ char+ -text 0=
+        2@ >r >r dup r@ cell+ @ lcount-mask and =
+        IF  2dup r@ cell+ cell+ -text 0=
 	    IF  2drop r> rdrop  EXIT  THEN  THEN
 	rdrop r>
  REPEAT nip nip ;
 
 \+
+
+\+peephole
+
+primtable	( -- wprimtable )	new
+""wprimtable is a table containing the xts of the primitives indexed
+by sequence-number in prim (for use in prepare-peephole-table).""
+wprimtable = (Cell)primtable(symbols+DOESJUMP+1,MAX_SYMBOLS-DOESJUMP-1);
+
+prepare-peephole-table	( wprimtable -- wpeeptable ) new prepare_peephole_opt
+""wpeeptable is a data structure used by @code{peephole-opt}; it is
+constructed by combining a primitives table with a simple peephole
+optimization table.""
+wpeeptable = prepare_peephole_table((Xt *)wprimtable);
+
+peephole-opt	( xt1 xt2 wpeeptable -- xt )	new	peephole_opt
+""xt is the combination of xt1 and xt2 (according to wpeeptable); if
+they cannot be combined, xt is 0.""
+xt = peephole_opt(xt1, xt2, wpeeptable);
+
+call	( #a_callee -- R:a_retaddr )
+""Call callee (a variant of docol with inline argument).""
+a_retaddr = (Cell *)IP;
+SET_IP((Xt *)a_callee);
+
+useraddr	( #u -- a_addr )
+a_addr = (Cell *)(up+u);
+
+include(peeprules.vmg)
+
+\+