steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compiler.cfg.linear-scan: fix bad interaction between inactive intervals and sync points

db4
Slava Pestov 2010-07-29 21:06:48 -04:00
parent 0f4c5d2bff
commit 94f6ac98de
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/compiler/cfg/linear-scan/allocation/allocation.factor
View File

@ -62,8 +62,8 @@ M: live-interval handle
M: sync-point handle ( sync-point -- ) M: sync-point handle ( sync-point -- )
[ n>> deactivate-intervals ] [ n>> deactivate-intervals ]
[ handle-sync-point ]
[ n>> activate-intervals ] [ n>> activate-intervals ]
[ handle-sync-point ]
tri ; tri ;
: smallest-heap ( heap1 heap2 -- heap ) : smallest-heap ( heap1 heap2 -- heap )

7
basis/compiler/cfg/linear-scan/assignment/assignment.factor
View File

@ -39,6 +39,11 @@ SYMBOL: pending-interval-assoc
drop leader vreg rep-of lookup-spill-slot drop leader vreg rep-of lookup-spill-slot
] unless ; ] unless ;
ERROR: not-spilled-error vreg ;
: vreg>spill-slot ( vreg -- spill-slot )
dup vreg>reg dup spill-slot? [ nip ] [ drop leader not-spilled-error ] if ;
: vregs>regs ( vregs -- assoc ) : vregs>regs ( vregs -- assoc )
[ f ] [ [ dup vreg>reg ] H{ } map>assoc ] if-empty ; [ f ] [ [ dup vreg>reg ] H{ } map>assoc ] if-empty ;
@ -144,7 +149,7 @@ M: vreg-insn assign-registers-in-insn
M: gc-map-insn assign-registers-in-insn M: gc-map-insn assign-registers-in-insn
[ [ assign-insn-defs ] [ assign-insn-uses ] [ assign-insn-temps ] tri ] [ [ assign-insn-defs ] [ assign-insn-uses ] [ assign-insn-temps ] tri ]
[ gc-map>> [ [ vreg>reg ] map ] change-gc-roots drop ] [ gc-map>> [ [ vreg>spill-slot ] map ] change-gc-roots drop ]
bi ; bi ;
M: insn assign-registers-in-insn drop ; M: insn assign-registers-in-insn drop ;