Diff for /gforth/prims2x.fs between versions 1.60 and 1.71

version 1.60, 2000/12/30 15:22:52 version 1.71, 2001/01/21 20:36:31
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 58  include ./environ.fs Line 59  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 68  variable rawinput \ pointer to next char Line 70  variable rawinput \ pointer to next char
 variable endrawinput \ pointer to the end of the input (the char after the last)  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 cookedinput \ pointer to the next char to be parsed
 variable line \ line number of char pointed to by input  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  2variable filename \ filename of original input file
 0 0 filename 2!  0 0 filename 2!
 2variable f-comment  2variable f-comment
Line 76  variable line \ line number of char poin Line 79  variable line \ line number of char poin
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?  variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on   skipsynclines on 
   
   variable next-stack-number 0 next-stack-number !
   
 : 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 ( -- )
       [char] " emit ;
   
 variable output \ xt ( -- ) of output word  variable output \ xt ( -- ) of output word
   
 : printprim ( -- )  : printprim ( -- )
  output @ execute ;   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% 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 100  struct% Line 125  struct%
  cell%    field item-stack  \ descriptor for the stack used, 0 is default   cell%    field item-stack  \ descriptor for the stack used, 0 is default
  cell%    field item-type   \ descriptor for the item type   cell%    field item-type   \ descriptor for the item type
  cell%    field item-offset \ offset in stack items, 0 for the deepest element   cell%    field item-offset \ offset in stack items, 0 for the deepest element
    cell%    field item-first  \ true if this is the first occurence of the item
 end-struct item%  end-struct item%
   
 struct%  struct%
Line 118  end-struct type% Line 144  end-struct type%
   
 : 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
       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-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 125  end-struct type% Line 152  end-struct type%
 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  s" IP" save-mem 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 137  s" ip" save-mem s" error don't use # on Line 164  s" ip" save-mem s" error don't use # on
     dup item% %size erase      dup item% %size erase
     item-name 2! ;      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  \ 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      item% max-effect * field prim-effect-in
 variable effect-in-end ( pointer )      item% max-effect * field prim-effect-out
 variable effect-out-end ( pointer )      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
   
   wordlist constant primitives
   
   : create-prim ( prim -- )
       get-current >r
       primitives set-current
       dup prim-name 2@ nextname constant
       r> set-current ;
   
   : 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 primitive-number -10 primitive-number !  
 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  \ for several reasons stack items of a word are stored in a wordlist
Line 172  variable items Line 232  variable items
 : complement ( set1 -- set2 )  : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;   empty ['] bit-equivalent binary-set-operation ;
   
 \ the parser  
   
 eof-char max-member \ the whole character set + EOF  
   
 : getinput ( -- n )  
  rawinput @ endrawinput @ =  
  if  
    eof-char  
  else  
    cookedinput @ c@  
  endif ;  
   
 :noname ( n -- )  
  dup bl > if  
   emit space  
  else  
   .  
  endif ;  
 print-token !  
   
 : testchar? ( set -- f )  
  getinput member? ;  
 ' testchar? test-vector !  
   
 : checksyncline ( -- )  
     \ when input points to a newline, check if the next line is a  
     \ sync line.  If it is, perform the appropriate actions.  
     rawinput @ >r  
     s" #line " r@ over compare 0<> if  
         rdrop 1 line +! EXIT  
     endif  
     0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )  
     dup c@ bl = if  
         char+ dup c@ [char] " <> abort" sync line syntax"  
         char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!  
         char+  
     endif  
     dup c@ nl-char <> abort" sync line syntax"  
     skipsynclines @ if  
         dup char+ rawinput !  
         rawinput @ c@ cookedinput @ c!  
     endif  
     drop ;  
   
 : ?nextchar ( f -- )  
     ?not? if  
         filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"  
         getinput . cr  
         rawinput @ endrawinput @ over - 100 min type cr  
         abort  
     endif  
     rawinput @ endrawinput @ <> if  
         rawinput @ c@  
         1 chars rawinput +!  
         1 chars cookedinput +!  
         nl-char = if  
             checksyncline  
         endif  
         rawinput @ c@ cookedinput @ c!  
     endif ;  
   
 : charclass ( set "name" -- )  
  ['] ?nextchar terminal ;  
   
 : .. ( c1 c2 -- set )  
  ( creates a set that includes the characters c, c1<=c<=c2 )  
  empty copy-set  
  swap 1+ rot do  
   i over add-member  
  loop ;  
   
 : ` ( -- terminal ) ( use: ` c )  
  ( creates anonymous terminal for the character c )  
  char singleton ['] ?nextchar make-terminal ;  
   
 char a char z ..  char A char Z ..  union char _ singleton union  charclass letter  
 char 0 char 9 ..                                        charclass digit  
 bl singleton tab-char over add-member                   charclass white  
 nl-char singleton eof-char over add-member complement   charclass nonl  
 nl-char singleton eof-char over add-member  
     char : over add-member complement                   charclass nocolonnl  
 bl 1+ maxchar .. char \ singleton complement intersection  
                                                         charclass nowhitebq  
 bl 1+ maxchar ..                                        charclass nowhite  
 char " singleton eof-char over add-member complement    charclass noquote  
 nl-char singleton                                       charclass nl  
 eof-char singleton                                      charclass eof  
   
   
 (( letter (( letter || digit )) **  
 )) <- c-ident ( -- )  
   
 (( ` # ?? (( letter || digit || ` : )) **  
 )) <- stack-ident ( -- )  
   
 (( nowhitebq nowhite ** ))  
 <- forth-ident ( -- )  
   
 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 ( -- )  
   
 (( (( ` c || ` C )) {{ start }} nonl **   
    {{ end c-flag @ IF type cr ELSE 2drop THEN }}  
 )) <- c-comment ( -- )  
   
 (( ` - nonl ** {{   
         forth-flag @ IF ." [ELSE]" cr THEN  
         c-flag @ IF ." #else" cr THEN }}  
 )) <- else-comment  
   
 (( ` + {{ start }} nonl ** {{ end  
         dup  
         IF      c-flag @  
                 IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr  
                 THEN  
                 forth-flag @  
                 IF  ." has? " type ."  [IF]"  cr THEN  
         ELSE    2drop  
             c-flag @      IF  ." #endif"  cr THEN  
             forth-flag @  IF  ." [THEN]"  cr THEN  
         THEN }}  
 )) <- if-comment  
   
 (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body  
   
 (( ` \ comment-body nl )) <- comment ( -- )  
   
 (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **  
 <- stack-items  
   
 (( {{ effect-in }}  stack-items {{ effect-in-end ! }}  
    ` - ` - white **  
    {{ effect-out }} stack-items {{ effect-out-end ! }}  
 )) <- stack-effect ( -- )  
   
 (( {{ 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 }} (( 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 white ** )) ** eof ))  
 parser primitives2something  
 warnings @ [IF]  
 .( parser generated ok ) cr  
 [THEN]  
   
 : primfilter ( file-id xt -- )  
 \ fileid is for the input file, xt ( -- ) is for the output word  
  output !  
  here dup rawinput ! cookedinput !  
  here unused rot read-file throw  
  dup here + endrawinput !  
  allot  
  align  
  checksyncline  
 \ begin  
 \     getinput dup eof-char = ?EXIT emit true ?nextchar  
 \ again ;  
  primitives2something ;  
   
 \ types  \ types
   
 : stack-access ( n stack -- )  : stack-access ( n stack -- )
Line 383  warnings @ [IF] Line 264  warnings @ [IF]
  >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 480  does> ( item -- ) Line 361  does> ( item -- )
     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@ items @ search-wordlist 0= if \ new name
         item item-name 2@ 2dup nextname item declare          item item-name 2@ nextname item declare
         typ type-c-name 2@ type space type  ." ;" cr          item item-first on
           \ typ type-c-name 2@ type space type  ." ;" cr
     else      else
         drop          drop
           item item-first off
     endif ;      endif ;
   
 : execute-prefix ( item addr1 u1 -- )  : execute-prefix ( item addr1 u1 -- )
Line 502  does> ( item -- ) Line 385  does> ( item -- )
 : declaration ( item -- )  : declaration ( item -- )
     dup item-name 2@ execute-prefix ;      dup item-name 2@ execute-prefix ;
   
   : declaration-list ( addr1 addr2 -- )
       ['] declaration map-items ;
   
   : declarations ( -- )
    wordlist dup items ! set-current
    prim prim-effect-in prim prim-effect-in-end @ declaration-list
    prim prim-effect-out prim prim-effect-out-end @ declaration-list ;
   
   : print-declaration { item -- }
       item item-first @ if
           item item-type @ type-c-name 2@ type space
           item item-name 2@ type ." ;" cr
       endif ;
   
   : print-declarations ( -- )
       prim prim-effect-in  prim prim-effect-in-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,
 does> ( item -- )  does> ( item -- )
Line 509  does> ( item -- ) Line 410  does> ( item -- )
     item item-name 2@ prefix-length /string item item-name 2!      item item-name 2@ prefix-length /string item item-name 2!
     stack item item-stack !      stack item item-stack !
     item declaration ;      item declaration ;
       
 : declaration-list ( addr1 addr2 -- )  
  swap ?do  
   i declaration  
  item% %size +loop ;  
   
 : declarations ( -- )  
  wordlist dup items ! set-current  
  effect-in effect-in-end @ declaration-list  
  effect-out effect-out-end @ declaration-list ;  
   
 \ offset computation  \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0  \ the leftmost (i.e. deepest) item has offset 0
Line 530  does> ( item -- ) Line 421  does> ( item -- )
     item item-stack @ xt execute dup @ >r +!      item item-stack @ xt execute dup @ >r +!
     r> item item-offset ! ;      r> item item-offset ! ;
   
 : compute-list ( addr1 addr2 xt -- )  : compute-offset-in ( addr1 addr2 -- )
     { xt }      ['] stack-in compute-offset ;
     swap u+do  
         i xt compute-offset  : compute-offset-out ( addr1 addr2 -- )
     item% %size +loop ;      ['] stack-out compute-offset ;
   
 : clear-stack { -- }  : clear-stack { -- }
     dup stack-in off stack-out off ;      dup stack-in off stack-out off ;
Line 542  does> ( item -- ) Line 433  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  @ ['] stack-in  compute-list      prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items
     effect-out effect-out-end @ ['] stack-out compute-list      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<> abort" # can only be on the input side" ;
   
 : flush-a-tos { stack -- }  : flush-a-tos { stack -- }
Line 575  does> ( item -- ) Line 466  does> ( item -- )
  dup item-type @ type-fetch @ execute ;   dup item-type @ type-fetch @ execute ;
   
 : fetches ( -- )  : fetches ( -- )
  effect-in-end @ effect-in ?do      prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
    i fetch  
  item% %size +loop ;   
   
 : stack-pointer-update { stack -- }  : stack-pointer-update { stack -- }
     \ stack grow downwards      \ stack grow downwards
Line 603  does> ( item -- ) Line 492  does> ( item -- )
  dup item-type @ type-store @ execute ;   dup item-type @ type-store @ execute ;
   
 : stores ( -- )  : stores ( -- )
  effect-out-end @ effect-out ?do      prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ;
    i store  
  item% %size +loop ;   
   
 : output-c-tail ( -- )  : output-c-tail ( -- )
     \ the final part of the generated C code      \ the final part of the generated C code
Line 626  does> ( item -- ) Line 513  does> ( item -- )
     repeat      repeat
     2drop type ;      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
       prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items
       ." 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_" prim prim-c-name 2@ type ." :   /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
  ." /* " doc 2@ type ."  */" cr   ." /* " prim prim-doc 2@ type ."  */" cr
  ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging   ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
  ." {" cr   ." {" cr
  ." DEF_CA" cr   ." DEF_CA" cr
  declarations   print-declarations
  compute-offsets \ for everything else  
  ." 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   prim prim-c-code 2@ type-c
  ." }" cr   ." }" cr
  output-c-tail   output-c-tail
  ." }" cr   ." }" cr
  cr   cr
 ;  ;
   
 : print-type-prefix ( type -- )  
     body> >head .name ;  
   
 : disasm-arg { item -- }  : disasm-arg { item -- }
     item item-stack @ inst-stream = if      item item-stack @ inst-stream = if
         ."   printarg_" item item-type @ print-type-prefix          ."   fputc(' ', vm_out); "
         ." (ip[" item item-offset @ 1+ 0 .r ." ]);" cr          ." printarg_" item item-type @ print-type-prefix
           ." ((" item item-type @ type-c-name 2@ type ." )"
           ." ip[" item item-offset @ 1+ 0 .r ." ]);" cr
     endif ;      endif ;
   
 : disasm-args ( -- )  : disasm-args ( -- )
  effect-in-end @ effect-in ?do      prim prim-effect-in prim prim-effect-in-end @ ['] disasm-arg map-items ;
    i disasm-arg  
  item% %size +loop ;   
   
 : 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(" [char] " emit forth-name 2@ type [char] " emit ." ,stdout);" cr      ."   fputs(" quote prim prim-name 2@ type quote ." , vm_out);" cr
     ." /* " declarations ." */" cr  
     compute-offsets  
     disasm-args      disasm-args
     ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr      ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
     ." } else "      ." } else " ;
     1 function-number +! ;  
   
   
   
   
 : gen-arg-parm { item -- }  : gen-arg-parm { item -- }
     item item-stack @ inst-stream = if      item item-stack @ inst-stream = if
Line 682  does> ( item -- ) Line 576  does> ( item -- )
     endif ;      endif ;
   
 : gen-args-parm ( -- )  : gen-args-parm ( -- )
  effect-in-end @ effect-in ?do      prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-parm map-items ;
    i gen-arg-parm  
  item% %size +loop ;   
   
 : gen-arg-gen { item -- }  : gen-arg-gen { item -- }
     item item-stack @ inst-stream = if      item item-stack @ inst-stream = if
Line 693  does> ( item -- ) Line 585  does> ( item -- )
     endif ;      endif ;
   
 : gen-args-gen ( -- )  : gen-args-gen ( -- )
  effect-in-end @ effect-in ?do      prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-gen map-items ;
    i gen-arg-gen  
  item% %size +loop ;   
   
 : output-gen ( -- )  : output-gen ( -- )
     \ generate C code for generating VM instructions      \ generate C code for generating VM instructions
     ." /* " declarations ." */" cr      ." void gen_" prim prim-c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr
     compute-offsets  
     ." void gen_" 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
     ." }" cr      ." }" 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<> ;
   
 : output-funclabel ( -- )  : output-funclabel ( -- )
   1 function-number +!    ." &I_" prim prim-c-name 2@ type ." ," cr ;
   ." &I_" c-name 2@ type ." ," cr ;  
   
 : output-forthname ( -- )  : output-forthname ( -- )
   1 function-number +!    '" emit prim prim-name 2@ type '" emit ." ," cr ;
   '" emit forth-name 2@ type '" emit ." ," cr ;  
   
 : output-c-func ( -- )  : output-c-func ( -- )
 \ used for word libraries  \ used for word libraries
     1 function-number +!      ." Cell * I_" prim prim-c-name 2@ type ." (Cell *SP, Cell **FP)      /* " prim prim-name 2@ type
     ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type      ."  ( " prim prim-stack-string 2@ type ."  ) */" cr
     ."  ( " stack-string 2@ type ."  ) */" cr      ." /* " prim prim-doc 2@ type ."  */" cr
     ." /* " doc 2@ type ."  */" cr      ." NAME(" quote prim prim-name 2@ type quote ." )" cr
     ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr  
     \ debugging      \ debugging
     ." {" cr      ." {" cr
     declarations      print-declarations
     compute-offsets \ for everything else  
     inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN      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
Line 739  does> ( item -- ) Line 622  does> ( item -- )
     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      prim prim-c-code 2@ type
     ." }" cr      ." }" cr
     stores      stores
     fill-tos      fill-tos
Line 749  does> ( item -- ) Line 632  does> ( item -- )
     cr ;      cr ;
   
 : output-label ( -- )    : output-label ( -- )  
     ." (Label)&&I_" c-name 2@ type ." ," cr      ." (Label)&&I_" prim prim-c-name 2@ type ." ," cr ;
     -1 primitive-number +! ;  
   
 : output-alias ( -- )   : output-alias ( -- ) 
     ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr      ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
     -1 primitive-number +! ;  
   
 : 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
         -1 primitive-number +!  
     THEN ;      THEN ;
   
 : output-tag-file ( -- )  : output-tag-file ( -- )
Line 777  does> ( item -- ) Line 657  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 ;
Line 787  does> ( item -- ) Line 667  does> ( item -- )
 [IFDEF] documentation  [IFDEF] documentation
 : register-doc ( -- )  : register-doc ( -- )
     get-current documentation set-current      get-current documentation set-current
     forth-name 2@ nextname create      prim prim-name 2@ nextname create
     forth-name 2@ 2,      prim prim-name 2@ 2,
     stack-string 2@ condition-stack-effect 2,      prim prim-stack-string 2@ condition-stack-effect 2,
     wordset 2@ 2,      prim prim-wordset 2@ 2,
     c-name 2@ condition-pronounciation 2,      prim prim-c-name 2@ condition-pronounciation 2,
     doc 2@ 2,      prim prim-doc 2@ 2,
     set-current ;      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;
   
   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
   
   : init-combined ( -- )
       0 num-combined !
       current-depth max-stacks cells erase
       max-depth     max-stacks cells erase ;
   
   : max! ( n addr -- )
       tuck @ max swap ! ;
   
   : add-depths { p -- }
       \ combine stack effect of p with *-depths
       max-stacks 0 ?do
           current-depth i cells + @
           p prim-stacks-in  i cells + @ +
           dup max-depth i cells + max!
           p prim-stacks-out i cells + @ -
           current-depth i cells + !
       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 @ cells + !
       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 cells + @ dup
           q prim-stacks-in i cells + !
           current-depth i cells + @ -
           q prim-stacks-out i cells + !
       loop ;
   
   : process-combined ( -- )
       prim compute-effects ;
   
   \ the parser
   
   eof-char max-member \ the whole character set + EOF
   
   : getinput ( -- n )
    rawinput @ endrawinput @ =
    if
      eof-char
    else
      cookedinput @ c@
    endif ;
   
   :noname ( n -- )
    dup bl > if
     emit space
    else
     .
    endif ;
   print-token !
   
   : testchar? ( set -- f )
    getinput member? ;
   ' testchar? test-vector !
   
   : checksyncline ( -- )
       \ when input points to a newline, check if the next line is a
       \ sync line.  If it is, perform the appropriate actions.
       rawinput @ >r
       s" #line " r@ over compare 0<> if
           rdrop 1 line +! EXIT
       endif
       0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
       dup c@ bl = if
           char+ dup c@ [char] " <> abort" sync line syntax"
           char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
           char+
       endif
       dup c@ nl-char <> abort" sync line syntax"
       skipsynclines @ if
           dup char+ rawinput !
           rawinput @ c@ cookedinput @ c!
       endif
       drop ;
   
   : ?nextchar ( f -- )
       s" syntax error, wrong char" ?print-error
       rawinput @ endrawinput @ <> if
           rawinput @ c@
           1 chars rawinput +!
           1 chars cookedinput +!
           nl-char = if
               checksyncline
               rawinput @ line-start !
           endif
           rawinput @ c@ cookedinput @ c!
       endif ;
   
   : charclass ( set "name" -- )
    ['] ?nextchar terminal ;
   
   : .. ( c1 c2 -- set )
    ( creates a set that includes the characters c, c1<=c<=c2 )
    empty copy-set
    swap 1+ rot do
     i over add-member
    loop ;
   
   : ` ( -- terminal ) ( use: ` c )
    ( creates anonymous terminal for the character c )
    char singleton ['] ?nextchar make-terminal ;
   
   char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
   char 0 char 9 ..                                        charclass digit
   bl singleton tab-char over add-member                   charclass white
   nl-char singleton eof-char over add-member complement   charclass nonl
   nl-char singleton eof-char over add-member
       char : over add-member complement                   charclass nocolonnl
   bl 1+ maxchar .. char \ singleton complement intersection
                                                           charclass nowhitebq
   bl 1+ maxchar ..                                        charclass nowhite
   char " singleton eof-char over add-member complement    charclass noquote
   nl-char singleton                                       charclass nl
   eof-char singleton                                      charclass eof
   
   
   (( letter (( letter || digit )) **
   )) <- c-ident ( -- )
   
   (( ` # ?? (( letter || digit || ` : )) **
   )) <- stack-ident ( -- )
   
   (( nowhitebq nowhite ** ))
   <- forth-ident ( -- )
   
   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 ( -- )
   
   (( (( ` c || ` C )) {{ start }} nonl ** 
      {{ end c-flag @ IF type cr ELSE 2drop THEN }}
   )) <- c-comment ( -- )
   
   (( ` - nonl ** {{ 
           forth-flag @ IF ." [ELSE]" cr THEN
           c-flag @ IF ." #else" cr THEN }}
   )) <- else-comment
   
   (( ` + {{ start }} nonl ** {{ end
           dup
           IF      c-flag @
                   IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr
                   THEN
                   forth-flag @
                   IF  ." has? " type ."  [IF]"  cr THEN
           ELSE    2drop
               c-flag @      IF  ." #endif"  cr THEN
               forth-flag @  IF  ." [THEN]"  cr THEN
           THEN }}
   )) <- if-comment
   
   (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
   
   (( ` \ comment-body nl )) <- comment ( -- )
   
   (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
   <- stack-items
   
   (( {{ prim prim-effect-in }}  stack-items {{ prim prim-effect-in-end ! }}
      ` - ` - white **
      {{ prim prim-effect-out }} stack-items {{ prim prim-effect-out-end ! }}
   )) <- stack-effect ( -- )
   
   (( {{ prim create-prim }}
      ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
      (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
         (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??
      )) ??  nl
      (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nl )) ??
      {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
      (( ` :  white ** nl
         {{ start }} (( nonl ++  nl white ** )) ++ {{ end prim prim-forth-code 2! }}
      )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}
      (( nl || eof ))
   )) <- simple-primitive ( -- )
   
   (( {{ init-combined }}
      ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++
      (( nl || eof )) {{ process-combined }}
   )) <- combined-primitive
   
   (( {{ make-prim to prim
         line @ name-line ! filename 2@ name-filename 2!
         start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
      (( simple-primitive || combined-primitive ))
   )) <- primitive ( -- )
   
   (( (( comment || primitive || nl white ** )) ** eof ))
   parser primitives2something
   warnings @ [IF]
   .( parser generated ok ) cr
   [THEN]
   
   : primfilter ( addr u -- )
       \ process the string at addr u
       over dup rawinput ! dup line-start ! cookedinput !
       + endrawinput !
       checksyncline
       primitives2something ;    
   
 : process-file ( addr u xt -- )  : process-file ( addr u xt -- )
     >r      output !
     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

Removed from v.1.60  
changed lines
  Added in v.1.71


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