--- gforth/prims2x.fs	2002/11/24 13:54:01	1.121
+++ gforth/prims2x.fs	2002/12/27 16:22:03	1.124
@@ -669,7 +669,7 @@ stack inst-stream IP Cell
     prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
 
 : stack-pointer-update { stack -- }
-    \ stack grow downwards
+    \ stacks grow downwards
     stack stack-diff
     ?dup-if \ this check is not necessary, gcc would do this for us
 	stack inst-stream = if
@@ -724,6 +724,12 @@ stack inst-stream IP Cell
     endif
     2drop ;
 
+: output-nextp2 ( -- )
+    ." NEXT_P2;" cr ;
+
+variable tail-nextp2 \ xt to execute for printing NEXT_P2 in INST_TAIL
+' output-nextp2 tail-nextp2 !
+
 : output-label2 ( -- )
     ." LABEL2(" prim prim-c-name 2@ type ." )" cr
     ." NEXT_P2;" cr ;
@@ -745,13 +751,13 @@ stack inst-stream IP Cell
     xt execute ;
 
 : output-c-tail ( -- )
-    ['] noop output-c-tail1 ;
+    tail-nextp2 @ output-c-tail1 ;
 
 : output-c-tail2 ( -- )
     ['] output-label2 output-c-tail1 ;
 
 : output-c-tail-no-stores ( -- )
-    ['] noop output-c-tail1-no-stores ;
+    tail-nextp2 @ output-c-tail1-no-stores ;
 
 : output-c-tail2-no-stores ( -- )
     ['] output-label2 output-c-tail1-no-stores ;
@@ -922,8 +928,8 @@ stack inst-stream IP Cell
 : output-alias ( -- ) 
     ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
 
-: output-prim-num ( -- )
-    prim prim-num @ 8 + 4 .r space prim prim-name 2@ type cr ;
+: output-c-prim-num ( -- )
+    ." #define N_" prim prim-c-name 2@ type prim prim-num @ 8 + 4 .r cr ;
 
 : output-forth ( -- )  
     prim prim-forth-code @ 0=
@@ -1166,7 +1172,7 @@ stack inst-stream IP Cell
     r> in-part ! ;
 
 : part-stack-pointer-updates ( -- )
-    max-stacks 0 +do
+    next-stack-number @ 0 +do
 	i part-num @ 1+ s-c-max-depth @ dup
 	i num-combined @ s-c-max-depth @ =    \ final depth
 	swap i part-num @ s-c-max-depth @ <> \ just reached now