From: Arthur Huillet <arthur.huil...@free.fr>

Signed-off-by: Vegard Nossum <vegard.nos...@gmail.com>
---
 jit/linear-scan.c           |    2 +-
 test/jit/linear-scan-test.c |    9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/jit/linear-scan.c b/jit/linear-scan.c
index d2a3c92..f038ba3 100644
--- a/jit/linear-scan.c
+++ b/jit/linear-scan.c
@@ -99,7 +99,7 @@ static enum machine_reg pick_register(unsigned long 
*free_until_pos, enum machin
                if (reg_type(i) != type)
                        continue;
 
-               if (pos > max_pos) {
+               if (pos >= max_pos) {
                        max_pos = pos;
                        ret = i;
                }
diff --git a/test/jit/linear-scan-test.c b/test/jit/linear-scan-test.c
index 8b581f9..b742084 100644
--- a/test/jit/linear-scan-test.c
+++ b/test/jit/linear-scan-test.c
@@ -28,8 +28,7 @@ void 
test_allocates_different_registers_for_overlapping_intervals(void)
 
        allocate_registers(cu);
 
-       assert_int_equals(R0, v1->interval->reg);
-       assert_int_equals(R1, v2->interval->reg);
+       assert(v1->interval->reg != v2->interval->reg);
 
        free_compilation_unit(cu);
 }
@@ -51,8 +50,7 @@ void test_reuses_registers_for_non_overlapping_intervals(void)
 
        allocate_registers(cu);
 
-       assert_int_equals(R0, v1->interval->reg);
-       assert_int_equals(R0, v2->interval->reg);
+       assert_int_equals(v1->interval->reg, v2->interval->reg);
 
        free_compilation_unit(cu);
 }
@@ -74,8 +72,7 @@ void 
test_honors_fixed_interval_register_constraint_for_overlapping_intervals(vo
 
        allocate_registers(cu);
 
-       assert_int_equals(R0, v1->interval->reg);
-       assert_int_equals(R1, v2->interval->reg);
+       assert(v1->interval->reg != v2->interval->reg);
 
        free_compilation_unit(cu);
 }
-- 
1.6.0.6


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel

Reply via email to