Merge branch 'master' of git://factorcode.org/git/factor into dcn

db4
Slava Pestov 2009-07-22 00:14:53 -05:00
commit 86df665f78
3 changed files with 10 additions and 28 deletions
basis/compiler/cfg

View File

@ -36,8 +36,8 @@ V{ } 5 test-bb
[ { 4 } ] [ 1 get dom-frontier [ number>> ] map ] unit-test
[ { 4 } ] [ 2 get dom-frontier [ number>> ] map ] unit-test
[ f ] [ 0 get dom-frontier ] unit-test
[ f ] [ 4 get dom-frontier ] unit-test
[ { } ] [ 0 get dom-frontier ] unit-test
[ { } ] [ 4 get dom-frontier ] unit-test
! Example from the paper
V{ } 0 test-bb

View File

@ -36,27 +36,20 @@ V{
test-diamond
3 vreg-counter set-global
[ ] [ cfg new 0 get >>entry eliminate-phis drop ] unit-test
[let | n! [ f ] |
[ ] [ 2 get successors>> first instructions>> first dst>> n>> n! ] unit-test
[ t ] [
T{ ##copy f V int-regs n V int-regs 1 }
2 get successors>> first instructions>> first =
[ T{ ##copy f V int-regs 4 V int-regs 1 } ] [
2 get successors>> first instructions>> first
] unit-test
[ t ] [
T{ ##copy f V int-regs n V int-regs 2 }
3 get successors>> first instructions>> first =
[ T{ ##copy f V int-regs 4 V int-regs 2 } ] [
3 get successors>> first instructions>> first
] unit-test
[ t ] [
T{ ##copy f V int-regs 3 V int-regs n }
4 get instructions>> first =
[ T{ ##copy f V int-regs 3 V int-regs 4 } ] [
4 get instructions>> first
] unit-test
]
[ 3 ] [ 4 get instructions>> length ] unit-test

View File

@ -1218,17 +1218,6 @@ test-diamond
[ t ] [ 1 get successors>> first 3 get eq? ] unit-test
[let | n! [ f ] |
[ ] [ 2 get successors>> first instructions>> first src>> n>> n! ] unit-test
[ t ] [
T{ ##copy f V int-regs n V int-regs 2 }
3 get successors>> first instructions>> first =
] unit-test
]
[ 3 ] [ 4 get instructions>> length ] unit-test
V{