Diff for /gforth/prims2x.fs between versions 1.68 and 1.85

version 1.68, 2001/01/18 19:43:02 version 1.85, 2001/02/27 10:30:02
Line 19 Line 19
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
   
   
 \ This is not very nice (hard limits, no checking, assumes 1 chars = 1)  \ This is not very nice (hard limits, no checking, assumes 1 chars = 1).
   \ And it grew even worse when it aged.
   
 \ Optimizations:  \ Optimizations:
 \ superfluous stores are removed. GCC removes the superfluous loads by itself  \ superfluous stores are removed. GCC removes the superfluous loads by itself
Line 39 Line 40
 \ add the store optimization for doubles  \ add the store optimization for doubles
 \ regarding problem 1 above: It would be better (for over) to implement  \ regarding problem 1 above: It would be better (for over) to implement
 \       the alternative  \       the alternative
   \ store optimization for combined instructions.
   \ eliminate stack-cast (no longer used)
   
   \ Design Uglyness:
   
   \ - global state (values, variables) in connection with combined instructions.
   
   \ - index computation is different for instruction-stream and the
   \ stacks; there are two mechanisms for dealing with that
   \ (stack-in-index-xt and a test for stack==instruction-stream); there
   \ should be only one.
   
 warnings off  warnings off
   
Line 49  warnings off Line 61  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 58  include ./environ.fs Line 71  include ./environ.fs
   
 include ./gray.fs  include ./gray.fs
   
 100 constant max-effect \ number of things on one side of a stack effect  32 constant max-effect \ number of things on one side of a stack effect
   4 constant max-stacks  \ the max. number of stacks (including inst-stream).
 255 constant maxchar  255 constant maxchar
 maxchar 1+ constant eof-char  maxchar 1+ constant eof-char
 #tab constant tab-char  #tab constant tab-char
Line 77  variable line-start \ pointer to start o Line 91  variable line-start \ pointer to start o
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?  variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on   skipsynclines on 
   
   : th ( addr1 n -- addr2 )
       cells + ;
   
   : holds ( addr u -- )
       \ like HOLD, but for a string
       tuck + swap 0 +do
           1- dup c@ hold
       loop
       drop ;
   
   : insert-wordlist { c-addr u wordlist xt -- }
       \ adds name "addr u" to wordlist using defining word xt
       \ xt may cause additional stack effects
       get-current >r wordlist set-current
       c-addr u nextname xt execute
       r> set-current ;
   
 : start ( -- addr )  : start ( -- addr )
  cookedinput @ ;   cookedinput @ ;
   
 : end ( addr -- addr u )  : end ( addr -- addr u )
  cookedinput @ over - ;   cookedinput @ over - ;
   
   : 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 ;
   
   : ?print-error { f addr u -- }
       f ?not? if
           outfile-id >r try
               stderr to outfile-id
               filename 2@ type ." :" line @ 0 .r ." : " addr u type cr
               print-error-line
               0
           recover endtry
           r> to outfile-id throw
           abort
       endif ;
   
 : quote ( -- )  : quote ( -- )
     [char] " emit ;      [char] " emit ;
   
 variable output \ xt ( -- ) of output word  variable output          \ xt ( -- ) of output word for simple primitives
   variable output-combined \ xt ( -- ) of output word for combined primitives
 : printprim ( -- )  
  output @ execute ;  
   
 struct%  struct%
       cell%    field stack-number \ the number of this stack
     cell% 2* field stack-pointer \ stackpointer name      cell% 2* field stack-pointer \ stackpointer name
       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 )
     cell%    field stack-in  \ number of stack items in effect in  
     cell%    field stack-out \ number of stack items in effect out  
 end-struct stack%  end-struct stack%
   
 struct%  struct%
Line 115  struct% Line 162  struct%
     cell%    field type-store \ xt of store code generator ( item -- )      cell%    field type-store \ xt of store code generator ( item -- )
 end-struct type%  end-struct type%
   
   variable next-stack-number 0 next-stack-number !
   create stacks max-stacks cells allot \ array of stacks
   
 : stack-in-index ( in-size item -- in-index )  : stack-in-index ( in-size item -- in-index )
     item-offset @ - 1- ;      item-offset @ - 1- ;
   
 : 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-cast u2 "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 !
       next-stack-number @ r@ stack-number !  1 next-stack-number +!
     save-mem r@ stack-cast 2!      save-mem r@ stack-cast 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 ! ;
   
 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  
 ' inst-in-index inst-stream stack-in-index-xt !  
 \ !! initialize stack-in and stack-out  
   
 \ stack items  \ stack items
   
 : init-item ( addr u addr1 -- )  : init-item ( addr u addr1 -- )
Line 148  s" IP" save-mem s" error don't use # on Line 194  s" IP" save-mem s" error don't use # on
         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
   
 2variable forth-name  struct%
 2variable wordset      cell% 2* field prim-name
 2variable c-name      cell% 2* field prim-wordset
 2variable doc      cell% 2* field prim-c-name
 2variable c-code      cell% 2* field prim-doc
 2variable forth-code      cell% 2* field prim-c-code
 2variable stack-string      cell% 2* field prim-forth-code
 create effect-in  max-effect item% %size * allot      cell% 2* field prim-stack-string
 create effect-out max-effect item% %size * allot      cell%    field prim-num            \ ordinal number
 variable effect-in-end ( pointer )      cell%    field prim-items-wordlist \ unique items
 variable effect-out-end ( pointer )      item% max-effect * field prim-effect-in
       item% max-effect * field prim-effect-out
       cell%    field prim-effect-in-end
       cell%    field prim-effect-out-end
       cell% max-stacks * field prim-stacks-in  \ number of in items per stack
       cell% max-stacks * field prim-stacks-out \ number of out items per stack
   end-struct prim%
   
   : make-prim ( -- prim )
       prim% %alloc { p }
       s" " p prim-doc 2! s" " p prim-forth-code 2! s" " p prim-wordset 2!
       p ;
   
   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
   
   table constant combinations
     \ the keys are the sequences of pointers to primitives
   
   create current-depth max-stacks cells allot
   create max-depth     max-stacks cells allot
   create min-depth     max-stacks cells allot
   
   wordlist constant primitives
   
   : create-prim ( prim -- )
       dup prim-name 2@ primitives ['] constant insert-wordlist ;
   
   : stack-in ( stack -- addr )
       \ address of number of stack items in effect in
       stack-number @ cells prim prim-stacks-in + ;
   
   : stack-out ( stack -- addr )
       \ address of number of stack items in effect out
       stack-number @ cells prim prim-stacks-out + ;
   
   \ global vars
 variable c-line  variable c-line
 2variable c-filename  2variable c-filename
 variable name-line  variable name-line
 2variable name-filename  2variable name-filename
 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 182  variable items Line 269  variable items
 : complement ( set1 -- set2 )  : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;   empty ['] bit-equivalent binary-set-operation ;
   
 \ types  \ stack access stuff
   
 : stack-access ( n stack -- )  : normal-stack-access ( n stack -- )
     \ print a stack access at index n of stack  
     stack-pointer 2@ type      stack-pointer 2@ type
     dup      dup
     if      if
Line 194  variable items Line 280  variable items
         drop ." TOS"          drop ." TOS"
     endif ;      endif ;
   
   \ forward declaration for inst-stream (breaks cycle in definitions)
   defer inst-stream-f ( -- stack )
   
   : part-stack-access { n stack -- }
       \ print _<stack><x>, x=inst-stream? n : maxdepth-currentdepth-n-1
       ." _" stack stack-pointer 2@ type
       stack stack-number @ { stack# }
       current-depth stack# th @ n + { access-depth }
       stack inst-stream-f = if
           access-depth
       else
           combined prim-stacks-in stack# th @
           assert( dup max-depth stack# th @ = )
           access-depth - 1-
       endif
       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 222  variable items Line 338  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 240  variable items Line 358  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 262  variable items Line 381  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 310  does> ( item -- ) Line 432  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 330  does> ( item -- ) Line 452  does> ( item -- )
         endif          endif
         -1 s+loop          -1 s+loop
     \ we did not find a type, abort      \ we did not find a type, abort
     true abort" unknown prefix" ;      false s" unknown prefix" ?print-error ;
   
 : declaration ( item -- )  : declaration ( item -- )
     dup item-name 2@ execute-prefix ;      dup item-name 2@ execute-prefix ;
Line 339  does> ( item -- ) Line 461  does> ( item -- )
     ['] declaration map-items ;      ['] declaration map-items ;
   
 : declarations ( -- )  : declarations ( -- )
  wordlist dup items ! set-current   wordlist dup prim prim-items-wordlist ! set-current
  effect-in effect-in-end @ declaration-list   prim prim-effect-in prim prim-effect-in-end @ declaration-list
  effect-out effect-out-end @ declaration-list ;   prim prim-effect-out prim prim-effect-out-end @ declaration-list ;
   
 : print-declaration { item -- }  : print-declaration { item -- }
     item item-first @ if      item item-first @ if
Line 350  does> ( item -- ) Line 472  does> ( item -- )
     endif ;      endif ;
   
 : print-declarations ( -- )  : print-declarations ( -- )
     effect-in  effect-in-end  @ ['] print-declaration map-items      prim prim-effect-in  prim prim-effect-in-end  @ ['] print-declaration map-items
     effect-out effect-out-end @ ['] print-declaration map-items ;      prim prim-effect-out prim prim-effect-out-end @ ['] print-declaration map-items ;
           
 : stack-prefix ( stack "prefix" -- )  : stack-prefix ( stack "prefix" -- )
     name tuck nextname create ( stack length ) 2,      name tuck nextname create ( stack length ) 2,
Line 361  does> ( item -- ) Line 483  does> ( item -- )
     stack item item-stack !      stack item item-stack !
     item declaration ;      item declaration ;
   
   \ types pointed to by stacks for use in combined prims
   \ !! output-c-combined shouldn't use these names!
   s" Cell"  single 0 create-type w
   s" Float" single 0 create-type r
   
   s" sp" save-mem w s" (Cell)" make-stack data-stack 
   s" fp" save-mem r s" "       make-stack fp-stack
   s" rp" save-mem w s" (Cell)" make-stack return-stack
   s" IP" save-mem w s" error don't use # on results" make-stack inst-stream
   ' inst-in-index inst-stream stack-in-index-xt !
   ' inst-stream <is> inst-stream-f
   \ !! initialize stack-in and stack-out
   
 \ 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 383  does> ( item -- ) Line 518  does> ( item -- )
 : 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      inst-stream clear-stack
     effect-in  effect-in-end  @ ['] compute-offset-in  map-items      prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items
     effect-out effect-out-end @ ['] compute-offset-out map-items      prim prim-effect-out prim prim-effect-out-end @ ['] compute-offset-out map-items
     inst-stream stack-out @ 0<> abort" # can only be on the input side" ;      inst-stream stack-out @ 0= s" # can only be on the input side" ?print-error ;
   
   : process-simple ( -- )
       prim prim { W^ key } key cell
       combinations ['] constant insert-wordlist
       declarations compute-offsets
       output @ execute ;
   
 : 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 413  does> ( item -- ) Line 554  does> ( item -- )
     return-stack fill-a-tos ;      return-stack fill-a-tos ;
   
 : fetch ( addr -- )  : fetch ( addr -- )
  dup item-type @ type-fetch @ execute ;      dup item-type @ type-fetch @ execute ;
   
 : fetches ( -- )  : fetches ( -- )
     effect-in effect-in-end @ ['] fetch map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
   
 : stack-pointer-update { stack -- }  : stack-pointer-update { stack -- }
     \ stack grow downwards      \ stack grow downwards
Line 442  does> ( item -- ) Line 583  does> ( item -- )
  dup item-type @ type-store @ execute ;   dup item-type @ type-store @ execute ;
   
 : stores ( -- )  : stores ( -- )
     effect-out effect-out-end @ ['] store map-items ;      prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ;
   
 : output-c-tail ( -- )  : output-c-tail ( -- )
     \ the final part of the generated C code      \ the final part of the generated C code
     ." NEXT_P1;" cr      ." NEXT_P1;" cr
     stores      stores
     fill-tos      fill-tos
     ." NEXT_P2;" cr ;      ." NEXT_P2;" ;
   
 : type-c ( c-addr u -- )  : type-c-code ( c-addr u xt -- )
     \ like TYPE, but replaces "TAIL;" with tail code      \ like TYPE, but replaces "TAIL;" with tail code produced by xt
       { xt }
     begin ( c-addr1 u1 )      begin ( c-addr1 u1 )
         2dup s" TAIL;" search          2dup s" TAIL;" search
     while ( c-addr1 u1 c-addr3 u3 )      while ( c-addr1 u1 c-addr3 u3 )
         2dup 2>r drop nip over - type          2dup 2>r drop nip over - type
         output-c-tail          xt execute
         2r> 5 /string          2r> 5 /string
         \ !! resync #line missing          \ !! resync #line missing
     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 474  does> ( item -- ) Line 613  does> ( item -- )
 : print-debug-args ( -- )  : print-debug-args ( -- )
     ." #ifdef VM_DEBUG" cr      ." #ifdef VM_DEBUG" cr
     ." if (vm_debug) {" cr      ." if (vm_debug) {" cr
     effect-in effect-in-end @ ['] print-debug-arg map-items      prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items
     ." fputc('\n', vm_out);" cr      ." fputc('\n', vm_out);" cr
     ." }" cr      ." }" cr
     ." #endif" cr ;      ." #endif" cr ;
   
   : print-entry ( -- )
       ." I_" prim prim-c-name 2@ type ." :" ;
           
 : output-c ( -- )   : output-c ( -- ) 
  ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ." ) */" cr   print-entry ."  /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
  ." /* " doc 2@ type ."  */" cr   ." /* " prim prim-doc 2@ type ."  */" cr
  ." NAME(" quote forth-name 2@ type quote ." )" cr \ debugging   ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
  ." {" cr   ." {" cr
  ." DEF_CA" cr   ." DEF_CA" cr
  print-declarations   print-declarations
Line 493  does> ( item -- ) Line 635  does> ( item -- )
  stack-pointer-updates   stack-pointer-updates
  ." {" cr   ." {" cr
  ." #line " c-line @ . quote c-filename 2@ type quote cr   ." #line " c-line @ . quote c-filename 2@ type quote cr
  c-code 2@ type-c   prim prim-c-code 2@ ['] output-c-tail type-c-code
  ." }" cr   ." }" cr
  output-c-tail   output-c-tail
  ." }" cr   ." }" cr
Line 509  does> ( item -- ) Line 651  does> ( item -- )
     endif ;      endif ;
   
 : disasm-args ( -- )  : disasm-args ( -- )
     effect-in effect-in-end @ ['] disasm-arg map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] disasm-arg map-items ;
   
 : output-disasm ( -- )  : output-disasm ( -- )
     \ generate code for disassembling VM instructions      \ generate code for disassembling VM instructions
     ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr      ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr
     ."   fputs(" quote forth-name 2@ type quote ." , vm_out);" cr      ."   fputs(" quote prim prim-name 2@ type quote ." , vm_out);" cr
     disasm-args      disasm-args
     ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr      ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
     ." } else " ;      ." } else " ;
Line 526  does> ( item -- ) Line 668  does> ( item -- )
     endif ;      endif ;
   
 : gen-args-parm ( -- )  : gen-args-parm ( -- )
     effect-in effect-in-end @ ['] gen-arg-parm map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-parm map-items ;
   
 : gen-arg-gen { item -- }  : gen-arg-gen { item -- }
     item item-stack @ inst-stream = if      item item-stack @ inst-stream = if
Line 535  does> ( item -- ) Line 677  does> ( item -- )
     endif ;      endif ;
   
 : gen-args-gen ( -- )  : gen-args-gen ( -- )
     effect-in effect-in-end @ ['] gen-arg-gen map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-gen map-items ;
   
 : output-gen ( -- )  : output-gen ( -- )
     \ generate C code for generating VM instructions      \ generate C code for generating VM instructions
     ." void gen_" c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr      ." void gen_" prim prim-c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr
     ." {" cr      ." {" cr
     ."   gen_inst(ctp, vm_prim[" function-number @ 0 .r ." ]);" cr      ."   gen_inst(ctp, vm_prim[" function-number @ 0 .r ." ]);" cr
     gen-args-gen      gen-args-gen
Line 549  does> ( item -- ) Line 691  does> ( item -- )
     stack stack-in @ stack stack-out @ or 0<> ;      stack stack-in @ stack stack-out @ or 0<> ;
   
 : output-funclabel ( -- )  : output-funclabel ( -- )
   ." &I_" c-name 2@ type ." ," cr ;    ." &I_" prim prim-c-name 2@ type ." ," cr ;
   
 : output-forthname ( -- )  : output-forthname ( -- )
   '" emit forth-name 2@ type '" emit ." ," cr ;    '" emit prim prim-name 2@ type '" emit ." ," cr ;
   
 : output-c-func ( -- )  : output-c-func ( -- )
 \ used for word libraries  \ used for word libraries
     ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type      ." Cell * I_" prim prim-c-name 2@ type ." (Cell *SP, Cell **FP)      /* " prim prim-name 2@ type
     ."  ( " stack-string 2@ type ."  ) */" cr      ."  ( " prim prim-stack-string 2@ type ."  ) */" cr
     ." /* " doc 2@ type ."  */" cr      ." /* " prim prim-doc 2@ type ."  */" cr
     ." NAME(" quote forth-name 2@ type quote ." )" cr      ." NAME(" quote prim prim-name 2@ type quote ." )" cr
     \ debugging      \ debugging
     ." {" cr      ." {" cr
     print-declarations      print-declarations
Line 573  does> ( item -- ) Line 715  does> ( item -- )
     fp-stack   stack-used? IF ." *FP=fp;" cr THEN      fp-stack   stack-used? IF ." *FP=fp;" cr THEN
     ." {" cr      ." {" cr
     ." #line " c-line @ . quote c-filename 2@ type quote cr      ." #line " c-line @ . quote c-filename 2@ type quote cr
     c-code 2@ type      prim prim-c-code 2@ type
     ." }" cr      ." }" cr
     stores      stores
     fill-tos      fill-tos
Line 582  does> ( item -- ) Line 724  does> ( item -- )
     cr ;      cr ;
   
 : output-label ( -- )    : output-label ( -- )  
     ." (Label)&&I_" c-name 2@ type ." ," cr ;      ." (Label)&&I_" prim prim-c-name 2@ type ." ," cr ;
   
 : output-alias ( -- )   : output-alias ( -- ) 
     ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr ;      ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
   
 : output-forth ( -- )    : output-forth ( -- )  
     forth-code @ 0=      prim prim-forth-code @ 0=
     IF          \ output-alias      IF          \ output-alias
         \ this is bad for ec: an alias is compiled if tho word does not exist!          \ this is bad for ec: an alias is compiled if tho word does not exist!
         \ JAW          \ JAW
     ELSE  ." : " forth-name 2@ type ."   ( "      ELSE  ." : " prim prim-name 2@ type ."   ( "
         stack-string 2@ type ." )" cr          prim prim-stack-string 2@ type ." )" cr
         forth-code 2@ type cr          prim prim-forth-code 2@ type cr
     THEN ;      THEN ;
   
 : output-tag-file ( -- )  : output-tag-file ( -- )
Line 607  does> ( item -- ) Line 749  does> ( item -- )
   
 : output-tag ( -- )  : output-tag ( -- )
     output-tag-file      output-tag-file
     forth-name 2@ 1+ type      prim prim-name 2@ 1+ type
     127 emit      127 emit
     space forth-name 2@ type space      space prim prim-name 2@ type space
     1 emit      1 emit
     name-line @ 0 .r      name-line @ 0 .r
     ." ,0" cr ;      ." ,0" cr ;
   
 [IFDEF] documentation  [IFDEF] documentation
 : register-doc ( -- )  : register-doc ( -- )
     get-current documentation set-current      prim prim-name 2@ documentation ['] create insert-wordlist
     forth-name 2@ nextname create      prim prim-name 2@ 2,
     forth-name 2@ 2,      prim prim-stack-string 2@ condition-stack-effect 2,
     stack-string 2@ condition-stack-effect 2,      prim prim-wordset 2@ 2,
     wordset 2@ 2,      prim prim-c-name 2@ condition-pronounciation 2,
     c-name 2@ condition-pronounciation 2,      prim prim-doc 2@ 2, ;
     doc 2@ 2,  
     set-current ;  
 [THEN]  [THEN]
   
   
   \ combining instructions
   
   \ The input should look like this:
   
   \ lit_+ = lit +
   
   \ The output should look like this:
   
   \  I_lit_+:
   \  {
   \  DEF_CA
   \  Cell _x_ip0;
   \  Cell _x_sp0;
   \  Cell _x_sp1;
   \  NEXT_P0;
   \  _x_ip0 = (Cell) IPTOS;
   \  _x_sp0 = (Cell) spTOS;
   \  INC_IP(1);
   \  /* sp += 0; */
   \  /* lit ( #w -- w ) */
   \  /*  */
   \  NAME("lit")
   \  {
   \  Cell w;
   \  w = (Cell) _x_ip0;
   \  #ifdef VM_DEBUG
   \  if (vm_debug) {
   \  fputs(" w=", vm_out); printarg_w (w);
   \  fputc('\n', vm_out);
   \  }
   \  #endif
   \  {
   \  #line 136 "./prim"
   \  }
   \  _x_sp1 = (Cell)w;
   \  }
   \  I_plus:      /* + ( n1 n2 -- n ) */
   \  /*  */
   \  NAME("+")
   \  {
   \  DEF_CA
   \  Cell n1;
   \  Cell n2;
   \  Cell n;
   \  NEXT_P0;
   \  n1 = (Cell) _x_sp0;
   \  n2 = (Cell) _x_sp1;
   \  #ifdef VM_DEBUG
   \  if (vm_debug) {
   \  fputs(" n1=", vm_out); printarg_n (n1);
   \  fputs(" n2=", vm_out); printarg_n (n2);
   \  fputc('\n', vm_out);
   \  }
   \  #endif
   \  {
   \  #line 516 "./prim"
   \  n = n1+n2;
   \  }
   \  NEXT_P1;
   \  _x_sp0 = (Cell)n;
   \  NEXT_P2;
   \  }
   \  NEXT_P1;
   \  spTOS = (Cell)_x_sp0;
   \  NEXT_P2;
   
   : init-combined ( -- )
       prim to combined
       0 num-combined !
       current-depth max-stacks cells erase
       max-depth     max-stacks cells erase
       min-depth     max-stacks cells erase
       prim prim-effect-in  prim prim-effect-in-end  !
       prim prim-effect-out prim prim-effect-out-end ! ;
   
   : max! ( n addr -- )
       tuck @ max swap ! ;
   
   : min! ( n addr -- )
       tuck @ min swap ! ;
   
   : add-depths { p -- }
       \ combine stack effect of p with *-depths
       max-stacks 0 ?do
           current-depth i th @
           p prim-stacks-in  i th @ +
           dup max-depth i th max!
           p prim-stacks-out i th @ -
           dup min-depth i th min!
           current-depth i th !
       loop ;
   
   : add-prim ( addr u -- )
       \ add primitive given by "addr u" to combined-prims
       primitives search-wordlist s" unknown primitive" ?print-error
       execute { p }
       p combined-prims num-combined @ th !
       1 num-combined +!
       p add-depths ;
   
   : compute-effects { q -- }
       \ compute the stack effects of q from the depths
       max-stacks 0 ?do
           max-depth i th @ dup
           q prim-stacks-in i th !
           current-depth i th @ -
           q prim-stacks-out i th !
       loop ;
   
   : make-effect-items { stack# items effect-endp -- }
       \ effect-endp points to a pointer to the end of the current item-array
       \ and has to be updated
       stacks stack# th @ { stack }
       items 0 +do
           effect-endp @ { item }
           i 0 <# #s stack stack-pointer 2@ holds [char] _ hold #> save-mem
           item item-name 2!
           stack item item-stack !
           stack stack-type @ item item-type !
           i item item-offset !
           item item-first on
           item% %size effect-endp +!
       loop ;
   
   : init-effects { q -- }
       \ initialize effects field for FETCHES and STORES
       max-stacks 0 ?do
           i q prim-stacks-in  i th @ q prim-effect-in-end  make-effect-items
           i q prim-stacks-out i th @ q prim-effect-out-end make-effect-items
       loop ;
   
   : process-combined ( -- )
       combined combined-prims num-combined @ cells
       combinations ['] constant insert-wordlist
       prim compute-effects
       prim init-effects
       output-combined perform ;
   
   \ C output
   
   : print-item { n stack -- }
       \ print nth stack item name
       stack stack-type @ type-c-name 2@ type space
       ." _" stack stack-pointer 2@ type n 0 .r ;
   
   : print-declarations-combined ( -- )
       max-stacks 0 ?do
           max-depth i th @ min-depth i th @ - 0 +do
               i stacks j th @ print-item ." ;" cr
           loop
       loop ;
   
   : part-fetches ( -- )
       fetches ;
   
   : part-output-c-tail ( -- )
       stores ;
   
   : output-combined-tail ( -- )
       part-output-c-tail
       prim >r combined to prim
       in-part @ >r in-part off
       output-c-tail
       r> in-part ! r> to prim ;
   
   : 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@ ['] output-combined-tail type-c-code
       ." }" 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 ( -- )
       print-entry cr
       \ debugging messages just in parts
       ." {" cr
       ." DEF_CA" cr
       print-declarations-combined
       ." NEXT_P0;" cr
       flush-tos
       fetches
       \ print-debug-args
       stack-pointer-updates
       output-parts
       output-c-tail
       ." }" cr
       cr ;
   
   : output-forth-combined ( -- )
   ;
   
   
   \ peephole optimization rules
   
   \ in order for this to work as intended, shorter combinations for each
   \ length must be present, and the longer combinations must follow
   \ shorter ones (this restriction may go away in the future).
     
   : output-peephole ( -- )
       combined-prims num-combined @ 1- cells combinations search-wordlist
       s" the prefix for this combination must be defined earlier" ?print-error
       ." {"
       execute prim-num @ 5 .r ." ,"
       combined-prims num-combined @ 1- th @ prim-num @ 5 .r ." ,"
       combined prim-num @ 5 .r ." }, /* "
       combined prim-c-name 2@ type ."  */"
       cr ;
   
   
 \ the parser  \ the parser
   
 eof-char max-member \ the whole character set + EOF  eof-char max-member \ the whole character set + EOF
Line 660  print-token ! Line 1027  print-token !
     endif      endif
     0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )      0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
     dup c@ bl = if      dup c@ bl = if
         char+ dup c@ [char] " <> abort" sync line syntax"          char+ dup c@ [char] " <> 0= s" sync line syntax" ?print-error
         char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!          char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
         char+          char+
     endif      endif
     dup c@ nl-char <> abort" sync line syntax"      dup c@ nl-char <> 0= s" sync line syntax" ?print-error
     skipsynclines @ if      skipsynclines @ if
         dup char+ rawinput !          dup char+ rawinput !
         rawinput @ c@ cookedinput @ c!          rawinput @ c@ cookedinput @ c!
     endif      endif
     drop ;      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 -- )  : ?nextchar ( f -- )
     ?not? if      s" syntax error, wrong char" ?print-error
         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      rawinput @ endrawinput @ <> if
         rawinput @ c@          rawinput @ c@
         1 chars rawinput +!          1 chars rawinput +!
Line 726  bl 1+ maxchar .. Line 1077  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 772  Variable c-flag Line 1123  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
   
 (( {{ effect-in }}  stack-items {{ effect-in-end ! }}  (( {{ prim prim-effect-in }}  stack-items {{ prim prim-effect-in-end ! }}
    ` - ` - white **     ` - ` - white **
    {{ effect-out }} stack-items {{ effect-out-end ! }}     {{ prim prim-effect-out }} stack-items {{ prim prim-effect-out-end ! }}
 )) <- stack-effect ( -- )  )) <- stack-effect ( -- )
   
 (( {{ s" " doc 2! s" " forth-code 2! s" " wordset 2! }}  (( {{ prim create-prim }}
    (( {{ line @ name-line ! filename 2@ name-filename 2! }}     ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
       {{ start }} forth-ident {{ end 2dup forth-name 2! c-name 2! }}  white ++     (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
       ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **        (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??
         (( {{ start }} forth-ident {{ end wordset 2! }} white **     )) ??  nleof
            (( {{ start }}  c-ident {{ end c-name 2! }} )) ??     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??
         )) ??  nl     {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nleof white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
    ))     (( ` :  white ** nleof
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " white ** nl )) ??        {{ start }} (( nonl ++  nleof white ** )) ++ {{ end prim prim-forth-code 2! }}
    {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end c-code 2! skipsynclines on }}     )) ?? {{ process-simple }}
    (( ` :  white ** nl     nleof
       {{ start }} (( nonl ++  nl white ** )) ++ {{ end forth-code 2! }}  )) <- simple-primitive ( -- )
    )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}  
    (( nl || eof ))  (( {{ init-combined }}
      ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++
      nleof {{ process-combined }}
   )) <- combined-primitive
   
   (( {{ make-prim to prim 0 to combined
         line @ name-line ! filename 2@ name-filename 2!
         function-number @ prim prim-num !
         start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
      (( simple-primitive || combined-primitive )) {{ 1 function-number +! }}
 )) <- primitive ( -- )  )) <- primitive ( -- )
   
 (( (( comment || primitive || nl white ** )) ** eof ))  (( (( comment || primitive || nl white ** )) ** eof ))
Line 804  warnings @ [IF] Line 1164  warnings @ [IF]
 .( parser generated ok ) cr  .( parser generated ok ) cr
 [THEN]  [THEN]
   
 : primfilter ( file-id xt -- )  : primfilter ( addr u -- )
 \ fileid is for the input file, xt ( -- ) is for the output word      \ process the string at addr u
  output !      over dup rawinput ! dup line-start ! cookedinput !
  here dup rawinput ! dup line-start ! cookedinput !      + endrawinput !
  here unused rot read-file throw      checksyncline
  dup here + endrawinput !      primitives2something ;    
  allot  
  align  
  checksyncline  
 \ begin  
 \     getinput dup eof-char = ?EXIT emit true ?nextchar  
 \ again ;  
  primitives2something ;  
   
 : process-file ( addr u xt -- )  : process-file ( addr u xt-simple x-combined -- )
     >r      output-combined ! output !
     save-mem 2dup filename 2!      save-mem 2dup filename 2!
     0 function-number !      slurp-file
     r/o open-file abort" cannot open file"  
     warnings @ if      warnings @ if
         ." ------------ CUT HERE -------------" cr  endif          ." ------------ CUT HERE -------------" cr  endif
     r> primfilter ;      primfilter ;
   
 : process      ( xt -- )  \  : process      ( xt -- )
     bl word count rot  \      bl word count rot
     process-file ;  \      process-file ;

Removed from v.1.68  
changed lines
  Added in v.1.85


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