use reject instead of [ ... not ] filter.

[factor.git] / basis / compiler / cfg / linear-scan / linear-scan.factor

diff --git a/basis/compiler/cfg/linear-scan/linear-scan.factor b/basis/compiler/cfg/linear-scan/linear-scan.factor
index 3a0a7f877002d19ba3fc6d32e833ca928a368dab..b159502cf10ac01ff188e0ba7d225247f28aa674 100644 (file)
--- a/basis/compiler/cfg/linear-scan/linear-scan.factor
+++ b/basis/compiler/cfg/linear-scan/linear-scan.factor
@@ -1,40 +1,26 @@
-! Copyright (C) 2008, 2009 Slava Pestov.
+! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel accessors namespaces make
-cpu.architecture
-compiler.cfg
-compiler.cfg.rpo
-compiler.cfg.instructions
-compiler.cfg.linear-scan.numbering
+USING: accessors assocs compiler.cfg.linear-scan.allocation
+compiler.cfg.linear-scan.assignment
 compiler.cfg.linear-scan.live-intervals
-compiler.cfg.linear-scan.allocation
-compiler.cfg.linear-scan.allocation.state
-compiler.cfg.linear-scan.assignment ;
+compiler.cfg.linear-scan.numbering
+compiler.cfg.linear-scan.resolve compiler.cfg.utilities cpu.architecture
+kernel sequences ;
 IN: compiler.cfg.linear-scan
 
-! References:
-
-! Linear Scan Register Allocation
-! by Massimiliano Poletto and Vivek Sarkar
-! http://www.cs.ucla.edu/~palsberg/course/cs132/linearscan.pdf
-
-! Linear Scan Register Allocation for the Java HotSpot Client Compiler
-! by Christian Wimmer
-! and http://www.ssw.uni-linz.ac.at/Research/Papers/Wimmer04Master/
-
-! Quality and Speed in Linear-scan Register Allocation
-! by Omri Traub, Glenn Holloway, Michael D. Smith
-! http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.34.8435
+: admissible-registers ( cfg -- regs )
+    machine-registers swap frame-pointer?>> [
+        [ [ frame-reg = ] reject ] assoc-map
+    ] when ;
 
-: (linear-scan) ( rpo machine-registers -- )
-    [
-        dup number-instructions
-        dup compute-live-intervals
-    ] dip
+: allocate-and-assign-registers ( cfg -- )
+    [ ] [ compute-live-intervals ] [ admissible-registers ] tri
     allocate-registers assign-registers ;
 
-: linear-scan ( cfg -- cfg' )
-    [
-        dup reverse-post-order machine-registers (linear-scan)
-        spill-counts get >>spill-counts
-    ] with-scope ;
+: linear-scan ( cfg -- )
+    {
+        number-instructions
+        allocate-and-assign-registers
+        resolve-data-flow
+        check-numbering
+    } apply-passes ;