* @author Michael Beck
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <assert.h>
struct _x87_simulator {
struct obstack obst; /**< An obstack for fast allocating. */
pmap *blk_states; /**< Map blocks to states. */
- const arch_env_t *arch_env; /**< The architecture environment. */
be_lv_t *lv; /**< intrablock liveness. */
vfp_liveness *live; /**< Liveness information. */
unsigned n_idx; /**< The cached get_irg_last_idx() result. */
/**
* Wrap the arch_* function here so we can check for errors.
*/
-static INLINE const arch_register_t *x87_get_irn_register(x87_simulator *sim, const ir_node *irn)
+static INLINE const arch_register_t *x87_get_irn_register(const ir_node *irn)
{
- const arch_register_t *res;
+ const arch_register_t *res = arch_get_irn_register(irn);
- res = arch_get_irn_register(sim->arch_env, irn);
assert(res->reg_class->regs == ia32_vfp_regs);
return res;
} /* x87_get_irn_register */
{
ir_node *fpush, *pred = get_irn_n(n, op_idx);
ia32_x87_attr_t *attr;
- const arch_register_t *out = x87_get_irn_register(state->sim, pred);
+ const arch_register_t *out = x87_get_irn_register(pred);
x87_push_dbl(state, arch_register_get_index(out), pred);
* Updates a live set over a single step from a given node to its predecessor.
* Everything defined at the node is removed from the set, the uses of the node get inserted.
*
- * @param sim The simulator handle.
* @param irn The node at which liveness should be computed.
* @param live The bitset of registers live before @p irn. This set gets modified by updating it to
* the registers live after irn.
*
* @return The live bitset.
*/
-static vfp_liveness vfp_liveness_transfer(x87_simulator *sim, ir_node *irn, vfp_liveness live)
+static vfp_liveness vfp_liveness_transfer(ir_node *irn, vfp_liveness live)
{
int i, n;
const arch_register_class_t *cls = &ia32_reg_classes[CLASS_ia32_vfp];
- const arch_env_t *arch_env = sim->arch_env;
if (get_irn_mode(irn) == mode_T) {
const ir_edge_t *edge;
foreach_out_edge(irn, edge) {
ir_node *proj = get_edge_src_irn(edge);
- if (arch_irn_consider_in_reg_alloc(arch_env, cls, proj)) {
- const arch_register_t *reg = x87_get_irn_register(sim, proj);
+ if (arch_irn_consider_in_reg_alloc(cls, proj)) {
+ const arch_register_t *reg = x87_get_irn_register(proj);
live &= ~(1 << arch_register_get_index(reg));
}
}
}
- if (arch_irn_consider_in_reg_alloc(arch_env, cls, irn)) {
- const arch_register_t *reg = x87_get_irn_register(sim, irn);
+ if (arch_irn_consider_in_reg_alloc(cls, irn)) {
+ const arch_register_t *reg = x87_get_irn_register(irn);
live &= ~(1 << arch_register_get_index(reg));
}
for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
ir_node *op = get_irn_n(irn, i);
- if (mode_is_float(get_irn_mode(op)) && arch_irn_consider_in_reg_alloc(arch_env, cls, op)) {
- const arch_register_t *reg = x87_get_irn_register(sim, op);
+ if (mode_is_float(get_irn_mode(op)) &&
+ arch_irn_consider_in_reg_alloc(cls, op)) {
+ const arch_register_t *reg = x87_get_irn_register(op);
live |= 1 << arch_register_get_index(reg);
}
}
int i;
vfp_liveness live = 0;
const arch_register_class_t *cls = &ia32_reg_classes[CLASS_ia32_vfp];
- const arch_env_t *arch_env = sim->arch_env;
const be_lv_t *lv = sim->lv;
be_lv_foreach(lv, block, be_lv_state_end, i) {
const arch_register_t *reg;
const ir_node *node = be_lv_get_irn(lv, block, i);
- if (!arch_irn_consider_in_reg_alloc(arch_env, cls, node))
+ if (!arch_irn_consider_in_reg_alloc(cls, node))
continue;
- reg = x87_get_irn_register(sim, node);
+ reg = x87_get_irn_register(node);
live |= 1 << arch_register_get_index(reg);
}
idx = get_irn_idx(irn);
sim->live[idx] = live;
- live = vfp_liveness_transfer(sim, irn, live);
+ live = vfp_liveness_transfer(irn, live);
}
idx = get_irn_idx(block);
sim->live[idx] = live;
x87_simulator *sim = state->sim;
ir_node *op1 = get_irn_n(n, n_ia32_binary_left);
ir_node *op2 = get_irn_n(n, n_ia32_binary_right);
- const arch_register_t *op1_reg = x87_get_irn_register(sim, op1);
- const arch_register_t *op2_reg = x87_get_irn_register(sim, op2);
- const arch_register_t *out = x87_get_irn_register(sim, n);
+ const arch_register_t *op1_reg = x87_get_irn_register(op1);
+ const arch_register_t *op2_reg = x87_get_irn_register(op2);
+ const arch_register_t *out = x87_get_irn_register(n);
int reg_index_1 = arch_register_get_index(op1_reg);
int reg_index_2 = arch_register_get_index(op2_reg);
vfp_liveness live = vfp_live_args_after(sim, n, REGMASK(out));
{
int op1_idx, out_idx;
x87_simulator *sim = state->sim;
- const arch_register_t *op1 = x87_get_irn_register(sim, get_irn_n(n, UNOP_IDX));
- const arch_register_t *out = x87_get_irn_register(sim, n);
+ const arch_register_t *op1 = x87_get_irn_register(get_irn_n(n, UNOP_IDX));
+ const arch_register_t *out = x87_get_irn_register(n);
ia32_x87_attr_t *attr;
unsigned live = vfp_live_args_after(sim, n, REGMASK(out));
*/
static int sim_load(x87_state *state, ir_node *n, ir_op *op)
{
- const arch_register_t *out = x87_get_irn_register(state->sim, n);
+ const arch_register_t *out = x87_get_irn_register(n);
ia32_x87_attr_t *attr;
DB((dbg, LEVEL_1, ">>> %+F -> %s\n", n, arch_register_get_name(out)));
x87_push(state, arch_register_get_index(out), x87_patch_insn(n, op));
- assert(out == x87_get_irn_register(state->sim, n));
+ assert(out == x87_get_irn_register(n));
attr = get_ia32_x87_attr(n);
attr->x87[2] = out = &ia32_st_regs[0];
DB((dbg, LEVEL_1, "<<< %s -> %s\n", get_irn_opname(n), arch_register_get_name(out)));
*/
static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p)
{
- x87_simulator *sim = state->sim;
ir_node *val = get_irn_n(n, n_ia32_vfst_val);
- const arch_register_t *op2 = x87_get_irn_register(sim, val);
- unsigned live = vfp_live_args_after(sim, n, 0);
+ const arch_register_t *op2 = x87_get_irn_register(val);
+ unsigned live = vfp_live_args_after(state->sim, n, 0);
int insn = NO_NODE_ADDED;
ia32_x87_attr_t *attr;
int op2_reg_idx, op2_idx, depth;
assert(mem && "Store memory not found");
- arch_set_irn_register(sim->arch_env, rproj, op2);
+ arch_set_irn_register(rproj, op2);
/* reroute all former users of the store memory to the load memory */
edges_reroute(mem, mproj, irg);
*/
static int sim_fisttp(x87_state *state, ir_node *n)
{
- x87_simulator *sim = state->sim;
ir_node *val = get_irn_n(n, n_ia32_vfst_val);
- const arch_register_t *op2 = x87_get_irn_register(sim, val);
+ const arch_register_t *op2 = x87_get_irn_register(val);
int insn = NO_NODE_ADDED;
ia32_x87_attr_t *attr;
int op2_reg_idx, op2_idx, depth;
x87_simulator *sim = state->sim;
ia32_x87_attr_t *attr = get_ia32_x87_attr(n);
ir_node *op1_node = get_irn_n(n, n_ia32_vFtstFnstsw_left);
- const arch_register_t *reg1 = x87_get_irn_register(sim, op1_node);
+ const arch_register_t *reg1 = x87_get_irn_register(op1_node);
int reg_index_1 = arch_register_get_index(reg1);
int op1_idx = x87_on_stack(state, reg_index_1);
unsigned live = vfp_live_args_after(sim, n, 0);
x87_simulator *sim = state->sim;
ir_node *op1_node = get_irn_n(n, n_ia32_vFucomFnstsw_left);
ir_node *op2_node = get_irn_n(n, n_ia32_vFucomFnstsw_right);
- const arch_register_t *op1 = x87_get_irn_register(sim, op1_node);
- const arch_register_t *op2 = x87_get_irn_register(sim, op2_node);
+ const arch_register_t *op1 = x87_get_irn_register(op1_node);
+ const arch_register_t *op2 = x87_get_irn_register(op2_node);
int reg_index_1 = arch_register_get_index(op1);
int reg_index_2 = arch_register_get_index(op2);
unsigned live = vfp_live_args_after(sim, n, 0);
arity = get_irn_arity(node);
for (i = 0; i < arity; ++i) {
op = get_irn_n(node, i);
- op_reg = arch_get_irn_register(state->sim->arch_env, op);
+ op_reg = arch_get_irn_register(op);
if (arch_register_get_class(op_reg) != &ia32_reg_classes[CLASS_ia32_vfp])
continue;
*/
static ir_node *create_Copy(x87_state *state, ir_node *n)
{
- x87_simulator *sim = state->sim;
ir_graph *irg = get_irn_irg(n);
dbg_info *n_dbg = get_irn_dbg_info(n);
ir_mode *mode = get_irn_mode(n);
break;
}
- out = x87_get_irn_register(sim, n);
- op1 = x87_get_irn_register(sim, pred);
+ out = x87_get_irn_register(n);
+ op1 = x87_get_irn_register(pred);
if (cnstr != NULL) {
/* copy a constant */
attr->x87[0] = &ia32_st_regs[op1_idx];
attr->x87[2] = &ia32_st_regs[0];
}
- arch_set_irn_register(sim->arch_env, res, out);
+ arch_set_irn_register(res, out);
return res;
} /* create_Copy */
*/
static int sim_Copy(x87_state *state, ir_node *n)
{
- x87_simulator *sim = state->sim;
ir_node *pred;
const arch_register_t *out;
const arch_register_t *op1;
return 0;
pred = get_irn_n(n, 0);
- out = x87_get_irn_register(sim, n);
- op1 = x87_get_irn_register(sim, pred);
- live = vfp_live_args_after(sim, n, REGMASK(out));
+ out = x87_get_irn_register(n);
+ op1 = x87_get_irn_register(pred);
+ live = vfp_live_args_after(state->sim, n, REGMASK(out));
DB((dbg, LEVEL_1, ">>> %+F %s -> %s\n", n,
arch_register_get_name(op1), arch_register_get_name(out)));
sched_add_before(next, node);
DB((dbg, LEVEL_1, "<<< %+F %s -> %s\n", node, op1->name,
- arch_get_irn_register(sim->arch_env, node)->name));
+ arch_get_irn_register(node)->name));
return NO_NODE_ADDED;
}
resproj = get_call_result_proj(n);
assert(resproj != NULL);
- reg = x87_get_irn_register(state->sim, resproj);
+ reg = x87_get_irn_register(resproj);
x87_push(state, arch_register_get_index(reg), resproj);
end_call:
static int sim_Perm(x87_state *state, ir_node *irn)
{
int i, n;
- x87_simulator *sim = state->sim;
ir_node *pred = get_irn_n(irn, 0);
int *stack_pos;
const ir_edge_t *edge;
/* collect old stack positions */
for (i = 0; i < n; ++i) {
- const arch_register_t *inreg = x87_get_irn_register(sim, get_irn_n(irn, i));
+ const arch_register_t *inreg = x87_get_irn_register(get_irn_n(irn, i));
int idx = x87_on_stack(state, arch_register_get_index(inreg));
assert(idx >= 0 && "Perm argument not on x87 stack");
/* now do the permutation */
foreach_out_edge(irn, edge) {
ir_node *proj = get_edge_src_irn(edge);
- const arch_register_t *out = x87_get_irn_register(sim, proj);
+ const arch_register_t *out = x87_get_irn_register(proj);
long num = get_Proj_proj(proj);
assert(0 <= num && num < n && "More Proj's than Perm inputs");
static int sim_Barrier(x87_state *state, ir_node *node)
{
- //const arch_env_t *arch_env = state->sim->arch_env;
int i, arity;
/* materialize unknown if needed */
if (!is_ia32_Unknown_VFP(op))
continue;
- reg = arch_get_irn_register(state->sim->arch_env, node);
+ reg = arch_get_irn_register(node);
/* create a zero at end of pred block */
zero = new_rd_ia32_fldz(NULL, current_ir_graph, pred_block, mode_E);
*
* @param sim a simulator handle, will be initialized
* @param irg the current graph
- * @param arch_env the architecture environment
*/
-static void x87_init_simulator(x87_simulator *sim, ir_graph *irg,
- const arch_env_t *arch_env)
+static void x87_init_simulator(x87_simulator *sim, ir_graph *irg)
{
obstack_init(&sim->obst);
sim->blk_states = pmap_create();
- sim->arch_env = arch_env;
sim->n_idx = get_irg_last_idx(irg);
sim->live = obstack_alloc(&sim->obst, sizeof(*sim->live) * sim->n_idx);
update_liveness(sim, block);
} /* update_liveness_walker */
-/**
- * Run a simulation and fix all virtual instructions for a graph.
- *
- * @param env the architecture environment
- * @param irg the current graph
- *
- * Needs a block-schedule.
- */
-void x87_simulate_graph(const arch_env_t *arch_env, be_irg_t *birg)
+void x87_simulate_graph(be_irg_t *birg)
{
+ /* TODO improve code quality (less executed fxch) by using execfreqs */
+
ir_node *block, *start_block;
blk_state *bl_state;
x87_simulator sim;
ir_graph *irg = be_get_birg_irg(birg);
/* create the simulator */
- x87_init_simulator(&sim, irg, arch_env);
+ x87_init_simulator(&sim, irg);
start_block = get_irg_start_block(irg);
bl_state = x87_get_bl_state(&sim, start_block);
projects / libfirm / blobdiff