--- gforth/prims2x.fs	2001/12/24 14:09:06	1.102
+++ gforth/prims2x.fs	2002/09/14 08:20:19	1.113
@@ -60,9 +60,9 @@ include startup.fs
 : struct% struct ; \ struct is redefined in gray
 
 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
@@ -78,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 + ;
@@ -121,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
 
@@ -312,26 +331,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
@@ -355,26 +374,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
@@ -385,7 +403,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 )
@@ -423,7 +441,7 @@ wordlist constant prefixes
     stack r@ type-stack !
     rdrop ;
 
-: type-prefix ( xt1 xt2 n stack "prefix" -- )
+: type-prefix ( addr u xt1 xt2 n stack "prefix" -- )
     get-current >r prefixes set-current
     create-type r> set-current
 does> ( item -- )
@@ -624,58 +642,70 @@ stack inst-stream IP Cell
     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 ;
+    2drop type
+    ." #line " out-nls @ 2 + . quote out-filename 2@ type quote cr
+    ." }" cr ;
 
 : print-entry ( -- )
-    ." LABEL(" 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 ( -- )
@@ -683,7 +713,7 @@ stack inst-stream IP Cell
 
 : 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
@@ -693,7 +723,7 @@ stack inst-stream IP Cell
 : 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
@@ -703,6 +733,30 @@ stack inst-stream IP Cell
     endif
     ." }" cr ;
 
+: output-profile-combined ( -- )
+    \ generate code for postprocessing the VM block profile stuff
+    ." if (VM_IS_INST(*ip, " function-number @ 0 .r ." )) {" cr
+    num-combined @ 0 +do
+	."   add_inst(b, " quote
+	combined-prims i th @ prim-name 2@ type
+	quote ." );" cr
+    loop
+    ."   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
 	." , " item item-type @ type-c-name 2@ type space
@@ -783,7 +837,7 @@ stack inst-stream IP Cell
     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
@@ -873,9 +927,7 @@ stack inst-stream IP Cell
 \  #line 516 "./prim"
 \  n = n1+n2;
 \  }
-\  NEXT_P1;
 \  _x_sp0 = (Cell)n;
-\  NEXT_P2;
 \  }
 \  NEXT_P1;
 \  spTOS = (Cell)_x_sp0;
@@ -992,10 +1044,7 @@ stack inst-stream IP Cell
     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 ;
 
@@ -1020,7 +1069,7 @@ stack inst-stream IP Cell
     \ print-debug-args
     stack-pointer-updates
     output-parts
-    output-c-tail
+    output-c-tail2
     ." }" cr
     cr ;
 
@@ -1082,7 +1131,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 )
@@ -1131,6 +1180,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
@@ -1142,7 +1193,7 @@ nl-char singleton eof-char over add-memb
 (( letter (( letter || digit )) **
 )) <- c-ident ( -- )
 
-(( ` # ?? (( letter || digit || ` : )) **
+(( ` # ?? (( letter || digit || ` : )) ++
 )) <- stack-ident ( -- )
 
 (( nowhitebq nowhite ** ))
@@ -1205,7 +1256,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 }}
@@ -1220,7 +1274,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 ( -- )