Signed-off-by: Tomek Grabiec <tgrab...@gmail.com> --- jit/spill-reload.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/jit/spill-reload.c b/jit/spill-reload.c index c7b3b51..ba8ac27 100644 --- a/jit/spill-reload.c +++ b/jit/spill-reload.c @@ -168,20 +168,20 @@ insert_spill_insn(struct live_interval *interval, struct compilation_unit *cu) return 0; } -static int insert_reload_insn(struct live_interval *interval, - struct compilation_unit *cu, - struct stack_slot *from, - struct insn *first) +static int +insert_reload_insn(struct live_interval *interval, struct compilation_unit *cu) { + struct insn *reload_before; struct insn *reload; - reload = reload_insn(from, &interval->spill_reload_reg); + reload = reload_insn(interval->spill_parent->spill_slot, + &interval->spill_reload_reg); if (!reload) return warn("out of memory"), -ENOMEM; - reload->bytecode_offset = first->bytecode_offset; - - list_add_tail(&reload->insn_list_node, &first->insn_list_node); + reload_before = get_reload_before_insn(cu, interval); + reload->bytecode_offset = reload_before->bytecode_offset; + list_add_tail(&reload->insn_list_node, &reload_before->insn_list_node); return 0; } @@ -227,9 +227,7 @@ static int __insert_spill_reload_insn(struct live_interval *interval, struct com */ assert((interval_start(interval) & 1) == 0); - err = insert_reload_insn(interval, cu, - interval->spill_parent->spill_slot, - get_reload_before_insn(cu, interval)); + err = insert_reload_insn(interval, cu); if (err) goto out; } -- 1.6.0.4 ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Jatovm-devel mailing list Jatovm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jatovm-devel