Commit add4d36e authored by qinsoon's avatar qinsoon

fix bugs. a change in validating register allocation may bring in

troubles
parent 8f9ebcca
......@@ -62,7 +62,7 @@ pub fn validate_regalloc(cf: &CompiledFunction,
Some(range) => range,
None => panic!("cannot find range for block {}", block)
};
let last_inst = range.end - 1;
let last_inst = mc.get_last_inst(range.end - 1).unwrap();
for i in range {
mc.trace_inst(i);
......
......@@ -5,7 +5,6 @@ use runtime::ValueLocation;
use std::fmt;
use std::collections::HashMap;
use utils::POINTER_SIZE;
use vm::VM;
// | previous frame ...
......@@ -50,7 +49,7 @@ impl Frame {
pub fn new(func_ver_id: MuID) -> Frame {
Frame {
func_ver_id: func_ver_id,
cur_offset: - (POINTER_SIZE as isize * 1), // reserve for old RBP
cur_offset: 0,
argument_by_reg: HashMap::new(),
argument_by_stack: HashMap::new(),
......
......@@ -1149,7 +1149,7 @@ def test_linked_list():
assert res.out == '1\n'
@may_spawn_proc
def test_rpytarget_richards():
def test_rpytarget_richards0():
from rpython.translator.goal.richards import entry_point
def main(argv):
res, t0, t1 = entry_point(int(argv[1]))
......@@ -1158,7 +1158,6 @@ def test_rpytarget_richards():
res = run_boot_image(main, '/tmp/test_richards-mu', args=['5'])
assert res.returncode == 0, res.err
@pytest.mark.xfail(reason='Segment Fault')
@may_spawn_proc
def test_rpytarget_richards_measure_time():
from rpython.translator.goal.richards import entry_point
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment