compiler.cfg.gvn: clean up

diff --git a/extra/compiler/cfg/gvn/gvn.factor b/extra/compiler/cfg/gvn/gvn.factor
index d315a58516bbe9a077e5e1b8915ff9c020844f45..c06aae0b00bcdaa55e235529870300dd299942e7 100644 (file)
--- a/extra/compiler/cfg/gvn/gvn.factor
+++ b/extra/compiler/cfg/gvn/gvn.factor
@@ -21,44 +21,38 @@ compiler.cfg.gvn.misc
 compiler.cfg.gvn.expressions ;
 IN: compiler.cfg.gvn
 
-GENERIC: process-instruction ( insn -- insn' )
+GENERIC: simplify ( insn -- insn' )
 
-: redundant-instruction ( insn vn -- insn' )
-    [ dst>> ] dip [ swap set-vn ] [ <copy> ] 2bi ;
+M: insn simplify dup rewrite [ simplify ] [ ] ?if ;
+M: array simplify [ simplify ] map ;
+M: ##copy simplify ;
 
-:: useful-instruction ( insn expr -- insn' )
-    insn dst>> :> vn
-    vn vn set-vn
-    vn expr exprs>vns get set-at
-    insn vn vns>insns get set-at
-    insn ;
-
-: check-redundancy ( insn -- insn' )
-    dup >expr dup exprs>vns get at
-    [ redundant-instruction ] [ useful-instruction ] ?if ;
-
-M: insn process-instruction
-    dup rewrite
-    [ process-instruction ]
-    [ dup defs-vregs length 1 = [ check-redundancy ] when ] ?if ;
+GENERIC: value-number ( insn -- )
 
-UNION: don't-check-redundancy alien-call-insn ##callback-inputs ;
+M: alien-call-insn value-number drop ;
+M: ##callback-inputs value-number drop ;
+M: ##copy value-number [ src>> vreg>vn ] [ dst>> ] bi set-vn ;
 
-M: don't-check-redundancy process-instruction
-    dup rewrite [ process-instruction ] [ ] ?if ;
+: redundant-instruction ( insn vn -- )
+    swap dst>> set-vn ;
 
-M: ##copy process-instruction
-    dup [ src>> vreg>vn ] [ dst>> ] bi set-vn ;
+:: useful-instruction ( insn expr -- )
+    insn dst>> :> vn
+    vn vn set-vn
+    vn expr exprs>vns get set-at
+    insn vn vns>insns get set-at ;
 
-M: array process-instruction
-    [ process-instruction ] map ;
+M: insn value-number
+    dup defs-vregs length 1 = [
+        dup >expr dup exprs>vns get at
+        [ redundant-instruction ] [ useful-instruction ] ?if
+    ] [ drop ] if ;
 
-: value-numbering-step ( insns -- insns' )
-    [ process-instruction ] map flatten ;
+: value-numbering-step ( insns -- )
+    [ simplify ] map flatten [ value-number ] each ;
 
 : value-numbering-iteration ( cfg -- )
-    clear-exprs
-    [ value-numbering-step drop ] simple-analysis ;
+    clear-exprs [ value-numbering-step ] simple-analysis ;
 
 : determine-value-numbers ( cfg -- )
     final-iteration? off
@@ -71,7 +65,6 @@ M: array process-instruction
 
 : value-numbering ( cfg -- cfg )
     needs-predecessors
-
     dup determine-value-numbers
 
     cfg-changed predecessors-changed ;