--- gforth/prims2x.fs	2001/03/11 21:47:27	1.90
+++ gforth/prims2x.fs	2002/09/22 09:00:04	1.114
@@ -41,7 +41,6 @@
 \ 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:
 
@@ -54,23 +53,16 @@
 
 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
-include ./stuff.fs
-[THEN]
-
-[IFUNDEF] environment?
-include ./environ.fs
+[IFUNDEF] try
+include startup.fs
 [THEN]
 
 : struct% struct ; \ struct is redefined in gray
 
-include ./gray.fs
+warnings off
+\ warnings on
 
+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
@@ -86,10 +78,17 @@ variable line-start \ pointer to start o
 0 line !
 2variable filename \ filename of original input file
 0 0 filename 2!
+2variable out-filename \ filename of the output file (for sync lines)
+0 0 out-filename 2!
 2variable f-comment
 0 0 f-comment 2!
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
-skipsynclines on 
+skipsynclines on
+variable out-nls \ newlines in output (for output sync lines)
+0 out-nls !
+variable store-optimization \ use store optimization?
+store-optimization off
+
 
 : th ( addr1 n -- addr2 )
     cells + ;
@@ -129,12 +128,24 @@ skipsynclines on
 	    0
 	recover endtry
 	r> to outfile-id throw
-	abort
+	1 (bye) \ abort
     endif ;
 
 : quote ( -- )
     [char] " emit ;
 
+\ count output lines to generate sync lines for output
+
+: count-nls ( addr u -- )
+    bounds u+do
+	i c@ nl-char = negate out-nls +!
+    loop ;
+
+:noname ( addr u -- )
+    2dup count-nls
+    defers type ;
+is type
+
 variable output          \ xt ( -- ) of output word for simple primitives
 variable output-combined \ xt ( -- ) of output word for combined primitives
 
@@ -142,7 +153,6 @@ 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 )
 end-struct stack%
 
@@ -171,15 +181,22 @@ create stacks max-stacks cells allot \ a
 : inst-in-index ( in-size item -- in-index )
     nip dup item-offset @ swap item-type @ type-size @ + 1- ;
 
-: make-stack ( addr-ptr u1 type addr-cast u2 "stack-name" -- )
+: 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 +!
-    save-mem r@ stack-cast 2!
+    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 -- )
@@ -233,6 +250,12 @@ variable in-part \ true if processing a
 create combined-prims max-combined cells allot
 variable num-combined
 
+: map-combined { xt -- }
+    \ perform xt for all components of the current combined instruction
+    num-combined @ 0 +do
+	combined-prims i th @ xt execute
+    loop ;
+
 table constant combinations
   \ the keys are the sequences of pointers to primitives
 
@@ -314,26 +337,26 @@ defer inst-stream-f ( -- stack )
     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
- ."  = 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 a single stack item from its stack
+    >r
+    ." vm_" r@ item-stack-type-name type
+    ." 2" r@ item-type @ print-type-prefix ." ("
+    r@ item-in-index r@ item-stack @ stack-access ." ,"
+    r@ item-name 2@ type
+    ." );" cr
+    rdrop ; 
 
 : fetch-double ( item -- )
- \ fetch a double stack item from its stack
- >r
- ." vm_two"
- r@ item-stack-type-name type ." 2"
- r@ item-type @ print-type-prefix ." ("
- r@ item-name 2@ type ." , "
- r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
- ." , "                      -1 under+ ." (Cell)" stack-access
- ." );" cr
- rdrop ;
+    \ fetch a double stack item from its stack
+    >r
+    ." vm_two"
+    r@ item-stack-type-name type ." 2"
+    r@ item-type @ print-type-prefix ." ("
+    r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
+    ." , "                      -1 under+ ." (Cell)" stack-access
+    ." , " r@ item-name 2@ type
+    ." )" cr
+    rdrop ;
 
 : same-as-in? ( item -- f )
  \ f is true iff the offset and stack of item is the same as on input
@@ -357,26 +380,25 @@ defer inst-stream-f ( -- stack )
     >r r@ item-stack @ stack-out @ r> item-offset @ - 1- ;
 
 : really-store-single ( item -- )
- >r
- 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 ;
+    >r
+    ." vm_"
+    r@ item-type @ print-type-prefix ." 2"
+    r@ item-stack-type-name type ." ("
+    r@ item-name 2@ type ." ,"
+    r@ item-out-index r@ item-stack @ stack-access ." );"
+    rdrop ;
 
 : store-single ( item -- )
- >r
- r@ same-as-in?
- if
-   r@ item-in-index 0= r@ item-out-index 0= xor
-   if
-       ." IF_" r@ item-stack @ stack-pointer 2@ type
-       ." TOS(" r@ really-store-single ." );" cr
-   endif
- else
-   r@ really-store-single cr
- endif
- rdrop ;
+    >r
+    store-optimization @ r@ same-as-in? and if
+	r@ item-in-index 0= r@ item-out-index 0= xor if
+	    ." IF_" r@ item-stack @ stack-pointer 2@ type
+	    ." TOS(" r@ really-store-single ." );" cr
+	endif
+    else
+	r@ really-store-single cr
+    endif
+    rdrop ;
 
 : store-double ( item -- )
 \ !! store optimization is not performed, because it is not yet needed
@@ -387,7 +409,7 @@ defer inst-stream-f ( -- stack )
  r@ item-name 2@ type ." , "
  r@ item-out-index r@ item-stack @ 2dup stack-access
  ." , "                       -1 under+ stack-access
- ." );" cr
+ ." )" cr
  rdrop ;
 
 : single ( -- xt1 xt2 n )
@@ -425,8 +447,9 @@ wordlist constant prefixes
     stack r@ type-stack !
     rdrop ;
 
-: type-prefix ( xt1 xt2 n stack "prefix" -- )
-    create-type
+: type-prefix ( addr u xt1 xt2 n stack "prefix" -- )
+    get-current >r prefixes set-current
+    create-type r> set-current
 does> ( item -- )
     \ initialize item
     { item typ }
@@ -476,7 +499,9 @@ does> ( item -- )
     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!
@@ -485,13 +510,23 @@ does> ( item -- )
 
 \ types pointed to by stacks for use in combined prims
 \ !! output-c-combined shouldn't use these names!
-s" Cell"  single 0 create-type w
-s" Float" single 0 create-type r
+: 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
 
-s" sp" save-mem w s" (Cell)" make-stack data-stack 
-s" fp" save-mem r s" "       make-stack fp-stack
-s" rp" save-mem w s" (Cell)" make-stack return-stack
-s" IP" save-mem w s" error don't use # on results" make-stack inst-stream
+: 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
@@ -516,7 +551,7 @@ s" IP" save-mem w s" error don't use # o
     dup stack-in off stack-out off ;
 
 : compute-offsets ( -- )
-    data-stack clear-stack  fp-stack clear-stack return-stack clear-stack
+    ['] 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
@@ -536,9 +571,7 @@ s" IP" save-mem w s" error don't use # o
     endif ;
 
 : flush-tos ( -- )
-    data-stack   flush-a-tos
-    fp-stack     flush-a-tos
-    return-stack flush-a-tos ;
+    ['] flush-a-tos map-stacks ;
 
 : fill-a-tos { stack -- }
     stack stack-out @ 0= stack stack-in @ 0<> and
@@ -549,9 +582,7 @@ s" IP" save-mem w s" error don't use # o
 
 : fill-tos ( -- )
     \ !! inst-stream for prefetching?
-    fp-stack     fill-a-tos
-    data-stack   fill-a-tos
-    return-stack fill-a-tos ;
+    ['] fill-a-tos map-stacks ;
 
 : fetch ( addr -- )
     dup item-type @ type-fetch @ execute ;
@@ -573,9 +604,7 @@ s" IP" save-mem w s" error don't use # o
 
 : stack-pointer-updates ( -- )
     inst-pointer-update
-    data-stack   stack-pointer-update
-    fp-stack     stack-pointer-update
-    return-stack stack-pointer-update ;
+    ['] stack-pointer-update map-stacks ;
 
 : store ( item -- )
 \ f is true if the item should be stored
@@ -585,76 +614,104 @@ s" IP" save-mem w s" error don't use # o
 : stores ( -- )
     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-c-tail1 ( -- )
+    \ the final part of the generated C code except LABEL2 and NEXT_P2
     output-super-end
+    print-debug-results
     ." NEXT_P1;" cr
     stores
-    fill-tos
+    fill-tos ;
+
+: output-c-tail ( -- )
+    \ the final part of the generated C code, without LABEL2
+    output-c-tail1
     ." NEXT_P2;" ;
 
+: 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 ;
+
 : type-c-code ( c-addr u xt -- )
-    \ like TYPE, but replaces "TAIL;" with tail code produced by xt
+    \ like TYPE, but replaces "INST_TAIL;" with tail code produced by xt
     { xt }
+    ." {" cr
+    ." #line " c-line @ . quote c-filename 2@ type quote cr
     begin ( c-addr1 u1 )
-	2dup s" TAIL;" search
+	2dup s" INST_TAIL;" search
     while ( c-addr1 u1 c-addr3 u3 )
 	2dup 2>r drop nip over - type
 	xt execute
-	2r> 5 /string
+	2r> 10 /string
 	\ !! resync #line missing
     repeat
-    2drop type ;
-
-: 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 ;
+    2drop type
+    ." #line " out-nls @ 2 + . quote out-filename 2@ type quote cr
+    ." }" cr ;
 
 : print-entry ( -- )
-    ." I_" prim prim-c-name 2@ type ." :" ;
+    ." LABEL(" prim prim-c-name 2@ type ." )" ;
     
 : output-c ( -- ) 
- 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
- print-declarations
- ." NEXT_P0;" cr
- flush-tos
- fetches
- print-debug-args
- stack-pointer-updates
- ." {" cr
- ." #line " c-line @ . quote c-filename 2@ type quote cr
- prim prim-c-code 2@ ['] output-c-tail type-c-code
- ." }" cr
- output-c-tail
- ." }" cr
- 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
+    ." DEF_CA" cr
+    print-declarations
+    ." NEXT_P0;" cr
+    flush-tos
+    fetches
+    print-debug-args
+    stack-pointer-updates
+    prim prim-c-code 2@ ['] output-c-tail type-c-code
+    output-c-tail2
+    ." }" 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
+	." {" cr
+	item print-declaration
+	item fetch
+	item print-debug-arg
+	." }" cr
     endif ;
 
 : disasm-args ( -- )
@@ -662,22 +719,50 @@ s" IP" save-mem w s" error don't use # o
 
 : output-disasm ( -- )
     \ generate code for disassembling VM instructions
-    ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr
+    ." if (VM_IS_INST(*ip, " 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
-    ." } else " ;
+    ."   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
+    ."   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
-    ." } else " cr ;
+    ." }" cr ;
+
+: output-profile-part ( p )
+    ."   add_inst(b, " quote
+    prim-name 2@ type
+    quote ." );" cr ;
+    
+: output-profile-combined ( -- )
+    \ generate code for postprocessing the VM block profile stuff
+    ." if (VM_IS_INST(*ip, " function-number @ 0 .r ." )) {" cr
+    ['] output-profile-part map-combined
+    ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
+    combined-prims num-combined @ 1- th @ prim-c-code 2@  s" SET_IP"    search nip nip
+    combined-prims num-combined @ 1- th @ prim-c-code 2@  s" SUPER_END" search nip nip or if
+	."   return;" cr
+    else
+	."   goto _endif_;" cr
+    endif
+    ." }" cr ;
+
+: output-superend ( -- )
+    \ output flag specifying whether the current word ends a dynamic superinst
+    prim prim-c-code 2@  s" SET_IP"    search nip nip
+    prim prim-c-code 2@  s" SUPER_END" search nip nip or 0<>
+    prim prim-c-code 2@  s" SUPER_CONTINUE" search nip nip 0= and
+    negate 0 .r ." , /* " prim prim-name 2@ type ."  */" cr ;
 
 : gen-arg-parm { item -- }
     item item-stack @ inst-stream = if
@@ -714,39 +799,43 @@ s" IP" save-mem w s" error don't use # o
 : output-forthname ( -- )
   '" emit prim prim-name 2@ type '" emit ." ," 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
-    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-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_" 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-forth ( -- )  
     prim prim-forth-code @ 0=
     IF    	\ output-alias
@@ -758,7 +847,7 @@ s" IP" save-mem w s" error don't use # o
     THEN ;
 
 : output-tag-file ( -- )
-    name-filename 2@ last-name-filename 2@ compare if
+    name-filename 2@ last-name-filename 2@ str= 0= if
 	name-filename 2@ last-name-filename 2!
 	#ff emit cr
 	name-filename 2@ type
@@ -774,6 +863,11 @@ s" IP" save-mem w s" error don't use # o
     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 ( -- )
     prim prim-name 2@ documentation ['] create insert-wordlist
@@ -843,9 +937,7 @@ s" IP" save-mem w s" error don't use # o
 \  #line 516 "./prim"
 \  n = n1+n2;
 \  }
-\  NEXT_P1;
 \  _x_sp0 = (Cell)n;
-\  NEXT_P2;
 \  }
 \  NEXT_P1;
 \  spTOS = (Cell)_x_sp0;
@@ -943,6 +1035,7 @@ s" IP" save-mem w s" error don't use # o
     fetches ;
 
 : part-output-c-tail ( -- )
+    print-debug-results
     stores ;
 
 : output-combined-tail ( -- )
@@ -961,19 +1054,14 @@ s" IP" save-mem w s" error don't use # o
     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
+    ['] output-part map-combined
     in-part off
     r> to prim ;
 
@@ -989,7 +1077,7 @@ s" IP" save-mem w s" error don't use # o
     \ print-debug-args
     stack-pointer-updates
     output-parts
-    output-c-tail
+    output-c-tail2
     ." }" cr
     cr ;
 
@@ -999,13 +1087,16 @@ s" IP" save-mem w s" error don't use # o
 
 \ peephole optimization rules
 
+\ data for a simple peephole optimizer that always tries to combine
+\ the currently compiled instruction with the last one.
+
 \ 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
+    s" the prefix for this superinstruction must be defined earlier" ?print-error
     ." {"
     execute prim-num @ 5 .r ." ,"
     combined-prims num-combined @ 1- th @ prim-num @ 5 .r ." ,"
@@ -1013,15 +1104,30 @@ s" IP" save-mem w s" error don't use # o
     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 ;
 
+\ superinstruction data for a sophisticated combiner (e.g., shortest path)
+
+\ This is intended as initializer for a structure like this
+
+\  struct super {
+\    int super;       /* index in vm_prims */
+\    int loads;       /* number of stack loads */
+\    int stores;      /* number of stack stores */
+\    int updates;     /* number of stack pointer updates */
+\    int length;      /* number of components */
+\    int *components; /* array of vm_prim indexes of components */
+\  };
+
+
+: output-num-part ( p -- )
+    prim-num @ 4 .r ." ," ;
+
+: output-supers ( -- )
+    ." {" combined prim-num @ 4 .r
+    ." ,0,0,0," \ counting this stuff is not yet implemented
+    num-combined @ 2 .r
+    ." , ((int []){" ['] output-num-part map-combined ." })}"
+    cr ;
 
 \ the parser
 
@@ -1051,7 +1157,7 @@ print-token !
     \ 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
+    s" #line " r@ over str= 0= if
 	rdrop 1 line +! EXIT
     endif
     0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
@@ -1100,6 +1206,8 @@ bl singleton tab-char over add-member
 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
+nl-char singleton eof-char over add-member
+    char } over add-member complement                   charclass nobracenl
 bl 1+ maxchar .. char \ singleton complement intersection
                                                         charclass nowhitebq
 bl 1+ maxchar ..                                        charclass nowhite
@@ -1111,7 +1219,7 @@ nl-char singleton eof-char over add-memb
 (( letter (( letter || digit )) **
 )) <- c-ident ( -- )
 
-(( ` # ?? (( letter || digit || ` : )) **
+(( ` # ?? (( letter || digit || ` : )) ++
 )) <- stack-ident ( -- )
 
 (( nowhitebq nowhite ** ))
@@ -1150,7 +1258,13 @@ Variable c-flag
 	THEN }}
 )) <- if-comment
 
-(( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
+(( (( ` 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 ( -- )
 
@@ -1168,7 +1282,10 @@ Variable c-flag
       (( {{ 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 }}
+   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }}
+   (( (( ` { nonl ** nleof (( (( nobracenl {{ line @ drop }} nonl ** )) ?? nleof )) ** ` } white ** nleof white ** ))
+   || (( 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 }}
@@ -1183,7 +1300,9 @@ Variable c-flag
 (( {{ 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 ++
+      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 +! }}
 )) <- primitive ( -- )
 
@@ -1193,6 +1312,18 @@ 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]
+
 : primfilter ( addr u -- )
     \ process the string at addr u
     over dup rawinput ! dup line-start ! cookedinput !