version 1.91, 2001/03/18 10:33:25
|
version 1.92, 2001/03/18 11:35:35
|
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 142 struct%
|
Line 141 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 169 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 485 does> ( item -- )
|
Line 490 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" Cell" stack-type-name w |
|
s" Float" stack-type-name r |
|
|
s" sp" save-mem w s" (Cell)" make-stack data-stack |
s" IP" save-mem w make-stack inst-stream |
s" fp" save-mem r s" " make-stack fp-stack |
|
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 |
|
' 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 |
|
|
|
s" sp" save-mem w make-stack data-stack |
|
s" fp" save-mem r make-stack fp-stack |
|
s" rp" save-mem w make-stack return-stack |
\ !! initialize stack-in and stack-out |
\ !! initialize stack-in and stack-out |
|
|
\ offset computation |
\ offset computation |
Line 516 s" IP" save-mem w s" error don't use # o
|
Line 525 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 545 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 556 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 578 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 733 s" IP" save-mem w s" error don't use # o
|
Line 736 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 ; |