--- gforth/prims2x.fs	2003/03/22 10:04:07	1.135
+++ gforth/prims2x.fs	2003/05/15 18:43:15	1.139
@@ -51,8 +51,15 @@
 \ (stack-in-index-xt and a test for stack==instruction-stream); there
 \ should be only one.
 
+\ for backwards compatibility, jaw
+require compat/strcomp.fs
+
 warnings off
 
+\ redefinitions of kernel words not present in gforth-0.6.1
+: latestxt lastcfa @ ;
+: latest last @ ;
+
 [IFUNDEF] try
 include startup.fs
 [THEN]
@@ -1264,43 +1271,62 @@ variable tail-nextp2 \ xt to execute for
 \    int loads;       /* number of stack loads */
 \    int stores;      /* number of stack stores */
 \    int updates;     /* number of stack pointer updates */
+\    int offset;      /* offset into super2 table */
 \    int length;      /* number of components */
-\    int *components; /* array of vm_prim indexes of components */
 \  };
 
 \ How do you know which primitive or combined instruction this
 \ structure refers to?  By the order of cost structures, as in most
 \ other cases.
 
+: super2-length ( -- n )
+    combined if
+	num-combined @
+    else
+	1
+    endif ;
+
 : compute-costs { p -- nloads nstores nupdates }
     \ compute the number of loads, stores, and stack pointer updates
     \ of a primitive or combined instruction; does not take TOS
-    \ caching into account, nor that IP updates are combined with
-    \ other stuff
+    \ caching into account
     0 max-stacks 0 +do
 	p prim-stacks-in i th @ +
     loop
+    super2-length 1- - \ don't count instruction fetches of subsumed insts
     0 max-stacks 0 +do
 	p prim-stacks-out i th @ +
     loop
-    0 max-stacks 0 +do
+    0 max-stacks 1 +do \ don't count ip updates, therefore "1 +do"
 	p prim-stacks-in i th @ p prim-stacks-out i th @ <> -
     loop ;
 
 : output-num-part ( p -- )
     prim-num @ 4 .r ." ," ;
 
+: output-name-comment ( -- )
+    ."  /* " prim prim-name 2@ type ."  */" ;
+
+variable offset-super2  0 offset-super2 ! \ offset into the super2 table
+
 : output-costs ( -- )
+    \ description of superinstructions and simple instructions
     ." {" prim compute-costs
     rot 2 .r ." ," swap 2 .r ." ," 2 .r ." ,"
+    offset-super2 @ 5 .r ." ,"
+    super2-length dup 2 .r ." }," offset-super2 +!
+    output-name-comment
+    cr ;
+
+: output-super2 ( -- )
+    \ table of superinstructions without requirement for existing prefixes
     combined if
-	num-combined @ 2 .r
-	." , ((int []){" ['] output-num-part map-combined ." })}, /* "
+	['] output-num-part map-combined 
     else
-	."  1, ((int []){" prim prim-num @ 4 .r ." })}, /* "
+	prim output-num-part
     endif
-    prim prim-name 2@ type ."  */"
-    cr ;
+    output-name-comment
+    cr ;   
 
 \ the parser
 
@@ -1477,7 +1503,8 @@ Variable c-flag
       start }} [ifdef] vmgen c-ident [else] forth-ident [then] {{ end
       2dup prim prim-name 2! prim prim-c-name 2! }}  white **
    (( ` / white ** {{ start }} c-ident {{ end prim prim-c-name 2! }} white ** )) ??
-   (( simple-primitive || combined-primitive )) {{ 1 function-number +! }}
+   (( simple-primitive || combined-primitive ))
+   {{ 1 function-number +! }}
 )) <- primitive ( -- )
 
 (( (( comment || primitive || nl white ** )) ** eof ))