[gforth] / gforth / prims2x.fs  

gforth: gforth/prims2x.fs

Diff for /gforth/prims2x.fs between version 1.135 and 1.145

version 1.135, Sat Mar 22 10:04:07 2003 UTC version 1.145, Thu Oct 9 20:25:59 2003 UTC
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
   
 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 181 
Line 188 
     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-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 262 
Line 290 
 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 322 
Line 353 
 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 337 
Line 375 
 \ stack access stuff  \ stack access stuff
   
 : normal-stack-access0 { n stack -- }  : normal-stack-access0 { n stack -- }
       \ n has the ss-offset already applied (see ...-access1)
     n stack stack-access-transform @ execute ." [" 0 .r ." ]" ;      n stack stack-access-transform @ execute ." [" 0 .r ." ]" ;
   
 : normal-stack-access1 { n stack -- }  : state-ss { stack state -- ss }
     stack stack-pointer 2@ type      state state-sss stack stack-number @ th @ ;
     n if  
         n stack normal-stack-access0  : 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
         ." 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 377 
Line 433 
     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 391 
Line 447 
     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 401 
Line 457 
     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 409 
Line 465 
     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 460 
Line 516 
  rdrop ;   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 472 
Line 528 
     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 0= and \  in in memory?
             ." IF_" r@ item-stack @ stack-pointer 2@ type      item item-out-index stack state-out stack-reg 0= and \ out in memory?
             ." 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 600 
Line 653 
 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 latestxt >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 }
       next-state-number @ s state-number ! 1 next-state-number +!
       max-stacks 0 ?do
           default-ss s state-sss i th !
       loop ;
   
   : 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 644 
Line 744 
     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 stack normal-stack-access0 ."  = " 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 { stack -- }
       \ spill regs of state-in that are not used by prim and are not in state-out
       stack state-in stack-offset { offset }
       stack state-in stack-state-items ( items )
       dup stack unused-stack-items - - +do
           \ 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 ;
   
 : fill-a-tos { stack -- }  : spill-state ( -- )
     stack stack-out @ 0= stack stack-in @ 0<> and      ['] spill-stack map-stacks1 ;
     if  
         ." IF_" stack stack-pointer 2@ 2dup type ." TOS("  : fill-stack { stack -- }
         2dup type ." TOS = " type 0 stack normal-stack-access0 ." );" cr      stack state-out stack-offset { offset }
     endif ;      stack state-out stack-state-items ( items )
       dup stack unused-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 671 
Line 787 
 : 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 ;
   
   : reg-reg-move ( reg-from reg-to -- )
       2dup = if
           2drop
       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 )  : stack-update-transform ( n1 stack -- n2 )
     \ n2 is the number by which the stack pointer should be      \ n2 is the number by which the stack pointer should be
     \ incremented to pop n1 items      \ incremented to pop n1 items
Line 678 
Line 827 
     0 r> execute - ;      0 r> execute - ;
   
 : stack-pointer-update { stack -- }  : stack-pointer-update { stack -- }
       \ and moves
     \ stacks grow downwards      \ stacks grow downwards
     stack stack-diff      stack stack-diff ( in-out )
       stack state-in  stack-offset -
       stack state-out stack-offset + ( [in-in_offset]-[out-out_offset] )
     ?dup-if \ this check is not necessary, gcc would do this for us      ?dup-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(" 0 .r ." );" cr
Line 687 
Line 839 
             stack stack-pointer 2@ type ."  += "              stack stack-pointer 2@ type ."  += "
             stack stack-update-transform 0 .r ." ;" cr              stack stack-update-transform 0 .r ." ;" cr
         endif          endif
     endif ;      endif
       stack stack-moves ;
   
 : stack-pointer-updates ( -- )  : stack-pointer-updates ( -- )
     ['] stack-pointer-update map-stacks ;      ['] stack-pointer-update map-stacks ;
Line 734 
Line 887 
     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 ( -- )  : output-nextp2 ( -- )
     ." NEXT_P2;" cr ;      ." NEXT_P2;" cr ;
   
Line 748 
Line 912 
     \ 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
     stores      stores
     fill-tos      fill-state
     xt execute ;      xt execute ;
   
 : 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 ( -- )
Line 799 
Line 963 
     ." {" 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 862 
Line 1026 
     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@ type ."  */" cr ;
   
Line 918 
Line 1086 
 \      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 927 
Line 1095 
 \      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 939 
Line 1107 
     ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;      ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
   
 : output-c-prim-num ( -- )  : output-c-prim-num ( -- )
     ." #define N_" prim prim-c-name 2@ type prim prim-num @ 8 + 4 .r cr ;      ." N_" prim prim-c-name 2@ type ." ," cr ;
   
 : output-forth ( -- )  : output-forth ( -- )
     prim prim-forth-code @ 0=      prim prim-forth-code @ 0=
Line 1154 
Line 1322 
     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  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-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 1221 
Line 1465 
     ." {" 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 1264 
Line 1508 
 \    int loads;       /* number of stack loads */  \    int loads;       /* number of stack loads */
 \    int stores;      /* number of stack stores */  \    int stores;      /* number of stack stores */
 \    int updates;     /* number of stack pointer updates */  \    int updates;     /* number of stack pointer updates */
   \    int offset;      /* offset into super2 table */
 \    int length;      /* number of components */  \    int length;      /* number of components */
 \    int *components; /* array of vm_prim indexes 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 2@ type ." ," ;
       \ prim-num @ 4 .r ." ," ;
   
   : output-name-comment ( -- )
       ."  /* " prim prim-name 2@ type ."  */" ;
   
   variable offset-super2  0 offset-super2 ! \ offset into the super2 table
   
   : output-costs-prefix ( -- )
       ." {" prim compute-costs
       rot 2 .r ." ," swap 2 .r ." ," 2 .r ." , "
       prim prim-branch? negate . ." ,"
       state-in  state-number @ 2 .r ." ,"
       state-out state-number @ 2 .r ." ," ;
   
   : output-costs-gforth-simple ( -- )
       output-costs-prefix
       prim output-num-part
       1 2 .r ." },"
       output-name-comment
       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 ( -- )  : output-costs ( -- )
       \ description of superinstructions and simple instructions
     ." {" prim compute-costs      ." {" prim compute-costs
     rot 2 .r ." ," swap 2 .r ." ," 2 .r ." ,"      rot 2 .r ." ," swap 2 .r ." ," 2 .r ." ,"
       offset-super2 @ 5 .r ." ,"
       super2-length dup 2 .r ." }," offset-super2 +!
       output-name-comment
       cr ;
   
   : output-super2 ( -- )
       \ table of superinstructions without requirement for existing prefixes
     combined if      combined if
         num-combined @ 2 .r          ['] output-num-part map-combined
         ." , ((int []){" ['] output-num-part map-combined ." })}, /* "  
     else      else
         ."  1, ((int []){" prim prim-num @ 4 .r ." })}, /* "          prim output-num-part
     endif      endif
     prim prim-name 2@ type ."  */"      output-name-comment
     cr ;      cr ;
   
 \ the parser  \ the parser
Line 1415 
Line 1700 
 )) <- 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 ." , " function-number @ 0 .r ." )" 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
Line 1477 
Line 1768 
       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 prim-c-name 2! }}  white **
    (( ` / white ** {{ start }} c-ident {{ end prim prim-c-name 2! }} white ** )) ??     (( ` / white ** {{ start }} c-ident {{ end prim 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 ))

Generate output suitable for use with a patch program
Legend:
Removed from v.1.135  
changed lines
  Added in v.1.145
CVS Admin

Powered by ViewCVS 1.0-dev 		(Powered by ViewCVS)

ViewCVS and CVS Help