--- gforth/prims2x.fs	1999/05/10 12:54:48	1.43
+++ gforth/prims2x.fs	2001/12/09 19:12:45	1.101
@@ -1,6 +1,6 @@
 \ converts primitives to, e.g., C code 
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,10 +16,11 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ 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
@@ -39,24 +40,31 @@
 \ 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.
+
+\ 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
 
-[IFUNDEF] vocabulary	\ we are executed just with kernel image
-			\ load the rest that is needed
-			\ (require fails because this file is needed from a
-			\ different directory with the wordlibraries)
-include ./search.fs			
-include ./extend.fs
+[IFUNDEF] try
+include startup.fs
 [THEN]
 
-[IFUNDEF] environment?
-include ./environ.fs
-[THEN]
+: struct% struct ; \ struct is redefined in gray
+
+warnings off
 
 include ./gray.fs
 
-100 constant max-effect \ number of things on one side of a stack effect
+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
@@ -66,7 +74,8 @@ variable rawinput \ pointer to next char
 variable endrawinput \ pointer to the end of the input (the char after the last)
 variable cookedinput \ pointer to the next char to be parsed
 variable line \ line number of char pointed to by input
-1 line !
+variable line-start \ pointer to start of current line (for error messages)
+0 line !
 2variable filename \ filename of original input file
 0 0 filename 2!
 2variable f-comment
@@ -74,61 +83,182 @@ variable line \ line number of char poin
 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 ;
+
+: insert-wordlist { 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 @ ;
 
 : end ( addr -- addr u )
  cookedinput @ over - ;
 
-variable output \ xt ( -- ) of output word
+: 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 ;
 
-: printprim ( -- )
- output @ execute ;
+variable output          \ xt ( -- ) of output word for simple primitives
+variable output-combined \ xt ( -- ) of output word for combined primitives
 
-: field
- <builds-field ( n1 n2 -- n3 )
- does>         ( addr1 -- addr2 )
-   @ + ;
-
-: const-field
- <builds-field ( n1 n2 -- n3 )
- does>         ( addr -- w )
-   @ + @ ;
-
-struct
- 2 cells field item-name
- cell field item-d-offset
- cell field item-f-offset
- cell field item-type
-constant item-descr
-
-2variable forth-name
-2variable wordset
-2variable c-name
-2variable doc
-2variable c-code
-2variable forth-code
-2variable stack-string
-create effect-in  max-effect item-descr * allot
-create effect-out max-effect item-descr * allot
-variable effect-in-end ( pointer )
-variable effect-out-end ( pointer )
-2variable effect-in-size
-2variable effect-out-size
+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%    field stack-in-index-xt \ ( in-size item -- in-index )
+end-struct stack%
+
+struct%
+ cell% 2* field item-name   \ name, excluding stack prefixes
+ cell%    field item-stack  \ descriptor for the stack used, 0 is default
+ cell%    field item-type   \ descriptor for the item type
+ cell%    field item-offset \ offset in stack items, 0 for the deepest element
+ cell%	  field item-first  \ true if this is the first occurence of the item
+end-struct item%
+
+struct%
+    cell% 2* field type-c-name
+    cell%    field type-stack \ default stack
+    cell%    field type-size  \ size of type in stack items
+    cell%    field type-fetch \ xt of fetch code generator ( item -- )
+    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 type "stack-name" -- )
+    next-stack-number @ max-stacks < s" too many stacks" ?print-error
+    create stack% %allot >r
+    r@ stacks next-stack-number @ th !
+    next-stack-number @ r@ stack-number !
+    1 next-stack-number +!
+    r@ stack-type !
+    save-mem r@ stack-pointer 2! 
+    ['] stack-in-index r> stack-in-index-xt ! ;
+
+: map-stacks { xt -- }
+    \ perform xt for all stacks except inst-stream
+    next-stack-number @ 1 +do
+	stacks i th @ xt execute
+    loop ;
+
+\ stack items
+
+: init-item ( addr u addr1 -- )
+    \ initialize item at addr1 with name addr u
+    \ !! remove stack prefix
+    dup item% %size erase
+    item-name 2! ;
+
+: map-items { addr end xt -- }
+    \ perform xt for all items in array addr...end
+    end addr ?do
+	i xt execute
+    item% %size +loop ;
+
+\ types
+
+: print-type-prefix ( type -- )
+    body> >head name>string type ;
+
+\ various variables for storing stuff of one primitive
+
+struct%
+    cell% 2* field prim-name
+    cell% 2* field prim-wordset
+    cell% 2* field prim-c-name
+    cell% 2* field prim-doc
+    cell% 2* field prim-c-code
+    cell% 2* field prim-forth-code
+    cell% 2* field prim-stack-string
+    cell%    field prim-num            \ ordinal number
+    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%
+
+: 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     \ 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
+
+: create-prim ( prim -- )
+    dup prim-name 2@ primitives ['] constant insert-wordlist ;
+
+: 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
 2variable c-filename
 variable name-line
 2variable name-filename
 2variable last-name-filename
-
-variable primitive-number -10 primitive-number !
 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 )
@@ -137,263 +267,109 @@ variable items
 : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;
 
-\ the parser
-
-eof-char max-member \ the whole character set + EOF
+\ stack access stuff
 
-: getinput ( -- n )
- rawinput @ endrawinput @ =
- if
-   eof-char
- else
-   cookedinput @ c@
- endif ;
-
-:noname ( n -- )
- dup bl > if
-  emit space
- else
-  .
- endif ;
-print-token !
+: normal-stack-access ( n stack -- )
+    stack-pointer 2@ type
+    dup
+    if
+	." [" 0 .r ." ]"
+    else
+	drop ." TOS"
+    endif ;
 
-: testchar? ( set -- f )
- getinput member? ;
-' testchar? test-vector !
+\ forward declaration for inst-stream (breaks cycle in definitions)
+defer inst-stream-f ( -- stack )
 
-: checksyncline ( -- )
-    \ 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 0<> if
-	rdrop 1 line +! EXIT
+: 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> 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 100 [char] " scan drop swap 2dup - save-mem filename 2!
-	char+
-    endif
-    dup c@ nl-char <> abort" sync line syntax"
-    skipsynclines @ if
-	dup char+ rawinput !
-	rawinput @ c@ cookedinput @ c!
-    endif
-    drop ;
+    0 .r ;
 
-: ?nextchar ( f -- )
-    ?not? if
-	filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
-	getinput . cr
-	rawinput @ endrawinput @ over - 100 min type cr
-	abort
-    endif
-    rawinput @ endrawinput @ <> if
-	rawinput @ c@
-	1 chars rawinput +!
-	1 chars cookedinput +!
-	nl-char = if
-	    checksyncline
-	endif
-	rawinput @ c@ cookedinput @ c!
+: stack-access ( n stack -- )
+    \ print a stack access at index n of stack
+    in-part @ if
+	part-stack-access
+    else
+	normal-stack-access
     endif ;
 
-: charclass ( set "name" -- )
- ['] ?nextchar terminal ;
+: 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 )
+    item r> stack-in-index-xt @ execute ;
 
-: .. ( c1 c2 -- set )
- ( creates a set that includes the characters c, c1<=c<=c2 )
- empty copy-set
- swap 1+ rot do
-  i over add-member
- loop ;
-
-: ` ( -- terminal ) ( use: ` c )
- ( creates anonymous terminal for the character c )
- char singleton ['] ?nextchar make-terminal ;
-
-char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
-char 0 char 9 ..					charclass digit
-bl singleton						charclass blank
-tab-char singleton					charclass tab
-nl-char singleton eof-char over add-member complement	charclass nonl
-nl-char singleton eof-char over add-member char : over add-member complement  charclass nocolonnl
-bl 1+ maxchar ..					charclass nowhite
-char " singleton eof-char over add-member complement	charclass noquote
-nl-char singleton					charclass nl
-eof-char singleton					charclass eof
-
-
-(( letter (( letter || digit )) **
-)) <- c-name ( -- )
-
-nowhite ++
-<- name ( -- )
-
-Variable forth-flag
-Variable c-flag
-
-(( (( ` f || ` F )) {{ start }} nonl ** 
-   {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
-)) <- forth-comment ( -- )
-
-(( (( ` c || ` C )) {{ start }} nonl ** 
-   {{ end c-flag @ IF type cr ELSE 2drop THEN }}
-)) <- c-comment ( -- )
-
-(( ` - nonl ** {{ 
-	forth-flag @ IF ." [ELSE]" cr THEN
-	c-flag @ IF ." #else" cr THEN }}
-)) <- else-comment
-
-(( ` + {{ start }} nonl ** {{ end
-	dup
-	IF	c-flag @
-		IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr
-		THEN
-		forth-flag @
-		IF  ." has? " type ."  [IF]"  cr THEN
-	ELSE	2drop
-		c-flag @
-		IF  ." #endif"  cr THEN
-		forth-flag @
-		IF  ." [THEN]"  cr THEN
-	THEN }}
-)) <- if-comment
-
-(( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
-
-(( ` \ comment-body nl )) <- comment ( -- )
-
-(( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}
-   ` - ` - blank **
-   {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}
-)) <- stack-effect ( -- )
-
-(( {{ s" " doc 2! s" " forth-code 2! }}
-   (( comment || nl )) **
-   (( {{ line @ name-line ! filename 2@ name-filename 2! }}
-      {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  tab ++
-      {{ start }} stack-effect {{ end stack-string 2! }} tab ++
-        {{ start }} name {{ end wordset 2! }} tab **
-        (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl
-   ))
-   (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??
-   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! skipsynclines on }}
-   (( ` :  nl
-      {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}
-   )) ??
-   (( nl || eof ))
-)) <- primitive ( -- )
-
-(( (( primitive {{ printprim }} )) ** eof ))
-parser primitives2something
-warnings @ [IF]
-.( parser generated ok ) cr
-[THEN]
-
-: primfilter ( file-id xt -- )
-\ fileid is for the input file, xt ( -- ) is for the output word
- output !
- here dup rawinput ! cookedinput !
- here unused rot read-file throw
- dup here + endrawinput !
- allot
- align
- checksyncline
-\ begin
-\     getinput dup eof-char = ?EXIT emit true ?nextchar
-\ again ;
- primitives2something ;
-
-\ types
-
-struct
- 2 cells field type-c-name
- cell const-field type-d-size
- cell const-field type-f-size
- cell const-field type-fetch-handler
- cell const-field type-store-handler
-constant type-description
-
-: data-stack-access ( n1 n2 n3 -- )
-\ n1 is the offset of the accessed item, n2, n3 are effect-*-size
- drop swap - 1- dup
- if
-   ." sp[" 0 .r ." ]"
- else
-   drop ." TOS"
- endif ;
-
-: fp-stack-access ( n1 n2 n3 -- )
-\ n1 is the offset of the accessed item, n2, n3 are effect-*-size
- nip swap - 1- dup
- if
-   ." fp[" 0 .r ." ]"
- else
-   drop ." FTOS"
- endif ;
+: item-stack-type-name ( item -- addr u )
+    item-stack @ stack-type @ type-c-name 2@ ;
 
 : fetch-single ( item -- )
+ \ fetch a single stack item from its stack
  >r
  r@ item-name 2@ type
- ."  = (" 
- r@ item-type @ type-c-name 2@ type ." ) "
- r@ item-d-offset @ effect-in-size 2@ data-stack-access ." ;" cr
+ ."  = vm_" r@ item-stack-type-name type
+ ." 2" r@ item-type @ print-type-prefix ." ("
+ r@ item-in-index r@ item-stack @ stack-access
+ ." );" cr
  rdrop ; 
 
 : fetch-double ( item -- )
+ \ fetch a double stack item from its stack
  >r
- ." FETCH_DCELL("
+ ." vm_two"
+ r@ item-stack-type-name type ." 2"
+ r@ item-type @ print-type-prefix ." ("
  r@ item-name 2@ type ." , "
- r@ item-d-offset @ dup    effect-in-size 2@ data-stack-access
- ." , "			1+ effect-in-size 2@ data-stack-access
+ r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
+ ." , "                      -1 under+ ." (Cell)" stack-access
  ." );" cr
  rdrop ;
 
-: fetch-float ( item -- )
+: 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@ type
- ."  = "
- \ ." (" r@ item-type @ type-c-name 2@ type ." ) "
- r@ item-f-offset @ effect-in-size 2@ fp-stack-access ." ;" cr
- rdrop ;
-
-: d-same-as-in? ( item -- f )
-\ f is true iff the offset 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
    drop false
  else
-   item-d-offset @ r@ item-d-offset @ =
+   dup  item-stack  @ r@ item-stack  @ = 
+   swap item-offset @ r@ item-offset @ = and
  endif
  rdrop ;
 
-: is-in-tos? ( item -- f )
-\ true if item has the same offset as the input TOS
- item-d-offset @ 1+ effect-in-size 2@ drop = ;
-
-: is-out-tos? ( item -- f )
-\ true if item has the same offset as the input TOS
- item-d-offset @ 1+ effect-out-size 2@ drop = ;
+: item-out-index ( item -- n )
+    \ n is the index of item (in the in-effect)
+    >r r@ item-stack @ stack-out @ r> item-offset @ - 1- ;
 
 : really-store-single ( item -- )
  >r
- r@ item-d-offset @ effect-out-size 2@ data-stack-access ."  = (Cell)"
- r@ item-name 2@ type ." ;"
+ r@ item-out-index r@ item-stack @ stack-access ."  = vm_"
+ r@ item-type @ print-type-prefix ." 2"
+ r@ item-stack-type-name type ." ("
+ r@ item-name 2@ type ." );"
  rdrop ;
 
 : store-single ( item -- )
  >r
- r@ d-same-as-in?
+ r@ same-as-in?
  if
-   r@ is-in-tos? r@ is-out-tos? xor
+   r@ item-in-index 0= r@ item-out-index 0= xor
    if
-     ." IF_TOS(" r@ really-store-single ." );" cr
+       ." IF_" r@ item-stack @ stack-pointer 2@ type
+       ." TOS(" r@ really-store-single ." );" cr
    endif
  else
    r@ really-store-single cr
@@ -403,289 +379,407 @@ constant type-description
 : store-double ( item -- )
 \ !! store optimization is not performed, because it is not yet needed
  >r
- ." STORE_DCELL(" r@ item-name 2@ type ." , "
- r@ item-d-offset @ dup    effect-out-size 2@ data-stack-access
- ." , "			1+ effect-out-size 2@ data-stack-access
+ ." vm_"
+ r@ item-type @ print-type-prefix ." 2two"
+ r@ item-stack-type-name type ." ("
+ r@ item-name 2@ type ." , "
+ r@ item-out-index r@ item-stack @ 2dup stack-access
+ ." , "                       -1 under+ stack-access
  ." );" cr
  rdrop ;
 
-: f-same-as-in? ( item -- f )
-\ f is true iff the offset of item is the same as on input
- >r
- r@ item-name 2@ items @ search-wordlist 0=
- abort" bug"
- execute @
- dup r@ =
- if \ item first appeared in output
-   drop false
- else
-   item-f-offset @ r@ item-f-offset @ =
- endif
- rdrop ;
-
-: is-in-ftos? ( item -- f )
-\ true if item has the same offset as the input TOS
- item-f-offset @ 1+ effect-in-size 2@ nip = ;
-
-: really-store-float ( item -- )
- >r
- r@ item-f-offset @ effect-out-size 2@ fp-stack-access ."  = "
- r@ item-name 2@ type ." ;"
- rdrop ;
-
-: store-float ( item -- )
- >r
- r@ f-same-as-in?
- if
-   r@ is-in-ftos?
-   if
-     ." IF_FTOS(" r@ really-store-float ." );" cr
-   endif
- else
-   r@ really-store-float cr
- endif
- rdrop ;
- 
-: single-type ( -- xt1 xt2 n1 n2 )
- ['] fetch-single ['] store-single 1 0 ;
-
-: double-type ( -- xt1 xt2 n1 n2 )
- ['] fetch-double ['] store-double 2 0 ;
+: single ( -- xt1 xt2 n )
+    ['] fetch-single ['] store-single 1 ;
 
-: float-type ( -- xt1 xt2 n1 n2 )
- ['] fetch-float ['] store-float 0 1 ;
+: double ( -- xt1 xt2 n )
+    ['] fetch-double ['] store-double 2 ;
 
 : s, ( addr u -- )
 \ allocate a string
  here swap dup allot move ;
 
-: starts-with ( addr u xt1 xt2 n1 n2 "prefix" -- )
-\ describes a type
-\ addr u specifies the C type name
-\ n1 is the size of the type on the data stack
-\ n2 is the size of the type on the FP stack
-\ stack effect entries of the type start with prefix
- >r >r >r >r
- dup >r here >r s,
- create
- r> r> 2,
- r> r> r> , r> , swap , , ;
-
-wordlist constant types
-get-current
-types set-current
-
-s" Bool"	single-type starts-with f
-s" Char"	single-type starts-with c
-s" Cell"	single-type starts-with n
-s" Cell"	single-type starts-with w
-s" UCell"	single-type starts-with u
-s" DCell"	double-type starts-with d
-s" UDCell"	double-type starts-with ud
-s" Float"	float-type  starts-with r
-s" Cell *"	single-type starts-with a_
-s" Char *"	single-type starts-with c_
-s" Float *"	single-type starts-with f_
-s" DFloat *"	single-type starts-with df_
-s" SFloat *"	single-type starts-with sf_
-s" Xt"		single-type starts-with xt
-s" WID"		single-type starts-with wid
-s" struct F83Name *"	single-type starts-with f83name
-
-set-current
-
-: get-type ( addr1 u1 -- type-descr )
-\ get the type of the name in addr1 u1
-\ type-descr is a pointer to a type-descriptor
- 0 swap ?do
-   dup i types search-wordlist
-   if \ ok, we have the type ( addr1 xt )
-     execute nip
-     UNLOOP EXIT
-   endif
- -1 s+loop
- \ we did not find a type, abort
- true abort" unknown type prefix" ;
+wordlist constant prefixes
 
 : declare ( addr "name" -- )
 \ remember that there is a stack item at addr called name
  create , ;
 
+: !default ( w addr -- )
+    dup @ if
+	2drop \ leave nonzero alone
+    else
+	!
+    endif ;
+
+: create-type { addr u xt1 xt2 n stack -- } ( "prefix" -- )
+    \ describes a type
+    \ addr u specifies the C type name
+    \ stack effect entries of the type start with prefix
+    create type% %allot >r
+    addr u save-mem r@ type-c-name 2!
+    xt1   r@ type-fetch !
+    xt2   r@ type-store !
+    n     r@ type-size !
+    stack r@ type-stack !
+    rdrop ;
+
+: type-prefix ( xt1 xt2 n stack "prefix" -- )
+    get-current >r prefixes set-current
+    create-type r> set-current
+does> ( item -- )
+    \ initialize item
+    { item typ }
+    typ item item-type !
+    typ type-stack @ item item-stack !default
+    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
+    else
+	drop
+	item item-first off
+    endif ;
+
+: execute-prefix ( item addr1 u1 -- )
+    \ execute the word ( item -- ) associated with the longest prefix
+    \ of addr1 u1
+    0 swap ?do
+	dup i prefixes search-wordlist
+	if \ ok, we have the type ( item addr1 xt )
+	    nip execute
+	    UNLOOP EXIT
+	endif
+	-1 s+loop
+    \ we did not find a type, abort
+    false s" unknown prefix" ?print-error ;
+
 : declaration ( item -- )
- dup item-name 2@ items @ search-wordlist
- if \ already declared ( item xt )
-   execute @ item-type @ swap item-type !
- else ( addr )
-   dup item-name 2@ nextname dup declare ( addr )
-   dup >r item-name 2@ 2dup get-type ( addr1 u type-descr )
-   dup r> item-type ! ( addr1 u type-descr )
-   type-c-name 2@ type space type ." ;" cr
- endif ;
+    dup item-name 2@ execute-prefix ;
 
 : declaration-list ( addr1 addr2 -- )
- swap ?do
-  i declaration
- item-descr +loop ;
-
-: fetch ( addr -- )
- dup item-type @ type-fetch-handler execute ;
+    ['] declaration map-items ;
 
 : declarations ( -- )
- wordlist dup items ! set-current
- effect-in effect-in-end @ declaration-list
- effect-out effect-out-end @ declaration-list ;
+ 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 ;
+
+: print-declaration { item -- }
+    item item-first @ if
+	item item-type @ type-c-name 2@ type space
+	item item-name 2@ type ." ;" cr
+    endif ;
+
+: print-declarations ( -- )
+    prim prim-effect-in  prim prim-effect-in-end  @ ['] print-declaration map-items
+    prim prim-effect-out prim prim-effect-out-end @ ['] print-declaration map-items ;
+    
+: stack-prefix ( stack "prefix" -- )
+    get-current >r prefixes set-current
+    name tuck nextname create ( stack length ) 2,
+    r> set-current
+does> ( item -- )
+    2@ { item stack prefix-length }
+    item item-name 2@ prefix-length /string item item-name 2!
+    stack item item-stack !
+    item declaration ;
+
+\ types pointed to by stacks for use in combined prims
+\ !! output-c-combined shouldn't use these names!
+: stack-type-name ( addr u "name" -- )
+    single 0 create-type ;
+
+wordlist constant type-names \ this is here just to meet the requirement
+                    \ that a type be a word; it is never used for lookup
+
+: stack ( "name" "stack-pointer" "type" -- )
+    \ define stack
+    name { d: stack-name }
+    name { d: stack-pointer }
+    name { d: stack-type }
+    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 inst-stream IP Cell
+' inst-in-index inst-stream stack-in-index-xt !
+' inst-stream <is> inst-stream-f
+\ !! initialize stack-in and stack-out
 
 \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset
 
-: compute-offset ( n1 n2 item -- n3 n4 )
-\ n1, n3 are data-stack-offsets
-\ n2, n4 are the fp-stack-offsets
- >r
- swap dup r@ item-d-offset !
- r@ item-type @ type-d-size +
- swap dup r@ item-f-offset !
- r@ item-type @ type-f-size +
- rdrop ;
+: compute-offset { item xt -- }
+    \ xt specifies in/out; update stack-in/out and set item-offset
+    item item-type @ type-size @
+    item item-stack @ xt execute dup @ >r +!
+    r> item item-offset ! ;
+
+: compute-offset-in ( addr1 addr2 -- )
+    ['] stack-in compute-offset ;
 
-: compute-list ( addr1 addr2 -- n1 n2 )
-\ n1, n2 are the final offsets
- 0 0 2swap swap ?do
-  i compute-offset
- item-descr +loop ;
+: compute-offset-out ( addr1 addr2 -- )
+    ['] stack-out compute-offset ;
+
+: clear-stack { -- }
+    dup stack-in off stack-out off ;
 
 : compute-offsets ( -- )
- effect-in effect-in-end @ compute-list effect-in-size 2!
- effect-out effect-out-end @ compute-list effect-out-size 2! ;
+    ['] clear-stack map-stacks
+    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= s" # can only be on the input side" ?print-error ;
+
+: process-simple ( -- )
+    prim prim { W^ key } key cell
+    combinations ['] constant insert-wordlist
+    declarations compute-offsets
+    output @ execute ;
+
+: flush-a-tos { stack -- }
+    stack stack-out @ 0<> stack stack-in @ 0= and
+    if
+	." IF_" stack stack-pointer 2@ 2dup type ." TOS("
+	2dup type ." [0] = " type ." TOS);" cr
+    endif ;
 
 : flush-tos ( -- )
- effect-in-size 2@ effect-out-size 2@
- 0<> rot 0= and
- if
-   ." IF_FTOS(fp[0] = FTOS);" cr
- endif
- 0<> swap 0= and
- if
-   ." IF_TOS(sp[0] = TOS);" cr
- endif ;
+    ['] flush-a-tos map-stacks ;
+
+: fill-a-tos { stack -- }
+    stack stack-out @ 0= stack stack-in @ 0<> and
+    if
+	." IF_" stack stack-pointer 2@ 2dup type ." TOS("
+	2dup type ." TOS = " type ." [0]);" cr
+    endif ;
 
 : fill-tos ( -- )
- effect-in-size 2@ effect-out-size 2@
- 0= rot 0<> and
- if
-   ." IF_FTOS(FTOS = fp[0]);" cr
- endif
- 0= swap 0<> and
- if
-   ." IF_TOS(TOS = sp[0]);" cr
- endif ;
+    \ !! inst-stream for prefetching?
+    ['] fill-a-tos map-stacks ;
+
+: fetch ( addr -- )
+    dup item-type @ type-fetch @ execute ;
 
 : fetches ( -- )
- effect-in-end @ effect-in ?do
-   i fetch
- item-descr +loop ; 
+    prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
+
+: stack-pointer-update { stack -- }
+    \ stack grow downwards
+    stack stack-in @ stack stack-out @ -
+    ?dup-if \ this check is not necessary, gcc would do this for us
+	stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr
+    endif ;
+
+: inst-pointer-update ( -- )
+    inst-stream stack-in @ ?dup-if
+	." INC_IP(" 0 .r ." );" cr
+    endif ;
 
 : stack-pointer-updates ( -- )
-\ we need not check if an update is a noop; gcc does this for us
- effect-in-size 2@
- effect-out-size 2@
- rot swap - ( d-in d-out f-diff )
- rot rot - ( f-diff d-diff )
- ?dup IF  ." sp += " 0 .r ." ;" cr  THEN
- ?dup IF  ." fp += " 0 .r ." ;" cr  THEN ;
+    inst-pointer-update
+    ['] stack-pointer-update map-stacks ;
 
 : store ( item -- )
 \ f is true if the item should be stored
 \ f is false if the store is probably not necessary
- dup item-type @ type-store-handler execute ;
+ dup item-type @ type-store @ execute ;
 
 : stores ( -- )
- effect-out-end @ effect-out ?do
-   i store
- item-descr +loop ; 
-
-: .stack-list ( start end -- )
- swap ?do
-   i item-name 2@ type space
- item-descr +loop ; 
+    prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ;
+
+: print-debug-arg { item -- }
+    ." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); "
+    ." printarg_" item item-type @ print-type-prefix
+    ." (" item item-name 2@ type ." );" cr ;
+    
+: print-debug-args ( -- )
+    ." #ifdef VM_DEBUG" cr
+    ." if (vm_debug) {" cr
+    prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items
+\    ." fputc('\n', vm_out);" cr
+    ." }" cr
+    ." #endif" cr ;
+
+: print-debug-result { item -- }
+    item item-first @ if
+	item print-debug-arg
+    endif ;
 
+: print-debug-results ( -- )
+    cr
+    ." #ifdef VM_DEBUG" cr
+    ." if (vm_debug) {" cr
+    ." fputs(" quote ."  -- " quote ." , vm_out); "
+    prim prim-effect-out prim prim-effect-out-end @ ['] print-debug-result map-items
+    ." fputc('\n', vm_out);" cr
+    ." }" cr
+    ." #endif" cr ;
+
+: output-super-end ( -- )
+    prim prim-c-code 2@ s" SET_IP" search if
+	." SUPER_END;" cr
+    endif
+    2drop ;
+
+: output-c-tail ( -- )
+    \ the final part of the generated C code
+    output-super-end
+    print-debug-results
+    ." NEXT_P1;" cr
+    stores
+    fill-tos
+    ." NEXT_P2;" ;
+
+: type-c-code ( c-addr u xt -- )
+    \ like TYPE, but replaces "TAIL;" with tail code produced by xt
+    { xt }
+    begin ( c-addr1 u1 )
+	2dup s" TAIL;" search
+    while ( c-addr1 u1 c-addr3 u3 )
+	2dup 2>r drop nip over - type
+	xt execute
+	2r> 5 /string
+	\ !! resync #line missing
+    repeat
+    2drop type ;
+
+: print-entry ( -- )
+    ." LABEL(" prim prim-c-name 2@ type ." ):" ;
+    
 : output-c ( -- ) 
- ." I_" c-name 2@ type ." :	/* " forth-name 2@ type ."  ( " stack-string 2@ type ."  ) */" cr
- ." /* " doc 2@ type ."  */" cr
- ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging
+ 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
  ." DEF_CA" cr
- declarations
- compute-offsets \ for everything else
+ print-declarations
  ." NEXT_P0;" cr
  flush-tos
  fetches
+ print-debug-args
  stack-pointer-updates
  ." {" cr
- ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
- c-code 2@ type
+ ." #line " c-line @ . quote c-filename 2@ type quote cr
+ prim prim-c-code 2@ ['] output-c-tail type-c-code
  ." }" cr
- ." NEXT_P1;" cr
- stores
- fill-tos
- ." NEXT_P2;" cr
+ output-c-tail
  ." }" cr
  cr
 ;
 
+: disasm-arg { item -- }
+    item item-stack @ inst-stream = if
+	."   fputc(' ', vm_out); "
+	." printarg_" item item-type @ print-type-prefix
+	." ((" item item-type @ type-c-name 2@ type ." )"
+	." ip[" item item-offset @ 1+ 0 .r ." ]);" cr
+    endif ;
+
+: disasm-args ( -- )
+    prim prim-effect-in prim prim-effect-in-end @ ['] disasm-arg map-items ;
+
+: output-disasm ( -- )
+    \ generate code for disassembling VM instructions
+    ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr
+    ."   fputs(" quote prim prim-name 2@ type quote ." , vm_out);" cr
+    disasm-args
+    ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
+    ."   goto _endif_;" cr
+    ." }" cr ;
+
+: output-profile ( -- )
+    \ generate code for postprocessing the VM block profile stuff
+    ." if (VM_IS_INST(*ip, " function-number @ 0 .r ." )) {" cr
+    ."   add_inst(b, " quote  prim prim-name 2@ type quote ." );" cr
+    ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
+    prim prim-c-code 2@  s" SET_IP"    search nip nip
+    prim prim-c-code 2@  s" SUPER_END" search nip nip or if
+	."   return;" cr
+    else
+	."   goto _endif_;" cr
+    endif
+    ." }" cr ;
+
+: gen-arg-parm { item -- }
+    item item-stack @ inst-stream = if
+	." , " item item-type @ type-c-name 2@ type space
+	item item-name 2@ type
+    endif ;
+
+: gen-args-parm ( -- )
+    prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-parm map-items ;
+
+: gen-arg-gen { item -- }
+    item item-stack @ inst-stream = if
+	."   genarg_" item item-type @ print-type-prefix
+        ." (ctp, " item item-name 2@ type ." );" cr
+    endif ;
+
+: gen-args-gen ( -- )
+    prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-gen map-items ;
+
+: output-gen ( -- )
+    \ generate C code for generating VM instructions
+    ." void gen_" prim prim-c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr
+    ." {" cr
+    ."   gen_inst(ctp, vm_prim[" function-number @ 0 .r ." ]);" cr
+    gen-args-gen
+    ." }" cr ;
+
+: stack-used? { stack -- f }
+    stack stack-in @ stack stack-out @ or 0<> ;
+
 : output-funclabel ( -- )
-  1 function-number +!
-  ." &I_" c-name 2@ type ." ," cr ;
+  ." &I_" prim prim-c-name 2@ type ." ," cr ;
 
 : output-forthname ( -- )
-  1 function-number +!
-  '" emit forth-name 2@ type '" emit ." ," cr ;
+  '" emit prim prim-name 2@ type '" emit ." ," cr ;
 
-: output-c-func ( -- )
-    1 function-number +!
-    ." void I_" c-name 2@ type ." ()      /* " forth-name 2@ type
-    ."  ( " stack-string 2@ type ."  ) */" cr
-    ." /* " doc 2@ type ."  */" cr
-    ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr
-    \ debugging
-    ." {" cr
-    ." DEF_CA" cr
-    declarations
-    compute-offsets \ for everything else
-    ." NEXT_P0;" cr
-    flush-tos
-    fetches
-    stack-pointer-updates
-    ." {" cr
-    ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
-    c-code 2@ type
-    ." }" cr
-    ." NEXT_P1;" cr
-    stores
-    fill-tos
-    ." NEXT_P2;" cr
-    ." }" cr
-    cr ;
+\  : output-c-func ( -- )
+\  \ used for word libraries
+\      ." Cell * I_" prim prim-c-name 2@ type ." (Cell *SP, Cell **FP)      /* " 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
+\      print-declarations
+\      \ !! don't know what to do about that
+\      inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN
+\      data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN
+\      fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN
+\      return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN
+\      flush-tos
+\      fetches
+\      stack-pointer-updates
+\      fp-stack   stack-used? IF ." *FP=fp;" cr THEN
+\      ." {" cr
+\      ." #line " c-line @ . quote c-filename 2@ type quote cr
+\      prim prim-c-code 2@ type
+\      ." }" cr
+\      stores
+\      fill-tos
+\      ." return (sp);" cr
+\      ." }" cr
+\      cr ;
 
 : output-label ( -- )  
-    ." (Label)&&I_" c-name 2@ type ." ," cr
-    -1 primitive-number +! ;
+    ." (Label)&&I_" prim prim-c-name 2@ type ." ," cr ;
 
 : output-alias ( -- ) 
-    ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
-    -1 primitive-number +! ;
+    ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
 
 : output-forth ( -- )  
-    forth-code @ 0=
+    prim prim-forth-code @ 0=
     IF    	\ output-alias
 	\ this is bad for ec: an alias is compiled if tho word does not exist!
 	\ JAW
-    ELSE  ." : " forth-name 2@ type ."   ( "
-	effect-in effect-in-end @ .stack-list ." -- "
-	effect-out effect-out-end @ .stack-list ." )" cr
-	forth-code 2@ type cr
-	-1 primitive-number +!
+    ELSE  ." : " prim prim-name 2@ type ."   ( "
+	prim prim-stack-string 2@ type ." )" cr
+	prim prim-forth-code 2@ type cr
     THEN ;
 
 : output-tag-file ( -- )
@@ -698,34 +792,471 @@ set-current
 
 : output-tag ( -- )
     output-tag-file
-    forth-name 2@ 1+ type
+    prim prim-name 2@ 1+ type
     127 emit
-    space forth-name 2@ type space
+    space prim prim-name 2@ type space
     1 emit
     name-line @ 0 .r
     ." ,0" cr ;
 
+: output-vi-tag ( -- )
+    name-filename 2@ type #tab emit
+    prim prim-name 2@ type #tab emit
+    ." /^" prim prim-name 2@ type ."  *(/" cr ;
+
 [IFDEF] documentation
 : register-doc ( -- )
-    get-current documentation set-current
-    forth-name 2@ nextname create
-    forth-name 2@ 2,
-    stack-string 2@ condition-stack-effect 2,
-    wordset 2@ 2,
-    c-name 2@ condition-pronounciation 2,
-    doc 2@ 2,
-    set-current ;
+    prim prim-name 2@ documentation ['] create insert-wordlist
+    prim prim-name 2@ 2,
+    prim prim-stack-string 2@ condition-stack-effect 2,
+    prim prim-wordset 2@ 2,
+    prim prim-c-name 2@ condition-pronounciation 2,
+    prim prim-doc 2@ 2, ;
+[THEN]
+
+
+\ combining instructions
+
+\ The input should look like this:
+
+\ lit_+ = lit +
+
+\ The output should look like this:
+
+\  I_lit_+:
+\  {
+\  DEF_CA
+\  Cell _x_ip0;
+\  Cell _x_sp0;
+\  Cell _x_sp1;
+\  NEXT_P0;
+\  _x_ip0 = (Cell) IPTOS;
+\  _x_sp0 = (Cell) spTOS;
+\  INC_IP(1);
+\  /* sp += 0; */
+\  /* lit ( #w -- w ) */
+\  /*  */
+\  NAME("lit")
+\  {
+\  Cell w;
+\  w = (Cell) _x_ip0;
+\  #ifdef VM_DEBUG
+\  if (vm_debug) {
+\  fputs(" w=", vm_out); printarg_w (w);
+\  fputc('\n', vm_out);
+\  }
+\  #endif
+\  {
+\  #line 136 "./prim"
+\  }
+\  _x_sp1 = (Cell)w;
+\  }
+\  I_plus:	/* + ( n1 n2 -- n ) */
+\  /*  */
+\  NAME("+")
+\  {
+\  DEF_CA
+\  Cell n1;
+\  Cell n2;
+\  Cell n;
+\  NEXT_P0;
+\  n1 = (Cell) _x_sp0;
+\  n2 = (Cell) _x_sp1;
+\  #ifdef VM_DEBUG
+\  if (vm_debug) {
+\  fputs(" n1=", vm_out); printarg_n (n1);
+\  fputs(" n2=", vm_out); printarg_n (n2);
+\  fputc('\n', vm_out);
+\  }
+\  #endif
+\  {
+\  #line 516 "./prim"
+\  n = n1+n2;
+\  }
+\  NEXT_P1;
+\  _x_sp0 = (Cell)n;
+\  NEXT_P2;
+\  }
+\  NEXT_P1;
+\  spTOS = (Cell)_x_sp0;
+\  NEXT_P2;
+
+: init-combined ( -- )
+    prim to 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 ( -- )
+    combined combined-prims num-combined @ cells
+    combinations ['] constant insert-wordlist
+    combined-prims num-combined @ 1- th ( last-part )
+    @ prim-c-code 2@ prim prim-c-code 2! \ used by output-super-end
+    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 ;
+
+: part-fetches ( -- )
+    fetches ;
+
+: part-output-c-tail ( -- )
+    print-debug-results
+    stores ;
+
+: output-combined-tail ( -- )
+    part-output-c-tail
+    prim >r combined to prim
+    in-part @ >r in-part off
+    output-c-tail
+    r> in-part ! r> to prim ;
+
+: 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@ ['] output-combined-tail type-c-code
+    ." }" cr
+    part-output-c-tail
+    ." }" cr ;
+
+: output-parts ( -- )
+    prim >r in-part on
+    current-depth max-stacks cells erase
+    num-combined @ 0 +do
+	combined-prims i th @ output-part
+    loop
+    in-part off
+    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 ( -- )
+;
+
+
+\ peephole optimization rules
+
+\ 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-peephole ( -- )
+    combined-prims num-combined @ 1- cells combinations search-wordlist
+    s" the prefix for this combination must be defined earlier" ?print-error
+    ." {"
+    execute prim-num @ 5 .r ." ,"
+    combined-prims num-combined @ 1- th @ prim-num @ 5 .r ." ,"
+    combined prim-num @ 5 .r ." }, /* "
+    combined prim-c-name 2@ type ."  */"
+    cr ;
+
+: output-forth-peephole ( -- )
+    combined-prims num-combined @ 1- cells combinations search-wordlist
+    s" the prefix for this combination must be defined earlier" ?print-error
+    execute prim-num @ 5 .r
+    combined-prims num-combined @ 1- th @ prim-num @ 5 .r
+    combined prim-num @ 5 .r ."  prim, \ "
+    combined prim-c-name 2@ type
+    cr ;
+
+
+\ the parser
+
+eof-char max-member \ the whole character set + EOF
+
+: getinput ( -- n )
+ rawinput @ endrawinput @ =
+ if
+   eof-char
+ else
+   cookedinput @ c@
+ endif ;
+
+:noname ( n -- )
+ dup bl > if
+  emit space
+ else
+  .
+ endif ;
+print-token !
+
+: testchar? ( set -- f )
+ getinput member? ;
+' testchar? test-vector !
+
+: checksyncline ( -- )
+    \ 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 0<> 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 ;
+
+: ?nextchar ( f -- )
+    s" syntax error, wrong char" ?print-error
+    rawinput @ endrawinput @ <> if
+	rawinput @ c@
+	1 chars rawinput +!
+	1 chars cookedinput +!
+	nl-char = if
+	    checksyncline
+	    rawinput @ line-start !
+	endif
+	rawinput @ c@ cookedinput @ c!
+    endif ;
+
+: charclass ( set "name" -- )
+ ['] ?nextchar terminal ;
+
+: .. ( c1 c2 -- set )
+ ( creates a set that includes the characters c, c1<=c<=c2 )
+ empty copy-set
+ swap 1+ rot do
+  i over add-member
+ loop ;
+
+: ` ( -- terminal ) ( use: ` c )
+ ( creates anonymous terminal for the character c )
+ char singleton ['] ?nextchar make-terminal ;
+
+char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
+char 0 char 9 ..					charclass digit
+bl singleton tab-char over add-member			charclass white
+nl-char singleton eof-char over add-member complement	charclass nonl
+nl-char singleton eof-char over add-member
+    char : over add-member complement                   charclass nocolonnl
+bl 1+ maxchar .. char \ singleton complement intersection
+                                                        charclass nowhitebq
+bl 1+ maxchar ..                                        charclass nowhite
+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 ( -- )
+
+(( ` # ?? (( letter || digit || ` : )) **
+)) <- stack-ident ( -- )
+
+(( nowhitebq nowhite ** ))
+<- forth-ident ( -- )
+
+Variable forth-flag
+Variable c-flag
+
+(( (( ` e || ` E )) {{ start }} nonl ** 
+   {{ end evaluate }}
+)) <- eval-comment ( ... -- ... )
+
+(( (( ` f || ` F )) {{ start }} nonl ** 
+   {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
+)) <- forth-comment ( -- )
+
+(( (( ` c || ` C )) {{ start }} nonl ** 
+   {{ end c-flag @ IF type cr ELSE 2drop THEN }}
+)) <- c-comment ( -- )
+
+(( ` - nonl ** {{ 
+	forth-flag @ IF ." [ELSE]" cr THEN
+	c-flag @ IF ." #else" cr THEN }}
+)) <- else-comment
+
+(( ` + {{ start }} nonl ** {{ end
+	dup
+	IF	c-flag @
+		IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr
+		THEN
+		forth-flag @
+		IF  ." has? " type ."  [IF]"  cr THEN
+	ELSE	2drop
+	    c-flag @      IF  ." #endif"  cr THEN
+	    forth-flag @  IF  ." [THEN]"  cr THEN
+	THEN }}
+)) <- if-comment
+
+(( (( ` g || ` G )) {{ start }} nonl **
+   {{ end
+      forth-flag @ IF  ." group " type cr  THEN
+      c-flag @     IF  ." GROUP(" type ." )" cr  THEN }}
+)) <- group-comment
+
+(( (( eval-comment || forth-comment || c-comment || else-comment || if-comment || group-comment )) ?? nonl ** )) <- comment-body
+
+(( ` \ comment-body nleof )) <- comment ( -- )
+
+(( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
+<- stack-items
+
+(( {{ prim prim-effect-in }}  stack-items {{ prim prim-effect-in-end ! }}
+   ` - ` - white **
+   {{ 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! }} )) ??
+   )) ??  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 }} white ** )) ++
+   nleof {{ process-combined }}
+)) <- combined-primitive
+
+(( {{ make-prim to prim 0 to combined
+      line @ name-line ! filename 2@ name-filename 2!
+      function-number @ prim prim-num !
+      start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
+   (( simple-primitive || combined-primitive )) {{ 1 function-number +! }}
+)) <- primitive ( -- )
+
+(( (( comment || primitive || nl white ** )) ** eof ))
+parser primitives2something
+warnings @ [IF]
+.( parser generated ok ) cr
+[THEN]
+
+
+\ run with gforth-0.5.0 (slurp-file is missing)
+[IFUNDEF] slurp-file
+: slurp-file ( c-addr1 u1 -- c-addr2 u2 )
+    \ c-addr1 u1 is the filename, c-addr2 u2 is the file's contents
+    r/o bin open-file throw >r
+    r@ file-size throw abort" file too large"
+    dup allocate throw swap
+    2dup r@ read-file throw over <> abort" could not read whole file"
+    r> close-file throw ;
 [THEN]
 
-: process-file ( addr u xt -- )
-    >r
-    2dup filename 2!
-    0 function-number !
-    r/o open-file abort" cannot open file"
+: primfilter ( addr u -- )
+    \ process the string at addr u
+    over dup rawinput ! dup line-start ! cookedinput !
+    + endrawinput !
+    checksyncline
+    primitives2something ;    
+
+: process-file ( addr u xt-simple x-combined -- )
+    output-combined ! output !
+    save-mem 2dup filename 2!
+    slurp-file
     warnings @ if
 	." ------------ CUT HERE -------------" cr  endif
-    r> primfilter ;
+    primfilter ;
 
-: process      ( xt -- )
-    bl word count rot
-    process-file ;
+\  : process      ( xt -- )
+\      bl word count rot
+\      process-file ;