--- gforth/prims2x.fs	2002/10/12 18:36:25	1.119
+++ gforth/prims2x.fs	2002/12/27 15:51:28	1.123
@@ -95,6 +95,9 @@ variable include-skipped-insts
 \ inline arguments (false)
 include-skipped-insts off
 
+variable immarg \ values for immediate arguments (to be used in IMM_ARG macros)
+$12340000 immarg !
+
 : th ( addr1 n -- addr2 )
     cells + ;
 
@@ -325,9 +328,12 @@ Variable function-number 0 function-numb
 : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;
 
+\ forward declaration for inst-stream (breaks cycle in definitions)
+defer inst-stream-f ( -- stack )
+
 \ stack access stuff
 
-: normal-stack-access ( n stack -- )
+: normal-stack-access1 ( n stack -- )
     stack-pointer 2@ type
     dup
     if
@@ -336,8 +342,13 @@ Variable function-number 0 function-numb
 	drop ." TOS"
     endif ;
 
-\ forward declaration for inst-stream (breaks cycle in definitions)
-defer inst-stream-f ( -- stack )
+: normal-stack-access ( n stack -- )
+    dup inst-stream-f = if
+	." IMM_ARG(" normal-stack-access1 ." ," immarg ? ." )"
+	1 immarg +!
+    else
+	normal-stack-access1
+    endif ;
 
 : stack-depth { stack -- n }
     current-depth stack stack-number @ th @ ;
@@ -657,17 +668,12 @@ stack inst-stream IP Cell
 : fetches ( -- )
     prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
 
-: inst-pointer-update ( -- )
-    inst-stream stack-in @ ?dup-if
-	." INC_IP(" 0 .r ." );" cr
-    endif ;
-
 : 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
-	    inst-pointer-update
+	    ." INC_IP(" 0 .r ." );" cr
 	else
 	    stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr
 	endif
@@ -718,39 +724,37 @@ stack inst-stream IP Cell
     endif
     2drop ;
 
-: output-c-tail1 ( -- )
-    \ the final part of the generated C code before stores
+: output-label2 ( -- )
+    ." LABEL2(" prim prim-c-name 2@ type ." )" cr
+    ." NEXT_P2;" cr ;
+
+: output-c-tail1 { xt -- }
+    \ the final part of the generated C code, with xt printing LABEL2 or not.
     output-super-end
     print-debug-results
-    ." NEXT_P1;" cr ;
-
-: output-c-tail ( -- )
-    \ the final part of the generated C code, without LABEL2
-    output-c-tail1
+    ." NEXT_P1;" cr
     stores
     fill-tos 
-    ." NEXT_P2;" ;
+    xt execute ;
 
-: output-c-tail-no-stores ( -- )
-    \ the final part of the generated C code, without LABEL2
-    output-c-tail1
+: output-c-tail1-no-stores { xt -- }
+    \ the final part of the generated C code for combinations
+    output-super-end
+    ." NEXT_P1;" cr
     fill-tos 
-    ." NEXT_P2;" ;
+    xt execute ;
+
+: output-c-tail ( -- )
+    ['] noop output-c-tail1 ;
 
 : output-c-tail2 ( -- )
-    \ the final part of the generated C code, including LABEL2
-    output-c-tail1
-    stores
-    fill-tos 
-    ." LABEL2(" prim prim-c-name 2@ type ." )" cr
-    ." NEXT_P2;" cr ;
+    ['] output-label2 output-c-tail1 ;
+
+: output-c-tail-no-stores ( -- )
+    ['] noop output-c-tail1-no-stores ;
 
 : output-c-tail2-no-stores ( -- )
-    \ the final part of the generated C code, including LABEL2
-    output-c-tail1
-    fill-tos 
-    ." LABEL2(" prim prim-c-name 2@ type ." )" cr
-    ." NEXT_P2;" cr ;
+    ['] output-label2 output-c-tail1-no-stores ;
 
 : type-c-code ( c-addr u xt -- )
     \ like TYPE, but replaces "INST_TAIL;" with tail code produced by xt
@@ -918,8 +922,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=
@@ -1162,7 +1166,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