--- gforth/prims2x.fs	2000/12/13 09:51:28	1.53
+++ gforth/prims2x.fs	2000/12/30 15:22:52	1.60
@@ -273,6 +273,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 +303,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 +315,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
@@ -432,15 +437,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 +472,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
@@ -519,31 +520,6 @@ does> ( item -- )
  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
-
 \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset
@@ -610,8 +586,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 ;
@@ -666,6 +647,67 @@ set-current
  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
+    endif ;
+
+: disasm-args ( -- )
+ effect-in-end @ effect-in ?do
+   i disasm-arg
+ item% %size +loop ; 
+
+: 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
+    ." /* " 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-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<> ;