#include "iredges_t.h"
#include "irgmod.h"
#include "irgwalk.h"
-#include "irprintf_t.h"
+#include "irprintf.h"
#include "irgopt.h"
#include "iropt_t.h"
#include "irtools.h"
#include "be.h"
#include "beabi.h"
+#include "beabihelper.h"
#include "bearch.h"
#include "benode.h"
#include "belive_t.h"
}
/**
- * Check if the given register is callee save, ie. will be saved by the callee.
+ * Check if the given register is callee save, i.e. will be saved by the callee.
*/
static bool arch_register_is_callee_save(
const arch_env_t *arch_env,
}
/**
- * Check if the given register is caller save, ie. must be saved by the caller.
+ * Check if the given register is caller save, i.e. must be saved by the caller.
*/
static bool arch_register_is_caller_save(
const arch_env_t *arch_env,
* checking */
continue;
}
- if (arch_register_is_caller_save(arch_env, reg)) {
- if (!(reg->type & arch_register_type_ignore)) {
- ARR_APP1(const arch_register_t*, destroyed_regs, reg);
- }
- }
+ if (arch_register_is_caller_save(arch_env, reg))
+ ARR_APP1(const arch_register_t*, destroyed_regs, reg);
}
}
continue;
foreach_out_edge(irn, res_edge) {
- int proj;
- ir_node *res = get_edge_src_irn(res_edge);
-
- assert(is_Proj(res));
-
- proj = get_Proj_proj(res);
+ ir_node *const res = get_edge_src_irn(res_edge);
+ long const proj = get_Proj_proj(res);
assert(proj < n_res);
assert(res_projs[proj] == NULL);
res_projs[proj] = res;
throws_exception = ir_throws_exception(irn);
if (env->call->flags.call_has_imm && is_SymConst(call_ptr)) {
/* direct call */
- low_call = be_new_Call(dbgi, irg, bl, curr_mem, sp->single_req, curr_sp,
+ low_call = be_new_Call(dbgi, bl, curr_mem, sp->single_req, curr_sp,
sp->single_req, curr_sp,
n_reg_results + pn_be_Call_first_res + ARR_LEN(destroyed_regs),
n_ins, in, get_Call_type(irn));
be_Call_set_entity(low_call, get_SymConst_entity(call_ptr));
} else {
/* indirect call */
- low_call = be_new_Call(dbgi, irg, bl, curr_mem, sp->single_req, curr_sp,
+ low_call = be_new_Call(dbgi, bl, curr_mem, sp->single_req, curr_sp,
sp->reg_class->class_req, call_ptr,
n_reg_results + pn_be_Call_first_res + ARR_LEN(destroyed_regs),
n_ins, in, get_Call_type(irn));
foreach_out_edge(alloc, edge) {
ir_node *irn = get_edge_src_irn(edge);
- assert(is_Proj(irn));
switch (get_Proj_proj(irn)) {
case pn_Alloc_M:
alloc_mem = irn;
return res;
}
-typedef struct {
- const arch_register_t *reg;
- ir_node *irn;
-} reg_node_map_t;
-
static int cmp_regs(const void *a, const void *b)
{
- const reg_node_map_t *p = (const reg_node_map_t*)a;
- const reg_node_map_t *q = (const reg_node_map_t*)b;
+ arch_register_t const *const p = *(arch_register_t const**)a;
+ arch_register_t const *const q = *(arch_register_t const**)b;
- if (p->reg->reg_class == q->reg->reg_class)
- return p->reg->index - q->reg->index;
+ if (p->reg_class == q->reg_class)
+ return p->index - q->index;
else
- return p->reg->reg_class < q->reg->reg_class ? -1 : +1;
+ return p->reg_class < q->reg_class ? -1 : +1;
}
-static void reg_map_to_arr(reg_node_map_t *res, pmap *reg_map)
+static void reg_map_to_arr(arch_register_t const **const res, pmap *const reg_map)
{
pmap_entry *ent;
size_t n = pmap_count(reg_map);
size_t i = 0;
foreach_pmap(reg_map, ent) {
- res[i].reg = (const arch_register_t*)ent->key;
- res[i].irn = (ir_node*)ent->value;
- i++;
+ res[i++] = (arch_register_t const*)ent->key;
}
qsort(res, n, sizeof(res[0]), cmp_regs);
*
* @param @env the abi environment
* @param irn the Return node
- * @param bl the block where the be_Retun should be placed
- * @param mem the current memory
- * @param n_res number of return results
*/
-static ir_node *create_be_return(be_abi_irg_t *env, ir_node *irn, ir_node *bl,
- ir_node *mem, int n_res)
+static ir_node *create_be_return(be_abi_irg_t *const env, ir_node *const irn)
{
+ ir_node *const bl = get_nodes_block(irn);
be_abi_call_t *call = env->call;
ir_graph *irg = get_Block_irg(bl);
const arch_env_t *arch_env = be_get_irg_arch_env(irg);
pmap *reg_map = pmap_create();
ir_node *keep = pmap_get(ir_node, env->keep_map, bl);
size_t in_max;
- ir_node *ret;
int i, n;
- unsigned pop;
ir_node **in;
ir_node *stack;
const arch_register_t **regs;
remove_End_keepalive(get_irg_end(irg), keep);
}
+ int const n_res = get_Return_n_ress(irn);
/* Insert results for Return into the register map. */
for (i = 0; i < n_res; ++i) {
ir_node *res = get_Return_res(irn, i);
/* Add uses of the callee save registers. */
foreach_pmap(env->regs, ent) {
const arch_register_t *reg = (const arch_register_t*)ent->key;
- if ((reg->type & arch_register_type_ignore) || arch_register_is_callee_save(arch_env, reg))
+ if (arch_register_is_callee_save(arch_env, reg))
pmap_insert(reg_map, ent->key, ent->value);
}
in = ALLOCAN(ir_node*, in_max);
regs = ALLOCAN(arch_register_t const*, in_max);
- in[0] = mem;
+ in[0] = get_Return_mem(irn);
in[1] = be_abi_reg_map_get(reg_map, arch_env->sp);
regs[0] = NULL;
regs[1] = arch_env->sp;
/* The in array for the new back end return is now ready. */
dbg_info *const dbgi = get_irn_dbg_info(irn);
- /* we have to pop the shadow parameter in in case of struct returns */
- pop = call->pop;
- ret = be_new_Return(dbgi, irg, bl, n_res, pop, n, in);
+ ir_node *const ret = be_new_Return(dbgi, bl, n_res, call->pop, n, in);
/* Set the register classes of the return's parameter accordingly. */
for (i = 0; i < n; ++i) {
int i, n;
unsigned j;
- reg_node_map_t *rm;
const arch_register_t *fp_reg;
ir_node *frame_pointer;
ir_node *start_bl;
* Note, that if a register corresponds to an argument, the regs map
* contains the old Proj from start for that argument.
*/
- rm = ALLOCAN(reg_node_map_t, pmap_count(env->regs));
- reg_map_to_arr(rm, env->regs);
+ arch_register_t const **const regs = ALLOCAN(arch_register_t const*, pmap_count(env->regs));
+ reg_map_to_arr(regs, env->regs);
for (i = 0, n = pmap_count(env->regs); i < n; ++i) {
- const arch_register_t *reg = rm[i].reg;
+ const arch_register_t *reg = regs[i];
ir_mode *mode = reg->reg_class->mode;
long nr = i;
arch_register_req_type_t add_type = arch_register_req_type_none;
ir_node *irn = get_Block_cfgpred(end, i);
if (is_Return(irn)) {
- ir_node *blk = get_nodes_block(irn);
- ir_node *mem = get_Return_mem(irn);
- ir_node *ret = create_be_return(env, irn, blk, mem, get_Return_n_ress(irn));
+ ir_node *const ret = create_be_return(env, irn);
exchange(irn, ret);
}
}