The EXPR_LOCAL rule should access received arguments by looking into the
non-fixed registers we have previously assigned.
Signed-off-by: Eduard - Gabriel Munteanu <eduard.munte...@linux360.ro>
---
arch/x86/insn-selector.brg | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/arch/x86/insn-selector.brg b/arch/x86/insn-selector.brg
index fcb8187..babbd89 100644
--- a/arch/x86/insn-selector.brg
+++ b/arch/x86/insn-selector.brg
@@ -221,7 +221,7 @@ reg: EXPR_LOCAL 1
struct compilation_unit *cu = s->b_parent;
struct expression *expr;
struct stack_slot *slot;
- struct var_info *result;
+ struct var_info *src, *result;
struct vm_method *method;
enum machine_reg reg;
int index;
@@ -230,20 +230,23 @@ reg: EXPR_LOCAL 1
method = cu->method;
+ result = get_var(s->b_parent, expr->vm_type);
+
if (expr->local_index < (unsigned long) method->args_count) {
reg = method->args_map[expr->local_index].reg;
if (reg == MACH_REG_UNASSIGNED) {
index = method->args_map[expr->local_index].stack_index;
slot = get_local_slot(s->b_parent->stack_frame, index);
- result = get_var(s->b_parent, J_LONG);
select_insn(s, tree,
memlocal_reg_insn(INSN_MOV_MEMLOCAL_REG,
slot, result));
- } else
- result = get_fixed_var(s->b_parent, reg);
+ } else {
+ src = s->b_parent->non_fixed_args[expr->local_index];
+ select_insn(s, tree, reg_reg_insn(INSN_MOV_REG_REG,
+ src, result));
+ }
} else {
index = expr->local_index - method->reg_args_count;
slot = get_local_slot(s->b_parent->stack_frame, index);
- result = get_var(s->b_parent, J_LONG);
select_insn(s, tree, memlocal_reg_insn(INSN_MOV_MEMLOCAL_REG,
slot, result));
}
--
1.6.0.6
------------------------------------------------------------------------------
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
