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

Fix scoping issue in compiler.cfg.linear-scan.assignment

db4
Slava Pestov 2009-05-31 18:21:23 -05:00
parent 1a52414bb1
commit 32f17f3e14
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,13 +13,13 @@ IN: compiler.cfg.linear-scan.assignment
! but since we never have too many machine registers (around 30 ! but since we never have too many machine registers (around 30
! at most) and we probably won't have that many live at any one ! at most) and we probably won't have that many live at any one
! time anyway, it is not a problem to check each element. ! time anyway, it is not a problem to check each element.
SYMBOL: active-intervals TUPLE: active-intervals seq ;
: add-active ( live-interval -- ) : add-active ( live-interval -- )
active-intervals get push ; active-intervals get seq>> push ;
: lookup-register ( vreg -- reg ) : lookup-register ( vreg -- reg )
active-intervals get [ vreg>> = ] with find nip reg>> ; active-intervals get seq>> [ vreg>> = ] with find nip reg>> ;
! Minheap of live intervals which still need a register allocation ! Minheap of live intervals which still need a register allocation
SYMBOL: unhandled-intervals SYMBOL: unhandled-intervals
@ -41,8 +41,7 @@ SYMBOL: unhandled-intervals
: expire-old-intervals ( n -- ) : expire-old-intervals ( n -- )
active-intervals get active-intervals get
swap '[ end>> _ = ] partition [ swap '[ end>> _ = ] partition ] change-seq drop
active-intervals set
[ insert-spill ] each ; [ insert-spill ] each ;
: insert-reload ( live-interval -- ) : insert-reload ( live-interval -- )
@ -65,14 +64,17 @@ GENERIC: assign-registers-in-insn ( insn -- )
[ defs-vregs ] [ temp-vregs ] [ uses-vregs ] tri 3append ; [ defs-vregs ] [ temp-vregs ] [ uses-vregs ] tri 3append ;
M: vreg-insn assign-registers-in-insn M: vreg-insn assign-registers-in-insn
active-intervals get over all-vregs '[ vreg>> _ member? ] filter active-intervals get seq>> over all-vregs '[ vreg>> _ member? ] filter
[ [ vreg>> ] [ reg>> ] bi ] { } map>assoc [ [ vreg>> ] [ reg>> ] bi ] { } map>assoc
>>regs drop ; >>regs drop ;
M: insn assign-registers-in-insn drop ; M: insn assign-registers-in-insn drop ;
: <active-intervals> ( -- obj )
V{ } clone active-intervals boa ;
: init-assignment ( live-intervals -- ) : init-assignment ( live-intervals -- )
V{ } clone active-intervals set <active-intervals> active-intervals set
<min-heap> unhandled-intervals set <min-heap> unhandled-intervals set
init-unhandled ; init-unhandled ;