--- gforth/prims2x.fs	2000/12/13 09:51:28	1.53
+++ gforth/prims2x.fs	2001/01/18 14:57:37	1.65
@@ -68,7 +68,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
@@ -82,6 +83,9 @@ skipsynclines on
 : end ( addr -- addr u )
  cookedinput @ over - ;
 
+: quote ( -- )
+    [char] " emit ;
+
 variable output \ xt ( -- ) of output word
 
 : printprim ( -- )
@@ -125,7 +129,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
 
@@ -137,6 +141,12 @@ s" ip" save-mem s" error don't use # on
     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 ;
+
 \ various variables for storing stuff of one primitive
 
 2variable forth-name
@@ -216,11 +226,22 @@ print-token !
     endif
     drop ;
 
+: 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 ;
+    
 : ?nextchar ( f -- )
     ?not? if
-	filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
-	getinput . cr
-	rawinput @ endrawinput @ over - 100 min type cr
+	outfile-id >r try
+	    stderr to outfile-id
+	    filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
+	    getinput . cr
+	    print-error-line
+	    0
+	recover endtry
+	r> to outfile-id throw
 	abort
     endif
     rawinput @ endrawinput @ <> if
@@ -229,6 +250,7 @@ print-token !
 	1 chars cookedinput +!
 	nl-char = if
 	    checksyncline
+	    rawinput @ line-start !
 	endif
 	rawinput @ c@ cookedinput @ c!
     endif ;
@@ -273,6 +295,10 @@ eof-char singleton					charclass eof
 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 ( -- )
@@ -299,7 +325,7 @@ Variable c-flag
 	THEN }}
 )) <- if-comment
 
-(( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
+(( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
 
 (( ` \ comment-body nl )) <- comment ( -- )
 
@@ -311,22 +337,23 @@ Variable c-flag
    {{ effect-out }} stack-items {{ effect-out-end ! }}
 )) <- stack-effect ( -- )
 
-(( {{ s" " doc 2! s" " forth-code 2! }}
+(( {{ s" " doc 2! s" " forth-code 2! s" " wordset 2! }}
    (( {{ line @ name-line ! filename 2@ name-filename 2! }}
       {{ start }} forth-ident {{ end 2dup forth-name 2! c-name 2! }}  white ++
       ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **
-        {{ start }} forth-ident {{ end wordset 2! }} white **
-        (( {{ start }}  c-ident {{ end c-name 2! }} )) ??  nl
+        (( {{ start }} forth-ident {{ end wordset 2! }} white **
+	   (( {{ start }}  c-ident {{ 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! }}
+   (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " white ** nl )) ??
+   {{ 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 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
@@ -335,7 +362,7 @@ warnings @ [IF]
 : primfilter ( file-id xt -- )
 \ fileid is for the input file, xt ( -- ) is for the output word
  output !
- here dup rawinput ! cookedinput !
+ here dup rawinput ! dup line-start ! cookedinput !
  here unused rot read-file throw
  dup here + endrawinput !
  allot
@@ -378,8 +405,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 ;
 
@@ -432,15 +459,11 @@ warnings @ [IF]
  ." );" cr
  rdrop ;
 
+: single ( -- xt1 xt2 n )
+    ['] fetch-single ['] store-single 1 ;
 
-: single-type ( -- xt1 xt2 n stack )
- ['] fetch-single ['] store-single 1 data-stack ;
-
-: double-type ( -- xt1 xt2 n stack )
- ['] fetch-double ['] store-double 2 data-stack ;
-
-: float-type ( -- xt1 xt2 n stack )
- ['] fetch-single ['] store-single 1 fp-stack ;
+: double ( -- xt1 xt2 n )
+    ['] fetch-double ['] store-double 2 ;
 
 : s, ( addr u -- )
 \ allocate a string
@@ -471,7 +494,7 @@ wordlist constant prefixes
     stack r@ type-stack !
     rdrop ;
 
-: type-prefix ( addr u xt1 xt2 n stack "prefix" -- )
+: type-prefix ( xt1 xt2 n stack "prefix" -- )
     create-type
 does> ( item -- )
     \ initialize item
@@ -501,48 +524,21 @@ does> ( item -- )
 : declaration ( item -- )
     dup item-name 2@ execute-prefix ;
 
-: stack-prefix ( stack "prefix" -- )
-    name tuck nextname create ( stack length ) 2,
-does> ( item -- )
-    2@ { item stack prefix-length }
-    item item-name 2@ prefix-length /string item item-name 2!
-    stack item item-stack !
-    item declaration ;
-    
 : declaration-list ( addr1 addr2 -- )
- swap ?do
-  i declaration
- item% %size +loop ;
+    ['] declaration map-items ;
 
 : declarations ( -- )
  wordlist dup items ! set-current
  effect-in effect-in-end @ declaration-list
  effect-out effect-out-end @ declaration-list ;
 
-get-current
-prefixes set-current
-
-s" Bool"	single-type type-prefix f
-s" Char"	single-type type-prefix c
-s" Cell"	single-type type-prefix n
-s" Cell"	single-type type-prefix w
-s" UCell"	single-type type-prefix u
-s" DCell"	double-type type-prefix d
-s" UDCell"	double-type type-prefix ud
-s" Float"	float-type  type-prefix r
-s" Cell *"	single-type type-prefix a_
-s" Char *"	single-type type-prefix c_
-s" Float *"	single-type type-prefix f_
-s" DFloat *"	single-type type-prefix df_
-s" SFloat *"	single-type type-prefix sf_
-s" Xt"		single-type type-prefix xt
-s" WID"		single-type type-prefix wid
-s" struct F83Name *"	single-type type-prefix f83name
-
-return-stack stack-prefix R:
-inst-stream  stack-prefix #
-
-set-current
+: stack-prefix ( stack "prefix" -- )
+    name tuck nextname create ( stack length ) 2,
+does> ( item -- )
+    2@ { item stack prefix-length }
+    item item-name 2@ prefix-length /string item item-name 2!
+    stack item item-stack !
+    item declaration ;
 
 \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0
@@ -554,11 +550,11 @@ set-current
     item item-stack @ xt execute dup @ >r +!
     r> item item-offset ! ;
 
-: compute-list ( addr1 addr2 xt -- )
-    { xt }
-    swap u+do
-	i xt compute-offset
-    item% %size +loop ;
+: compute-offset-in ( addr1 addr2 -- )
+    ['] stack-in compute-offset ;
+
+: compute-offset-out ( addr1 addr2 -- )
+    ['] stack-out compute-offset ;
 
 : clear-stack { -- }
     dup stack-in off stack-out off ;
@@ -566,8 +562,8 @@ set-current
 : compute-offsets ( -- )
     data-stack clear-stack  fp-stack clear-stack return-stack clear-stack
     inst-stream clear-stack
-    effect-in  effect-in-end  @ ['] stack-in  compute-list
-    effect-out effect-out-end @ ['] stack-out compute-list
+    effect-in  effect-in-end  @ ['] compute-offset-in  map-items
+    effect-out effect-out-end @ ['] compute-offset-out map-items
     inst-stream stack-out @ 0<> abort" # can only be on the input side" ;
 
 : flush-a-tos { stack -- }
@@ -599,9 +595,7 @@ set-current
  dup item-type @ type-fetch @ execute ;
 
 : fetches ( -- )
- effect-in-end @ effect-in ?do
-   i fetch
- item% %size +loop ; 
+    effect-in effect-in-end @ ['] fetch map-items ;
 
 : stack-pointer-update { stack -- }
     \ stack grow downwards
@@ -610,8 +604,13 @@ set-current
 	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 ( -- )
-    inst-stream  stack-pointer-update
+    inst-pointer-update
     data-stack   stack-pointer-update
     fp-stack     stack-pointer-update
     return-stack stack-pointer-update ;
@@ -622,9 +621,7 @@ set-current
  dup item-type @ type-store @ execute ;
 
 : stores ( -- )
- effect-out-end @ effect-out ?do
-   i store
- item% %size +loop ; 
+    effect-out effect-out-end @ ['] store map-items ;
 
 : output-c-tail ( -- )
     \ the final part of the generated C code
@@ -645,10 +642,26 @@ set-current
     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 effect-in-end @ ['] print-debug-arg map-items
+    ." 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
@@ -656,9 +669,10 @@ set-current
  ." 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
@@ -666,6 +680,57 @@ set-current
  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 ( -- )
+    effect-in 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 forth-name 2@ type quote ." , vm_out);" cr
+    ." /* " declarations ." */" cr
+    compute-offsets
+    disasm-args
+    ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
+    ." } 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 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 ( -- )
+    effect-in effect-in-end @ ['] gen-arg-gen map-items ;
+
+: 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<> ;
 
@@ -683,7 +748,7 @@ set-current
     ." 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
@@ -697,7 +762,7 @@ set-current
     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
@@ -756,7 +821,7 @@ set-current
 
 : 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