Diff for /gforth/prims2x.fs between versions 1.73 and 1.79

version 1.73, 2001/01/23 17:05:40 version 1.79, 2001/02/08 21:30:08
Line 50  warnings off Line 50  warnings off
 include ./search.fs                       include ./search.fs                     
 include ./extend.fs  include ./extend.fs
 [THEN]  [THEN]
   include ./stuff.fs
   
 [IFUNDEF] environment?  [IFUNDEF] environment?
 include ./environ.fs  include ./environ.fs
Line 125  variable output-combined \ xt ( -- ) of Line 126  variable output-combined \ xt ( -- ) of
 struct%  struct%
     cell%    field stack-number \ the number of this stack      cell%    field stack-number \ the number of this stack
     cell% 2* field stack-pointer \ stackpointer name      cell% 2* field stack-pointer \ stackpointer name
     cell% 2* field stack-typename \ name for default type of stack items      cell%    field stack-type \ name for default type of stack items
     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-index-xt \ ( in-size item -- in-index )
 end-struct stack%  end-struct stack%
Line 155  create stacks max-stacks cells allot \ a Line 156  create stacks max-stacks cells allot \ a
 : inst-in-index ( in-size item -- in-index )  : inst-in-index ( in-size item -- in-index )
     nip dup item-offset @ swap item-type @ type-size @ + 1- ;      nip dup item-offset @ swap item-type @ type-size @ + 1- ;
   
 : make-stack ( addr-ptr u1 addr-stack u2 addr-cast u3 "stack-name" -- )  : make-stack ( addr-ptr u1 type addr-cast u2 "stack-name" -- )
     create stack% %allot >r      create stack% %allot >r
     r@ stacks next-stack-number @ th !      r@ stacks next-stack-number @ th !
     next-stack-number @ r@ stack-number !  1 next-stack-number +!      next-stack-number @ r@ stack-number !  1 next-stack-number +!
     save-mem r@ stack-cast 2!      save-mem r@ stack-cast 2!
     save-mem r@ stack-typename 2!      r@ stack-type !
     save-mem r@ stack-pointer 2!       save-mem r@ stack-pointer 2! 
     ['] stack-in-index r> stack-in-index-xt ! ;      ['] stack-in-index r> stack-in-index-xt ! ;
   
Line 178  create stacks max-stacks cells allot \ a Line 179  create stacks max-stacks cells allot \ a
         i xt execute          i xt execute
     item% %size +loop ;      item% %size +loop ;
   
   \ types
   
   : print-type-prefix ( type -- )
       body> >head name>string type ;
   
 \ various variables for storing stuff of one primitive  \ various variables for storing stuff of one primitive
   
 struct%  struct%
Line 188  struct% Line 194  struct%
     cell% 2* field prim-c-code      cell% 2* field prim-c-code
     cell% 2* field prim-forth-code      cell% 2* field prim-forth-code
     cell% 2* field prim-stack-string      cell% 2* field prim-stack-string
       cell%    field prim-items-wordlist \ unique items
     item% max-effect * field prim-effect-in      item% max-effect * field prim-effect-in
     item% max-effect * field prim-effect-out      item% max-effect * field prim-effect-out
     cell%    field prim-effect-in-end      cell%    field prim-effect-in-end
Line 201  end-struct prim% Line 208  end-struct prim%
     s" " p prim-doc 2! s" " p prim-forth-code 2! s" " p prim-wordset 2!      s" " p prim-doc 2! s" " p prim-forth-code 2! s" " p prim-wordset 2!
     p ;      p ;
   
 0 value prim  0 value prim     \ in combined prims either combined or a part
   0 value combined \ in combined prims the combined prim
   variable in-part \ true if processing a part
    in-part off
   
   1000 constant max-combined
   create combined-prims max-combined cells allot
   variable num-combined
   
   create current-depth max-stacks cells allot
   create max-depth     max-stacks cells allot
   create min-depth     max-stacks cells allot
   
 wordlist constant primitives  wordlist constant primitives
   
Line 227  variable name-line Line 245  variable name-line
 2variable last-name-filename  2variable last-name-filename
 Variable function-number 0 function-number !  Variable function-number 0 function-number !
   
 \ for several reasons stack items of a word are stored in a wordlist  
 \ since neither forget nor marker are implemented yet, we make a new  
 \ wordlist for every word and store it in the variable items  
 variable items  
   
 \ a few more set ops  \ a few more set ops
   
 : bit-equivalent ( w1 w2 -- w3 )  : bit-equivalent ( w1 w2 -- w3 )
Line 242  variable items Line 255  variable items
   
 \ types  \ types
   
 : stack-access ( n stack -- )  
     \ print a stack access at index n of stack  : normal-stack-access ( n stack -- )
     stack-pointer 2@ type      stack-pointer 2@ type
     dup      dup
     if      if
Line 252  variable items Line 265  variable items
         drop ." TOS"          drop ." TOS"
     endif ;      endif ;
   
   : part-stack-access { n stack -- }
       \ print _<stack><x>, x=maxdepth-currentdepth-n-1
       ." _" stack stack-pointer 2@ type
       stack stack-number @ { stack# }
       combined prim-stacks-in stack# th @ assert( dup max-depth stack# th @ = )
       current-depth stack# th @ - n - 1-
       0 .r ;
   
   : stack-access ( n stack -- )
       \ print a stack access at index n of stack
       in-part @ if
           part-stack-access
       else
           normal-stack-access
       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)
     item item-stack @ dup >r stack-in @ ( in-size r:stack )      item item-stack @ dup >r stack-in @ ( in-size r:stack )
     item r> stack-in-index-xt @ execute ;      item r> stack-in-index-xt @ execute ;
   
   : item-stack-type-name ( item -- addr u )
       item-stack @ stack-type @ type-c-name 2@ ;
   
 : fetch-single ( item -- )  : fetch-single ( item -- )
  \ fetch a single stack item from its stack   \ fetch a single stack item from its stack
  >r   >r
  r@ item-name 2@ type   r@ item-name 2@ type
  ."  = ("    ."  = vm_" r@ item-stack-type-name type
  r@ item-type @ type-c-name 2@ type ." ) "   ." 2" r@ item-type @ print-type-prefix ." ("
  r@ item-in-index r@ item-stack @ stack-access   r@ item-in-index r@ item-stack @ stack-access
  ." ;" cr   ." );" cr
  rdrop ;    rdrop ; 
   
 : fetch-double ( item -- )  : fetch-double ( item -- )
  \ fetch a double stack item from its stack   \ fetch a double stack item from its stack
  >r   >r
  ." FETCH_DCELL("   ." vm_two"
    r@ item-stack-type-name type ." 2"
    r@ item-type @ print-type-prefix ." ("
  r@ item-name 2@ type ." , "   r@ item-name 2@ type ." , "
  r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access   r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
  ." , "                      -1 under+ ." (Cell)" stack-access   ." , "                      -1 under+ ." (Cell)" stack-access
Line 280  variable items Line 314  variable items
 : same-as-in? ( item -- f )  : same-as-in? ( item -- f )
  \ f is true iff the offset and stack of item is the same as on input   \ f is true iff the offset and stack of item is the same as on input
  >r   >r
  r@ item-name 2@ items @ search-wordlist 0=   r@ item-first @ if
  abort" bug"       rdrop false exit
    endif
    r@ item-name 2@ prim prim-items-wordlist @ search-wordlist 0= abort" bug"
  execute @   execute @
  dup r@ =   dup r@ =
  if \ item first appeared in output   if \ item first appeared in output
Line 298  variable items Line 334  variable items
   
 : really-store-single ( item -- )  : really-store-single ( item -- )
  >r   >r
  r@ item-out-index r@ item-stack @ stack-access ."  = "   r@ item-out-index r@ item-stack @ stack-access ."  = vm_"
  r@ item-stack @ stack-cast 2@ type   r@ item-type @ print-type-prefix ." 2"
  r@ item-name 2@ type ." ;"   r@ item-stack-type-name type ." ("
    r@ item-name 2@ type ." );"
  rdrop ;   rdrop ;
   
 : store-single ( item -- )  : store-single ( item -- )
Line 320  variable items Line 357  variable items
 : store-double ( item -- )  : store-double ( item -- )
 \ !! store optimization is not performed, because it is not yet needed  \ !! store optimization is not performed, because it is not yet needed
  >r   >r
  ." STORE_DCELL(" r@ item-name 2@ type ." , "   ." vm_"
    r@ item-type @ print-type-prefix ." 2two"
    r@ item-stack-type-name type ." ("
    r@ item-name 2@ type ." , "
  r@ item-out-index r@ item-stack @ 2dup stack-access   r@ item-out-index r@ item-stack @ 2dup stack-access
  ." , "                       -1 under+ stack-access   ." , "                       -1 under+ stack-access
  ." );" cr   ." );" cr
Line 368  does> ( item -- ) Line 408  does> ( item -- )
     { item typ }      { item typ }
     typ item item-type !      typ item item-type !
     typ type-stack @ item item-stack !default      typ type-stack @ item item-stack !default
     item item-name 2@ items @ search-wordlist 0= if \ new name      item item-name 2@ prim prim-items-wordlist @ search-wordlist 0= if
         item item-name 2@ nextname item declare          item item-name 2@ nextname item declare
         item item-first on          item item-first on
         \ typ type-c-name 2@ type space type  ." ;" cr          \ typ type-c-name 2@ type space type  ." ;" cr
Line 397  does> ( item -- ) Line 437  does> ( item -- )
     ['] declaration map-items ;      ['] declaration map-items ;
   
 : declarations ( -- )  : declarations ( -- )
  wordlist dup items ! set-current   wordlist dup prim prim-items-wordlist ! set-current
  prim prim-effect-in prim prim-effect-in-end @ declaration-list   prim prim-effect-in prim prim-effect-in-end @ declaration-list
  prim prim-effect-out prim prim-effect-out-end @ declaration-list ;   prim prim-effect-out prim prim-effect-out-end @ declaration-list ;
   
Line 419  does> ( item -- ) Line 459  does> ( item -- )
     stack item item-stack !      stack item item-stack !
     item declaration ;      item declaration ;
   
 s" sp" save-mem s" Cell"  save-mem s" (Cell)" make-stack data-stack   \ types pointed to by stacks for use in combined prims
 s" fp" save-mem s" Float" save-mem s" "       make-stack fp-stack  s" Cell"  single 0 create-type cell-type
 s" rp" save-mem s" Cell"  save-mem s" (Cell)" make-stack return-stack  s" Float" single 0 create-type float-type
 s" IP" save-mem s" Cell"  save-mem s" error don't use # on results" make-stack inst-stream  
   s" sp" save-mem cell-type  s" (Cell)" make-stack data-stack 
   s" fp" save-mem float-type s" "       make-stack fp-stack
   s" rp" save-mem cell-type  s" (Cell)" make-stack return-stack
   s" IP" save-mem cell-type  s" error don't use # on results" make-stack inst-stream
 ' inst-in-index inst-stream stack-in-index-xt !  ' inst-in-index inst-stream stack-in-index-xt !
 \ !! initialize stack-in and stack-out  \ !! initialize stack-in and stack-out
   
Line 528  s" IP" save-mem s" Cell"  save-mem s" er Line 572  s" IP" save-mem s" Cell"  save-mem s" er
     repeat      repeat
     2drop type ;      2drop type ;
   
 : print-type-prefix ( type -- )  
     body> >head .name ;  
   
 : print-debug-arg { item -- }  : print-debug-arg { item -- }
     ." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); "      ." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); "
     ." printarg_" item item-type @ print-type-prefix      ." printarg_" item item-type @ print-type-prefix
Line 761  s" IP" save-mem s" Cell"  save-mem s" er Line 802  s" IP" save-mem s" Cell"  save-mem s" er
 \  spTOS = (Cell)_x_sp0;  \  spTOS = (Cell)_x_sp0;
 \  NEXT_P2;  \  NEXT_P2;
   
 1000 constant max-combined  
 create combined-prims max-combined cells allot  
 variable num-combined  
   
 create current-depth max-stacks cells allot  
 create max-depth     max-stacks cells allot  
 create min-depth     max-stacks cells allot  
   
 : init-combined ( -- )  : init-combined ( -- )
       prim to combined
     0 num-combined !      0 num-combined !
     current-depth max-stacks cells erase      current-depth max-stacks cells erase
     max-depth     max-stacks cells erase      max-depth     max-stacks cells erase
Line 820  create min-depth     max-stacks cells al Line 854  create min-depth     max-stacks cells al
         i 0 <# #s stack stack-pointer 2@ holds [char] _ hold #> save-mem          i 0 <# #s stack stack-pointer 2@ holds [char] _ hold #> save-mem
         item item-name 2!          item item-name 2!
         stack item item-stack !          stack item item-stack !
         0 item item-type !          stack stack-type @ item item-type !
         i item item-offset !          i item item-offset !
         item item-first on          item item-first on
         item% %size effect-endp +!          item% %size effect-endp +!
Line 842  create min-depth     max-stacks cells al Line 876  create min-depth     max-stacks cells al
   
 : print-item { n stack -- }  : print-item { n stack -- }
     \ print nth stack item name      \ print nth stack item name
     ." _" stack stack-typename 2@ type space      stack stack-type @ type-c-name 2@ type space
     stack stack-pointer 2@ type n 0 .r ;      ." _" stack stack-pointer 2@ type n 0 .r ;
   
 : print-declarations-combined ( -- )  : print-declarations-combined ( -- )
     max-stacks 0 ?do      max-stacks 0 ?do
Line 851  create min-depth     max-stacks cells al Line 885  create min-depth     max-stacks cells al
             i stacks j th @ print-item ." ;" cr              i stacks j th @ print-item ." ;" cr
         loop          loop
     loop ;      loop ;
       
   : part-fetches ( -- )
       fetches ;
   
   : part-output-c-tail ( -- )
       output-c-tail ;
   
   : output-part ( p -- )
       to prim
       ." /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
       ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
       ." {" cr
       print-declarations
       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@ type-c \ !! deal with TAIL
       ." }" cr
       part-output-c-tail
       ." }" cr ;
   
   : output-parts ( -- )
       prim >r in-part on
       current-depth max-stacks cells erase
       num-combined @ 0 +do
           combined-prims i th @ output-part
       loop
       in-part off
       r> to prim ;
   
 : output-c-combined ( -- )  : output-c-combined ( -- )
     print-entry cr      print-entry cr
     \ debugging messages just in constituents      \ debugging messages just in parts
     ." {" cr      ." {" cr
     ." DEF_CA" cr      ." DEF_CA" cr
     print-declarations-combined      print-declarations-combined
     ." NEXT_P0;" cr      ." NEXT_P0;" cr
     flush-tos      flush-tos
     fetches      fetches
     ;      \ print-debug-args
       stack-pointer-updates
       output-parts
       output-c-tail
       ." }" cr
       cr ;
   
 : output-forth-combined ( -- )  : output-forth-combined ( -- )
     ;      ;
Line 949  bl 1+ maxchar .. Line 1019  bl 1+ maxchar ..
 char " singleton eof-char over add-member complement    charclass noquote  char " singleton eof-char over add-member complement    charclass noquote
 nl-char singleton                                       charclass nl  nl-char singleton                                       charclass nl
 eof-char singleton                                      charclass eof  eof-char singleton                                      charclass eof
   nl-char singleton eof-char over add-member              charclass nleof
   
 (( letter (( letter || digit )) **  (( letter (( letter || digit )) **
 )) <- c-ident ( -- )  )) <- c-ident ( -- )
Line 995  Variable c-flag Line 1065  Variable c-flag
   
 (( (( eval-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 nleof )) <- comment ( -- )
   
 (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **  (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
 <- stack-items  <- stack-items
Line 1009  Variable c-flag Line 1079  Variable c-flag
    ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **     ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
    (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **     (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
       (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??        (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??
    )) ??  nl     )) ??  nleof
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nl )) ??     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??
    {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}     {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nleof white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
    (( ` :  white ** nl     (( ` :  white ** nleof
       {{ start }} (( nonl ++  nl white ** )) ++ {{ end prim prim-forth-code 2! }}        {{ start }} (( nonl ++  nleof white ** )) ++ {{ end prim prim-forth-code 2! }}
    )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}     )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}
    (( nl || eof ))     nleof
 )) <- simple-primitive ( -- )  )) <- simple-primitive ( -- )
   
 (( {{ init-combined }}  (( {{ init-combined }}
    ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++     ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++
    (( nl || eof )) {{ process-combined }}     nleof {{ process-combined }}
 )) <- combined-primitive  )) <- combined-primitive
   
 (( {{ make-prim to prim  (( {{ make-prim to prim 0 to combined
       line @ name-line ! filename 2@ name-filename 2!        line @ name-line ! filename 2@ name-filename 2!
       start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++        start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
    (( simple-primitive || combined-primitive ))     (( simple-primitive || combined-primitive ))

Removed from v.1.73  
changed lines
  Added in v.1.79


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