--- gforth/prims2x.fs	2001/01/19 21:07:05	1.69
+++ gforth/prims2x.fs	2001/01/28 22:43:39	1.76
@@ -19,7 +19,8 @@
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
-\ This is not very nice (hard limits, no checking, assumes 1 chars = 1)
+\ This is not very nice (hard limits, no checking, assumes 1 chars = 1).
+\ And it grew even worse when it aged.
 
 \ Optimizations:
 \ superfluous stores are removed. GCC removes the superfluous loads by itself
@@ -49,6 +50,7 @@ warnings off
 include ./search.fs			
 include ./extend.fs
 [THEN]
+include ./stuff.fs
 
 [IFUNDEF] environment?
 include ./environ.fs
@@ -59,6 +61,7 @@ include ./environ.fs
 include ./gray.fs
 
 32 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
 #tab constant tab-char
@@ -77,26 +80,55 @@ variable line-start \ pointer to start o
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on 
 
+: th ( addr1 n -- addr2 )
+    cells + ;
+
+: holds ( addr u -- )
+    \ like HOLD, but for a string
+    tuck + swap 0 +do
+	1- dup c@ hold
+    loop
+    drop ;
+
 : start ( -- addr )
  cookedinput @ ;
 
 : end ( addr -- addr u )
  cookedinput @ over - ;
 
+: print-error-line ( -- )
+    \ print the current line and position
+    line-start @ endrawinput @ over - 2dup nl-char scan drop nip ( start end )
+    over - type cr
+    line-start @ rawinput @ over - typewhite ." ^" cr ;
+
+: ?print-error { f addr u -- }
+    f ?not? if
+	outfile-id >r try
+	    stderr to outfile-id
+	    filename 2@ type ." :" line @ 0 .r ." : " addr u type cr
+	    print-error-line
+	    0
+	recover endtry
+	r> to outfile-id throw
+	abort
+    endif ;
+
 : quote ( -- )
     [char] " emit ;
 
-variable output \ xt ( -- ) of output word
+variable output          \ xt ( -- ) of output word for simple primitives
+variable output-combined \ xt ( -- ) of output word for combined primitives
 
 : printprim ( -- )
  output @ execute ;
 
 struct%
+    cell%    field stack-number \ the number of this stack
     cell% 2* field stack-pointer \ stackpointer name
+    cell%    field stack-type \ name for default type of stack items
     cell% 2* field stack-cast \ cast string for assignments to stack elements
     cell%    field stack-in-index-xt \ ( in-size item -- in-index )
-    cell%    field stack-in  \ number of stack items in effect in
-    cell%    field stack-out \ number of stack items in effect out
 end-struct stack%
 
 struct%
@@ -115,25 +147,24 @@ struct%
     cell%    field type-store \ xt of store code generator ( item -- )
 end-struct type%
 
+variable next-stack-number 0 next-stack-number !
+create stacks max-stacks cells allot \ array of stacks
+
 : stack-in-index ( in-size item -- in-index )
     item-offset @ - 1- ;
 
 : inst-in-index ( in-size item -- in-index )
     nip dup item-offset @ swap item-type @ type-size @ + 1- ;
 
-: make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )
+: make-stack ( addr-ptr u1 type addr-cast u2 "stack-name" -- )
     create stack% %allot >r
+    r@ stacks next-stack-number @ th !
+    next-stack-number @ r@ stack-number !  1 next-stack-number +!
     save-mem r@ stack-cast 2!
+    r@ stack-type !
     save-mem r@ stack-pointer 2! 
     ['] stack-in-index r> stack-in-index-xt ! ;
 
-s" sp" save-mem s" (Cell)" make-stack data-stack 
-s" fp" save-mem s" "       make-stack fp-stack
-s" rp" save-mem s" (Cell)" make-stack return-stack
-s" IP" save-mem s" error don't use # on results" make-stack inst-stream
-' inst-in-index inst-stream stack-in-index-xt !
-\ !! initialize stack-in and stack-out
-
 \ stack items
 
 : init-item ( addr u addr1 -- )
@@ -158,13 +189,37 @@ struct%
     cell% 2* field prim-c-code
     cell% 2* field prim-forth-code
     cell% 2* field prim-stack-string
+    cell%    field prim-items-wordlist \ unique items
     item% max-effect * field prim-effect-in
     item% max-effect * field prim-effect-out
     cell%    field prim-effect-in-end
     cell%    field prim-effect-out-end
+    cell% max-stacks * field prim-stacks-in  \ number of in items per stack
+    cell% max-stacks * field prim-stacks-out \ number of out items per stack
 end-struct prim%
 
-create prim prim% %allot
+: make-prim ( -- prim )
+    prim% %alloc { p }
+    s" " p prim-doc 2! s" " p prim-forth-code 2! s" " p prim-wordset 2!
+    p ;
+
+0 value prim
+
+wordlist constant primitives
+
+: create-prim ( prim -- )
+    get-current >r
+    primitives set-current
+    dup prim-name 2@ nextname constant
+    r> set-current ;
+
+: stack-in ( stack -- addr )
+    \ address of number of stack items in effect in
+    stack-number @ cells prim prim-stacks-in + ;
+
+: stack-out ( stack -- addr )
+    \ address of number of stack items in effect out
+    stack-number @ cells prim prim-stacks-out + ;
 
 \ global vars
 variable c-line
@@ -174,11 +229,6 @@ variable name-line
 2variable last-name-filename
 Variable function-number 0 function-number !
 
-\ for several reasons stack items of a word are stored in a wordlist
-\ since neither forget nor marker are implemented yet, we make a new
-\ wordlist for every word and store it in the variable items
-variable items
-
 \ a few more set ops
 
 : bit-equivalent ( w1 w2 -- w3 )
@@ -227,8 +277,10 @@ variable items
 : same-as-in? ( item -- f )
  \ f is true iff the offset and stack of item is the same as on input
  >r
- r@ item-name 2@ items @ search-wordlist 0=
- abort" bug"
+ r@ item-first @ if
+     rdrop false exit
+ endif
+ r@ item-name 2@ prim prim-items-wordlist @ search-wordlist 0= abort" bug"
  execute @
  dup r@ =
  if \ item first appeared in output
@@ -315,7 +367,7 @@ does> ( item -- )
     { item typ }
     typ item item-type !
     typ type-stack @ item item-stack !default
-    item item-name 2@ items @ search-wordlist 0= if \ new name
+    item item-name 2@ prim prim-items-wordlist @ search-wordlist 0= if
 	item item-name 2@ nextname item declare
 	item item-first on
 	\ typ type-c-name 2@ type space type  ." ;" cr
@@ -344,7 +396,7 @@ does> ( item -- )
     ['] declaration map-items ;
 
 : declarations ( -- )
- wordlist dup items ! set-current
+ wordlist dup prim prim-items-wordlist ! set-current
  prim prim-effect-in prim prim-effect-in-end @ declaration-list
  prim prim-effect-out prim prim-effect-out-end @ declaration-list ;
 
@@ -366,6 +418,17 @@ does> ( item -- )
     stack item item-stack !
     item declaration ;
 
+\ types pointed to by stacks for use in combined prims
+s" Cell"  single 0 create-type cell-type
+s" Float" single 0 create-type float-type
+
+s" sp" save-mem cell-type  s" (Cell)" make-stack data-stack 
+s" fp" save-mem cell-type  s" "       make-stack fp-stack
+s" rp" save-mem float-type s" (Cell)" make-stack return-stack
+s" IP" save-mem cell-type  s" error don't use # on results" make-stack inst-stream
+' inst-in-index inst-stream stack-in-index-xt !
+\ !! initialize stack-in and stack-out
+
 \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset
@@ -418,7 +481,7 @@ does> ( item -- )
     return-stack fill-a-tos ;
 
 : fetch ( addr -- )
- dup item-type @ type-fetch @ execute ;
+    dup item-type @ type-fetch @ execute ;
 
 : fetches ( -- )
     prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
@@ -483,9 +546,12 @@ does> ( item -- )
     ." fputc('\n', vm_out);" cr
     ." }" cr
     ." #endif" cr ;
+
+: print-entry ( -- )
+    ." I_" prim prim-c-name 2@ type ." :" ;
     
 : output-c ( -- ) 
- ." I_" prim prim-c-name 2@ type ." :	/* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
+ print-entry ."  /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
  ." /* " prim prim-doc 2@ type ."  */" cr
  ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
  ." {" cr
@@ -698,6 +764,123 @@ does> ( item -- )
 \  spTOS = (Cell)_x_sp0;
 \  NEXT_P2;
 
+1000 constant max-combined
+create combined-prims max-combined cells allot
+variable num-combined
+
+create current-depth max-stacks cells allot
+create max-depth     max-stacks cells allot
+create min-depth     max-stacks cells allot
+
+: init-combined ( -- )
+    0 num-combined !
+    current-depth max-stacks cells erase
+    max-depth     max-stacks cells erase
+    min-depth     max-stacks cells erase
+    prim prim-effect-in  prim prim-effect-in-end  !
+    prim prim-effect-out prim prim-effect-out-end ! ;
+
+: max! ( n addr -- )
+    tuck @ max swap ! ;
+
+: min! ( n addr -- )
+    tuck @ min swap ! ;
+
+: add-depths { p -- }
+    \ combine stack effect of p with *-depths
+    max-stacks 0 ?do
+	current-depth i th @
+	p prim-stacks-in  i th @ +
+	dup max-depth i th max!
+	p prim-stacks-out i th @ -
+	dup min-depth i th min!
+	current-depth i th !
+    loop ;
+
+: add-prim ( addr u -- )
+    \ add primitive given by "addr u" to combined-prims
+    primitives search-wordlist s" unknown primitive" ?print-error
+    execute { p }
+    p combined-prims num-combined @ th !
+    1 num-combined +!
+    p add-depths ;
+
+: compute-effects { q -- }
+    \ compute the stack effects of q from the depths
+    max-stacks 0 ?do
+	max-depth i th @ dup
+	q prim-stacks-in i th !
+	current-depth i th @ -
+	q prim-stacks-out i th !
+    loop ;
+
+: make-effect-items { stack# items effect-endp -- }
+    \ effect-endp points to a pointer to the end of the current item-array
+    \ and has to be updated
+    stacks stack# th @ { stack }
+    items 0 +do
+	effect-endp @ { item }
+	i 0 <# #s stack stack-pointer 2@ holds [char] _ hold #> save-mem
+	item item-name 2!
+	stack item item-stack !
+	stack stack-type @ item item-type !
+	i item item-offset !
+	item item-first on
+	item% %size effect-endp +!
+    loop ;
+
+: init-effects { q -- }
+    \ initialize effects field for FETCHES and STORES
+    max-stacks 0 ?do
+	i q prim-stacks-in  i th @ q prim-effect-in-end  make-effect-items
+	i q prim-stacks-out i th @ q prim-effect-out-end make-effect-items
+    loop ;
+
+: process-combined ( -- )
+    prim compute-effects
+    prim init-effects
+    output-combined perform ;
+
+\ C output
+
+: print-item { n stack -- }
+    \ print nth stack item name
+    ." _" stack stack-type @ type-c-name 2@ type space
+    stack stack-pointer 2@ type n 0 .r ;
+
+: print-declarations-combined ( -- )
+    max-stacks 0 ?do
+	max-depth i th @ min-depth i th @ - 0 +do
+	    i stacks j th @ print-item ." ;" cr
+	loop
+    loop ;
+    
+: output-parts ( -- )
+    prim >r
+    num-combined @ 0 +do
+	combined-prims i th @ to prim
+	output-c
+    loop
+    r> to prim ;
+
+: output-c-combined ( -- )
+    print-entry cr
+    \ debugging messages just in parts
+    ." {" cr
+    ." DEF_CA" cr
+    print-declarations-combined
+    ." NEXT_P0;" cr
+    flush-tos
+    fetches
+    \ print-debug-args
+    stack-pointer-updates
+    output-parts
+    output-c-tail
+    ." }" cr
+    cr ;
+
+: output-forth-combined ( -- )
+    ;
 
 \ the parser
 
@@ -743,24 +926,8 @@ print-token !
     endif
     drop ;
 
-: print-error-line ( -- )
-    \ print the current line and position
-    line-start @ endrawinput @ over - 2dup nl-char scan drop nip ( start end )
-    over - type cr
-    line-start @ rawinput @ over - typewhite ." ^" cr ;
-    
 : ?nextchar ( f -- )
-    ?not? if
-	outfile-id >r try
-	    stderr to outfile-id
-	    filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
-	    getinput . cr
-	    print-error-line
-	    0
-	recover endtry
-	r> to outfile-id throw
-	abort
-    endif
+    s" syntax error, wrong char" ?print-error
     rawinput @ endrawinput @ <> if
 	rawinput @ c@
 	1 chars rawinput +!
@@ -854,7 +1021,7 @@ Variable c-flag
    {{ prim prim-effect-out }} stack-items {{ prim prim-effect-out-end ! }}
 )) <- stack-effect ( -- )
 
-((
+(( {{ prim create-prim }}
    ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
    (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
       (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??
@@ -867,10 +1034,12 @@ Variable c-flag
    (( nl || eof ))
 )) <- simple-primitive ( -- )
 
-(( ` = (( white ++ forth-ident )) ++ (( nl || eof ))
+(( {{ init-combined }}
+   ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++
+   (( nl || eof )) {{ process-combined }}
 )) <- combined-primitive
 
-(( {{ s" " prim prim-doc 2! s" " prim prim-forth-code 2! s" " prim prim-wordset 2!
+(( {{ make-prim to prim
       line @ name-line ! filename 2@ name-filename 2!
       start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
    (( simple-primitive || combined-primitive ))
@@ -889,14 +1058,14 @@ warnings @ [IF]
     checksyncline
     primitives2something ;    
 
-: process-file ( addr u xt -- )
-    output !
+: process-file ( addr u xt-simple x-combined -- )
+    output-combined ! output !
     save-mem 2dup filename 2!
     slurp-file
     warnings @ if
 	." ------------ CUT HERE -------------" cr  endif
     primfilter ;
 
-: process      ( xt -- )
-    bl word count rot
-    process-file ;
+\  : process      ( xt -- )
+\      bl word count rot
+\      process-file ;