--- gforth/prims2x.fs	2002/10/12 11:05:22	1.118
+++ gforth/prims2x.fs	2002/12/28 17:18:27	1.125
@@ -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 + ;
 
@@ -286,11 +289,16 @@ create min-depth     max-stacks cells al
 create sp-update-in max-stacks cells allot
 \ where max-depth occured the first time
 create max-depths max-stacks max-combined 1+ * cells allot
-\ maximum depth at start of each component: array[components] of array[stack]
+\ maximum depth at start of each part: array[parts] of array[stack]
+create max-back-depths max-stacks max-combined 1+ * cells allot
+\ maximun depth from end of the combination to the start of the each part
 
 : s-c-max-depth ( nstack ncomponent -- addr )
     max-stacks * + cells max-depths + ;
 
+: s-c-max-back-depth ( nstack ncomponent -- addr )
+    max-stacks * + cells max-back-depths + ;
+
 wordlist constant primitives
 
 : create-prim ( prim -- )
@@ -320,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
@@ -331,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 @ ;
@@ -361,8 +377,19 @@ defer inst-stream-f ( -- stack )
 	drop n stack part-stack-access
     endif ;
 
-: part-stack-write ( n stack -- )
-    part-stack-access ;
+: stack-diff ( stack -- n )
+    \ in-out
+    dup stack-in @ swap stack-out @ - ;
+
+: part-stack-write { n stack -- }
+    stack stack-depth n +
+    stack stack-number @ part-num @ s-c-max-back-depth @
+    over <= if ( ndepth )
+	stack combined ['] stack-diff prim-context -
+	stack normal-stack-access
+    else
+	drop n stack part-stack-access
+    endif ;
 
 : stack-read ( n stack -- )
     \ print a stack access at index n of stack
@@ -641,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
-    stack stack-in @ stack stack-out @ -
+    \ 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
@@ -702,24 +724,43 @@ stack inst-stream IP Cell
     endif
     2drop ;
 
-: output-c-tail1 ( -- )
-    \ the final part of the generated C code except LABEL2 and NEXT_P2
+: 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 ;
+
+: 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
     stores
-    fill-tos ;
+    fill-tos 
+    xt execute ;
+
+: output-c-tail1-no-stores { xt -- }
+    \ the final part of the generated C code for combinations
+    output-super-end
+    ." NEXT_P1;" cr
+    fill-tos 
+    xt execute ;
 
 : output-c-tail ( -- )
-    \ the final part of the generated C code, without LABEL2
-    output-c-tail1
-    ." NEXT_P2;" ;
+    tail-nextp2 @ output-c-tail1 ;
 
 : output-c-tail2 ( -- )
-    \ the final part of the generated C code, including LABEL2
-    output-c-tail1
-    ." LABEL2(" prim prim-c-name 2@ type ." )" cr
-    ." NEXT_P2;" cr ;
+    ['] output-label2 output-c-tail1 ;
+
+: output-c-tail-no-stores ( -- )
+    tail-nextp2 @ output-c-tail1-no-stores ;
+
+: output-c-tail2-no-stores ( -- )
+    ['] 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
@@ -882,13 +923,13 @@ stack inst-stream IP Cell
 \      cr ;
 
 : output-label ( -- )  
-    ." INST_ADDR(" prim prim-c-name 2@ type ." )," cr ;
+    ." INST_ADDR(" prim prim-c-name 2@ type ." )" cr ;
 
 : 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=
@@ -1013,16 +1054,15 @@ stack inst-stream IP Cell
 : min! ( n addr -- )
     tuck @ min swap ! ;
 
-: inst-stream-correction ( nin1 nstack -- nin2 )
-    0= if
-	include-skipped-insts @ -
-    endif ;
+: inst-stream-adjustment ( nstack -- n )
+    \ number of stack items to add for each part
+    0= include-skipped-insts @ and negate ;
 
 : add-depths { p -- }
     \ combine stack effect of p with *-depths
     max-stacks 0 ?do
 	current-depth i th @
-	p prim-stacks-in  i th @ + i inst-stream-correction
+	p prim-stacks-in  i th @ + i inst-stream-adjustment +
 	dup max-depth i th max!
 	p prim-stacks-out i th @ -
 	dup min-depth i th min!
@@ -1073,6 +1113,27 @@ stack inst-stream IP Cell
 	i q prim-stacks-out i th @ q prim-effect-out-end make-effect-items
     loop ;
 
+: compute-stack-max-back-depths ( stack -- )
+    stack-number @ { stack# }
+    current-depth stack# th @ dup
+    dup stack# num-combined @ s-c-max-back-depth !
+    -1 num-combined @ 1- -do ( max-depth current-depth )
+	combined-prims i th @ { p }
+	p prim-stacks-out stack# th @ +
+	dup >r max r>
+	over stack# i s-c-max-back-depth !
+	p prim-stacks-in stack# th @ -
+	stack# inst-stream-adjustment -
+    1 -loop
+    assert( dup stack# inst-stream-adjustment negate = )
+    assert( over max-depth stack# th @ = )
+    2drop ;
+
+: compute-max-back-depths ( -- )
+    \ compute max-back-depths.
+    \ assumes that current-depths is correct for the end of the combination
+    ['] compute-stack-max-back-depths map-stacks ;
+
 : process-combined ( -- )
     combined combined-prims num-combined @ cells
     combinations ['] constant insert-wordlist
@@ -1080,6 +1141,7 @@ stack inst-stream IP Cell
     @ prim-c-code 2@ prim prim-c-code 2! \ used by output-super-end
     prim compute-effects
     prim init-effects
+    compute-max-back-depths
     output-combined perform ;
 
 \ C output
@@ -1106,11 +1168,11 @@ stack inst-stream IP Cell
 : output-combined-tail ( -- )
     part-output-c-tail
     in-part @ >r in-part off
-    combined ['] output-c-tail prim-context
+    combined ['] output-c-tail-no-stores prim-context
     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
@@ -1155,7 +1217,7 @@ stack inst-stream IP Cell
     \ print-debug-args
     \ stack-pointer-updates now in parts
     output-parts
-    output-c-tail2
+    output-c-tail2-no-stores
     ." }" cr
     cr ;
 
@@ -1362,7 +1424,7 @@ Variable c-flag
 (( (( ` g || ` G )) {{ start }} nonl **
    {{ end
       forth-flag @ IF  ." group " type cr  THEN
-      c-flag @     IF  ." GROUP(" type ." )" cr  THEN }}
+      c-flag @     IF  ." GROUP(" type ." , " function-number @ 0 .r ." )" cr  THEN }}
 )) <- group-comment
 
 (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment || group-comment )) ?? nonl ** )) <- comment-body