#include "bearch.h"
#include "benode.h"
#include "beutil.h"
-#include "beifg_t.h"
+#include "beifg.h"
#include "beintlive_t.h"
#include "becopyopt_t.h"
#include "becopystat.h"
{
if (env->ifg)
return be_ifg_connected(env->ifg, a, b);
- else
- return be_values_interfere(env->birg->lv, a, b);
+ else {
+ be_lv_t *lv = be_get_irg_liveness(env->irg);
+ return be_values_interfere(lv, a, b);
+ }
}
int res;
ir_node *root_bl = get_nodes_block(root);
ir_node *copy_bl = is_Phi(root) ? get_Block_cfgpred_block(root_bl, pos) : root_bl;
+ ir_exec_freq *exec_freq = be_get_irg_exec_freq(co->cenv->irg);
(void) arg;
- res = get_block_execfreq_ulong(co->cenv->birg->exec_freq, copy_bl);
+ res = get_block_execfreq_ulong(exec_freq, copy_bl);
/* don't allow values smaller than one. */
return res < 1 ? 1 : res;
static void co_collect_units(ir_node *irn, void *env)
{
- const arch_register_req_t *req = arch_get_register_req_out(irn);
+ const arch_register_req_t *req;
copy_opt_t *co = env;
unit_t *unit;
+ if (get_irn_mode(irn) == mode_T)
+ return;
+ req = arch_get_register_req_out(irn);
if (req->cls != co->cls)
return;
if (!co_is_optimizable_root(irn))
static void build_graph_walker(ir_node *irn, void *env)
{
- const arch_register_req_t *req = arch_get_register_req_out(irn);
+ const arch_register_req_t *req;
copy_opt_t *co = env;
int pos, max;
const arch_register_t *reg;
+ if (get_irn_mode(irn) == mode_T)
+ return;
+ req = arch_get_register_req_out(irn);
if (req->cls != co->cls || arch_irn_is_ignore(irn))
return;
co->nodes = NULL;
}
-/* co_solve_ilp1() co_solve_ilp2() are implemented in becopyilpX.c */
-
int co_gs_is_optimizable(copy_opt_t *co, ir_node *irn)
{
affinity_node_t new_node, *n;
int *node_map = XMALLOCN(int, get_irg_last_idx(co->irg) + 1);
ir_node *irn;
- void *it, *nit;
+ nodes_iter_t it;
+ neighbours_iter_t nit;
int n, n_regs;
unsigned i;
* the values below n are the pre-colored register nodes
*/
- it = be_ifg_nodes_iter_alloca(ifg);
- nit = be_ifg_neighbours_iter_alloca(ifg);
-
n = n_regs;
- be_ifg_foreach_node(ifg, it, irn) {
+ be_ifg_foreach_node(ifg, &it, irn) {
if (arch_irn_is_ignore(irn))
continue;
node_map[get_irn_idx(irn)] = n++;
fprintf(f, "%d %d\n", n, n_regs);
- be_ifg_foreach_node(ifg, it, irn) {
+ be_ifg_foreach_node(ifg, &it, irn) {
if (!arch_irn_is_ignore(irn)) {
int idx = node_map[get_irn_idx(irn)];
affinity_node_t *a = get_affinity_info(co, irn);
}
}
- be_ifg_foreach_neighbour(ifg, nit, irn, adj) {
+ be_ifg_foreach_neighbour(ifg, &nit, irn, adj) {
if (!arch_irn_is_ignore(adj) &&
!co_dump_appel_disjoint_constraints(co, irn, adj)) {
int adj_idx = node_map[get_irn_idx(adj)];
return col < sizeof(names)/sizeof(names[0]) ? names[col] : "white";
}
-typedef struct _co_ifg_dump_t {
+typedef struct co_ifg_dump_t {
const copy_opt_t *co;
unsigned flags;
} co_ifg_dump_t;
char buf[1024];
size_t i, n;
char *tu_name;
+ const char *cup_name = be_get_irg_main_env(env->irg)->cup_name;
- n = strlen(env->birg->main_env->cup_name);
+ n = strlen(cup_name);
tu_name = XMALLOCN(char, n + 1);
- strcpy(tu_name, env->birg->main_env->cup_name);
+ strcpy(tu_name, cup_name);
for (i = 0; i < n; ++i)
if (tu_name[i] == '.')
tu_name[i] = '_';
if (selected_copyopt->copyopt == void_algo)
return;
- be_liveness_assure_chk(be_get_birg_liveness(cenv->birg));
+ be_liveness_assure_chk(be_get_irg_liveness(cenv->irg));
co = new_copy_opt(cenv, cost_func);
co_build_ou_structure(co);