summaryrefslogtreecommitdiffhomepage
path: root/ir/be/ia32
diff options
context:
space:
mode:
authorChristoph Mallon <christoph.mallon@gmx.de>2018-06-01 18:04:23 +0200
committerChristoph Mallon <christoph.mallon@gmx.de>2018-06-01 18:18:40 +0200
commit2d2a2483162d27c3b7f134a6ada1576e53995f93 (patch)
tree9b9f5abb08a7bc7a0ed27122967e5e7435b78e63 /ir/be/ia32
parent1cf3fc34e7fb69d4a3a11f195c179efd9fafcd45 (diff)
ia32: Rename 'Return' to 'Ret' to match the instruction name.
Diffstat (limited to 'ir/be/ia32')
-rw-r--r--ir/be/ia32/ia32_bearch.c12
-rw-r--r--ir/be/ia32/ia32_emitter.c2
-rw-r--r--ir/be/ia32/ia32_encode.c2
-rw-r--r--ir/be/ia32/ia32_optimize.c2
-rw-r--r--ir/be/ia32/ia32_spec.pl2
-rw-r--r--ir/be/ia32/ia32_transform.c14
-rw-r--r--ir/be/ia32/x86_x87.c2
7 files changed, 18 insertions, 18 deletions
diff --git a/ir/be/ia32/ia32_bearch.c b/ir/be/ia32/ia32_bearch.c
index cbcee56..4b5beed 100644
--- a/ir/be/ia32/ia32_bearch.c
+++ b/ir/be/ia32/ia32_bearch.c
@@ -956,7 +956,7 @@ static int determine_ebp_input(ir_node *ret)
static void introduce_epilogue(ir_node *const ret, bool const omit_fp)
{
ir_node *curr_sp;
- ir_node *const first_sp = get_irn_n(ret, n_ia32_Return_stack);
+ ir_node *const first_sp = get_irn_n(ret, n_ia32_Ret_stack);
ir_node *const block = get_nodes_block(ret);
ir_graph *const irg = get_irn_irg(ret);
if (!omit_fp) {
@@ -966,7 +966,7 @@ static void introduce_epilogue(ir_node *const ret, bool const omit_fp)
ir_node *restore;
int const n_ebp = determine_ebp_input(ret);
ir_node *curr_bp = get_irn_n(ret, n_ebp);
- ir_node *curr_mem = get_irn_n(ret, n_ia32_Return_mem);
+ ir_node *curr_mem = get_irn_n(ret, n_ia32_Ret_mem);
if (ia32_cg_config.use_leave) {
restore = new_bd_ia32_Leave(NULL, block, curr_mem, curr_bp);
curr_bp = be_new_Proj_reg(restore, pn_ia32_Leave_frame, bp);
@@ -986,15 +986,15 @@ static void introduce_epilogue(ir_node *const ret, bool const omit_fp)
curr_mem = be_new_Proj(restore, pn_ia32_Pop_M);
}
sched_add_before(ret, restore);
- set_irn_n(ret, n_ia32_Return_mem, curr_mem);
- set_irn_n(ret, n_ebp, curr_bp);
+ set_irn_n(ret, n_ia32_Ret_mem, curr_mem);
+ set_irn_n(ret, n_ebp, curr_bp);
} else {
ir_type *const frame_type = get_irg_frame_type(irg);
unsigned const frame_size = get_type_size(frame_type);
curr_sp = ia32_new_IncSP(block, first_sp, -(int)frame_size, true);
sched_add_before(ret, curr_sp);
}
- set_irn_n(ret, n_ia32_Return_stack, curr_sp);
+ set_irn_n(ret, n_ia32_Ret_stack, curr_sp);
/* Keep verifier happy. */
if (get_irn_n_edges(first_sp) == 0 && is_Proj(first_sp))
@@ -1049,7 +1049,7 @@ static void introduce_prologue_epilogue(ir_graph *const irg, bool omit_fp)
{
/* introduce epilogue for every return node */
foreach_irn_in(get_irg_end_block(irg), i, ret) {
- assert(is_ia32_Return(ret));
+ assert(is_ia32_Ret(ret));
introduce_epilogue(ret, omit_fp);
}
diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index feb65ef..0fd2976 100644
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -1131,7 +1131,7 @@ static void ia32_register_emitters(void)
be_set_emitter(op_be_CopyKeep, emit_be_CopyKeep);
be_set_emitter(op_be_IncSP, emit_be_IncSP);
be_set_emitter(op_be_Perm, emit_be_Perm);
- be_set_emitter(op_ia32_Return, emit_ia32_Return);
+ be_set_emitter(op_ia32_Ret, emit_ia32_Return);
be_set_emitter(op_ia32_Conv_FP2FP, emit_ia32_Conv_FP2FP);
be_set_emitter(op_ia32_Conv_FP2I, emit_ia32_Conv_FP2I);
be_set_emitter(op_ia32_Conv_I2FP, emit_ia32_Conv_I2FP);
diff --git a/ir/be/ia32/ia32_encode.c b/ir/be/ia32/ia32_encode.c
index 9686d21..02047d5 100644
--- a/ir/be/ia32/ia32_encode.c
+++ b/ir/be/ia32/ia32_encode.c
@@ -1279,7 +1279,7 @@ static void ia32_register_binary_emitters(void)
be_set_emitter(op_be_CopyKeep, enc_copy);
be_set_emitter(op_be_IncSP, enc_incsp);
be_set_emitter(op_be_Perm, enc_perm);
- be_set_emitter(op_ia32_Return, enc_return);
+ be_set_emitter(op_ia32_Ret, enc_return);
be_set_emitter(op_ia32_Bswap, enc_bswap);
be_set_emitter(op_ia32_Bt, enc_bt);
be_set_emitter(op_ia32_CMovcc, enc_cmovcc);
diff --git a/ir/be/ia32/ia32_optimize.c b/ir/be/ia32/ia32_optimize.c
index 5e913e0..c967440 100644
--- a/ir/be/ia32/ia32_optimize.c
+++ b/ir/be/ia32/ia32_optimize.c
@@ -1107,7 +1107,7 @@ void ia32_peephole_optimization(ir_graph *irg)
register_peephole_optimization(op_be_IncSP, peephole_be_IncSP);
register_peephole_optimization(op_ia32_Or, peephole_ia32_Or);
register_peephole_optimization(op_ia32_Test, peephole_ia32_Test);
- register_peephole_optimization(op_ia32_Return, peephole_ia32_Return);
+ register_peephole_optimization(op_ia32_Ret, peephole_ia32_Return);
register_peephole_optimization(op_ia32_Xor, peephole_ia32_Xor);
be_peephole_opt(irg);
}
diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index 08d52d1..2533ce5 100644
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -1257,7 +1257,7 @@ Popcnt => {
latency => 1,
},
-Return => {
+Ret => {
state => "pinned",
op_flags => [ "cfopcode" ],
in_reqs => "...",
diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index ec098ce..3e10645 100644
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -4085,18 +4085,18 @@ static ir_node *gen_Return(ir_node *node)
x86_cconv_t *cconv = current_cconv;
/* estimate number of return values */
- unsigned p = n_ia32_Return_first_result;
+ unsigned p = n_ia32_Ret_first_result;
unsigned const n_callee_saves = rbitset_popcount(cconv->callee_saves, N_IA32_REGISTERS);
unsigned const n_ins = p + n_res + n_callee_saves;
arch_register_req_t const **const reqs = be_allocate_in_reqs(irg, n_ins);
ir_node **in = ALLOCAN(ir_node*, n_ins);
- in[n_ia32_Return_mem] = new_mem;
- reqs[n_ia32_Return_mem] = arch_memory_req;
+ in[n_ia32_Ret_mem] = new_mem;
+ reqs[n_ia32_Ret_mem] = arch_memory_req;
- in[n_ia32_Return_stack] = sp;
- reqs[n_ia32_Return_stack] = ia32_registers[REG_ESP].single_req;
+ in[n_ia32_Ret_stack] = sp;
+ reqs[n_ia32_Ret_stack] = ia32_registers[REG_ESP].single_req;
/* result values */
for (size_t i = 0; i < n_res; ++i) {
@@ -4118,8 +4118,8 @@ static ir_node *gen_Return(ir_node *node)
}
assert(p == n_ins);
- ir_node *const ret = new_bd_ia32_Return(dbgi, new_block, n_ins, in, reqs, current_cconv->sp_delta);
- be_stack_record_chain(&stack_env, ret, n_ia32_Return_stack, NULL);
+ ir_node *const ret = new_bd_ia32_Ret(dbgi, new_block, n_ins, in, reqs, current_cconv->sp_delta);
+ be_stack_record_chain(&stack_env, ret, n_ia32_Ret_stack, NULL);
return ret;
}
diff --git a/ir/be/ia32/x86_x87.c b/ir/be/ia32/x86_x87.c
index 63180be..f67b0e4 100644
--- a/ir/be/ia32/x86_x87.c
+++ b/ir/be/ia32/x86_x87.c
@@ -1562,7 +1562,7 @@ void x86_prepare_x87_callbacks_ia32(void)
x86_register_x87_sim(op_ia32_FtstFnstsw, sim_FtstFnstsw);
x86_register_x87_sim(op_ia32_FucomFnstsw, sim_ia32_FucomFnstsw);
x86_register_x87_sim(op_ia32_Fucomi, sim_ia32_Fucomi);
- x86_register_x87_sim(op_ia32_Return, x86_sim_x87_ret);
+ x86_register_x87_sim(op_ia32_Ret, x86_sim_x87_ret);
}
/**