version 1.89, 2001/03/04 13:39:34
|
version 1.101, 2001/12/09 19:12:45
|
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 |
|
include ./stuff.fs |
|
[THEN] |
|
|
|
[IFUNDEF] environment? |
|
include ./environ.fs |
|
[THEN] |
[THEN] |
|
|
: struct% struct ; \ struct is redefined in gray |
: struct% struct ; \ struct is redefined in gray |
|
|
|
warnings off |
|
|
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 |
Line 142 struct%
|
Line 134 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 ) |
end-struct stack% |
end-struct stack% |
|
|
Line 171 create stacks max-stacks cells allot \ a
|
Line 162 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 ! ; |
|
|
|
: map-stacks { xt -- } |
|
\ perform xt for all stacks except inst-stream |
|
next-stack-number @ 1 +do |
|
stacks i th @ xt execute |
|
loop ; |
|
|
\ stack items |
\ stack items |
|
|
: init-item ( addr u addr1 -- ) |
: init-item ( addr u addr1 -- ) |
Line 426 wordlist constant prefixes
|
Line 424 wordlist constant prefixes
|
rdrop ; |
rdrop ; |
|
|
: type-prefix ( xt1 xt2 n stack "prefix" -- ) |
: type-prefix ( 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 475 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 486 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 ; |
|
|
|
wordlist constant type-names \ this is here just to meet the requirement |
|
\ that a type be a word; it is never used for lookup |
|
|
s" sp" save-mem w s" (Cell)" make-stack data-stack |
: stack ( "name" "stack-pointer" "type" -- ) |
s" fp" save-mem r s" " make-stack fp-stack |
\ define stack |
s" rp" save-mem w s" (Cell)" make-stack return-stack |
name { d: stack-name } |
s" IP" save-mem w s" error don't use # on results" make-stack inst-stream |
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 516 s" IP" save-mem w s" error don't use # o
|
Line 527 s" IP" save-mem w s" error don't use # o
|
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 |
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 |
Line 536 s" IP" save-mem w s" error don't use # o
|
Line 547 s" IP" save-mem w s" error don't use # o
|
endif ; |
endif ; |
|
|
: flush-tos ( -- ) |
: flush-tos ( -- ) |
data-stack flush-a-tos |
['] flush-a-tos map-stacks ; |
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 |
Line 549 s" IP" save-mem w s" error don't use # o
|
Line 558 s" IP" save-mem w s" error don't use # o
|
|
|
: fill-tos ( -- ) |
: fill-tos ( -- ) |
\ !! inst-stream for prefetching? |
\ !! inst-stream for prefetching? |
fp-stack fill-a-tos |
['] fill-a-tos map-stacks ; |
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 573 s" IP" save-mem w s" error don't use # o
|
Line 580 s" IP" save-mem w s" error don't use # o
|
|
|
: stack-pointer-updates ( -- ) |
: stack-pointer-updates ( -- ) |
inst-pointer-update |
inst-pointer-update |
data-stack stack-pointer-update |
['] stack-pointer-update map-stacks ; |
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 590 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 ; |
|
|
|
: print-debug-arg { item -- } |
|
." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); " |
|
." printarg_" item item-type @ print-type-prefix |
|
." (" item item-name 2@ type ." );" cr ; |
|
|
|
: print-debug-args ( -- ) |
|
." #ifdef VM_DEBUG" cr |
|
." if (vm_debug) {" cr |
|
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 |
|
." }" cr |
|
." #endif" cr ; |
|
|
: output-super-end ( -- ) |
: output-super-end ( -- ) |
prim prim-c-code 2@ s" SET_IP" search if |
prim prim-c-code 2@ s" SET_IP" search if |
." SUPER_END;" cr |
." SUPER_END;" cr |
Line 594 s" IP" save-mem w s" error don't use # o
|
Line 627 s" IP" save-mem w s" error don't use # o
|
: output-c-tail ( -- ) |
: output-c-tail ( -- ) |
\ the final part of the generated C code |
\ the final part of the generated C code |
output-super-end |
output-super-end |
|
print-debug-results |
." NEXT_P1;" cr |
." NEXT_P1;" cr |
stores |
stores |
fill-tos |
fill-tos |
Line 612 s" IP" save-mem w s" error don't use # o
|
Line 646 s" IP" save-mem w s" error don't use # o
|
repeat |
repeat |
2drop type ; |
2drop type ; |
|
|
: print-debug-arg { item -- } |
|
." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); " |
|
." printarg_" item item-type @ print-type-prefix |
|
." (" item item-name 2@ type ." );" cr ; |
|
|
|
: print-debug-args ( -- ) |
|
." #ifdef VM_DEBUG" cr |
|
." if (vm_debug) {" cr |
|
prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items |
|
." fputc('\n', vm_out);" cr |
|
." }" cr |
|
." #endif" 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 |
Line 666 s" IP" save-mem w s" error don't use # o
|
Line 687 s" IP" save-mem w s" error don't use # o
|
." 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 ( -- ) |
: output-profile ( -- ) |
\ generate code for postprocessing the VM block profile stuff |
\ generate code for postprocessing the VM block profile stuff |
Line 676 s" IP" save-mem w s" error don't use # o
|
Line 698 s" IP" save-mem w s" error don't use # o
|
prim prim-c-code 2@ s" SET_IP" search nip nip |
prim prim-c-code 2@ s" SET_IP" search nip nip |
prim prim-c-code 2@ s" SUPER_END" search nip nip or if |
prim prim-c-code 2@ s" SUPER_END" search nip nip or if |
." return;" cr |
." return;" cr |
|
else |
|
." goto _endif_;" cr |
endif |
endif |
." } else " cr ; |
." }" cr ; |
|
|
: gen-arg-parm { item -- } |
: gen-arg-parm { item -- } |
item item-stack @ inst-stream = if |
item item-stack @ inst-stream = if |
Line 714 s" IP" save-mem w s" error don't use # o
|
Line 738 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 ; |
." (Label)&&I_" prim prim-c-name 2@ type ." ," cr ; |
Line 774 s" IP" save-mem w s" error don't use # o
|
Line 799 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 943 s" IP" save-mem w s" error don't use # o
|
Line 973 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 ( -- ) |
Line 1013 s" IP" save-mem w s" error don't use # o
|
Line 1044 s" IP" save-mem w s" error don't use # o
|
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 ; |
|
|
|
|
\ the parser |
\ the parser |
|
|
Line 1141 Variable c-flag
|
Line 1181 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 ." )" 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 1184 warnings @ [IF]
|
Line 1230 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 ! |