Diff for /gforth/prims2x.fs between versions 1.67 and 1.72

version 1.67, 2001/01/18 16:57:41 version 1.72, 2001/01/23 10:05:36
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 77  variable line-start \ pointer to start o Line 79  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 ;
   
 : 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 ( -- )  : 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-typename \ 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 146  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 addr-stack u2 addr-cast u3 "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!
       save-mem r@ stack-typename 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 ! ;
   
 s" sp" save-mem s" (Cell)" make-stack data-stack   s" sp" save-mem s" Cell"  save-mem s" (Cell)" make-stack data-stack 
 s" fp" save-mem s" "       make-stack fp-stack  s" fp" save-mem s" Float" save-mem s" "       make-stack fp-stack
 s" rp" save-mem s" (Cell)" make-stack return-stack  s" rp" save-mem s" Cell"  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" Cell"  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 150  s" IP" save-mem s" error don't use # on Line 187  s" IP" save-mem s" error don't use # on
   
 \ 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 341  does> ( item -- ) Line 405  does> ( item -- )
   
 : declarations ( -- )  : declarations ( -- )
  wordlist dup items ! set-current   wordlist dup items ! 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 351  does> ( item -- ) Line 415  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 384  does> ( item -- ) Line 448  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<> abort" # can only be on the input side" ;
   
 : flush-a-tos { stack -- }  : flush-a-tos { stack -- }
Line 414  does> ( item -- ) Line 478  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 443  does> ( item -- ) Line 507  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
Line 475  does> ( item -- ) Line 539  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
  declarations  
  compute-offsets \ for everything else  
  print-declarations   print-declarations
  ." NEXT_P0;" cr   ." NEXT_P0;" cr
  flush-tos   flush-tos
Line 496  does> ( item -- ) Line 561  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@ type-c
  ." }" cr   ." }" cr
  output-c-tail   output-c-tail
  ." }" cr   ." }" cr
Line 512  does> ( item -- ) Line 577  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
     ." /* " 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 532  does> ( item -- ) Line 594  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 541  does> ( item -- ) Line 603  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
     ." /* " 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(" quote forth-name 2@ type quote ." )" cr  
     \ debugging      \ debugging
     ." {" cr      ." {" cr
     declarations  
     compute-offsets \ for everything else  
     print-declarations      print-declarations
     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
Line 587  does> ( item -- ) Line 641  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 596  does> ( item -- ) Line 650  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 624  does> ( item -- ) Line 675  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 634  does> ( item -- ) Line 685  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
   create min-depth     max-stacks cells allot
   
   : init-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 !
           0 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 ( -- )
       prim compute-effects
       prim init-effects
       output-combined perform ;
   
   \ C output
   
   : print-item { n stack -- }
       \ print nth stack item name
       ." _" stack stack-typename 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 ;
       
   : output-c-combined ( -- )
       print-entry cr
       \ debugging messages just in constituents
       ." {" cr
       ." DEF_CA" cr
       print-declarations-combined
       ." NEXT_P0;" cr
       flush-tos
       fetches
       ;
   
   : output-forth-combined ( -- )
       ;
   
 \ the parser  \ the parser
   
 eof-char max-member \ the whole character set + EOF  eof-char max-member \ the whole character set + EOF
Line 688  print-token ! Line 910  print-token !
     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 794  Variable c-flag Line 1000  Variable c-flag
 (( {{ 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 **     )) ??  nl
            (( {{ start }}  c-ident {{ end c-name 2! }} )) ??     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nl )) ??
         )) ??  nl     {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
    ))  
    (( ` " ` "  {{ 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     (( ` :  white ** nl
       {{ start }} (( nonl ++  nl white ** )) ++ {{ end forth-code 2! }}        {{ start }} (( nonl ++  nl white ** )) ++ {{ end prim prim-forth-code 2! }}
    )) ?? {{ printprim }}     )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}
    (( nl || eof ))     (( 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 ( -- )  )) <- primitive ( -- )
   
 (( (( comment || primitive || nl white ** )) ** eof ))  (( (( comment || primitive || nl white ** )) ** eof ))
Line 821  warnings @ [IF] Line 1035  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.67  
changed lines
  Added in v.1.72


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