version 1.108, 2002/08/09 09:42:35
|
version 1.126, 2002/12/31 14:50:53
|
Line 60 include startup.fs
|
Line 60 include startup.fs
|
: struct% struct ; \ struct is redefined in gray |
: struct% struct ; \ struct is redefined in gray |
|
|
warnings off |
warnings off |
|
\ warnings on |
|
|
include ./gray.fs |
include ./gray.fs |
|
|
32 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). |
4 constant max-stacks \ the max. number of stacks (including inst-stream). |
255 constant maxchar |
255 constant maxchar |
Line 78 variable line-start \ pointer to start o
|
Line 78 variable line-start \ pointer to start o
|
0 line ! |
0 line ! |
2variable filename \ filename of original input file |
2variable filename \ filename of original input file |
0 0 filename 2! |
0 0 filename 2! |
|
2variable out-filename \ filename of the output file (for sync lines) |
|
0 0 out-filename 2! |
2variable f-comment |
2variable f-comment |
0 0 f-comment 2! |
0 0 f-comment 2! |
variable skipsynclines \ are sync lines ("#line ...") invisible to the parser? |
variable skipsynclines \ are sync lines ("#line ...") invisible to the parser? |
skipsynclines on |
skipsynclines on |
|
variable out-nls \ newlines in output (for output sync lines) |
|
0 out-nls ! |
|
variable store-optimization \ use store optimization? |
|
store-optimization off |
|
|
|
variable include-skipped-insts |
|
\ does the threaded code for a combined instruction include the cells |
|
\ for the component instructions (true) or only the cells for the |
|
\ inline arguments (false) |
|
include-skipped-insts off |
|
|
|
variable immarg \ values for immediate arguments (to be used in IMM_ARG macros) |
|
$12340000 immarg ! |
|
|
: th ( addr1 n -- addr2 ) |
: th ( addr1 n -- addr2 ) |
cells + ; |
cells + ; |
Line 121 skipsynclines on
|
Line 136 skipsynclines on
|
0 |
0 |
recover endtry |
recover endtry |
r> to outfile-id throw |
r> to outfile-id throw |
abort |
1 (bye) \ abort |
endif ; |
endif ; |
|
|
: quote ( -- ) |
: quote ( -- ) |
[char] " emit ; |
[char] " emit ; |
|
|
|
\ count output lines to generate sync lines for output |
|
|
|
: count-nls ( addr u -- ) |
|
bounds u+do |
|
i c@ nl-char = negate out-nls +! |
|
loop ; |
|
|
|
:noname ( addr u -- ) |
|
2dup count-nls |
|
defers type ; |
|
is type |
|
|
variable output \ xt ( -- ) of output word for simple primitives |
variable output \ xt ( -- ) of output word for simple primitives |
variable output-combined \ xt ( -- ) of output word for combined primitives |
variable output-combined \ xt ( -- ) of output word for combined primitives |
|
|
Line 135 struct%
|
Line 162 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 170 create stacks max-stacks cells allot \ a
|
Line 198 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 |
|
next-stack-number @ 0 +do |
|
stacks i th @ xt execute |
|
loop ; |
|
|
|
: map-stacks1 { xt -- } |
\ perform xt for all stacks except inst-stream |
\ perform xt 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 |
Line 227 end-struct prim%
|
Line 263 end-struct prim%
|
variable in-part \ true if processing a part |
variable in-part \ true if processing a part |
in-part off |
in-part off |
|
|
|
: prim-context ( ... p xt -- ... ) |
|
\ execute xt with prim set to p |
|
prim >r |
|
swap to prim |
|
catch |
|
r> to prim |
|
throw ; |
|
|
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 |
|
variable part-num \ current part number during process-combined |
|
|
|
: map-combined { xt -- } |
|
\ perform xt for all components of the current combined instruction |
|
num-combined @ 0 +do |
|
combined-prims i th @ xt execute |
|
loop ; |
|
|
table constant combinations |
table constant combinations |
\ the keys are the sequences of pointers to primitives |
\ the keys are the sequences of pointers to primitives |
Line 238 create current-depth max-stacks cells al
|
Line 289 create current-depth max-stacks cells al
|
create max-depth max-stacks cells allot |
create max-depth max-stacks cells allot |
create min-depth max-stacks cells allot |
create min-depth max-stacks cells allot |
|
|
|
create sp-update-in max-stacks cells allot |
|
\ where max-depth occured the first time |
|
create max-depths max-stacks max-combined 1+ * cells allot |
|
\ maximum depth at start of each part: array[parts] of array[stack] |
|
create max-back-depths max-stacks max-combined 1+ * cells allot |
|
\ maximun depth from end of the combination to the start of the each part |
|
|
|
: s-c-max-depth ( nstack ncomponent -- addr ) |
|
max-stacks * + cells max-depths + ; |
|
|
|
: s-c-max-back-depth ( nstack ncomponent -- addr ) |
|
max-stacks * + cells max-back-depths + ; |
|
|
wordlist constant primitives |
wordlist constant primitives |
|
|
: create-prim ( prim -- ) |
: create-prim ( prim -- ) |
Line 267 Variable function-number 0 function-numb
|
Line 331 Variable function-number 0 function-numb
|
: complement ( set1 -- set2 ) |
: complement ( set1 -- set2 ) |
empty ['] bit-equivalent binary-set-operation ; |
empty ['] bit-equivalent binary-set-operation ; |
|
|
|
\ forward declaration for inst-stream (breaks cycle in definitions) |
|
defer inst-stream-f ( -- stack ) |
|
|
\ stack access stuff |
\ stack access stuff |
|
|
|
: normal-stack-access0 { n stack -- } |
|
n stack stack-access-transform @ execute ." [" 0 .r ." ]" ; |
|
|
|
: normal-stack-access1 { n stack -- } |
|
stack stack-pointer 2@ type |
|
n if |
|
n stack normal-stack-access0 |
|
else |
|
." TOS" |
|
endif ; |
|
|
: normal-stack-access ( n stack -- ) |
: normal-stack-access ( n stack -- ) |
stack-pointer 2@ type |
dup inst-stream-f = if |
dup |
." IMM_ARG(" normal-stack-access1 ." ," immarg ? ." )" |
if |
1 immarg +! |
." [" 0 .r ." ]" |
|
else |
else |
drop ." TOS" |
normal-stack-access1 |
endif ; |
endif ; |
|
|
\ forward declaration for inst-stream (breaks cycle in definitions) |
: stack-depth { stack -- n } |
defer inst-stream-f ( -- stack ) |
current-depth stack stack-number @ th @ ; |
|
|
: part-stack-access { n stack -- } |
: part-stack-access { n stack -- } |
\ print _<stack><x>, x=inst-stream? n : maxdepth-currentdepth-n-1 |
\ print _<stack><x>, x=inst-stream? n : maxdepth-currentdepth-n-1 |
." _" stack stack-pointer 2@ type |
." _" stack stack-pointer 2@ type |
stack stack-number @ { stack# } |
stack stack-number @ { stack# } |
current-depth stack# th @ n + { access-depth } |
stack stack-depth n + { access-depth } |
stack inst-stream-f = if |
stack inst-stream-f = if |
access-depth |
access-depth |
else |
else |
Line 295 defer inst-stream-f ( -- stack )
|
Line 372 defer inst-stream-f ( -- stack )
|
endif |
endif |
0 .r ; |
0 .r ; |
|
|
: stack-access ( n stack -- ) |
: part-stack-read { n stack -- } |
|
stack stack-depth n + ( ndepth ) |
|
stack stack-number @ part-num @ s-c-max-depth @ |
|
\ max-depth stack stack-number @ th @ ( ndepth nmaxdepth ) |
|
over <= if ( ndepth ) \ load from memory |
|
stack normal-stack-access |
|
else |
|
drop n stack part-stack-access |
|
endif ; |
|
|
|
: stack-diff ( stack -- n ) |
|
\ in-out |
|
dup stack-in @ swap stack-out @ - ; |
|
|
|
: part-stack-write { n stack -- } |
|
stack stack-depth n + |
|
stack stack-number @ part-num @ s-c-max-back-depth @ |
|
over <= if ( ndepth ) |
|
stack combined ['] stack-diff prim-context - |
|
stack normal-stack-access |
|
else |
|
drop n stack part-stack-access |
|
endif ; |
|
|
|
: stack-read ( n stack -- ) |
\ print a stack access at index n of stack |
\ print a stack access at index n of stack |
in-part @ if |
in-part @ if |
part-stack-access |
part-stack-read |
|
else |
|
normal-stack-access |
|
endif ; |
|
|
|
: stack-write ( n stack -- ) |
|
\ print a stack access at index n of stack |
|
in-part @ if |
|
part-stack-write |
else |
else |
normal-stack-access |
normal-stack-access |
endif ; |
endif ; |
Line 316 defer inst-stream-f ( -- stack )
|
Line 425 defer inst-stream-f ( -- stack )
|
>r |
>r |
." vm_" r@ item-stack-type-name type |
." vm_" r@ item-stack-type-name type |
." 2" r@ item-type @ print-type-prefix ." (" |
." 2" r@ item-type @ print-type-prefix ." (" |
r@ item-in-index r@ item-stack @ stack-access ." ," |
r@ item-in-index r@ item-stack @ stack-read ." ," |
r@ item-name 2@ type |
r@ item-name 2@ type |
." );" cr |
." );" cr |
rdrop ; |
rdrop ; |
Line 327 defer inst-stream-f ( -- stack )
|
Line 436 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-access |
r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-read |
." , " -1 under+ ." (Cell)" stack-access |
." , " -1 under+ ." (Cell)" stack-read |
." , " r@ item-name 2@ type |
." , " r@ item-name 2@ type |
." )" cr |
." )" cr |
rdrop ; |
rdrop ; |
Line 360 defer inst-stream-f ( -- stack )
|
Line 469 defer inst-stream-f ( -- stack )
|
r@ item-type @ print-type-prefix ." 2" |
r@ item-type @ print-type-prefix ." 2" |
r@ item-stack-type-name type ." (" |
r@ item-stack-type-name type ." (" |
r@ item-name 2@ type ." ," |
r@ item-name 2@ type ." ," |
r@ item-out-index r@ item-stack @ stack-access ." );" |
r@ item-out-index r@ item-stack @ stack-write ." );" |
rdrop ; |
rdrop ; |
|
|
: store-single ( item -- ) |
: store-single ( item -- ) |
>r |
>r |
r@ same-as-in? |
store-optimization @ in-part @ 0= and r@ same-as-in? and if |
if |
r@ item-in-index 0= r@ item-out-index 0= xor if |
r@ item-in-index 0= r@ item-out-index 0= xor |
." IF_" r@ item-stack @ stack-pointer 2@ type |
if |
." TOS(" r@ really-store-single ." );" cr |
." IF_" r@ item-stack @ stack-pointer 2@ type |
endif |
." TOS(" r@ really-store-single ." );" cr |
else |
endif |
r@ really-store-single cr |
else |
endif |
r@ really-store-single cr |
rdrop ; |
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 384 defer inst-stream-f ( -- stack )
|
Line 491 defer inst-stream-f ( -- stack )
|
r@ item-type @ print-type-prefix ." 2two" |
r@ item-type @ print-type-prefix ." 2two" |
r@ item-stack-type-name type ." (" |
r@ item-stack-type-name type ." (" |
r@ item-name 2@ type ." , " |
r@ item-name 2@ type ." , " |
r@ item-out-index r@ item-stack @ 2dup stack-access |
r@ item-out-index r@ item-stack @ 2dup stack-write |
." , " -1 under+ stack-access |
." , " -1 under+ stack-write |
." )" cr |
." )" cr |
rdrop ; |
rdrop ; |
|
|
Line 524 stack inst-stream IP Cell
|
Line 631 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 { -- } |
: clear-stack ( stack -- ) |
dup stack-in off stack-out off ; |
dup stack-in off stack-out off ; |
|
|
: compute-offsets ( -- ) |
: compute-offsets ( -- ) |
['] clear-stack map-stacks |
['] clear-stack map-stacks |
inst-stream clear-stack |
|
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 ; |
Line 544 stack inst-stream IP Cell
|
Line 650 stack inst-stream IP Cell
|
stack stack-out @ 0<> stack stack-in @ 0= and |
stack stack-out @ 0<> stack stack-in @ 0= and |
if |
if |
." IF_" stack stack-pointer 2@ 2dup type ." TOS(" |
." IF_" stack stack-pointer 2@ 2dup type ." TOS(" |
2dup type ." [0] = " type ." TOS);" cr |
2dup type 0 stack normal-stack-access0 ." = " type ." TOS);" cr |
endif ; |
endif ; |
|
|
: flush-tos ( -- ) |
: flush-tos ( -- ) |
['] flush-a-tos map-stacks ; |
['] flush-a-tos map-stacks1 ; |
|
|
: fill-a-tos { stack -- } |
: fill-a-tos { stack -- } |
stack stack-out @ 0= stack stack-in @ 0<> and |
stack stack-out @ 0= stack stack-in @ 0<> and |
if |
if |
." IF_" stack stack-pointer 2@ 2dup type ." TOS(" |
." IF_" stack stack-pointer 2@ 2dup type ." TOS(" |
2dup type ." TOS = " type ." [0]);" cr |
2dup type ." TOS = " type 0 stack normal-stack-access0 ." );" cr |
endif ; |
endif ; |
|
|
: fill-tos ( -- ) |
: fill-tos ( -- ) |
\ !! inst-stream for prefetching? |
\ !! inst-stream for prefetching? |
['] fill-a-tos map-stacks ; |
['] fill-a-tos map-stacks1 ; |
|
|
: fetch ( addr -- ) |
: fetch ( addr -- ) |
dup item-type @ type-fetch @ execute ; |
dup item-type @ type-fetch @ execute ; |
Line 567 stack inst-stream IP Cell
|
Line 673 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-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 - ; |
|
|
: stack-pointer-update { stack -- } |
: stack-pointer-update { stack -- } |
\ stack grow downwards |
\ stacks grow downwards |
stack stack-in @ stack stack-out @ - |
stack stack-diff |
?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 stack-pointer 2@ type ." += " 0 .r ." ;" cr |
stack inst-stream = if |
endif ; |
." INC_IP(" 0 .r ." );" cr |
|
else |
: inst-pointer-update ( -- ) |
stack stack-pointer 2@ type ." += " |
inst-stream stack-in @ ?dup-if |
stack stack-update-transform 0 .r ." ;" cr |
." INC_IP(" 0 .r ." );" cr |
endif |
endif ; |
endif ; |
|
|
: stack-pointer-updates ( -- ) |
: stack-pointer-updates ( -- ) |
inst-pointer-update |
|
['] stack-pointer-update map-stacks ; |
['] stack-pointer-update map-stacks ; |
|
|
: store ( item -- ) |
: store ( item -- ) |
Line 625 stack inst-stream IP Cell
|
Line 736 stack inst-stream IP Cell
|
endif |
endif |
2drop ; |
2drop ; |
|
|
: output-c-tail1 ( -- ) |
: output-nextp2 ( -- ) |
\ the final part of the generated C code except LABEL2 and NEXT_P2 |
." NEXT_P2;" cr ; |
|
|
|
variable tail-nextp2 \ xt to execute for printing NEXT_P2 in INST_TAIL |
|
' output-nextp2 tail-nextp2 ! |
|
|
|
: output-label2 ( -- ) |
|
." LABEL2(" prim prim-c-name 2@ type ." )" cr |
|
." NEXT_P2;" cr ; |
|
|
|
: output-c-tail1 { xt -- } |
|
\ 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 |
." NEXT_P1;" cr |
stores |
stores |
fill-tos ; |
fill-tos |
|
xt execute ; |
|
|
|
: output-c-tail1-no-stores { xt -- } |
|
\ the final part of the generated C code for combinations |
|
output-super-end |
|
." NEXT_P1;" cr |
|
fill-tos |
|
xt execute ; |
|
|
: output-c-tail ( -- ) |
: output-c-tail ( -- ) |
\ the final part of the generated C code, without LABEL2 |
tail-nextp2 @ output-c-tail1 ; |
output-c-tail1 |
|
." NEXT_P2;" ; |
|
|
|
: output-c-tail2 ( -- ) |
: output-c-tail2 ( -- ) |
\ the final part of the generated C code, including LABEL2 |
['] output-label2 output-c-tail1 ; |
output-c-tail1 |
|
." LABEL2(" prim prim-c-name 2@ type ." )" cr |
: output-c-tail-no-stores ( -- ) |
." NEXT_P2;" cr ; |
tail-nextp2 @ output-c-tail1-no-stores ; |
|
|
|
: output-c-tail2-no-stores ( -- ) |
|
['] output-label2 output-c-tail1-no-stores ; |
|
|
: type-c-code ( c-addr u xt -- ) |
: type-c-code ( c-addr u xt -- ) |
\ like TYPE, but replaces "TAIL;" with tail code produced by xt |
\ like TYPE, but replaces "INST_TAIL;" with tail code produced by xt |
{ xt } |
{ xt } |
|
." {" cr |
|
." #line " c-line @ . quote c-filename 2@ type quote cr |
begin ( c-addr1 u1 ) |
begin ( c-addr1 u1 ) |
2dup s" TAIL;" search |
2dup s" INST_TAIL;" search |
while ( c-addr1 u1 c-addr3 u3 ) |
while ( c-addr1 u1 c-addr3 u3 ) |
2dup 2>r drop nip over - type |
2dup 2>r drop nip over - type |
xt execute |
xt execute |
2r> 5 /string |
2r> 10 /string |
\ !! resync #line missing |
\ !! resync #line missing |
repeat |
repeat |
2drop type ; |
2drop type |
|
." #line " out-nls @ 2 + . quote out-filename 2@ type quote cr |
|
." }" cr ; |
|
|
: print-entry ( -- ) |
: print-entry ( -- ) |
." LABEL(" prim prim-c-name 2@ type ." ):" ; |
." LABEL(" prim prim-c-name 2@ type ." )" ; |
|
|
: output-c ( -- ) |
: output-c ( -- ) |
print-entry ." /* " prim prim-name 2@ type ." ( " prim prim-stack-string 2@ type ." ) */" cr |
print-entry ." /* " prim prim-name 2@ type ." ( " prim prim-stack-string 2@ type ." ) */" 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 |
." NEXT_P0;" cr |
flush-tos |
flush-tos |
fetches |
fetches |
print-debug-args |
print-debug-args |
stack-pointer-updates |
stack-pointer-updates |
." {" cr |
prim prim-c-code 2@ ['] output-c-tail type-c-code |
." #line " c-line @ . quote c-filename 2@ type quote cr |
output-c-tail2 |
prim prim-c-code 2@ ['] output-c-tail type-c-code |
." }" cr |
." }" cr |
cr |
output-c-tail2 |
|
." }" cr |
|
cr |
|
; |
; |
|
|
: disasm-arg { item -- } |
: disasm-arg { item -- } |
Line 715 stack inst-stream IP Cell
|
Line 846 stack inst-stream IP Cell
|
endif |
endif |
." }" cr ; |
." }" cr ; |
|
|
|
: output-profile-part ( p ) |
|
." add_inst(b, " quote |
|
prim-name 2@ type |
|
quote ." );" cr ; |
|
|
: output-profile-combined ( -- ) |
: output-profile-combined ( -- ) |
\ generate code for postprocessing the VM block profile stuff |
\ generate code for postprocessing the VM block profile stuff |
." if (VM_IS_INST(*ip, " function-number @ 0 .r ." )) {" cr |
." if (VM_IS_INST(*ip, " function-number @ 0 .r ." )) {" cr |
num-combined @ 0 +do |
['] output-profile-part map-combined |
." add_inst(b, " quote |
|
combined-prims i th @ prim-name 2@ type |
|
quote ." );" cr |
|
loop |
|
." ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr |
." ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr |
combined-prims num-combined @ 1- th @ prim-c-code 2@ s" SET_IP" search nip nip |
combined-prims num-combined @ 1- th @ prim-c-code 2@ s" SET_IP" search nip nip |
combined-prims num-combined @ 1- th @ prim-c-code 2@ s" SUPER_END" search nip nip or if |
combined-prims num-combined @ 1- th @ prim-c-code 2@ s" SUPER_END" search nip nip or if |
Line 803 stack inst-stream IP Cell
|
Line 935 stack inst-stream IP Cell
|
\ cr ; |
\ cr ; |
|
|
: output-label ( -- ) |
: output-label ( -- ) |
." INST_ADDR(" prim prim-c-name 2@ type ." )," cr ; |
." INST_ADDR(" prim prim-c-name 2@ type ." )" cr ; |
|
|
: 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 ( -- ) |
|
." #define N_" prim prim-c-name 2@ type prim prim-num @ 8 + 4 .r cr ; |
|
|
: output-forth ( -- ) |
: output-forth ( -- ) |
prim prim-forth-code @ 0= |
prim prim-forth-code @ 0= |
IF \ output-alias |
IF \ output-alias |
Line 919 stack inst-stream IP Cell
|
Line 1054 stack inst-stream IP Cell
|
prim to combined |
prim to combined |
0 num-combined ! |
0 num-combined ! |
current-depth max-stacks cells erase |
current-depth max-stacks cells erase |
|
include-skipped-insts @ current-depth 0 th ! |
max-depth max-stacks cells erase |
max-depth max-stacks cells erase |
min-depth max-stacks cells erase |
min-depth max-stacks cells erase |
prim prim-effect-in prim prim-effect-in-end ! |
prim prim-effect-in prim prim-effect-in-end ! |
Line 930 stack inst-stream IP Cell
|
Line 1066 stack inst-stream IP Cell
|
: min! ( n addr -- ) |
: min! ( n addr -- ) |
tuck @ min swap ! ; |
tuck @ min swap ! ; |
|
|
|
: inst-stream-adjustment ( nstack -- n ) |
|
\ number of stack items to add for each part |
|
0= include-skipped-insts @ and negate ; |
|
|
: add-depths { p -- } |
: add-depths { p -- } |
\ combine stack effect of p with *-depths |
\ combine stack effect of p with *-depths |
max-stacks 0 ?do |
max-stacks 0 ?do |
current-depth i th @ |
current-depth i th @ |
p prim-stacks-in i th @ + |
p prim-stacks-in i th @ + i inst-stream-adjustment + |
dup max-depth i th max! |
dup max-depth i th max! |
p prim-stacks-out i th @ - |
p prim-stacks-out i th @ - |
dup min-depth i th min! |
dup min-depth i th min! |
current-depth i th ! |
current-depth i th ! |
loop ; |
loop ; |
|
|
|
: copy-maxdepths ( n -- ) |
|
max-depth max-depths rot max-stacks * th max-stacks cells move ; |
|
|
: add-prim ( addr u -- ) |
: add-prim ( addr u -- ) |
\ add primitive given by "addr u" to combined-prims |
\ add primitive given by "addr u" to combined-prims |
primitives search-wordlist s" unknown primitive" ?print-error |
primitives search-wordlist s" unknown primitive" ?print-error |
execute { p } |
execute { p } |
p combined-prims num-combined @ th ! |
p combined-prims num-combined @ th ! |
|
num-combined @ copy-maxdepths |
1 num-combined +! |
1 num-combined +! |
p add-depths ; |
p add-depths |
|
num-combined @ copy-maxdepths ; |
|
|
: compute-effects { q -- } |
: compute-effects { q -- } |
\ compute the stack effects of q from the depths |
\ compute the stack effects of q from the depths |
Line 980 stack inst-stream IP Cell
|
Line 1125 stack inst-stream IP Cell
|
i q prim-stacks-out i th @ q prim-effect-out-end make-effect-items |
i q prim-stacks-out i th @ q prim-effect-out-end make-effect-items |
loop ; |
loop ; |
|
|
|
: compute-stack-max-back-depths ( stack -- ) |
|
stack-number @ { stack# } |
|
current-depth stack# th @ dup |
|
dup stack# num-combined @ s-c-max-back-depth ! |
|
-1 num-combined @ 1- -do ( max-depth current-depth ) |
|
combined-prims i th @ { p } |
|
p prim-stacks-out stack# th @ + |
|
dup >r max r> |
|
over stack# i s-c-max-back-depth ! |
|
p prim-stacks-in stack# th @ - |
|
stack# inst-stream-adjustment - |
|
1 -loop |
|
assert( dup stack# inst-stream-adjustment negate = ) |
|
assert( over max-depth stack# th @ = ) |
|
2drop ; |
|
|
|
: compute-max-back-depths ( -- ) |
|
\ compute max-back-depths. |
|
\ assumes that current-depths is correct for the end of the combination |
|
['] compute-stack-max-back-depths map-stacks ; |
|
|
: process-combined ( -- ) |
: process-combined ( -- ) |
combined combined-prims num-combined @ cells |
combined combined-prims num-combined @ cells |
combinations ['] constant insert-wordlist |
combinations ['] constant insert-wordlist |
Line 987 stack inst-stream IP Cell
|
Line 1153 stack inst-stream IP Cell
|
@ prim-c-code 2@ prim prim-c-code 2! \ used by output-super-end |
@ prim-c-code 2@ prim prim-c-code 2! \ used by output-super-end |
prim compute-effects |
prim compute-effects |
prim init-effects |
prim init-effects |
|
compute-max-back-depths |
output-combined perform ; |
output-combined perform ; |
|
|
\ C output |
\ C output |
Line 1012 stack inst-stream IP Cell
|
Line 1179 stack inst-stream IP Cell
|
|
|
: output-combined-tail ( -- ) |
: output-combined-tail ( -- ) |
part-output-c-tail |
part-output-c-tail |
prim >r combined to prim |
|
in-part @ >r in-part off |
in-part @ >r in-part off |
output-c-tail |
combined ['] output-c-tail-no-stores prim-context |
r> in-part ! r> to prim ; |
r> in-part ! ; |
|
|
|
: part-stack-pointer-updates ( -- ) |
|
next-stack-number @ 0 +do |
|
i part-num @ 1+ s-c-max-depth @ dup |
|
i num-combined @ s-c-max-depth @ = \ final depth |
|
swap i part-num @ s-c-max-depth @ <> \ just reached now |
|
part-num @ 0= \ first part |
|
or and if |
|
stacks i th @ stack-pointer-update |
|
endif |
|
loop ; |
|
|
: output-part ( p -- ) |
: output-part ( p -- ) |
to prim |
to prim |
Line 1025 stack inst-stream IP Cell
|
Line 1202 stack inst-stream IP Cell
|
print-declarations |
print-declarations |
part-fetches |
part-fetches |
print-debug-args |
print-debug-args |
|
combined ['] part-stack-pointer-updates prim-context |
|
1 part-num +! |
prim add-depths \ !! right place? |
prim add-depths \ !! right place? |
." {" cr |
|
." #line " c-line @ . quote c-filename 2@ type quote cr |
|
prim prim-c-code 2@ ['] output-combined-tail type-c-code |
prim prim-c-code 2@ ['] output-combined-tail type-c-code |
." }" cr |
|
part-output-c-tail |
part-output-c-tail |
." }" cr ; |
." }" cr ; |
|
|
: output-parts ( -- ) |
: output-parts ( -- ) |
prim >r in-part on |
prim >r in-part on |
current-depth max-stacks cells erase |
current-depth max-stacks cells erase |
num-combined @ 0 +do |
0 part-num ! |
combined-prims i th @ output-part |
['] output-part map-combined |
loop |
|
in-part off |
in-part off |
r> to prim ; |
r> to prim ; |
|
|
Line 1050 stack inst-stream IP Cell
|
Line 1225 stack inst-stream IP Cell
|
print-declarations-combined |
print-declarations-combined |
." NEXT_P0;" cr |
." NEXT_P0;" cr |
flush-tos |
flush-tos |
fetches |
\ fetches \ now in parts |
\ print-debug-args |
\ print-debug-args |
stack-pointer-updates |
\ stack-pointer-updates now in parts |
output-parts |
output-parts |
output-c-tail2 |
output-c-tail2-no-stores |
." }" cr |
." }" cr |
cr ; |
cr ; |
|
|
Line 1064 stack inst-stream IP Cell
|
Line 1239 stack inst-stream IP Cell
|
|
|
\ peephole optimization rules |
\ peephole optimization rules |
|
|
|
\ data for a simple peephole optimizer that always tries to combine |
|
\ the currently compiled instruction with the last one. |
|
|
\ in order for this to work as intended, shorter combinations for each |
\ in order for this to work as intended, shorter combinations for each |
\ length must be present, and the longer combinations must follow |
\ length must be present, and the longer combinations must follow |
\ shorter ones (this restriction may go away in the future). |
\ shorter ones (this restriction may go away in the future). |
|
|
: output-peephole ( -- ) |
: output-peephole ( -- ) |
combined-prims num-combined @ 1- cells combinations search-wordlist |
combined-prims num-combined @ 1- cells combinations search-wordlist |
s" the prefix for this combination must be defined earlier" ?print-error |
s" the prefix for this superinstruction must be defined earlier" ?print-error |
." {" |
." {" |
execute prim-num @ 5 .r ." ," |
execute prim-num @ 5 .r ." ," |
combined-prims num-combined @ 1- th @ prim-num @ 5 .r ." ," |
combined-prims num-combined @ 1- th @ prim-num @ 5 .r ." ," |
Line 1078 stack inst-stream IP Cell
|
Line 1256 stack inst-stream IP Cell
|
combined prim-c-name 2@ type ." */" |
combined prim-c-name 2@ type ." */" |
cr ; |
cr ; |
|
|
: output-forth-peephole ( -- ) |
|
combined-prims num-combined @ 1- cells combinations search-wordlist |
|
s" the prefix for this combination must be defined earlier" ?print-error |
|
execute prim-num @ 5 .r |
|
combined-prims num-combined @ 1- th @ prim-num @ 5 .r |
|
combined prim-num @ 5 .r ." prim, \ " |
|
combined prim-c-name 2@ type |
|
cr ; |
|
|
|
|
\ cost and superinstruction data for a sophisticated combiner (e.g., |
|
\ shortest path) |
|
|
|
\ This is intended as initializer for a structure like this |
|
|
|
\ struct cost { |
|
\ int loads; /* number of stack loads */ |
|
\ int stores; /* number of stack stores */ |
|
\ int updates; /* number of stack pointer updates */ |
|
\ int length; /* number of components */ |
|
\ int *components; /* array of vm_prim indexes of components */ |
|
\ }; |
|
|
|
\ How do you know which primitive or combined instruction this |
|
\ structure refers to? By the order of cost structures, as in most |
|
\ other cases. |
|
|
|
: compute-costs { p -- nloads nstores nupdates } |
|
\ compute the number of loads, stores, and stack pointer updates |
|
\ of a primitive or combined instruction; does not take TOS |
|
\ caching into account, nor that IP updates are combined with |
|
\ other stuff |
|
0 max-stacks 0 +do |
|
p prim-stacks-in i th @ + |
|
loop |
|
0 max-stacks 0 +do |
|
p prim-stacks-out i th @ + |
|
loop |
|
0 max-stacks 0 +do |
|
p prim-stacks-in i th @ p prim-stacks-out i th @ <> - |
|
loop ; |
|
|
|
: output-num-part ( p -- ) |
|
prim-num @ 4 .r ." ," ; |
|
|
|
: output-costs ( -- ) |
|
." {" prim compute-costs |
|
rot 2 .r ." ," swap 2 .r ." ," 2 .r ." ," |
|
combined if |
|
num-combined @ 2 .r |
|
." , ((int []){" ['] output-num-part map-combined ." })}, /* " |
|
else |
|
." 1, ((int []){" prim prim-num @ 4 .r ." })}, /* " |
|
endif |
|
prim prim-name 2@ type ." */" |
|
cr ; |
|
|
\ the parser |
\ the parser |
|
|
Line 1116 print-token !
|
Line 1332 print-token !
|
\ 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 @ >r |
s" #line " r@ over compare 0<> 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 ) |
Line 1165 bl singleton tab-char over add-member
|
Line 1381 bl singleton tab-char over add-member
|
nl-char singleton eof-char over add-member complement charclass nonl |
nl-char singleton eof-char over add-member complement charclass nonl |
nl-char singleton eof-char over add-member |
nl-char singleton eof-char over add-member |
char : over add-member complement charclass nocolonnl |
char : over add-member complement charclass nocolonnl |
|
nl-char singleton eof-char over add-member |
|
char } over add-member complement charclass nobracenl |
bl 1+ maxchar .. char \ singleton complement intersection |
bl 1+ maxchar .. char \ singleton complement intersection |
charclass nowhitebq |
charclass nowhitebq |
bl 1+ maxchar .. charclass nowhite |
bl 1+ maxchar .. charclass nowhite |
Line 1176 nl-char singleton eof-char over add-memb
|
Line 1394 nl-char singleton eof-char over add-memb
|
(( letter (( letter || digit )) ** |
(( letter (( letter || digit )) ** |
)) <- c-ident ( -- ) |
)) <- c-ident ( -- ) |
|
|
(( ` # ?? (( letter || digit || ` : )) ** |
(( ` # ?? (( letter || digit || ` : )) ++ |
)) <- stack-ident ( -- ) |
)) <- stack-ident ( -- ) |
|
|
(( nowhitebq nowhite ** )) |
(( nowhitebq nowhite ** )) |
Line 1218 Variable c-flag
|
Line 1436 Variable c-flag
|
(( (( ` g || ` G )) {{ start }} nonl ** |
(( (( ` g || ` G )) {{ start }} nonl ** |
{{ end |
{{ end |
forth-flag @ IF ." group " type cr THEN |
forth-flag @ IF ." group " type cr THEN |
c-flag @ IF ." GROUP(" type ." )" cr THEN }} |
c-flag @ IF ." 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 1239 Variable c-flag
|
Line 1457 Variable c-flag
|
(( {{ start }} c-ident {{ end prim prim-c-name 2! }} )) ?? |
(( {{ start }} c-ident {{ end prim 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 }} (( nocolonnl nonl ** nleof white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }} |
{{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} |
|
(( (( ` { nonl ** nleof (( (( nobracenl {{ line @ drop }} nonl ** )) ?? nleof )) ** ` } white ** nleof white ** )) |
|
|| (( nocolonnl nonl ** nleof white ** )) ** )) |
|
{{ end prim prim-c-code 2! skipsynclines on }} |
(( ` : white ** nleof |
(( ` : white ** nleof |
{{ start }} (( nonl ++ nleof white ** )) ++ {{ end prim prim-forth-code 2! }} |
{{ start }} (( nonl ++ nleof white ** )) ++ {{ end prim prim-forth-code 2! }} |
)) ?? {{ process-simple }} |
)) ?? {{ process-simple }} |
Line 1254 Variable c-flag
|
Line 1475 Variable c-flag
|
(( {{ make-prim to prim 0 to combined |
(( {{ make-prim to prim 0 to combined |
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 }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }} white ++ |
start }} [ifdef] vmgen c-ident [else] forth-ident [then] {{ end |
|
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 ( -- ) |