version 1.85, 2001/02/27 10:30:02
|
version 1.131, 2003/01/30 17:11:02
|
Line 41
|
Line 41
|
\ regarding problem 1 above: It would be better (for over) to implement |
\ regarding problem 1 above: It would be better (for over) to implement |
\ the alternative |
\ the alternative |
\ store optimization for combined instructions. |
\ store optimization for combined instructions. |
\ eliminate stack-cast (no longer used) |
|
|
|
\ Design Uglyness: |
\ Design Uglyness: |
|
|
Line 54
|
Line 53
|
|
|
warnings off |
warnings off |
|
|
[IFUNDEF] vocabulary \ we are executed just with kernel image |
[IFUNDEF] try |
\ load the rest that is needed |
include startup.fs |
\ (require fails because this file is needed from a |
|
\ different directory with the wordlibraries) |
|
include ./search.fs |
|
include ./extend.fs |
|
[THEN] |
|
include ./stuff.fs |
|
|
|
[IFUNDEF] environment? |
|
include ./environ.fs |
|
[THEN] |
[THEN] |
|
|
: struct% struct ; \ struct is redefined in gray |
: struct% struct ; \ struct is redefined in gray |
|
|
include ./gray.fs |
warnings off |
|
\ warnings on |
|
|
|
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 86 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 129 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 142 struct%
|
Line 161 struct%
|
cell% field stack-number \ the number of this stack |
cell% field stack-number \ the number of this stack |
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% 2* field stack-cast \ cast string for assignments to stack elements |
|
cell% field stack-in-index-xt \ ( in-size item -- in-index ) |
cell% field stack-in-index-xt \ ( in-size item -- in-index ) |
|
cell% field stack-access-transform \ ( nitem -- index ) |
end-struct stack% |
end-struct stack% |
|
|
struct% |
struct% |
Line 171 create stacks max-stacks cells allot \ a
|
Line 190 create stacks max-stacks cells allot \ a
|
: inst-in-index ( in-size item -- in-index ) |
: inst-in-index ( in-size item -- in-index ) |
nip dup item-offset @ swap item-type @ type-size @ + 1- ; |
nip dup item-offset @ swap item-type @ type-size @ + 1- ; |
|
|
: make-stack ( addr-ptr u1 type addr-cast u2 "stack-name" -- ) |
: make-stack ( addr-ptr u1 type "stack-name" -- ) |
|
next-stack-number @ max-stacks < s" too many stacks" ?print-error |
create stack% %allot >r |
create stack% %allot >r |
r@ stacks next-stack-number @ th ! |
r@ stacks next-stack-number @ th ! |
next-stack-number @ r@ stack-number ! 1 next-stack-number +! |
next-stack-number @ r@ stack-number ! |
save-mem r@ stack-cast 2! |
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 -- } |
|
\ 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 |
|
next-stack-number @ 1 +do |
|
stacks i th @ xt execute |
|
loop ; |
|
|
\ stack items |
\ stack items |
|
|
Line 229 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 240 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 269 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 297 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 |
|
in-part @ if |
|
part-stack-read |
|
else |
|
normal-stack-access |
|
endif ; |
|
|
|
: stack-write ( 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-write |
else |
else |
normal-stack-access |
normal-stack-access |
endif ; |
endif ; |
Line 314 defer inst-stream-f ( -- stack )
|
Line 421 defer inst-stream-f ( -- stack )
|
item-stack @ stack-type @ type-c-name 2@ ; |
item-stack @ stack-type @ type-c-name 2@ ; |
|
|
: fetch-single ( item -- ) |
: fetch-single ( item -- ) |
\ fetch a single stack item from its stack |
\ fetch a single stack item from its stack |
>r |
>r |
r@ item-name 2@ type |
." 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-read ." ," |
r@ item-in-index r@ item-stack @ stack-access |
r@ item-name 2@ type |
." );" cr |
." );" cr |
rdrop ; |
rdrop ; |
|
|
: fetch-double ( item -- ) |
: fetch-double ( item -- ) |
\ fetch a double stack item from its stack |
\ fetch a double stack item from its stack |
>r |
>r |
." 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-name 2@ type ." , " |
r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-read |
r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access |
." , " -1 under+ ." (Cell)" stack-read |
." , " -1 under+ ." (Cell)" stack-access |
." , " 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 |
Line 357 defer inst-stream-f ( -- stack )
|
Line 464 defer inst-stream-f ( -- stack )
|
>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 -- ) |
>r |
>r |
r@ item-out-index r@ item-stack @ stack-access ." = vm_" |
." vm_" |
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 ." ," |
rdrop ; |
r@ item-out-index r@ item-stack @ stack-write ." );" |
|
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 385 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 ; |
|
|
: single ( -- xt1 xt2 n ) |
: single ( -- xt1 xt2 n ) |
Line 425 wordlist constant prefixes
|
Line 531 wordlist constant prefixes
|
stack r@ type-stack ! |
stack r@ type-stack ! |
rdrop ; |
rdrop ; |
|
|
: type-prefix ( xt1 xt2 n stack "prefix" -- ) |
: type-prefix ( addr u xt1 xt2 n stack "prefix" -- ) |
create-type |
get-current >r prefixes set-current |
|
create-type r> set-current |
does> ( item -- ) |
does> ( item -- ) |
\ initialize item |
\ initialize item |
{ item typ } |
{ item typ } |
Line 476 does> ( item -- )
|
Line 583 does> ( item -- )
|
prim prim-effect-out prim prim-effect-out-end @ ['] print-declaration map-items ; |
prim prim-effect-out prim prim-effect-out-end @ ['] print-declaration map-items ; |
|
|
: stack-prefix ( stack "prefix" -- ) |
: stack-prefix ( stack "prefix" -- ) |
|
get-current >r prefixes set-current |
name tuck nextname create ( stack length ) 2, |
name tuck nextname create ( stack length ) 2, |
|
r> set-current |
does> ( item -- ) |
does> ( item -- ) |
2@ { item stack prefix-length } |
2@ { item stack prefix-length } |
item item-name 2@ prefix-length /string item item-name 2! |
item item-name 2@ prefix-length /string item item-name 2! |
Line 485 does> ( item -- )
|
Line 594 does> ( item -- )
|
|
|
\ 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! |
s" Cell" single 0 create-type w |
: stack-type-name ( addr u "name" -- ) |
s" Float" single 0 create-type r |
single 0 create-type ; |
|
|
s" sp" save-mem w s" (Cell)" make-stack data-stack |
wordlist constant type-names \ this is here just to meet the requirement |
s" fp" save-mem r s" " make-stack fp-stack |
\ that a type be a word; it is never used for lookup |
s" rp" save-mem w s" (Cell)" make-stack return-stack |
|
s" IP" save-mem w s" error don't use # on results" make-stack inst-stream |
: stack ( "name" "stack-pointer" "type" -- ) |
|
\ define stack |
|
name { d: stack-name } |
|
name { d: stack-pointer } |
|
name { d: stack-type } |
|
get-current type-names set-current |
|
stack-type 2dup nextname stack-type-name |
|
set-current |
|
stack-pointer lastxt >body stack-name nextname make-stack ; |
|
|
|
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 |
Line 512 s" IP" save-mem w s" error don't use # o
|
Line 631 s" IP" save-mem w s" error don't use # o
|
: 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 ( -- ) |
data-stack clear-stack fp-stack clear-stack return-stack clear-stack |
['] 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 532 s" IP" save-mem w s" error don't use # o
|
Line 650 s" IP" save-mem w s" error don't use # o
|
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 ( -- ) |
data-stack flush-a-tos |
['] flush-a-tos map-stacks1 ; |
fp-stack flush-a-tos |
|
return-stack flush-a-tos ; |
|
|
|
: 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? |
fp-stack fill-a-tos |
['] fill-a-tos map-stacks1 ; |
data-stack fill-a-tos |
|
return-stack fill-a-tos ; |
|
|
|
: fetch ( addr -- ) |
: fetch ( addr -- ) |
dup item-type @ type-fetch @ execute ; |
dup item-type @ type-fetch @ execute ; |
Line 559 s" IP" save-mem w s" error don't use # o
|
Line 673 s" IP" save-mem w s" error don't use # o
|
: 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 ; |
data-stack stack-pointer-update |
|
fp-stack stack-pointer-update |
|
return-stack stack-pointer-update ; |
|
|
|
: store ( item -- ) |
: store ( item -- ) |
\ f is true if the item should be stored |
\ f is true if the item should be stored |
Line 585 s" IP" save-mem w s" error don't use # o
|
Line 702 s" IP" save-mem w s" error don't use # o
|
: stores ( -- ) |
: stores ( -- ) |
prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ; |
prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ; |
|
|
: output-c-tail ( -- ) |
|
\ the final part of the generated C code |
|
." NEXT_P1;" cr |
|
stores |
|
fill-tos |
|
." NEXT_P2;" ; |
|
|
|
: type-c-code ( c-addr u xt -- ) |
|
\ like TYPE, but replaces "TAIL;" with tail code produced by xt |
|
{ xt } |
|
begin ( c-addr1 u1 ) |
|
2dup s" TAIL;" search |
|
while ( c-addr1 u1 c-addr3 u3 ) |
|
2dup 2>r drop nip over - type |
|
xt execute |
|
2r> 5 /string |
|
\ !! resync #line missing |
|
repeat |
|
2drop type ; |
|
|
|
: print-debug-arg { item -- } |
: print-debug-arg { item -- } |
." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); " |
." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); " |
." printarg_" item item-type @ print-type-prefix |
." printarg_" item item-type @ print-type-prefix |
Line 614 s" IP" save-mem w s" error don't use # o
|
Line 711 s" IP" save-mem w s" error don't use # o
|
." #ifdef VM_DEBUG" cr |
." #ifdef VM_DEBUG" cr |
." if (vm_debug) {" cr |
." if (vm_debug) {" cr |
prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items |
prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items |
|
\ ." fputc('\n', vm_out);" cr |
|
." }" cr |
|
." #endif" cr ; |
|
|
|
: print-debug-result { item -- } |
|
item item-first @ if |
|
item print-debug-arg |
|
endif ; |
|
|
|
: print-debug-results ( -- ) |
|
cr |
|
." #ifdef VM_DEBUG" cr |
|
." if (vm_debug) {" cr |
|
." fputs(" quote ." -- " quote ." , vm_out); " |
|
prim prim-effect-out prim prim-effect-out-end @ ['] print-debug-result map-items |
." fputc('\n', vm_out);" cr |
." fputc('\n', vm_out);" cr |
." }" cr |
." }" cr |
." #endif" cr ; |
." #endif" cr ; |
|
|
|
: output-super-end ( -- ) |
|
prim prim-c-code 2@ s" SET_IP" search if |
|
." SUPER_END;" cr |
|
endif |
|
2drop ; |
|
|
|
: output-nextp2 ( -- ) |
|
." 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 |
|
print-debug-results |
|
." NEXT_P1;" cr |
|
stores |
|
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 ( -- ) |
|
tail-nextp2 @ output-c-tail1 ; |
|
|
|
: output-c-tail2 ( -- ) |
|
['] output-label2 output-c-tail1 ; |
|
|
|
: output-c-tail-no-stores ( -- ) |
|
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 -- ) |
|
\ like TYPE, but replaces "INST_TAIL;" with tail code produced by xt |
|
{ xt } |
|
." {" cr |
|
." #line " c-line @ . quote c-filename 2@ type quote cr |
|
begin ( c-addr1 u1 ) |
|
2dup s" INST_TAIL;" search |
|
while ( c-addr1 u1 c-addr3 u3 ) |
|
2dup 2>r drop nip over - type |
|
xt execute |
|
2r> 10 /string |
|
\ !! resync #line missing |
|
repeat |
|
2drop type |
|
." #line " out-nls @ 2 + . quote out-filename 2@ type quote cr |
|
." }" cr ; |
|
|
: print-entry ( -- ) |
: print-entry ( -- ) |
." I_" 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-tail |
|
." }" cr |
|
cr |
|
; |
; |
|
|
: disasm-arg { item -- } |
: disasm-arg { item -- } |
item item-stack @ inst-stream = if |
item item-stack @ inst-stream = if |
." fputc(' ', vm_out); " |
." {" cr |
." printarg_" item item-type @ print-type-prefix |
item print-declaration |
." ((" item item-type @ type-c-name 2@ type ." )" |
item fetch |
." ip[" item item-offset @ 1+ 0 .r ." ]);" cr |
item print-debug-arg |
|
." }" cr |
endif ; |
endif ; |
|
|
: disasm-args ( -- ) |
: disasm-args ( -- ) |
Line 655 s" IP" save-mem w s" error don't use # o
|
Line 826 s" IP" save-mem w s" error don't use # o
|
|
|
: output-disasm ( -- ) |
: output-disasm ( -- ) |
\ generate code for disassembling VM instructions |
\ generate code for disassembling VM instructions |
." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr |
." if (VM_IS_INST(*ip, " function-number @ 0 .r ." )) {" cr |
." fputs(" quote prim prim-name 2@ type quote ." , vm_out);" cr |
." fputs(" quote prim prim-name 2@ type quote ." , vm_out);" cr |
disasm-args |
disasm-args |
." ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr |
." ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr |
." } else " ; |
." goto _endif_;" cr |
|
." }" cr ; |
|
|
|
: output-profile ( -- ) |
|
\ generate code for postprocessing the VM block profile stuff |
|
." if (VM_IS_INST(*ip, " function-number @ 0 .r ." )) {" cr |
|
." add_inst(b, " quote prim prim-name 2@ type quote ." );" cr |
|
." ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr |
|
prim prim-c-code 2@ s" SET_IP" search nip nip |
|
prim prim-c-code 2@ s" SUPER_END" search nip nip or if |
|
." return;" cr |
|
else |
|
." goto _endif_;" cr |
|
endif |
|
." }" cr ; |
|
|
|
: output-profile-part ( p ) |
|
." add_inst(b, " quote |
|
prim-name 2@ type |
|
quote ." );" cr ; |
|
|
|
: output-profile-combined ( -- ) |
|
\ generate code for postprocessing the VM block profile stuff |
|
." if (VM_IS_INST(*ip, " function-number @ 0 .r ." )) {" cr |
|
['] output-profile-part map-combined |
|
." 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" SUPER_END" search nip nip or if |
|
." return;" cr |
|
else |
|
." goto _endif_;" cr |
|
endif |
|
." }" cr ; |
|
|
|
: output-superend ( -- ) |
|
\ output flag specifying whether the current word ends a dynamic superinst |
|
prim prim-c-code 2@ s" SET_IP" search nip nip |
|
prim prim-c-code 2@ s" SUPER_END" search nip nip or 0<> |
|
prim prim-c-code 2@ s" SUPER_CONTINUE" search nip nip 0= and |
|
negate 0 .r ." , /* " prim prim-name 2@ type ." */" cr ; |
|
|
: gen-arg-parm { item -- } |
: gen-arg-parm { item -- } |
item item-stack @ inst-stream = if |
item item-stack @ inst-stream = if |
Line 696 s" IP" save-mem w s" error don't use # o
|
Line 906 s" IP" save-mem w s" error don't use # o
|
: output-forthname ( -- ) |
: output-forthname ( -- ) |
'" emit prim prim-name 2@ type '" emit ." ," cr ; |
'" emit prim prim-name 2@ type '" emit ." ," cr ; |
|
|
: output-c-func ( -- ) |
\ : output-c-func ( -- ) |
\ used for word libraries |
\ \ used for word libraries |
." Cell * I_" prim prim-c-name 2@ type ." (Cell *SP, Cell **FP) /* " prim prim-name 2@ type |
\ ." Cell * I_" prim prim-c-name 2@ type ." (Cell *SP, Cell **FP) /* " prim prim-name 2@ type |
." ( " prim prim-stack-string 2@ type ." ) */" cr |
\ ." ( " 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 |
\ ." NAME(" quote prim prim-name 2@ type quote ." )" cr |
\ debugging |
\ \ debugging |
." {" cr |
\ ." {" cr |
print-declarations |
\ print-declarations |
inst-stream stack-used? IF ." Cell *ip=IP;" cr THEN |
\ \ !! don't know what to do about that |
data-stack stack-used? IF ." Cell *sp=SP;" cr THEN |
\ inst-stream stack-used? IF ." Cell *ip=IP;" cr THEN |
fp-stack stack-used? IF ." Cell *fp=*FP;" cr THEN |
\ data-stack stack-used? IF ." Cell *sp=SP;" cr THEN |
return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN |
\ fp-stack stack-used? IF ." Cell *fp=*FP;" cr THEN |
flush-tos |
\ return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN |
fetches |
\ flush-tos |
stack-pointer-updates |
\ fetches |
fp-stack stack-used? IF ." *FP=fp;" cr THEN |
\ stack-pointer-updates |
." {" cr |
\ fp-stack stack-used? IF ." *FP=fp;" cr THEN |
." #line " c-line @ . quote c-filename 2@ type quote cr |
\ ." {" cr |
prim prim-c-code 2@ type |
\ ." #line " c-line @ . quote c-filename 2@ type quote cr |
." }" cr |
\ prim prim-c-code 2@ type |
stores |
\ ." }" cr |
fill-tos |
\ stores |
." return (sp);" cr |
\ fill-tos |
." }" cr |
\ ." return (sp);" cr |
cr ; |
\ ." }" cr |
|
\ cr ; |
|
|
: output-label ( -- ) |
: output-label ( -- ) |
." (Label)&&I_" 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 756 s" IP" save-mem w s" error don't use # o
|
Line 970 s" IP" save-mem w s" error don't use # o
|
name-line @ 0 .r |
name-line @ 0 .r |
." ,0" cr ; |
." ,0" cr ; |
|
|
|
: output-vi-tag ( -- ) |
|
name-filename 2@ type #tab emit |
|
prim prim-name 2@ type #tab emit |
|
." /^" prim prim-name 2@ type ." *(/" cr ; |
|
|
[IFDEF] documentation |
[IFDEF] documentation |
: register-doc ( -- ) |
: register-doc ( -- ) |
prim prim-name 2@ documentation ['] create insert-wordlist |
prim prim-name 2@ documentation ['] create insert-wordlist |
Line 825 s" IP" save-mem w s" error don't use # o
|
Line 1044 s" IP" save-mem w s" error don't use # o
|
\ #line 516 "./prim" |
\ #line 516 "./prim" |
\ n = n1+n2; |
\ n = n1+n2; |
\ } |
\ } |
\ NEXT_P1; |
|
\ _x_sp0 = (Cell)n; |
\ _x_sp0 = (Cell)n; |
\ NEXT_P2; |
|
\ } |
\ } |
\ NEXT_P1; |
\ NEXT_P1; |
\ spTOS = (Cell)_x_sp0; |
\ spTOS = (Cell)_x_sp0; |
Line 837 s" IP" save-mem w s" error don't use # o
|
Line 1054 s" IP" save-mem w s" error don't use # o
|
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 848 s" IP" save-mem w s" error don't use # o
|
Line 1066 s" IP" save-mem w s" error don't use # o
|
: 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 898 s" IP" save-mem w s" error don't use # o
|
Line 1125 s" IP" save-mem w s" error don't use # o
|
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 |
|
combined-prims num-combined @ 1- th ( last-part ) |
|
@ 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 923 s" IP" save-mem w s" error don't use # o
|
Line 1174 s" IP" save-mem w s" error don't use # o
|
fetches ; |
fetches ; |
|
|
: part-output-c-tail ( -- ) |
: part-output-c-tail ( -- ) |
|
print-debug-results |
stores ; |
stores ; |
|
|
: 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 940 s" IP" save-mem w s" error don't use # o
|
Line 1202 s" IP" save-mem w s" error don't use # o
|
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 965 s" IP" save-mem w s" error don't use # o
|
Line 1225 s" IP" save-mem w s" error don't use # o
|
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-tail |
output-c-tail2-no-stores |
." }" cr |
." }" cr |
cr ; |
cr ; |
|
|
Line 979 s" IP" save-mem w s" error don't use # o
|
Line 1239 s" IP" save-mem w s" error don't use # o
|
|
|
\ 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 994 s" IP" save-mem w s" error don't use # o
|
Line 1257 s" IP" save-mem w s" error don't use # o
|
cr ; |
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 |
|
|
eof-char max-member \ the whole character set + EOF |
eof-char max-member \ the whole character set + EOF |
Line 1018 print-token !
|
Line 1328 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 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 ) |
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 1045 print-token !
|
Line 1355 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 1071 bl singleton tab-char over add-member
|
Line 1382 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 1082 nl-char singleton eof-char over add-memb
|
Line 1395 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 1121 Variable c-flag
|
Line 1434 Variable c-flag
|
THEN }} |
THEN }} |
)) <- if-comment |
)) <- if-comment |
|
|
(( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body |
(( (( ` g || ` G )) {{ start }} nonl ** |
|
{{ end |
|
forth-flag @ IF ." group " type cr THEN |
|
c-flag @ IF ." GROUP(" type ." , " function-number @ 0 .r ." )" cr THEN }} |
|
)) <- group-comment |
|
|
|
(( (( eval-comment || forth-comment || c-comment || else-comment || if-comment || group-comment )) ?? nonl ** )) <- comment-body |
|
|
(( ` \ comment-body nleof )) <- comment ( -- ) |
(( ` \ comment-body nleof )) <- comment ( -- ) |
|
|
Line 1139 Variable c-flag
|
Line 1458 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 1147 Variable c-flag
|
Line 1469 Variable c-flag
|
)) <- simple-primitive ( -- ) |
)) <- simple-primitive ( -- ) |
|
|
(( {{ init-combined }} |
(( {{ init-combined }} |
` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++ |
` = white ** (( {{ start }} forth-ident {{ end add-prim }} white ** )) ++ |
nleof {{ process-combined }} |
nleof {{ process-combined }} |
)) <- combined-primitive |
)) <- combined-primitive |
|
|
(( {{ 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 ** )) ?? |
(( simple-primitive || combined-primitive )) {{ 1 function-number +! }} |
(( simple-primitive || combined-primitive )) {{ 1 function-number +! }} |
)) <- primitive ( -- ) |
)) <- primitive ( -- ) |
|
|
Line 1164 warnings @ [IF]
|
Line 1488 warnings @ [IF]
|
.( parser generated ok ) cr |
.( parser generated ok ) cr |
[THEN] |
[THEN] |
|
|
|
|
|
\ run with gforth-0.5.0 (slurp-file is missing) |
|
[IFUNDEF] slurp-file |
|
: slurp-file ( c-addr1 u1 -- c-addr2 u2 ) |
|
\ c-addr1 u1 is the filename, c-addr2 u2 is the file's contents |
|
r/o bin open-file throw >r |
|
r@ file-size throw abort" file too large" |
|
dup allocate throw swap |
|
2dup r@ read-file throw over <> abort" could not read whole file" |
|
r> close-file throw ; |
|
[THEN] |
|
|
: primfilter ( addr u -- ) |
: primfilter ( addr u -- ) |
\ 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 ; |