--- gforth/prims2x.fs	2001/02/07 09:58:46	1.78
+++ gforth/prims2x.fs	2001/02/23 10:43:40	1.81
@@ -40,6 +40,17 @@
 \ add the store optimization for doubles
 \ regarding problem 1 above: It would be better (for over) to implement
 \ 	the alternative
+\ store optimization for combined instructions.
+\ eliminate stack-cast (no longer used)
+
+\ Design Uglyness:
+
+\ - global state (values, variables) in connection with combined instructions.
+
+\ - index computation is different for instruction-stream and the
+\ stacks; there are two mechanisms for dealing with that
+\ (stack-in-index-xt and a test for stack==instruction-stream); there
+\ should be only one.
 
 warnings off
 
@@ -90,6 +101,13 @@ skipsynclines on
     loop
     drop ;
 
+: wordlist-insert { c-addr u wordlist xt -- }
+    \ adds name "addr u" to wordlist using defining word xt
+    \ xt may cause additional stack effects
+    get-current >r wordlist set-current
+    c-addr u nextname xt execute
+    r> set-current ;
+
 : start ( -- addr )
  cookedinput @ ;
 
@@ -120,9 +138,6 @@ skipsynclines on
 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
@@ -208,7 +223,21 @@ end-struct prim%
     s" " p prim-doc 2! s" " p prim-forth-code 2! s" " p prim-wordset 2!
     p ;
 
-0 value prim
+0 value prim     \ in combined prims either combined or a part
+0 value combined \ in combined prims the combined prim
+variable in-part \ true if processing a part
+ in-part off
+
+1000 constant max-combined
+create combined-prims max-combined cells allot
+variable num-combined
+
+table constant combinations
+  \ the keys are the sequences of pointers to primitives
+
+create current-depth max-stacks cells allot
+create max-depth     max-stacks cells allot
+create min-depth     max-stacks cells allot
 
 wordlist constant primitives
 
@@ -242,10 +271,9 @@ Variable function-number 0 function-numb
 : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;
 
-\ types
+\ stack access stuff
 
-: stack-access ( n stack -- )
-    \ print a stack access at index n of stack
+: normal-stack-access ( n stack -- )
     stack-pointer 2@ type
     dup
     if
@@ -254,6 +282,31 @@ Variable function-number 0 function-numb
 	drop ." TOS"
     endif ;
 
+\ forward declaration for inst-stream (breaks cycle in definitions)
+defer inst-stream-f ( -- stack )
+
+: part-stack-access { n stack -- }
+    \ print _<stack><x>, x=inst-stream? n : maxdepth-currentdepth-n-1
+    ." _" stack stack-pointer 2@ type
+    stack stack-number @ { stack# }
+    current-depth stack# th @ n + { access-depth }
+    stack inst-stream-f = if
+	access-depth
+    else
+	combined prim-stacks-in stack# th @
+	assert( dup max-depth stack# th @ = )
+	access-depth - 1-
+    endif
+    0 .r ;
+
+: stack-access ( n stack -- )
+    \ print a stack access at index n of stack
+    in-part @ if
+	part-stack-access
+    else
+	normal-stack-access
+    endif ;
+
 : item-in-index { item -- n }
     \ n is the index of item (in the in-effect)
     item item-stack @ dup >r stack-in @ ( in-size r:stack )
@@ -401,7 +454,7 @@ does> ( item -- )
 	endif
 	-1 s+loop
     \ we did not find a type, abort
-    true abort" unknown prefix" ;
+    false s" unknown prefix" ?print-error ;
 
 : declaration ( item -- )
     dup item-name 2@ execute-prefix ;
@@ -441,6 +494,7 @@ s" fp" save-mem float-type s" "       ma
 s" rp" save-mem cell-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 !
+' inst-stream <is> inst-stream-f
 \ !! initialize stack-in and stack-out
 
 \ offset computation
@@ -467,7 +521,14 @@ s" IP" save-mem cell-type  s" error don'
     inst-stream clear-stack
     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<> abort" # can only be on the input side" ;
+    inst-stream stack-out @ 0= s" # can only be on the input side" ?print-error ;
+
+: process-simple ( -- )
+    prim prim { W^ key } key cell
+    combinations ['] constant wordlist-insert
+    declarations compute-offsets
+    output @ execute
+    1 function-number +! ;
 
 : flush-a-tos { stack -- }
     stack stack-out @ 0<> stack stack-in @ 0= and
@@ -775,15 +836,8 @@ s" IP" save-mem cell-type  s" error don'
 \  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 ( -- )
+    prim to combined
     0 num-combined !
     current-depth max-stacks cells erase
     max-depth     max-stacks cells erase
@@ -848,6 +902,8 @@ create min-depth     max-stacks cells al
     loop ;
 
 : process-combined ( -- )
+    combined combined-prims num-combined @ cells
+    combinations ['] constant wordlist-insert
     prim compute-effects
     prim init-effects
     output-combined perform ;
@@ -856,8 +912,8 @@ create min-depth     max-stacks cells al
 
 : 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 ;
+    stack stack-type @ type-c-name 2@ type space
+    ." _" stack stack-pointer 2@ type n 0 .r ;
 
 : print-declarations-combined ( -- )
     max-stacks 0 ?do
@@ -865,13 +921,36 @@ create min-depth     max-stacks cells al
 	    i stacks j th @ print-item ." ;" cr
 	loop
     loop ;
-    
+
+: part-fetches ( -- )
+    fetches ;
+
+: part-output-c-tail ( -- )
+    output-c-tail ;
+
+: output-part ( p -- )
+    to prim
+    ." /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
+    ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
+    ." {" cr
+    print-declarations
+    part-fetches
+    print-debug-args
+    prim add-depths \ !! right place?
+    ." {" cr
+    ." #line " c-line @ . quote c-filename 2@ type quote cr
+    prim prim-c-code 2@ type-c \ !! deal with TAIL
+    ." }" cr
+    part-output-c-tail
+    ." }" cr ;
+
 : output-parts ( -- )
-    prim >r
+    prim >r in-part on
+    current-depth max-stacks cells erase
     num-combined @ 0 +do
-	combined-prims i th @ to prim
-	output-c
+	combined-prims i th @ output-part
     loop
+    in-part off
     r> to prim ;
 
 : output-c-combined ( -- )
@@ -891,7 +970,21 @@ create min-depth     max-stacks cells al
     cr ;
 
 : output-forth-combined ( -- )
-    ;
+;
+
+
+\ compile VM insts
+
+\ in order for this to work as intended, shorter combinations for each
+\ length must be present, and the longer combinations must follow
+\ shorter ones (this restriction may go away in the future).
+  
+: output-pregen-combined ( -- )
+    combined-prims num-combined @ 1- cells combinations search-wordlist
+    s" the prefix for this combination must be defined earlier" ?print-error
+    execute prim-c-name 2@ type space
+    combined-prims num-combined @ 1- th @ prim-c-name 2@ type ."  -> "
+    combined prim-c-name 2@ type cr ;
 
 \ the parser
 
@@ -926,11 +1019,11 @@ print-token !
     endif
     0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
     dup c@ bl = if
-	char+ dup c@ [char] " <> abort" sync line syntax"
+	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 <> abort" sync line syntax"
+    dup c@ nl-char <> 0= s" sync line syntax" ?print-error
     skipsynclines @ if
 	dup char+ rawinput !
 	rawinput @ c@ cookedinput @ c!
@@ -976,7 +1069,7 @@ bl 1+ maxchar ..
 char " singleton eof-char over add-member complement	charclass noquote
 nl-char singleton					charclass nl
 eof-char singleton					charclass eof
-
+nl-char singleton eof-char over add-member		charclass nleof
 
 (( letter (( letter || digit )) **
 )) <- c-ident ( -- )
@@ -1022,7 +1115,7 @@ Variable c-flag
 
 (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
 
-(( ` \ comment-body nl )) <- comment ( -- )
+(( ` \ comment-body nleof )) <- comment ( -- )
 
 (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
 <- stack-items
@@ -1036,21 +1129,21 @@ Variable c-flag
    ` ( 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! }} )) ??
-   )) ??  nl
-   (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nl )) ??
-   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
-   (( ` :  white ** nl
-      {{ start }} (( nonl ++  nl white ** )) ++ {{ end prim prim-forth-code 2! }}
-   )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}
-   (( nl || eof ))
+   )) ??  nleof
+   (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??
+   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nleof white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
+   (( ` :  white ** nleof
+      {{ start }} (( nonl ++  nleof white ** )) ++ {{ end prim prim-forth-code 2! }}
+   )) ?? {{ process-simple }}
+   nleof
 )) <- simple-primitive ( -- )
 
 (( {{ init-combined }}
    ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++
-   (( nl || eof )) {{ process-combined }}
+   nleof {{ process-combined }}
 )) <- combined-primitive
 
-(( {{ make-prim to prim
+(( {{ make-prim to prim 0 to combined
       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 ))