factor: trim using lists

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

diff --git a/basis/compiler/cfg/linear-scan/debugger/debugger.factor b/basis/compiler/cfg/linear-scan/debugger/debugger.factor
index 89bf81d2ba17ec8f5469cc0a33e8a48e348f101b..4a34af386050478c2ffac63adbd648c0a646c2fe 100644 (file)
--- a/basis/compiler/cfg/linear-scan/debugger/debugger.factor
+++ b/basis/compiler/cfg/linear-scan/debugger/debugger.factor
@@ -1,23 +1,26 @@
-! Copyright (C) 2008 Slava Pestov.
+! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel sequences sets arrays
-compiler.cfg.linear-scan.live-intervals
-compiler.cfg.linear-scan.allocation ;
+USING: accessors arrays assocs
+compiler.cfg.linear-scan.allocation
+compiler.cfg.linear-scan.live-intervals kernel math namespaces
+prettyprint sequences strings ;
 IN: compiler.cfg.linear-scan.debugger
 
-: check-assigned ( live-intervals -- )
+: check-linear-scan ( live-intervals machine-registers -- )
     [
-        reg>>
-        [ "Not all intervals have registers" throw ] unless
-    ] each ;
+        [ clone ] map dup [ [ vreg>> ] keep ] H{ } map>assoc
+        live-intervals set
+    ] dip
+    allocate-registers drop ;
 
-: split-children ( live-interval -- seq )
-    dup split-before>> [
-        [ split-before>> ] [ split-after>> ] bi
-        [ split-children ] bi@
-        append
-    ] [ 1array ] if ;
+: picture ( uses -- str )
+    dup last 1 + CHAR: space <string>
+    [ '[ CHAR: * swap _ set-nth ] each ] keep ;
 
-: check-linear-scan ( live-intervals machine-registers -- )
-    [ [ clone ] map ] dip allocate-registers
-    [ split-children ] map concat check-assigned ;
+: interval-picture ( interval -- str )
+    [ uses>> picture ]
+    [ vreg>> unparse ]
+    bi 2array ;
+
+: live-intervals. ( seq -- )
+    [ interval-picture ] map simple-table. ;