--- gforth/prims2x.fs	2000/12/26 19:35:32	1.58
+++ gforth/prims2x.fs	2001/01/09 16:11:36	1.63
@@ -82,6 +82,9 @@ skipsynclines on
 : end ( addr -- addr u )
  cookedinput @ over - ;
 
+: quote ( -- )
+    [char] " emit ;
+
 variable output \ xt ( -- ) of output word
 
 : printprim ( -- )
@@ -125,7 +128,7 @@ end-struct type%
 s" sp" save-mem s" (Cell)" make-stack data-stack 
 s" fp" save-mem s" "       make-stack fp-stack
 s" rp" save-mem s" (Cell)" make-stack return-stack
-s" ip" save-mem s" error don't use # on results" make-stack inst-stream
+s" IP" save-mem s" error don't use # on results" make-stack inst-stream
 ' inst-in-index inst-stream stack-in-index-xt !
 \ !! initialize stack-in and stack-out
 
@@ -324,14 +327,14 @@ Variable c-flag
 	)) ??  nl
    ))
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " white ** nl )) ??
-   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! skipsynclines on }}
+   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end c-code 2! skipsynclines on }}
    (( ` :  white ** nl
-      {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}
+      {{ start }} (( nonl ++  nl white ** )) ++ {{ end forth-code 2! }}
    )) ?? {{ printprim }}
    (( nl || eof ))
 )) <- primitive ( -- )
 
-(( (( comment || primitive || nl )) ** eof ))
+(( (( comment || primitive || nl white ** )) ** eof ))
 parser primitives2something
 warnings @ [IF]
 .( parser generated ok ) cr
@@ -383,8 +386,8 @@ warnings @ [IF]
  >r
  ." FETCH_DCELL("
  r@ item-name 2@ type ." , "
- r@ item-in-index r@ item-stack @ 2dup stack-access
- ." , "                      -1 under+ stack-access
+ r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
+ ." , "                      -1 under+ ." (Cell)" stack-access
  ." );" cr
  rdrop ;
 
@@ -626,10 +629,28 @@ does> ( item -- )
     repeat
     2drop type ;
 
+: print-type-prefix ( type -- )
+    body> >head .name ;
+
+: 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
+    effect-in-end @ effect-in ?do
+	i print-debug-arg
+	item% %size +loop
+    ." fputc('\n', vm_out);" cr
+    ." }" cr
+    ." #endif" cr ;
+    
 : 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
+ ." NAME(" quote forth-name 2@ type quote ." )" cr \ debugging
  ." {" cr
  ." DEF_CA" cr
  declarations
@@ -637,9 +658,10 @@ does> ( item -- )
  ." 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
+ ." #line " c-line @ . quote c-filename 2@ type quote cr
  c-code 2@ type-c
  ." }" cr
  output-c-tail
@@ -647,13 +669,12 @@ does> ( item -- )
  cr
 ;
 
-: print-type-prefix ( type -- )
-    body> >head .name ;
-
 : disasm-arg { item -- }
     item item-stack @ inst-stream = if
-	."   printarg_" item item-type @ print-type-prefix
-	." (ip[" item item-offset @ 1+ 0 .r ." ]);" cr
+	."   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 ( -- )
@@ -664,7 +685,7 @@ does> ( item -- )
 : output-disasm ( -- )
     \ generate code for disassembling VM instructions
     ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr
-    ."   fputs(" [char] " emit forth-name 2@ type [char] " emit ." ,stdout);" cr
+    ."   fputs(" quote forth-name 2@ type quote ." , vm_out);" cr
     ." /* " declarations ." */" cr
     compute-offsets
     disasm-args
@@ -672,6 +693,39 @@ does> ( item -- )
     ." } else "
     1 function-number +! ;
 
+: 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 ( -- )
+ effect-in-end @ effect-in ?do
+   i gen-arg-parm
+ item% %size +loop ; 
+
+: 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 ( -- )
+ effect-in-end @ effect-in ?do
+   i gen-arg-gen
+ item% %size +loop ; 
+
+: output-gen ( -- )
+    \ generate C code for generating VM instructions
+    ." /* " declarations ." */" cr
+    compute-offsets
+    ." void gen_" 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
+    1 function-number +! ;
+
 : stack-used? { stack -- f }
     stack stack-in @ stack stack-out @ or 0<> ;
 
@@ -689,7 +743,7 @@ does> ( item -- )
     ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type
     ."  ( " stack-string 2@ type ."  ) */" cr
     ." /* " doc 2@ type ."  */" cr
-    ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr
+    ." NAME(" quote forth-name 2@ type quote ." )" cr
     \ debugging
     ." {" cr
     declarations
@@ -703,7 +757,7 @@ does> ( item -- )
     stack-pointer-updates
     fp-stack   stack-used? IF ." *FP=fp;" cr THEN
     ." {" cr
-    ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
+    ." #line " c-line @ . quote c-filename 2@ type quote cr
     c-code 2@ type
     ." }" cr
     stores
@@ -762,7 +816,7 @@ does> ( item -- )
 
 : process-file ( addr u xt -- )
     >r
-    2dup filename 2!
+    save-mem 2dup filename 2!
     0 function-number !
     r/o open-file abort" cannot open file"
     warnings @ if