Diff for /gforth/prims2x.fs between versions 1.51 and 1.63

version 1.51, 2000/11/12 18:14:09 version 1.63, 2001/01/09 16:11:36
Line 82  skipsynclines on Line 82  skipsynclines on
 : end ( addr -- addr u )  : end ( addr -- addr u )
  cookedinput @ over - ;   cookedinput @ over - ;
   
   : quote ( -- )
       [char] " emit ;
   
 variable output \ xt ( -- ) of output word  variable output \ xt ( -- ) of output word
   
 : printprim ( -- )  : printprim ( -- )
  output @ execute ;   output @ execute ;
   
 \ stack types  
   
 struct%  struct%
     cell% 2* field stack-pointer \ stackpointer name      cell% 2* field stack-pointer \ stackpointer name
     cell% 2* field stack-cast \ cast string for assignments to stack elements      cell% 2* field stack-cast \ cast string for assignments to stack elements
       cell%    field stack-in-index-xt \ ( in-size item -- in-index )
     cell%    field stack-in  \ number of stack items in effect in      cell%    field stack-in  \ number of stack items in effect in
     cell%    field stack-out \ number of stack items in effect out      cell%    field stack-out \ number of stack items in effect out
 end-struct stack%  end-struct stack%
   
   struct%
    cell% 2* field item-name   \ name, excluding stack prefixes
    cell%    field item-stack  \ descriptor for the stack used, 0 is default
    cell%    field item-type   \ descriptor for the item type
    cell%    field item-offset \ offset in stack items, 0 for the deepest element
   end-struct item%
   
   struct%
       cell% 2* field type-c-name
       cell%    field type-stack \ default stack
       cell%    field type-size  \ size of type in stack items
       cell%    field type-fetch \ xt of fetch code generator ( item -- )
       cell%    field type-store \ xt of store code generator ( item -- )
   end-struct type%
   
   : stack-in-index ( in-size item -- in-index )
       item-offset @ - 1- ;
   
   : inst-in-index ( in-size item -- in-index )
       nip dup item-offset @ swap item-type @ type-size @ + 1- ;
   
 : make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )  : make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )
     create stack% %allot >r      create stack% %allot >r
     save-mem r@ stack-cast 2!      save-mem r@ stack-cast 2!
     save-mem r> stack-pointer 2! ;      save-mem r@ stack-pointer 2! 
       ['] stack-in-index r> stack-in-index-xt ! ;
   
 s" sp" save-mem s" (Cell)" make-stack data-stack   s" sp" save-mem s" (Cell)" make-stack data-stack 
 s" fp" save-mem s" "       make-stack fp-stack  s" fp" save-mem s" "       make-stack fp-stack
 s" rp" save-mem s" (Cell)" make-stack return-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
   ' inst-in-index inst-stream stack-in-index-xt !
 \ !! initialize stack-in and stack-out  \ !! initialize stack-in and stack-out
   
 \ stack items  \ stack items
   
 struct%  
  cell% 2* field item-name   \ name, excluding stack prefixes  
  cell%    field item-stack  \ descriptor for the stack used, 0 is default  
  cell%    field item-type   \ descriptor for the item type  
  cell%    field item-offset \ offset in stack items, 0 for the deepest element  
 end-struct item%  
   
 : init-item ( addr u addr1 -- )  : init-item ( addr u addr1 -- )
     \ initialize item at addr1 with name addr u      \ initialize item at addr1 with name addr u
     \ !! remove stack prefix      \ !! remove stack prefix
Line 257  eof-char singleton     charclass eof Line 276  eof-char singleton     charclass eof
 Variable forth-flag  Variable forth-flag
 Variable c-flag  Variable c-flag
   
   (( (( ` e || ` E )) {{ start }} nonl ** 
      {{ end evaluate }}
   )) <- eval-comment ( ... -- ... )
   
 (( (( ` f || ` F )) {{ start }} nonl **   (( (( ` f || ` F )) {{ start }} nonl ** 
    {{ end forth-flag @ IF type cr ELSE 2drop THEN }}     {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
 )) <- forth-comment ( -- )  )) <- forth-comment ( -- )
Line 283  Variable c-flag Line 306  Variable c-flag
         THEN }}          THEN }}
 )) <- if-comment  )) <- 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 ( -- )  (( ` \ comment-body nl )) <- comment ( -- )
   
Line 295  Variable c-flag Line 318  Variable c-flag
    {{ effect-out }} stack-items {{ effect-out-end ! }}     {{ effect-out }} stack-items {{ effect-out-end ! }}
 )) <- stack-effect ( -- )  )) <- 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! }}     (( {{ line @ name-line ! filename 2@ name-filename 2! }}
       {{ start }} forth-ident {{ end 2dup forth-name 2! c-name 2! }}  white ++        {{ start }} forth-ident {{ end 2dup forth-name 2! c-name 2! }}  white ++
       ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **        ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **
         {{ start }} forth-ident {{ end wordset 2! }} white **          (( {{ start }} forth-ident {{ end wordset 2! }} white **
         (( {{ start }}  c-ident {{ end c-name 2! }} )) ??  nl             (( {{ start }}  c-ident {{ end c-name 2! }} )) ??
           )) ??  nl
    ))     ))
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " 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 }}
    (( ` :  nl     (( ` :  white ** nl
       {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}        {{ start }} (( nonl ++  nl white ** )) ++ {{ end forth-code 2! }}
    )) ?? {{ printprim }}     )) ?? {{ printprim }}
    (( nl || eof ))     (( nl || eof ))
 )) <- primitive ( -- )  )) <- primitive ( -- )
   
 (( (( comment || primitive || nl )) ** eof ))  (( (( comment || primitive || nl white ** )) ** eof ))
 parser primitives2something  parser primitives2something
 warnings @ [IF]  warnings @ [IF]
 .( parser generated ok ) cr  .( parser generated ok ) cr
Line 332  warnings @ [IF] Line 356  warnings @ [IF]
   
 \ types  \ types
   
 struct%  
     cell% 2* field type-c-name  
     cell%    field type-stack \ default stack  
     cell%    field type-size  \ size of type in stack items  
     cell%    field type-fetch \ xt of fetch code generator ( item -- )  
     cell%    field type-store \ xt of store code generator ( item -- )  
 end-struct type%  
   
 : stack-access ( n stack -- )  : stack-access ( n stack -- )
     \ print a stack access at index n of stack      \ print a stack access at index n of stack
     stack-pointer 2@ type      stack-pointer 2@ type
Line 350  end-struct type% Line 366  end-struct type%
         drop ." TOS"          drop ." TOS"
     endif ;      endif ;
   
 : item-in-index ( item -- n )  : item-in-index { item -- n }
     \ n is the index of item (in the in-effect)      \ n is the index of item (in the in-effect)
     >r r@ item-stack @ stack-in @ r> item-offset @ - 1- ;      item item-stack @ dup >r stack-in @ ( in-size r:stack )
       item r> stack-in-index-xt @ execute ;
   
 : fetch-single ( item -- )  : fetch-single ( item -- )
  \ fetch a single stack item from its stack   \ fetch a single stack item from its stack
Line 369  end-struct type% Line 386  end-struct type%
  >r   >r
  ." FETCH_DCELL("   ." FETCH_DCELL("
  r@ item-name 2@ type ." , "   r@ item-name 2@ type ." , "
  r@ item-in-index r@ item-stack @ 2dup stack-access   r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
  ." , "                      -1 under+ stack-access   ." , "                      -1 under+ ." (Cell)" stack-access
  ." );" cr   ." );" cr
  rdrop ;   rdrop ;
   
Line 423  end-struct type% Line 440  end-struct type%
  ." );" cr   ." );" cr
  rdrop ;   rdrop ;
   
   : single ( -- xt1 xt2 n )
       ['] fetch-single ['] store-single 1 ;
   
 : single-type ( -- xt1 xt2 n stack )  : double ( -- xt1 xt2 n )
  ['] fetch-single ['] store-single 1 data-stack ;      ['] fetch-double ['] store-double 2 ;
   
 : 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 ;  
   
 : s, ( addr u -- )  : s, ( addr u -- )
 \ allocate a string  \ allocate a string
Line 462  wordlist constant prefixes Line 475  wordlist constant prefixes
     stack r@ type-stack !      stack r@ type-stack !
     rdrop ;      rdrop ;
   
 : type-prefix ( addr u xt1 xt2 n stack "prefix" -- )  : type-prefix ( xt1 xt2 n stack "prefix" -- )
     create-type      create-type
 does> ( item -- )  does> ( item -- )
     \ initialize item      \ initialize item
Line 510  does> ( item -- ) Line 523  does> ( item -- )
  effect-in effect-in-end @ declaration-list   effect-in effect-in-end @ declaration-list
  effect-out effect-out-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:  
   
 set-current  
   
 \ offset computation  \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0  \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset  \ the rightmost item has the highest offset
Line 553  set-current Line 542  set-current
 : clear-stack { -- }  : clear-stack { -- }
     dup stack-in off stack-out off ;      dup stack-in off stack-out off ;
   
   
 : compute-offsets ( -- )  : compute-offsets ( -- )
     data-stack clear-stack  fp-stack clear-stack return-stack clear-stack      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-in  effect-in-end  @ ['] stack-in  compute-list
     effect-out effect-out-end @ ['] stack-out compute-list ;      effect-out effect-out-end @ ['] stack-out compute-list
       inst-stream stack-out @ 0<> abort" # can only be on the input side" ;
   
 : flush-a-tos { stack -- }  : flush-a-tos { stack -- }
     stack stack-out @ 0<> stack stack-in @ 0= and      stack stack-out @ 0<> stack stack-in @ 0= and
Line 579  set-current Line 569  set-current
     endif ;      endif ;
   
 : fill-tos ( -- )  : fill-tos ( -- )
       \ !! inst-stream for prefetching?
     fp-stack     fill-a-tos      fp-stack     fill-a-tos
     data-stack   fill-a-tos      data-stack   fill-a-tos
     return-stack fill-a-tos ;      return-stack fill-a-tos ;
Line 598  set-current Line 589  set-current
         stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr          stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr
     endif ;      endif ;
   
   : inst-pointer-update ( -- )
       inst-stream stack-in @ ?dup-if
           ." INC_IP(" 0 .r ." );" cr
       endif ;
   
 : stack-pointer-updates ( -- )  : stack-pointer-updates ( -- )
       inst-pointer-update
     data-stack   stack-pointer-update      data-stack   stack-pointer-update
     fp-stack     stack-pointer-update      fp-stack     stack-pointer-update
     return-stack stack-pointer-update ;      return-stack stack-pointer-update ;
Line 613  set-current Line 610  set-current
    i store     i store
  item% %size +loop ;    item% %size +loop ; 
   
   : output-c-tail ( -- )
       \ the final part of the generated C code
       ." NEXT_P1;" cr
       stores
       fill-tos
       ." NEXT_P2;" cr ;
   
   : type-c ( c-addr u -- )
       \ like TYPE, but replaces "TAIL;" with tail code
       begin ( c-addr1 u1 )
           2dup s" TAIL;" search
       while ( c-addr1 u1 c-addr3 u3 )
           2dup 2>r drop nip over - type
           output-c-tail
           2r> 5 /string
           \ !! resync #line missing
       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 ( -- )   : output-c ( -- ) 
  ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ." ) */" cr   ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ." ) */" cr
  ." /* " doc 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   ." {" cr
  ." DEF_CA" cr   ." DEF_CA" cr
  declarations   declarations
Line 624  set-current Line 658  set-current
  ." NEXT_P0;" cr   ." NEXT_P0;" cr
  flush-tos   flush-tos
  fetches   fetches
    print-debug-args
  stack-pointer-updates   stack-pointer-updates
  ." {" cr   ." {" 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-code 2@ type-c
  ." }" cr   ." }" cr
  ." NEXT_P1;" cr   output-c-tail
  stores  
  fill-tos  
  ." NEXT_P2;" cr  
  ." }" cr   ." }" cr
  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
       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(" 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-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-used? { stack -- f }
     stack stack-in @ stack stack-out @ or 0<> ;      stack stack-in @ stack stack-out @ or 0<> ;
   
Line 654  set-current Line 743  set-current
     ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type      ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type
     ."  ( " stack-string 2@ type ."  ) */" cr      ."  ( " stack-string 2@ type ."  ) */" cr
     ." /* " doc 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      \ debugging
     ." {" cr      ." {" cr
     declarations      declarations
     compute-offsets \ for everything else      compute-offsets \ for everything else
       inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN
     data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN      data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN
     fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN      fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN
     return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN      return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN
Line 667  set-current Line 757  set-current
     stack-pointer-updates      stack-pointer-updates
     fp-stack   stack-used? IF ." *FP=fp;" cr THEN      fp-stack   stack-used? IF ." *FP=fp;" cr THEN
     ." {" cr      ." {" 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-code 2@ type
     ." }" cr      ." }" cr
     stores      stores
Line 726  set-current Line 816  set-current
   
 : process-file ( addr u xt -- )  : process-file ( addr u xt -- )
     >r      >r
     2dup filename 2!      save-mem 2dup filename 2!
     0 function-number !      0 function-number !
     r/o open-file abort" cannot open file"      r/o open-file abort" cannot open file"
     warnings @ if      warnings @ if

Removed from v.1.51  
changed lines
  Added in v.1.63


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>