Diff for /gforth/prims2x.fs between versions 1.122 and 1.166

version 1.122, 2002/12/08 09:57:53 version 1.166, 2007/02/24 14:45:53
Line 1 Line 1
 \ converts primitives to, e.g., C code   \ converts primitives to, e.g., C code 
   
 \ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 51 Line 51
 \ (stack-in-index-xt and a test for stack==instruction-stream); there  \ (stack-in-index-xt and a test for stack==instruction-stream); there
 \ should be only one.  \ should be only one.
   
   
   \ for backwards compatibility, jaw
   require compat/strcomp.fs
   
   [undefined] outfile-execute [if]
       : outfile-execute ( ... xt file-id -- ... )
           \ unsafe replacement
           outfile-id >r to outfile-id execute r> to outfile-id ;
   [then]
   
 warnings off  warnings off
   
   \ redefinitions of kernel words not present in gforth-0.6.1
   : latestxt lastcfa @ ;
   : latest last @ ;
   
 [IFUNDEF] try  [IFUNDEF] try
 include startup.fs  include startup.fs
 [THEN]  [THEN]
Line 63  warnings off Line 77  warnings off
 \ warnings on  \ warnings on
   
 include ./gray.fs  include ./gray.fs
 32 constant max-effect \ number of things on one side of a stack effect  128 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).  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
Line 95  variable include-skipped-insts Line 109  variable include-skipped-insts
 \ inline arguments (false)  \ inline arguments (false)
 include-skipped-insts off  include-skipped-insts off
   
   2variable threaded-code-pointer-type \ type used for geninst etc.
   s" Inst **" threaded-code-pointer-type 2!
   
 variable immarg \ values for immediate arguments (to be used in IMM_ARG macros)  variable immarg \ values for immediate arguments (to be used in IMM_ARG macros)
 $12340000 immarg !  $12340000 immarg !
   
Line 127  $12340000 immarg ! Line 144  $12340000 immarg !
     over - type cr      over - type cr
     line-start @ rawinput @ over - typewhite ." ^" cr ;      line-start @ rawinput @ over - typewhite ." ^" cr ;
   
   : print-error { addr u -- }
       filename 2@ type ." :" line @ 0 .r ." : " addr u type cr
       print-error-line ;
   
 : ?print-error { f addr u -- }  : ?print-error { f addr u -- }
     f ?not? if      f ?not? if
         outfile-id >r try          addr u ['] print-error stderr outfile-execute
             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  
         1 (bye) \ abort          1 (bye) \ abort
     endif ;      endif ;
   
Line 162  struct% Line 177  struct%
     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%    field stack-type \ name for default type of stack items
     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-access-transform \ ( nitem -- index )
 end-struct stack%  end-struct stack%
   
 struct%  struct%
Line 180  struct% Line 196  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%
   
   struct%
       cell%    field register-number
       cell%    field register-type \ pointer to type
       cell% 2* field register-name \ c name
   end-struct register%
   
   struct%
       cell% 2* field ss-registers  \ addr u; ss-registers[0] is TOS
                                    \ 0 means: use memory
       cell%    field ss-offset     \ stack pointer offset: sp[-offset] is TOS
   end-struct ss% \ stack-state
   
   struct%
       cell%              field state-enabled
       cell%              field state-number
       cell% max-stacks * field state-sss
   end-struct state%
   
 variable next-stack-number 0 next-stack-number !  variable next-stack-number 0 next-stack-number !
 create stacks max-stacks cells allot \ array of stacks  create stacks max-stacks cells allot \ array of stacks
   256 constant max-registers
   create registers max-registers cells allot \ array of registers
   variable nregisters 0 nregisters ! \ number of registers
   variable next-state-number 0 next-state-number ! \ next state number
   
 : stack-in-index ( in-size item -- in-index )  : stack-in-index ( in-size item -- in-index )
     item-offset @ - 1- ;      item-offset @ - 1- ;
Line 197  create stacks max-stacks cells allot \ a Line 235  create stacks max-stacks cells allot \ a
     1 next-stack-number +!      1 next-stack-number +!
     r@ stack-type !      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 !
       ['] noop r@ stack-access-transform !
       rdrop ;
   
 : map-stacks { xt -- }  : map-stacks { xt -- }
     \ perform xt for all stacks      \ perform xt ( stack -- ) for all stacks
     next-stack-number @ 0 +do      next-stack-number @ 0 +do
         stacks i th @ xt execute          stacks i th @ xt execute
     loop ;      loop ;
   
 : map-stacks1 { xt -- }  : map-stacks1 { xt -- }
     \ perform xt for all stacks except inst-stream      \ perform xt ( stack -- ) for all stacks except inst-stream
     next-stack-number @ 1 +do      next-stack-number @ 1 +do
         stacks i th @ xt execute          stacks i th @ xt execute
     loop ;      loop ;
Line 215  create stacks max-stacks cells allot \ a Line 255  create stacks max-stacks cells allot \ a
   
 : init-item ( addr u addr1 -- )  : init-item ( addr u addr1 -- )
     \ initialize item at addr1 with name addr u      \ initialize item at addr1 with name addr u
     \ !! remove stack prefix      \ the stack prefix is removed by the stack-prefix
     dup item% %size erase      dup item% %size erase
     item-name 2! ;      item-name 2! ;
   
Line 236  struct% Line 276  struct%
     cell% 2* field prim-name      cell% 2* field prim-name
     cell% 2* field prim-wordset      cell% 2* field prim-wordset
     cell% 2* field prim-c-name      cell% 2* field prim-c-name
       cell% 2* field prim-c-name-orig \ for reprocessed prims, the original name
     cell% 2* field prim-doc      cell% 2* field prim-doc
     cell% 2* field prim-c-code      cell% 2* field prim-c-code
     cell% 2* field prim-forth-code      cell% 2* field prim-forth-code
Line 248  struct% Line 289  struct%
     cell%    field prim-effect-out-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-in  \ number of in items per stack
     cell% max-stacks * field prim-stacks-out \ number of out items per stack      cell% max-stacks * field prim-stacks-out \ number of out items per stack
       cell% max-stacks * field prim-stacks-sync \ sync flag per stack
 end-struct prim%  end-struct prim%
   
 : make-prim ( -- prim )  : make-prim ( -- prim )
Line 259  end-struct prim% Line 301  end-struct prim%
 0 value combined \ in combined prims the combined prim  0 value combined \ in combined prims the combined prim
 variable in-part \ true if processing a part  variable in-part \ true if processing a part
  in-part off   in-part off
   0 value state-in  \ state on entering prim
   0 value state-out \ state on exiting prim
   0 value state-default  \ canonical state at bb boundaries
   
 : prim-context ( ... p xt -- ... )  : prim-context ( ... p xt -- ... )
     \ execute xt with prim set to p      \ execute xt with prim set to p
Line 268  variable in-part \ true if processing a Line 313  variable in-part \ true if processing a
     r> to prim      r> to prim
     throw ;      throw ;
   
   : prim-c-name-2! ( c-addr u -- )
       2dup prim prim-c-name 2! prim prim-c-name-orig 2! ;
   
 1000 constant max-combined  1000 constant max-combined
 create combined-prims max-combined cells allot  create combined-prims max-combined cells allot
 variable num-combined  variable num-combined
Line 312  wordlist constant primitives Line 360  wordlist constant primitives
     \ address of number of stack items in effect out      \ address of number of stack items in effect out
     stack-number @ cells prim prim-stacks-out + ;      stack-number @ cells prim prim-stacks-out + ;
   
   : stack-prim-stacks-sync ( stack -- addr )
       prim prim-stacks-sync swap stack-number @ th ;
   
 \ global vars  \ global vars
 variable c-line  variable c-line
 2variable c-filename  2variable c-filename
Line 319  variable name-line Line 370  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 !
   Variable function-old 0 function-old !
   : function-diff ( n -- )
       ." GROUPADD(" function-number @ function-old @ - 0 .r ." )" cr
       function-number @ function-old ! ;
   : forth-fdiff ( -- )
       function-number @ function-old @ - 0 .r ."  groupadd" cr
       function-number @ function-old ! ;
   
 \ a few more set ops  \ a few more set ops
   
Line 333  defer inst-stream-f ( -- stack ) Line 391  defer inst-stream-f ( -- stack )
   
 \ stack access stuff  \ stack access stuff
   
 : normal-stack-access1 ( n stack -- )  : normal-stack-access0 { n stack -- }
     stack-pointer 2@ type      \ n has the ss-offset already applied (see ...-access1)
     dup      n stack stack-access-transform @ execute ." [" 0 .r ." ]" ;
     if  
         ." [" 0 .r ." ]"  : state-ss { stack state -- ss }
       state state-sss stack stack-number @ th @ ;
   
   : stack-reg { n stack state -- reg }
       \ n is the index (TOS=0); reg is 0 if the access is to memory
       stack state state-ss ss-registers 2@ n u> if ( addr ) \ in ss-registers?
           n th @
     else      else
         drop ." TOS"          drop 0
     endif ;      endif ;
   
 : normal-stack-access ( n stack -- )  : .reg ( reg -- )
     dup inst-stream-f = if      register-name 2@ type ;
   
   : stack-offset ( stack state -- n )
       \ offset for stack in state
       state-ss ss-offset @ ;
   
   : normal-stack-access1 { n stack state -- }
       n stack state stack-reg ?dup-if
           .reg exit
       endif
       stack stack-pointer 2@ type
       n stack state stack-offset - stack normal-stack-access0 ;
   
   : normal-stack-access ( n stack state -- )
       over inst-stream-f = if
         ." IMM_ARG(" normal-stack-access1 ." ," immarg ? ." )"          ." IMM_ARG(" normal-stack-access1 ." ," immarg ? ." )"
         1 immarg +!          1 immarg +!
     else      else
Line 372  defer inst-stream-f ( -- stack ) Line 450  defer inst-stream-f ( -- stack )
     stack stack-number @ part-num @ s-c-max-depth @      stack stack-number @ part-num @ s-c-max-depth @
 \    max-depth stack stack-number @ th @ ( ndepth nmaxdepth )  \    max-depth stack stack-number @ th @ ( ndepth nmaxdepth )
     over <= if ( ndepth ) \ load from memory      over <= if ( ndepth ) \ load from memory
         stack normal-stack-access          stack state-in normal-stack-access
     else      else
         drop n stack part-stack-access          drop n stack part-stack-access
     endif ;      endif ;
Line 386  defer inst-stream-f ( -- stack ) Line 464  defer inst-stream-f ( -- stack )
     stack stack-number @ part-num @ s-c-max-back-depth @      stack stack-number @ part-num @ s-c-max-back-depth @
     over <= if ( ndepth )      over <= if ( ndepth )
         stack combined ['] stack-diff prim-context -          stack combined ['] stack-diff prim-context -
         stack normal-stack-access          stack state-out normal-stack-access
     else      else
         drop n stack part-stack-access          drop n stack part-stack-access
     endif ;      endif ;
Line 396  defer inst-stream-f ( -- stack ) Line 474  defer inst-stream-f ( -- stack )
     in-part @ if      in-part @ if
         part-stack-read          part-stack-read
     else      else
         normal-stack-access          state-in normal-stack-access
     endif ;      endif ;
   
 : stack-write ( n stack -- )  : stack-write ( n stack -- )
Line 404  defer inst-stream-f ( -- stack ) Line 482  defer inst-stream-f ( -- stack )
     in-part @ if      in-part @ if
         part-stack-write          part-stack-write
     else      else
         normal-stack-access          state-out normal-stack-access
     endif ;      endif ;
   
 : item-in-index { item -- n }  : item-in-index { item -- n }
Line 431  defer inst-stream-f ( -- stack ) Line 509  defer inst-stream-f ( -- stack )
     ." vm_two"      ." vm_two"
     r@ item-stack-type-name type ." 2"      r@ item-stack-type-name type ." 2"
     r@ item-type @ print-type-prefix ." ("      r@ item-type @ print-type-prefix ." ("
     r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-read      r@ item-in-index r@ item-stack @ 2dup stack-read
     ." , "                      -1 under+ ." (Cell)" stack-read      ." , "                      -1 under+ stack-read
     ." , " r@ item-name 2@ type      ." , " r@ item-name 2@ type
     ." )" cr      ." )" cr
     rdrop ;      rdrop ;
   
 : 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-first @ if      r@ item-stack @ stack-prim-stacks-sync @ if
      rdrop false exit          rdrop false exit
  endif      endif
  r@ item-name 2@ prim prim-items-wordlist @ search-wordlist 0= abort" bug"      r@ item-first @ if
  execute @          rdrop false exit
  dup r@ =      endif
  if \ item first appeared in output      r@ item-name 2@ prim prim-items-wordlist @ search-wordlist 0= abort" bug"
    drop false      execute @
  else      dup r@ =
    dup  item-stack  @ r@ item-stack  @ =       if \ item first appeared in output
    swap item-offset @ r@ item-offset @ = and          drop false
  endif      else
  rdrop ;          dup  item-stack  @ r@ item-stack  @ = 
           swap item-offset @ r@ item-offset @ = and
       endif
       rdrop ;
   
 : item-out-index ( item -- n )  : item-out-index ( item -- n )
     \ n is the index of item (in the in-effect)      \ n is the index of item (in the out-effect)
     >r r@ item-stack @ stack-out @ r> item-offset @ - 1- ;      >r r@ item-stack @ stack-out @ r> item-offset @ - 1- ;
   
 : really-store-single ( item -- )  : really-store-single ( item -- )
Line 467  defer inst-stream-f ( -- stack ) Line 548  defer inst-stream-f ( -- stack )
     r@ item-out-index r@ item-stack @ stack-write ." );"      r@ item-out-index r@ item-stack @ stack-write ." );"
     rdrop ;      rdrop ;
   
 : store-single ( item -- )  : store-single { item -- }
     >r      item item-stack @ { stack }
     store-optimization @ in-part @ 0= and r@ same-as-in? and if      store-optimization @ in-part @ 0= and item same-as-in? and
         r@ item-in-index 0= r@ item-out-index 0= xor if      item item-in-index  stack state-in  stack-reg       \  in reg/mem
             ." IF_" r@ item-stack @ stack-pointer 2@ type      item item-out-index stack state-out stack-reg = and \ out reg/mem
             ." TOS(" r@ really-store-single ." );" cr      0= if
         endif          item really-store-single cr
     else      endif ;
         r@ really-store-single cr  
     endif  
     rdrop ;  
   
 : 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
Line 553  does> ( item -- ) Line 631  does> ( item -- )
             UNLOOP EXIT              UNLOOP EXIT
         endif          endif
         -1 s+loop          -1 s+loop
     \ we did not find a type, abort          \ we did not find a type, abort
           abort
     false s" unknown prefix" ?print-error ;      false s" unknown prefix" ?print-error ;
   
 : declaration ( item -- )  : declaration ( item -- )
Line 587  does> ( item -- ) Line 666  does> ( item -- )
     stack item item-stack !      stack item item-stack !
     item declaration ;      item declaration ;
   
   : set-prim-stacks-sync ( stack -- )
       stack-prim-stacks-sync on ;
   
   : clear-prim-stacks-sync ( stack -- )
       stack-prim-stacks-sync off ;
   
   
   get-current prefixes set-current
   : ... ( item -- )
       \ this "prefix" ensures that the appropriate stack is synced with memory
       dup item-name 2@ s" ..." str= 0= abort" '...' must end the item name"
       item-stack @ dup if
           set-prim-stacks-sync
       else \ prefixless "..." syncs all stacks
           drop ['] set-prim-stacks-sync map-stacks1
       endif ;
   set-current
   
   create ...-item ( -- addr ) \ just used for letting stack-prefixes work on it
   item% %allot                \ stores the stack temporarily until used by ...
   
   : init-item1 ( addr1 addr u -- addr2 )
       \ initialize item at addr1 with name addr u, next item is at addr2
       \ !! make sure that any mention of "..." is only stack-prefixed
       2dup s" ..." search nip nip if ( addr1 addr u )
           0 ...-item item-stack ! \ initialize to prefixless
           2dup ...-item item-name 2!
           ...-item rot rot execute-prefix ( addr1 )
       else
           2 pick init-item item% %size +
       endif ;
   
 \ types pointed to by stacks for use in combined prims  \ types pointed to by stacks for use in combined prims
 \ !! output-c-combined shouldn't use these names!  \ !! output-c-combined shouldn't use these names!
 : stack-type-name ( addr u "name" -- )  : stack-type-name ( addr u "name" -- )
Line 595  does> ( item -- ) Line 706  does> ( item -- )
 wordlist constant type-names \ this is here just to meet the requirement  wordlist constant type-names \ this is here just to meet the requirement
                     \ that a type be a word; it is never used for lookup                      \ that a type be a word; it is never used for lookup
   
   : define-type ( addr u -- xt )
       \ define single type with name addr u, without stack
       get-current type-names set-current >r
       2dup nextname stack-type-name
       r> set-current
       latestxt ;
   
 : stack ( "name" "stack-pointer" "type" -- )  : stack ( "name" "stack-pointer" "type" -- )
     \ define stack      \ define stack
     name { d: stack-name }      name { d: stack-name }
     name { d: stack-pointer }      name { d: stack-pointer }
     name { d: stack-type }      name { d: stack-type }
     get-current type-names set-current      stack-type define-type
     stack-type 2dup nextname stack-type-name      stack-pointer rot >body stack-name nextname make-stack ;
     set-current  
     stack-pointer lastxt >body stack-name nextname make-stack ;  
   
 stack inst-stream IP Cell  stack inst-stream IP Cell
 ' inst-in-index inst-stream stack-in-index-xt !  ' inst-in-index inst-stream stack-in-index-xt !
 ' inst-stream <is> inst-stream-f  ' inst-stream <is> inst-stream-f
 \ !! initialize stack-in and stack-out  \ !! initialize stack-in and stack-out
   
   \ registers
   
   : make-register ( type addr u -- )
       \ define register with type TYPE and name ADDR U.
       nregisters @ max-registers < s" too many registers" ?print-error
       2dup nextname create register% %allot >r
       r@ register-name 2!
       r@ register-type !
       nregisters @ r@ register-number !
       1 nregisters +!
       rdrop ;
   
   : register ( "name" "type" -- )
       \ define register
       name { d: reg-name }
       name { d: reg-type }
       reg-type define-type >body
       reg-name make-register ;
   
   \ stack-states
   
   : stack-state ( a-addr u uoffset "name" -- )
       create ss% %allot >r
       r@ ss-offset !
       r@ ss-registers 2!
       rdrop ;
   
   0 0 0 stack-state default-ss
   
   \ state
   
   : state ( "name" -- )
       \ create a state initialized with default-sss
       create state% %allot { s }
       s state-enabled on
       next-state-number @ s state-number ! 1 next-state-number +!
       max-stacks 0 ?do
           default-ss s state-sss i th !
       loop ;
   
   : state-disable ( state -- )
       state-enabled off ;
   
   : state-enabled? ( state -- f )
       state-enabled @ ;
   
   : .state ( state -- )
       0 >body - >name .name ;
   
   : set-ss ( ss stack state -- )
       state-sss swap stack-number @ th ! ;
   
 \ 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 626  stack inst-stream IP Cell Line 794  stack inst-stream IP Cell
 : compute-offset-out ( addr1 addr2 -- )  : compute-offset-out ( addr1 addr2 -- )
     ['] stack-out compute-offset ;      ['] stack-out compute-offset ;
   
 : clear-stack ( stack -- )  
     dup stack-in off stack-out off ;  
   
 : compute-offsets ( -- )  : compute-offsets ( -- )
     ['] clear-stack map-stacks      prim prim-stacks-in  max-stacks cells erase
       prim prim-stacks-out max-stacks cells erase
     prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items      prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items
     prim prim-effect-out prim prim-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= s" # can only be on the input side" ?print-error ;      inst-stream stack-out @ 0= s" # can only be on the input side" ?print-error ;
   
   : init-simple { prim -- }
       \ much of the initialization is elsewhere
       ['] clear-prim-stacks-sync map-stacks ;
   
 : process-simple ( -- )  : process-simple ( -- )
     prim prim { W^ key } key cell      prim prim { W^ key } key cell
     combinations ['] constant insert-wordlist      combinations ['] constant insert-wordlist
     declarations compute-offsets      declarations compute-offsets
     output @ execute ;      output @ execute ;
   
 : flush-a-tos { stack -- }  : stack-state-items ( stack state -- n )
     stack stack-out @ 0<> stack stack-in @ 0= and      state-ss ss-registers 2@ nip ;
     if  
         ." IF_" stack stack-pointer 2@ 2dup type ." TOS("  
         2dup type ." [0] = " type ." TOS);" cr  
     endif ;  
   
 : flush-tos ( -- )  : unused-stack-items { stack -- n-in n-out }
     ['] flush-a-tos map-stacks1 ;      \ n-in  are the stack items in state-in  not used    by prim
       \ n-out are the stack items in state-out not written by prim
       stack state-in  stack-state-items stack stack-in  @ - 0 max
       stack state-out stack-state-items stack stack-out @ - 0 max ;
   
   : spill-stack-items { stack -- u }
       \ there are u items to spill in stack
       stack unused-stack-items
       stack stack-prim-stacks-sync @ if
           drop 0
       endif
       swap - ;
   
 : fill-a-tos { stack -- }  : spill-stack { stack -- }
     stack stack-out @ 0= stack stack-in @ 0<> and      \ spill regs of state-in that are not used by prim and are not in state-out
     if      stack state-in stack-offset { offset }
         ." IF_" stack stack-pointer 2@ 2dup type ." TOS("      stack state-in stack-state-items ( items )
         2dup type ." TOS = " type ." [0]);" cr      dup stack spill-stack-items + +do
     endif ;          \ loop through the bottom items
           stack stack-pointer 2@ type
           i offset - stack normal-stack-access0 ."  = "
           i stack state-in normal-stack-access1 ." ;" cr
       loop ;
   
   : spill-state ( -- )
       ['] spill-stack map-stacks1 ;
   
   : fill-stack-items { stack -- u }
       \ there are u items to fill in stack
       stack unused-stack-items
       stack stack-prim-stacks-sync @ if
           swap drop 0 swap
       endif
       - ;
   
   : fill-stack { stack -- }
       stack state-out stack-offset { offset }
       stack state-out stack-state-items ( items )
       dup stack fill-stack-items + +do
           \ loop through the bottom items
           i stack state-out normal-stack-access1 ."  = "
           stack stack-pointer 2@ type
           i offset - stack normal-stack-access0 ." ;" cr
       loop ;
   
 : fill-tos ( -- )  : fill-state ( -- )
     \ !! inst-stream for prefetching?      \ !! inst-stream for prefetching?
     ['] fill-a-tos map-stacks1 ;      ['] fill-stack map-stacks1 ;
   
 : fetch ( addr -- )  : fetch ( addr -- )
     dup item-type @ type-fetch @ execute ;      dup item-type @ type-fetch @ execute ;
Line 668  stack inst-stream IP Cell Line 870  stack inst-stream IP Cell
 : fetches ( -- )  : fetches ( -- )
     prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
   
 : stack-pointer-update { stack -- }  : reg-reg-move ( reg-from reg-to -- )
     \ stack grow downwards      2dup = if
     stack stack-diff          2drop
     ?dup-if \ this check is not necessary, gcc would do this for us      else
           .reg ."  = " .reg ." ;" cr
       endif ;
   
   : stack-bottom-reg { n stack state -- reg }
       stack state stack-state-items n - 1- stack state stack-reg ;
   
   : stack-moves { stack -- }
       \ generate moves between registers in state-in/state-out that are
       \ not spilled or consumed/produced by prim.
       \ !! this works only for a simple stack cache, not e.g., for
       \ rotating stack caches, or registers shared between stacks (the
       \ latter would also require a change in interface)
       \ !! maybe place this after NEXT_P1?
       stack unused-stack-items 2dup < if ( n-in n-out )
           \ move registers from 0..n_in-1 to n_out-n_in..n_out-1
           over - { diff } ( n-in )
           -1 swap 1- -do
               i stack state-in stack-bottom-reg ( reg-from )
               i diff + stack state-out stack-bottom-reg reg-reg-move
           1 -loop
       else
           \ move registers from n_in-n_out..n_in-1 to 0..n_out-1
           swap over - { diff } ( n-out )
           0 +do
               i diff + stack state-in stack-bottom-reg ( reg-from )
               i stack state-out stack-bottom-reg reg-reg-move
           loop
       endif ;
   
   : stack-update-transform ( n1 stack -- n2 )
       \ n2 is the number by which the stack pointer should be
       \ incremented to pop n1 items
       stack-access-transform @ dup >r execute
       0 r> execute - ;
   
   : update-stack-pointer { stack n -- }
       n if \ this check is not necessary, gcc would do this for us
         stack inst-stream = if          stack inst-stream = if
             ." INC_IP(" 0 .r ." );" cr              ." INC_IP(" n 0 .r ." );" cr
         else          else
             stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr              stack stack-pointer 2@ type ."  += "
               n stack stack-update-transform 0 .r ." ;" cr
         endif          endif
     endif ;      endif ;
   
   : stack-pointer-update { stack -- }
       \ and moves
       \ stacks grow downwards
       stack stack-prim-stacks-sync @ if
           stack stack-in @
           stack state-in  stack-offset -
           stack swap update-stack-pointer
       else
           stack stack-diff ( in-out )
           stack state-in  stack-offset -
           stack state-out stack-offset + ( [in-in_offset]-[out-out_offset] )
           stack swap update-stack-pointer
           stack stack-moves
       endif ;
   
 : stack-pointer-updates ( -- )  : stack-pointer-updates ( -- )
     ['] stack-pointer-update map-stacks ;      ['] stack-pointer-update map-stacks ;
   
   : stack-pointer-update2 { stack -- }
       stack stack-prim-stacks-sync @ if
           stack state-out stack-offset
           stack stack-out @ -
           stack swap update-stack-pointer
       endif ;
   
   : stack-pointer-updates2 ( -- )
       \ update stack pointers after C code, where necessary
       ['] stack-pointer-update2 map-stacks ;
   
 : store ( item -- )  : store ( item -- )
 \ f is true if the item should be stored  \ f is true if the item should be stored
 \ f is false if the store is probably not necessary  \ f is false if the store is probably not necessary
Line 724  stack inst-stream IP Cell Line 990  stack inst-stream IP Cell
     endif      endif
     2drop ;      2drop ;
   
   
   defer output-nextp0
   :noname ( -- )
       ." NEXT_P0;" cr ;
   is output-nextp0
   
   defer output-nextp1
   :noname ( -- )
       ." NEXT_P1;" cr ;
   is output-nextp1
   
   : output-nextp2 ( -- )
       ." NEXT_P2;" cr ;
   
   variable tail-nextp2 \ xt to execute for printing NEXT_P2 in INST_TAIL
   ' output-nextp2 tail-nextp2 !
   
 : output-label2 ( -- )  : output-label2 ( -- )
     ." LABEL2(" prim prim-c-name 2@ type ." )" cr      ." LABEL2(" prim prim-c-name 2@ type ." )" cr
     ." NEXT_P2;" cr ;      ." NEXT_P1_5;" cr
       ." LABEL3(" prim prim-c-name 2@ type ." )" cr
       ." DO_GOTO;" cr ;
   
 : output-c-tail1 { xt -- }  : output-c-tail1 { xt -- }
     \ the final part of the generated C code, with xt printing LABEL2 or not.      \ the final part of the generated C code, with xt printing LABEL2 or not.
     output-super-end      output-super-end
     print-debug-results      print-debug-results
     ." NEXT_P1;" cr      output-nextp1
       stack-pointer-updates2
     stores      stores
     fill-tos       fill-state 
     xt execute ;      xt execute ;
   
   : output-c-vm-jump-tail ( -- )
       \ !! this functionality not yet implemented for superinstructions
       output-super-end
       print-debug-results
       stores
       fill-state 
       ." LABEL2(" prim prim-c-name 2@ type ." )" cr
       ." LABEL3(" prim prim-c-name 2@ type ." )" cr
       ." DO_GOTO;" cr ;
   
 : output-c-tail1-no-stores { xt -- }  : output-c-tail1-no-stores { xt -- }
     \ the final part of the generated C code for combinations      \ the final part of the generated C code for combinations
     output-super-end      output-super-end
     ." NEXT_P1;" cr      output-nextp1
     fill-tos       fill-state 
     xt execute ;      xt execute ;
   
 : output-c-tail ( -- )  : output-c-tail ( -- )
     ['] noop output-c-tail1 ;      tail-nextp2 @ output-c-tail1 ;
   
 : output-c-tail2 ( -- )  : output-c-tail2 ( -- )
     ['] output-label2 output-c-tail1 ;      prim prim-c-code 2@ s" VM_JUMP(" search nip nip if
           output-c-vm-jump-tail
       else
           ['] output-label2 output-c-tail1
       endif ;
   
 : output-c-tail-no-stores ( -- )  : output-c-tail-no-stores ( -- )
     ['] noop output-c-tail1-no-stores ;      tail-nextp2 @ output-c-tail1-no-stores ;
   
 : output-c-tail2-no-stores ( -- )  : output-c-tail2-no-stores ( -- )
     ['] output-label2 output-c-tail1-no-stores ;      ['] output-label2 output-c-tail1-no-stores ;
Line 775  stack inst-stream IP Cell Line 1075  stack inst-stream IP Cell
   
 : print-entry ( -- )  : print-entry ( -- )
     ." LABEL(" prim prim-c-name 2@ type ." )" ;      ." LABEL(" prim prim-c-name 2@ type ." )" ;
       
 : output-c ( -- )   : prim-type ( addr u -- )
     print-entry ."  /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr      \ print out a primitive, but avoid "*/"
       2dup s" */" search  nip nip  IF
           bounds ?DO  I c@ dup '* = IF  drop 'x  THEN  emit  LOOP
       ELSE  type  THEN ;
   
   : output-c ( -- )
       print-entry ."  /* " prim prim-name 2@ prim-type
       ."  ( " prim prim-stack-string 2@ type ." ) "
       state-in .state ." -- " state-out .state ."  */" cr
     ." /* " prim prim-doc 2@ type ."  */" cr      ." /* " prim prim-doc 2@ type ."  */" cr
     ." NAME(" quote prim prim-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
     ." NEXT_P0;" cr      output-nextp0
     flush-tos      spill-state
     fetches      fetches
     print-debug-args      print-debug-args
     stack-pointer-updates      stack-pointer-updates
Line 846  stack inst-stream IP Cell Line 1154  stack inst-stream IP Cell
     endif      endif
     ." }" cr ;      ." }" cr ;
   
   : prim-branch? { prim -- f }
       \ true if prim is a branch or super-end
       prim prim-c-code 2@  s" SET_IP" search nip nip 0<> ;
   
 : output-superend ( -- )  : output-superend ( -- )
     \ output flag specifying whether the current word ends a dynamic superinst      \ output flag specifying whether the current word ends a dynamic superinst
     prim prim-c-code 2@  s" SET_IP"    search nip nip      prim prim-branch?
     prim prim-c-code 2@  s" SUPER_END" search nip nip or 0<>      prim prim-c-code 2@  s" SUPER_END" search nip nip 0<> or
     prim prim-c-code 2@  s" SUPER_CONTINUE" search nip nip 0= and      prim prim-c-code 2@  s" SUPER_CONTINUE" search nip nip 0= and
     negate 0 .r ." , /* " prim prim-name 2@ type ."  */" cr ;      negate 0 .r ." , /* " prim prim-name 2@ prim-type ."  */" cr ;
   
 : gen-arg-parm { item -- }  : gen-arg-parm { item -- }
     item item-stack @ inst-stream = if      item item-stack @ inst-stream = if
Line 873  stack inst-stream IP Cell Line 1185  stack inst-stream IP Cell
   
 : output-gen ( -- )  : output-gen ( -- )
     \ generate C code for generating VM instructions      \ generate C code for generating VM instructions
     ." void gen_" prim prim-c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr      ." void gen_" prim prim-c-name 2@ type ." ("
       threaded-code-pointer-type 2@ type ." ctp" gen-args-parm ." )" cr
     ." {" cr      ." {" cr
     ."   gen_inst(ctp, vm_prim[" function-number @ 0 .r ." ]);" cr      ."   gen_inst(ctp, " function-number @ 0 .r ." );" cr
     gen-args-gen      gen-args-gen
     ." }" cr ;      ." }" cr ;
   
Line 902  stack inst-stream IP Cell Line 1215  stack inst-stream IP Cell
 \      data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN  \      data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN
 \      fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN  \      fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN
 \      return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN  \      return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN
 \      flush-tos  \      spill-state
 \      fetches  \      fetches
 \      stack-pointer-updates  \      stack-pointer-updates
 \      fp-stack   stack-used? IF ." *FP=fp;" cr THEN  \      fp-stack   stack-used? IF ." *FP=fp;" cr THEN
Line 911  stack inst-stream IP Cell Line 1224  stack inst-stream IP Cell
 \      prim prim-c-code 2@ type  \      prim prim-c-code 2@ type
 \      ." }" cr  \      ." }" cr
 \      stores  \      stores
 \      fill-tos  \      fill-state
 \      ." return (sp);" cr  \      ." return (sp);" cr
 \      ." }" cr  \      ." }" cr
 \      cr ;  \      cr ;
Line 922  stack inst-stream IP Cell Line 1235  stack inst-stream IP Cell
 : output-alias ( -- )   : output-alias ( -- ) 
     ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;      ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
   
 : output-c-prim-num ( -- )  defer output-c-prim-num ( -- )
     ." #define N_" prim prim-c-name 2@ type prim prim-num @ 8 + 4 .r cr ;  
   :noname ( -- )
       ." N_" prim prim-c-name 2@ type ." ," cr ;
   is output-c-prim-num
   
 : output-forth ( -- )    : output-forth ( -- )  
     prim prim-forth-code @ 0=      prim prim-forth-code @ 0=
Line 1138  stack inst-stream IP Cell Line 1454  stack inst-stream IP Cell
     compute-max-back-depths      compute-max-back-depths
     output-combined perform ;      output-combined perform ;
   
   \ reprocessing (typically to generate versions for another cache states)
   \ !! use prim-context
   
   variable reprocessed-num 0 reprocessed-num !
   
   : new-name ( -- c-addr u )
       reprocessed-num @ 0
       1 reprocessed-num +!
       <# #s 'p hold '_ hold #> save-mem ;
   
   : reprocess-simple ( prim -- )
       to prim
       new-name prim prim-c-name 2!
       output @ execute ;
   
   : lookup-prim ( c-addr u -- prim )
       primitives search-wordlist 0= -13 and throw execute ;
   
   : state-prim1 { in-state out-state prim -- }
       in-state out-state state-default dup d= ?EXIT
       in-state state-enabled? out-state state-enabled? and 0= ?EXIT
       in-state  to state-in
       out-state to state-out
       prim reprocess-simple ;
   
   : state-prim ( in-state out-state "name" -- )
       parse-word lookup-prim state-prim1 ;
   
   \ reprocessing with default states
   
   \ This is a simple scheme and should be generalized
   \ assumes we only cache one stack and use simple states for that
   
   0 value cache-stack  \ stack that we cache
   2variable cache-states \ states of the cache, starting with the empty state
   
   : compute-default-state-out ( n-in -- n-out )
       \ for the current prim
       cache-stack stack-in @ - 0 max
       cache-stack stack-prim-stacks-sync @ if
           drop 0
       endif
       cache-stack stack-out @ + cache-states 2@ nip 1- min ;
   
   : gen-prim-states ( prim -- )
       to prim
       cache-states 2@ swap { states } ( nstates )
       cache-stack stack-in @ +do
           states i th @
           states i compute-default-state-out th @
           prim state-prim1
       loop ;
   
   : prim-states ( "name" -- )
       parse-word lookup-prim gen-prim-states ;
   
   : gen-branch-states ( prim -- )
       \ generate versions that produce state-default; useful for branches
       to prim
       cache-states 2@ swap { states } ( nstates )
       cache-stack stack-in @ +do
           states i th @ state-default prim state-prim1
       loop ;
   
   : branch-states ( out-state "name" -- )
       parse-word lookup-prim gen-branch-states ;
   
   \ producing state transitions
   
   : gen-transitions ( "name" -- )
       parse-word lookup-prim { prim }
       cache-states 2@ { states nstates }
       nstates 0 +do
           nstates 0 +do
               i j <> if
                   states i th @ states j th @ prim state-prim1
               endif
           loop
       loop ;
   
 \ C output  \ C output
   
 : print-item { n stack -- }  : print-item { n stack -- }
     \ print nth stack item name      \ print nth stack item name
     stack stack-type @ type-c-name 2@ type space      stack stack-type @ type-c-name 2@ type space
     ." _" stack stack-pointer 2@ type n 0 .r ;      ." MAYBE_UNUSED _" stack stack-pointer 2@ type n 0 .r ;
   
 : print-declarations-combined ( -- )  : print-declarations-combined ( -- )
     max-stacks 0 ?do      max-stacks 0 ?do
Line 1166  stack inst-stream IP Cell Line 1562  stack inst-stream IP Cell
     r> in-part ! ;      r> in-part ! ;
   
 : part-stack-pointer-updates ( -- )  : part-stack-pointer-updates ( -- )
     max-stacks 0 +do      next-stack-number @ 0 +do
         i part-num @ 1+ s-c-max-depth @ dup          i part-num @ 1+ s-c-max-depth @ dup
         i num-combined @ s-c-max-depth @ =    \ final depth          i num-combined @ s-c-max-depth @ =    \ final depth
         swap i part-num @ s-c-max-depth @ <> \ just reached now          swap i part-num @ s-c-max-depth @ <> \ just reached now
Line 1178  stack inst-stream IP Cell Line 1574  stack inst-stream IP Cell
   
 : output-part ( p -- )  : output-part ( p -- )
     to prim      to prim
     ." /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr      ." /* " prim prim-name 2@ prim-type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
     ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging      ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
     ." {" cr      ." {" cr
     print-declarations      print-declarations
Line 1205  stack inst-stream IP Cell Line 1601  stack inst-stream IP Cell
     ." {" cr      ." {" cr
     ." DEF_CA" cr      ." DEF_CA" cr
     print-declarations-combined      print-declarations-combined
     ." NEXT_P0;" cr      output-nextp0
     flush-tos      spill-state
     \ fetches \ now in parts      \ fetches \ now in parts
     \ print-debug-args      \ print-debug-args
     \ stack-pointer-updates now in parts      \ stack-pointer-updates now in parts
Line 1245  stack inst-stream IP Cell Line 1641  stack inst-stream IP Cell
 \ This is intended as initializer for a structure like this  \ This is intended as initializer for a structure like this
   
 \  struct cost {  \  struct cost {
 \    int loads;       /* number of stack loads */  \    char loads;       /* number of stack loads */
 \    int stores;      /* number of stack stores */  \    char stores;      /* number of stack stores */
 \    int updates;     /* number of stack pointer updates */  \    char updates;     /* number of stack pointer updates */
 \    int length;      /* number of components */  \    char branch;      /* is it a branch (SET_IP) */
 \    int *components; /* array of vm_prim indexes of components */  \    char state_in;    /* state on entry */
   \    char state_out;   /* state on exit */
   \    short offset;     /* offset into super2 table */
   \    char length;      /* number of components */
 \  };  \  };
   
 \ How do you know which primitive or combined instruction this  \ How do you know which primitive or combined instruction this
 \ structure refers to?  By the order of cost structures, as in most  \ structure refers to?  By the order of cost structures, as in most
 \ other cases.  \ other cases.
   
   : super2-length ( -- n )
       combined if
           num-combined @
       else
           1
       endif ;
   
 : compute-costs { p -- nloads nstores nupdates }  : compute-costs { p -- nloads nstores nupdates }
     \ compute the number of loads, stores, and stack pointer updates      \ compute the number of loads, stores, and stack pointer updates
     \ of a primitive or combined instruction; does not take TOS      \ of a primitive or combined instruction; does not take TOS
     \ caching into account, nor that IP updates are combined with      \ caching into account
     \ other stuff  
     0 max-stacks 0 +do      0 max-stacks 0 +do
         p prim-stacks-in i th @ +          p prim-stacks-in i th @ +
     loop      loop
       super2-length 1- - \ don't count instruction fetches of subsumed insts
     0 max-stacks 0 +do      0 max-stacks 0 +do
         p prim-stacks-out i th @ +          p prim-stacks-out i th @ +
     loop      loop
     0 max-stacks 0 +do      0 max-stacks 1 +do \ don't count ip updates, therefore "1 +do"
         p prim-stacks-in i th @ p prim-stacks-out i th @ <> -          p prim-stacks-in i th @ p prim-stacks-out i th @ <> -
     loop ;      loop ;
   
 : output-num-part ( p -- )  : output-num-part ( p -- )
     prim-num @ 4 .r ." ," ;      ." N_" prim-c-name-orig 2@ type ." ," ;
       \ prim-num @ 4 .r ." ," ;
   
   : output-name-comment ( -- )
       ."  /* " prim prim-name 2@ prim-type ."  */" ;
   
   variable offset-super2  0 offset-super2 ! \ offset into the super2 table
   
 : output-costs ( -- )  : output-costs-prefix ( -- )
     ." {" prim compute-costs      ." {" prim compute-costs
     rot 2 .r ." ," swap 2 .r ." ," 2 .r ." ,"      rot 2 .r ." ," swap 2 .r ." ," 2 .r ." , "
     combined if      prim prim-branch? negate . ." ,"
         num-combined @ 2 .r      state-in  state-number @ 2 .r ." ,"
         ." , ((int []){" ['] output-num-part map-combined ." })}, /* "      state-out state-number @ 2 .r ." ,"
     else      inst-stream stack-in @ 1 .r ." ,"
         ."  1, ((int []){" prim prim-num @ 4 .r ." })}, /* "  ;
     endif  
     prim prim-name 2@ type ."  */"  : output-costs-gforth-simple ( -- )
       output-costs-prefix
       prim output-num-part
       1 2 .r ." },"
       output-name-comment
     cr ;      cr ;
   
   : output-costs-gforth-combined ( -- )
       output-costs-prefix
       ." N_START_SUPER+" offset-super2 @ 5 .r ." ,"
       super2-length dup 2 .r ." }," offset-super2 +!
       output-name-comment
       cr ;
   
   \  : output-costs ( -- )
   \      \ description of superinstructions and simple instructions
   \      ." {" prim compute-costs
   \      rot 2 .r ." ," swap 2 .r ." ," 2 .r ." ,"
   \      offset-super2 @ 5 .r ." ,"
   \      super2-length dup 2 .r ." ," offset-super2 +!
   \      inst-stream stack-in @ 1 .r ." },"
   \      output-name-comment
   \      cr ;
   
   : output-super2-simple ( -- )
       prim prim-c-name 2@ prim prim-c-name-orig 2@ d= if
           prim output-num-part
           output-name-comment
           cr
       endif ;   
     
   : output-super2-combined ( -- )
       ['] output-num-part map-combined 
       output-name-comment
       cr ;   
   
 \ the parser  \ the parser
   
 eof-char max-member \ the whole character set + EOF  eof-char max-member \ the whole character set + EOF
Line 1310  print-token ! Line 1755  print-token !
  getinput member? ;   getinput member? ;
 ' testchar? test-vector !  ' testchar? test-vector !
   
 : checksyncline ( -- )  : checksynclines ( -- )
     \ when input points to a newline, check if the next line is a      \ when input points to a newline, check if the next line is a
     \ sync line.  If it is, perform the appropriate actions.      \ sync line.  If it is, perform the appropriate actions.
     rawinput @ >r      rawinput @ begin >r
     s" #line " r@ over compare if          s" #line " r@ over compare if
         rdrop 1 line +! EXIT              rdrop 1 line +! EXIT
     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] " <> 0= s" sync line syntax" ?print-error              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 <> 0= s" sync line syntax" ?print-error          dup c@ nl-char <> 0= s" sync line syntax" ?print-error
     skipsynclines @ if          skipsynclines @ if
         dup char+ rawinput !              char+ dup rawinput !
         rawinput @ c@ cookedinput @ c!              rawinput @ c@ cookedinput @ c!
     endif          endif
     drop ;      again ;
   
 : ?nextchar ( f -- )  : ?nextchar ( f -- )
     s" syntax error, wrong char" ?print-error      s" syntax error, wrong char" ?print-error
Line 1337  print-token ! Line 1782  print-token !
         1 chars rawinput +!          1 chars rawinput +!
         1 chars cookedinput +!          1 chars cookedinput +!
         nl-char = if          nl-char = if
             checksyncline              checksynclines
             rawinput @ line-start !              rawinput @ line-start !
         endif          endif
         rawinput @ c@ cookedinput @ c!          rawinput @ c@
           cookedinput @ c!
     endif ;      endif ;
   
 : charclass ( set "name" -- )  : charclass ( set "name" -- )
Line 1376  nl-char singleton eof-char over add-memb Line 1822  nl-char singleton eof-char over add-memb
 (( letter (( letter || digit )) **  (( letter (( letter || digit )) **
 )) <- c-ident ( -- )  )) <- c-ident ( -- )
   
 (( ` # ?? (( letter || digit || ` : )) ++  (( ` . ` . ` .
   )) <- sync-stack ( -- )
   
   (( ` # ?? (( letter || digit || ` : )) ++ sync-stack ??
   || sync-stack
 )) <- stack-ident ( -- )  )) <- stack-ident ( -- )
   
 (( nowhitebq nowhite ** ))  (( nowhitebq nowhite ** ))
Line 1398  Variable c-flag Line 1848  Variable c-flag
 )) <- c-comment ( -- )  )) <- c-comment ( -- )
   
 (( ` - nonl ** {{   (( ` - nonl ** {{ 
         forth-flag @ IF ." [ELSE]" cr THEN          forth-flag @ IF forth-fdiff ." [ELSE]" cr THEN
         c-flag @ IF ." #else" cr THEN }}          c-flag @ IF
               function-diff
               ." #else /* " function-number @ 0 .r ."  */" cr THEN }}
 )) <- else-comment  )) <- else-comment
   
 (( ` + {{ start }} nonl ** {{ end  (( ` + {{ start }} nonl ** {{ end
         dup          dup
         IF      c-flag @          IF      c-flag @
                 IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr              IF
                   function-diff
                   ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr
                 THEN                  THEN
                 forth-flag @                  forth-flag @
                 IF  ." has? " type ."  [IF]"  cr THEN                  IF  forth-fdiff  ." has? " type ."  [IF]"  cr THEN
         ELSE    2drop          ELSE    2drop
             c-flag @      IF  ." #endif"  cr THEN              c-flag @      IF
             forth-flag @  IF  ." [THEN]"  cr THEN                  function-diff  ." #endif" cr THEN
               forth-flag @  IF  forth-fdiff  ." [THEN]"  cr THEN
         THEN }}          THEN }}
 )) <- if-comment  )) <- if-comment
   
 (( (( ` g || ` G )) {{ start }} nonl **  (( (( ` g || ` G )) {{ start }} nonl **
    {{ end     {{ end
       forth-flag @ IF  ." group " type cr  THEN        forth-flag @ IF  forth-fdiff  ." group " type cr  THEN
       c-flag @     IF  ." GROUP(" type ." )" cr  THEN }}        c-flag @     IF  function-diff
             ." GROUP(" type ." , " function-number @ 0 .r ." )" cr  THEN }}
 )) <- group-comment  )) <- group-comment
   
 (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment || group-comment )) ?? nonl ** )) <- comment-body  (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment || group-comment )) ?? nonl ** )) <- comment-body
   
 (( ` \ comment-body nleof )) <- comment ( -- )  (( ` \ comment-body nleof )) <- comment ( -- )
   
 (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **  (( {{ start }} stack-ident {{ end init-item1 }} white ** )) **
 <- stack-items  <- stack-items ( addr1 -- addr2 )
   
 (( {{ prim prim-effect-in }}  stack-items {{ prim prim-effect-in-end ! }}  (( {{ prim prim-effect-in }}  stack-items {{ prim prim-effect-in-end ! }}
    ` - ` - white **     ` - ` - white **
    {{ prim prim-effect-out }} stack-items {{ prim prim-effect-out-end ! }}     {{ prim prim-effect-out }} stack-items {{ prim prim-effect-out-end ! }}
 )) <- stack-effect ( -- )  )) <- stack-effect ( -- )
   
 (( {{ prim create-prim }}  (( {{ prim create-prim prim init-simple }}
    ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **     ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
    (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **     (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
       (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??        (( {{ start }}  c-ident {{ end 2dup prim-c-name-2! }} )) ??
    )) ??  nleof     )) ??  nleof
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??
    {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }}     {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }}
Line 1458  Variable c-flag Line 1914  Variable c-flag
       line @ name-line ! filename 2@ name-filename 2!        line @ name-line ! filename 2@ name-filename 2!
       function-number @ prim prim-num !        function-number @ prim prim-num !
       start }} [ifdef] vmgen c-ident [else] forth-ident [then] {{ end        start }} [ifdef] vmgen c-ident [else] forth-ident [then] {{ end
       2dup prim prim-name 2! prim prim-c-name 2! }}  white **        2dup prim prim-name 2! prim-c-name-2! }}  white **
    (( ` / white ** {{ start }} c-ident {{ end prim prim-c-name 2! }} white ** )) ??     (( ` / white ** {{ start }} c-ident {{ end prim-c-name-2! }} white ** )) ??
    (( simple-primitive || combined-primitive )) {{ 1 function-number +! }}     (( simple-primitive || combined-primitive ))
      {{ 1 function-number +! }}
 )) <- primitive ( -- )  )) <- primitive ( -- )
   
 (( (( comment || primitive || nl white ** )) ** eof ))  (( (( comment || primitive || nl white ** )) ** eof ))
Line 1485  warnings @ [IF] Line 1942  warnings @ [IF]
     \ process the string at addr u      \ process the string at addr u
     over dup rawinput ! dup line-start ! cookedinput !      over dup rawinput ! dup line-start ! cookedinput !
     + endrawinput !      + endrawinput !
     checksyncline      checksynclines
     primitives2something ;          primitives2something ;    
   
   : unixify ( c-addr u1 -- c-addr u2 )
       \ delete crs from the string
       bounds tuck tuck ?do ( c-addr1 )
           i c@ dup #cr <> if
               over c! char+
           else
               drop
           endif
       loop
       over - ;
   
 : process-file ( addr u xt-simple x-combined -- )  : process-file ( addr u xt-simple x-combined -- )
     output-combined ! output !      output-combined ! output !
     save-mem 2dup filename 2!      save-mem 2dup filename 2!
     slurp-file      slurp-file unixify
     warnings @ if      warnings @ if
         ." ------------ CUT HERE -------------" cr  endif          ." ------------ CUT HERE -------------" cr  endif
     primfilter ;      primfilter ;

Removed from v.1.122  
changed lines
  Added in v.1.166


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