--- gforth/prims2x.fs	2002/10/12 11:05:22	1.118
+++ gforth/prims2x.fs	2003/05/13 09:36:59	1.138
@@ -1,6 +1,6 @@
 \ converts primitives to, e.g., C code 
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -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]
@@ -63,7 +70,7 @@ warnings off
 \ warnings on
 
 include ./gray.fs
-32 constant max-effect \ number of things on one side of a stack effect
+128 constant max-effect \ number of things on one side of a stack effect
 4 constant max-stacks  \ the max. number of stacks (including inst-stream).
 255 constant maxchar
 maxchar 1+ constant eof-char
@@ -95,6 +102,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 + ;
 
@@ -159,6 +169,7 @@ struct%
     cell% 2* field stack-pointer \ stackpointer name
     cell%    field stack-type \ name for default type of stack items
     cell%    field stack-in-index-xt \ ( in-size item -- in-index )
+    cell%    field stack-access-transform \ ( nitem -- index )
 end-struct stack%
 
 struct%
@@ -194,7 +205,9 @@ create stacks max-stacks cells allot \ a
     1 next-stack-number +!
     r@ stack-type !
     save-mem r@ stack-pointer 2! 
-    ['] stack-in-index r> stack-in-index-xt ! ;
+    ['] stack-in-index r@ stack-in-index-xt !
+    ['] noop r@ stack-access-transform !
+    rdrop ;
 
 : map-stacks { xt -- }
     \ perform xt for all stacks
@@ -286,11 +299,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,19 +338,29 @@ 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 -- )
-    stack-pointer 2@ type
-    dup
-    if
-	." [" 0 .r ." ]"
+: normal-stack-access0 { n stack -- }
+    n stack stack-access-transform @ execute ." [" 0 .r ." ]" ;
+    
+: normal-stack-access1 { n stack -- }
+    stack stack-pointer 2@ type
+    n if
+	n stack normal-stack-access0
     else
-	drop ." TOS"
+	." 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 +389,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
@@ -576,7 +615,7 @@ wordlist constant type-names \ this is h
     get-current type-names set-current
     stack-type 2dup nextname stack-type-name
     set-current
-    stack-pointer lastxt >body stack-name nextname make-stack ;
+    stack-pointer latestxt >body stack-name nextname make-stack ;
 
 stack inst-stream IP Cell
 ' inst-in-index inst-stream stack-in-index-xt !
@@ -599,11 +638,9 @@ stack inst-stream IP Cell
 : compute-offset-out ( addr1 addr2 -- )
     ['] stack-out compute-offset ;
 
-: clear-stack ( stack -- )
-    dup stack-in off stack-out off ;
-
 : compute-offsets ( -- )
-    ['] clear-stack map-stacks
+    prim prim-stacks-in  max-stacks cells erase
+    prim prim-stacks-out max-stacks cells erase
     prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items
     prim prim-effect-out prim prim-effect-out-end @ ['] compute-offset-out map-items
     inst-stream stack-out @ 0= s" # can only be on the input side" ?print-error ;
@@ -618,7 +655,7 @@ stack inst-stream IP Cell
     stack stack-out @ 0<> stack stack-in @ 0= and
     if
 	." IF_" stack stack-pointer 2@ 2dup type ." TOS("
-	2dup type ." [0] = " type ." TOS);" cr
+	2dup type 0 stack normal-stack-access0 ."  = " type ." TOS);" cr
     endif ;
 
 : flush-tos ( -- )
@@ -628,7 +665,7 @@ stack inst-stream IP Cell
     stack stack-out @ 0= stack stack-in @ 0<> and
     if
 	." IF_" stack stack-pointer 2@ 2dup type ." TOS("
-	2dup type ." TOS = " type ." [0]);" cr
+	2dup type ." TOS = " type 0 stack normal-stack-access0 ." );" cr
     endif ;
 
 : fill-tos ( -- )
@@ -641,19 +678,21 @@ 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-update-transform ( n1 stack -- n2 )
+    \ n2 is the number by which the stack pointer should be
+    \ incremented to pop n1 items
+    stack-access-transform @ dup >r execute
+    0 r> execute - ;
 
 : 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
+	    stack stack-pointer 2@ type ."  += "
+	    stack stack-update-transform 0 .r ." ;" cr
 	endif
     endif ;
 
@@ -702,24 +741,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
@@ -887,8 +945,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=
@@ -1013,16 +1071,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 +1130,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 +1158,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 +1185,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 +1234,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 ;
 
@@ -1192,8 +1271,8 @@ stack inst-stream IP Cell
 \    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
@@ -1218,17 +1297,36 @@ stack inst-stream IP Cell
 : output-num-part ( p -- )
     prim-num @ 4 .r ." ," ;
 
+: super2-length ( -- n )
+    combined if
+	num-combined @
+    else
+	1
+    endif ;
+
+: 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
 
@@ -1254,25 +1352,25 @@ print-token !
  getinput member? ;
 ' testchar? test-vector !
 
-: checksyncline ( -- )
+: checksynclines ( -- )
     \ when input points to a newline, check if the next line is a
     \ sync line.  If it is, perform the appropriate actions.
-    rawinput @ >r
-    s" #line " r@ over compare if
-	rdrop 1 line +! EXIT
-    endif
-    0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
-    dup c@ bl = if
-	char+ dup c@ [char] " <> 0= s" sync line syntax" ?print-error
-	char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
-	char+
-    endif
-    dup c@ nl-char <> 0= s" sync line syntax" ?print-error
-    skipsynclines @ if
-	dup char+ rawinput !
-	rawinput @ c@ cookedinput @ c!
-    endif
-    drop ;
+    rawinput @ begin >r
+	s" #line " r@ over compare if
+	    rdrop 1 line +! EXIT
+	endif
+	0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
+	dup c@ bl = if
+	    char+ dup c@ [char] " <> 0= s" sync line syntax" ?print-error
+	    char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
+	    char+
+	endif
+	dup c@ nl-char <> 0= s" sync line syntax" ?print-error
+	skipsynclines @ if
+	    char+ dup rawinput !
+	    rawinput @ c@ cookedinput @ c!
+	endif
+    again ;
 
 : ?nextchar ( f -- )
     s" syntax error, wrong char" ?print-error
@@ -1281,10 +1379,11 @@ print-token !
 	1 chars rawinput +!
 	1 chars cookedinput +!
 	nl-char = if
-	    checksyncline
+	    checksynclines
 	    rawinput @ line-start !
 	endif
-	rawinput @ c@ cookedinput @ c!
+	rawinput @ c@
+	cookedinput @ c!
     endif ;
 
 : charclass ( set "name" -- )
@@ -1362,7 +1461,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
@@ -1404,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 ))
@@ -1429,13 +1529,24 @@ warnings @ [IF]
     \ process the string at addr u
     over dup rawinput ! dup line-start ! cookedinput !
     + endrawinput !
-    checksyncline
+    checksynclines
     primitives2something ;    
 
+: unixify ( c-addr u1 -- c-addr u2 )
+    \ delete crs from the string
+    bounds tuck tuck ?do ( c-addr1 )
+	i c@ dup #cr <> if
+	    over c! char+
+	else
+	    drop
+	endif
+    loop
+    over - ;
+
 : process-file ( addr u xt-simple x-combined -- )
     output-combined ! output !
     save-mem 2dup filename 2!
-    slurp-file
+    slurp-file unixify
     warnings @ if
 	." ------------ CUT HERE -------------" cr  endif
     primfilter ;