This renames INSN_MOV_FREG_MEMLOCAL and INSN_MOV_MEMLOCAL_FREG
to INSN_MOV_XMM_MEMLOCAL and INSN_MOV_MEMLOCAL_XMM.
All other instructions already use XMM to refer FPU registers.
Signed-off-by: Tomek Grabiec <tgrab...@gmail.com>
---
arch/x86/emit-code.c | 8 ++++----
arch/x86/include/arch/instruction.h | 8 ++++----
arch/x86/insn-selector.brg | 8 ++++----
arch/x86/lir-printer.c | 8 ++++----
arch/x86/use-def.c | 4 ++--
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/x86/emit-code.c b/arch/x86/emit-code.c
index 6fa7261..8035ec6 100644
--- a/arch/x86/emit-code.c
+++ b/arch/x86/emit-code.c
@@ -747,7 +747,7 @@ emit_mov_memlocal_reg(struct buffer *buf, struct operand
*src, struct operand *d
}
static void
-emit_mov_memlocal_freg(struct buffer *buf, struct operand *src, struct operand
*dest)
+emit_mov_memlocal_xmm(struct buffer *buf, struct operand *src, struct operand
*dest)
{
enum machine_reg dest_reg;
unsigned long disp;
@@ -890,7 +890,7 @@ static void emit_mov_reg_memlocal(struct buffer *buf,
struct operand *src,
emit_imm(buf, disp);
}
-static void emit_mov_freg_memlocal(struct buffer *buf, struct operand *src,
+static void emit_mov_xmm_memlocal(struct buffer *buf, struct operand *src,
struct operand *dest)
{
unsigned long disp;
@@ -1513,7 +1513,7 @@ struct emitter emitters[] = {
DECL_EMITTER(INSN_MOV_IMM_THREAD_LOCAL_MEMBASE,
emit_mov_imm_thread_local_membase, TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_IP_THREAD_LOCAL_MEMBASE,
emit_mov_ip_thread_local_membase, SINGLE_OPERAND),
DECL_EMITTER(INSN_MOV_MEMLOCAL_REG, emit_mov_memlocal_reg,
TWO_OPERANDS),
- DECL_EMITTER(INSN_MOV_MEMLOCAL_FREG, emit_mov_memlocal_freg,
TWO_OPERANDS),
+ DECL_EMITTER(INSN_MOV_MEMLOCAL_XMM, emit_mov_memlocal_xmm,
TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_MEMBASE_REG, emit_mov_membase_reg, TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_MEMDISP_REG, emit_mov_memdisp_reg, TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_MEMDISP_XMM, emit_mov_memdisp_xmm, TWO_OPERANDS),
@@ -1526,7 +1526,7 @@ struct emitter emitters[] = {
DECL_EMITTER(INSN_MOV_REG_MEMLOCAL, emit_mov_reg_memlocal,
TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_REG_THREAD_LOCAL_MEMBASE,
emit_mov_reg_thread_local_membase, TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_REG_THREAD_LOCAL_MEMDISP,
emit_mov_reg_thread_local_memdisp, TWO_OPERANDS),
- DECL_EMITTER(INSN_MOV_FREG_MEMLOCAL, emit_mov_freg_memlocal,
TWO_OPERANDS),
+ DECL_EMITTER(INSN_MOV_XMM_MEMLOCAL, emit_mov_xmm_memlocal,
TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_REG_REG, emit_mov_reg_reg, TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_XMM_MEMDISP, emit_mov_xmm_memdisp, TWO_OPERANDS),
DECL_EMITTER(INSN_MOV_XMM_MEMINDEX, emit_mov_xmm_memindex,
TWO_OPERANDS),
diff --git a/arch/x86/include/arch/instruction.h
b/arch/x86/include/arch/instruction.h
index 8cfdb77..6f9d823 100644
--- a/arch/x86/include/arch/instruction.h
+++ b/arch/x86/include/arch/instruction.h
@@ -96,7 +96,7 @@ enum insn_type {
INSN_MOV_IP_REG,
INSN_MOV_IP_THREAD_LOCAL_MEMBASE,
INSN_MOV_MEMLOCAL_REG,
- INSN_MOV_MEMLOCAL_FREG,
+ INSN_MOV_MEMLOCAL_XMM,
INSN_MOV_MEMBASE_REG,
INSN_MOV_MEMDISP_REG,
INSN_MOV_MEMDISP_XMM,
@@ -108,7 +108,7 @@ enum insn_type {
INSN_MOV_REG_MEMBASE,
INSN_MOV_REG_MEMINDEX,
INSN_MOV_REG_MEMLOCAL,
- INSN_MOV_FREG_MEMLOCAL,
+ INSN_MOV_XMM_MEMLOCAL,
INSN_MOV_REG_REG,
INSN_MOV_MEMBASE_XMM,
INSN_MOV_MEMINDEX_XMM,
@@ -220,7 +220,7 @@ spill_insn(struct var_info *var, struct stack_slot *slot)
insn_type = INSN_MOV_REG_MEMLOCAL;
break;
case REG_TYPE_FPU:
- insn_type = INSN_MOV_FREG_MEMLOCAL;
+ insn_type = INSN_MOV_XMM_MEMLOCAL;
break;
default:
die("unknown register type: %d", var->type);
@@ -240,7 +240,7 @@ reload_insn(struct stack_slot *slot, struct var_info *var)
insn_type = INSN_MOV_MEMLOCAL_REG;
break;
case REG_TYPE_FPU:
- insn_type = INSN_MOV_MEMLOCAL_FREG;
+ insn_type = INSN_MOV_MEMLOCAL_XMM;
break;
default:
die("unknown register type: %d", var->type);
diff --git a/arch/x86/insn-selector.brg b/arch/x86/insn-selector.brg
index d101707..46e1e8d 100644
--- a/arch/x86/insn-selector.brg
+++ b/arch/x86/insn-selector.brg
@@ -233,7 +233,7 @@ freg: EXPR_LOCAL 0
result = get_var(s->b_parent, expr->vm_type);
state->reg1 = result;
- select_insn(s, tree, memlocal_reg_insn(INSN_MOV_MEMLOCAL_FREG, slot,
result));
+ select_insn(s, tree, memlocal_reg_insn(INSN_MOV_MEMLOCAL_XMM, slot,
result));
}
reg: EXPR_TEMPORARY 0
@@ -1791,7 +1791,7 @@ stmt: STMT_STORE(EXPR_FLOAT_LOCAL, freg)
local = to_expr(stmt->store_dest);
slot = get_local_slot(cu->stack_frame, local->local_index);
- select_insn(s, tree, reg_memlocal_insn(INSN_MOV_FREG_MEMLOCAL, src,
slot));
+ select_insn(s, tree, reg_memlocal_insn(INSN_MOV_XMM_MEMLOCAL, src,
slot));
}
%ifdef CONFIG_X86_32
@@ -1835,7 +1835,7 @@ stmt: STMT_STORE(EXPR_FLOAT_TEMPORARY, EXPR_FLOAT_LOCAL)
1
dest = exprdest->tmp_low;
- select_insn(s, tree, memlocal_reg_insn(INSN_MOV_MEMLOCAL_FREG, slot,
dest));
+ select_insn(s, tree, memlocal_reg_insn(INSN_MOV_MEMLOCAL_XMM, slot,
dest));
}
%else
stmt: STMT_STORE(EXPR_TEMPORARY, EXPR_LOCAL) 1
@@ -1889,7 +1889,7 @@ stmt: STMT_STORE(EXPR_FLOAT_TEMPORARY, EXPR_FLOAT_LOCAL)
1
if (reg == REG_UNASSIGNED) {
index = method->args_map[exprsrc->local_index].stack_index;
slot = get_local_slot(s->b_parent->stack_frame, index);
- select_insn(s, tree, memlocal_reg_insn(INSN_MOV_MEMLOCAL_FREG,
+ select_insn(s, tree, memlocal_reg_insn(INSN_MOV_MEMLOCAL_XMM,
slot, dest));
} else {
src = get_fixed_var(s->b_parent, reg);
diff --git a/arch/x86/lir-printer.c b/arch/x86/lir-printer.c
index 53f1888..0082f8b 100644
--- a/arch/x86/lir-printer.c
+++ b/arch/x86/lir-printer.c
@@ -438,7 +438,7 @@ static int print_mov_memlocal_reg(struct string *str,
struct insn *insn)
return print_memlocal_reg(str, insn);
}
-static int print_mov_memlocal_freg(struct string *str, struct insn *insn)
+static int print_mov_memlocal_xmm(struct string *str, struct insn *insn)
{
print_func_name(str);
return print_memlocal_reg(str, insn);
@@ -540,7 +540,7 @@ static int print_mov_reg_memlocal(struct string *str,
struct insn *insn)
return print_reg_memlocal(str, insn);
}
-static int print_mov_freg_memlocal(struct string *str, struct insn *insn)
+static int print_mov_xmm_memlocal(struct string *str, struct insn *insn)
{
print_func_name(str);
return print_reg_memlocal(str, insn);
@@ -782,7 +782,7 @@ static print_insn_fn insn_printers[] = {
[INSN_MOV_IMM_THREAD_LOCAL_MEMBASE] = print_mov_imm_tlmembase,
[INSN_MOV_IP_THREAD_LOCAL_MEMBASE] = print_mov_ip_tlmembase,
[INSN_MOV_MEMLOCAL_REG] = print_mov_memlocal_reg,
- [INSN_MOV_MEMLOCAL_FREG] = print_mov_memlocal_freg,
+ [INSN_MOV_MEMLOCAL_XMM] = print_mov_memlocal_xmm,
[INSN_MOV_MEMBASE_REG] = print_mov_membase_reg,
[INSN_MOV_MEMDISP_REG] = print_mov_memdisp_reg,
[INSN_MOV_MEMDISP_XMM] = print_mov_memdisp_xmm,
@@ -795,7 +795,7 @@ static print_insn_fn insn_printers[] = {
[INSN_MOV_REG_MEMLOCAL] = print_mov_reg_memlocal,
[INSN_MOV_REG_THREAD_LOCAL_MEMBASE] = print_mov_reg_tlmembase,
[INSN_MOV_REG_THREAD_LOCAL_MEMDISP] = print_mov_reg_tlmemdisp,
- [INSN_MOV_FREG_MEMLOCAL] = print_mov_freg_memlocal,
+ [INSN_MOV_XMM_MEMLOCAL] = print_mov_xmm_memlocal,
[INSN_MOV_REG_REG] = print_mov_reg_reg,
[INSN_MOV_XMM_MEMDISP] = print_mov_xmm_memdisp,
[INSN_MOV_XMM_MEMINDEX] = print_mov_xmm_memindex,
diff --git a/arch/x86/use-def.c b/arch/x86/use-def.c
index 68cc940..0c0a34f 100644
--- a/arch/x86/use-def.c
+++ b/arch/x86/use-def.c
@@ -81,7 +81,7 @@ static struct insn_info insn_infos[] = {
DECLARE_INFO(INSN_MOV_IP_THREAD_LOCAL_MEMBASE, USE_NONE | DEF_NONE),
DECLARE_INFO(INSN_MOV_IP_REG, DEF_DST),
DECLARE_INFO(INSN_MOV_MEMLOCAL_REG, USE_FP | DEF_DST),
- DECLARE_INFO(INSN_MOV_MEMLOCAL_FREG, USE_FP | DEF_DST),
+ DECLARE_INFO(INSN_MOV_MEMLOCAL_XMM, USE_FP | DEF_DST),
DECLARE_INFO(INSN_MOV_MEMBASE_REG, USE_SRC | DEF_DST),
DECLARE_INFO(INSN_MOV_MEMDISP_REG, USE_NONE | DEF_DST),
DECLARE_INFO(INSN_MOV_MEMDISP_XMM, USE_NONE | DEF_DST),
@@ -94,7 +94,7 @@ static struct insn_info insn_infos[] = {
DECLARE_INFO(INSN_MOV_REG_MEMLOCAL, USE_SRC),
DECLARE_INFO(INSN_MOV_REG_THREAD_LOCAL_MEMBASE, USE_SRC | USE_DST |
DEF_NONE),
DECLARE_INFO(INSN_MOV_REG_THREAD_LOCAL_MEMDISP, USE_SRC | DEF_NONE),
- DECLARE_INFO(INSN_MOV_FREG_MEMLOCAL, USE_SRC),
+ DECLARE_INFO(INSN_MOV_XMM_MEMLOCAL, USE_SRC),
DECLARE_INFO(INSN_MOV_REG_REG, USE_SRC | DEF_DST),
DECLARE_INFO(INSN_MOV_XMM_MEMDISP, USE_SRC | DEF_NONE),
DECLARE_INFO(INSN_MOV_XMM_MEMINDEX, USE_SRC | USE_DST | USE_IDX_DST |
DEF_NONE),
--
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
