projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove stray declaration
[libfirm]
/
ir
/
be
/
beblocksched.c
diff --git
a/ir/be/beblocksched.c
b/ir/be/beblocksched.c
index
387749a
..
f7cefaa
100644
(file)
--- a/
ir/be/beblocksched.c
+++ b/
ir/be/beblocksched.c
@@
-75,7
+75,7
@@
typedef enum blocksched_algos_t {
static int algo = BLOCKSCHED_GREEDY;
static const lc_opt_enum_int_items_t blockschedalgo_items[] = {
static int algo = BLOCKSCHED_GREEDY;
static const lc_opt_enum_int_items_t blockschedalgo_items[] = {
- { "naiv",
BLOCKSCHED_NAIV },
+ { "naiv", BLOCKSCHED_NAIV },
{ "greedy", BLOCKSCHED_GREEDY },
#ifdef WITH_ILP
{ "ilp", BLOCKSCHED_ILP },
{ "greedy", BLOCKSCHED_GREEDY },
#ifdef WITH_ILP
{ "ilp", BLOCKSCHED_ILP },
@@
-88,7
+88,7
@@
static lc_opt_enum_int_var_t algo_var = {
};
static const lc_opt_table_entry_t be_blocksched_options[] = {
};
static const lc_opt_table_entry_t be_blocksched_options[] = {
- LC_OPT_ENT_ENUM_INT ("
algo
", "the block scheduling algorithm", &algo_var),
+ LC_OPT_ENT_ENUM_INT ("
blockscheduler
", "the block scheduling algorithm", &algo_var),
LC_OPT_LAST
};
LC_OPT_LAST
};
@@
-137,7
+137,7
@@
struct blocksched_env_t {
*/
static void collect_egde_frequency(ir_node *block, void *data)
{
*/
static void collect_egde_frequency(ir_node *block, void *data)
{
- blocksched_env_t *env = data;
+ blocksched_env_t *env =
(blocksched_env_t*)
data;
int arity;
edge_t edge;
blocksched_entry_t *entry;
int arity;
edge_t edge;
blocksched_entry_t *entry;
@@
-206,16
+206,16
@@
static void collect_egde_frequency(ir_node *block, void *data)
static int cmp_edges(const void *d1, const void *d2)
{
static int cmp_edges(const void *d1, const void *d2)
{
- const edge_t *e1 = d1;
- const edge_t *e2 = d2;
+ const edge_t *e1 =
(const edge_t*)
d1;
+ const edge_t *e2 =
(const edge_t*)
d2;
return QSORT_CMP(e2->execfreq, e1->execfreq);
}
static int cmp_edges_outedge_penalty(const void *d1, const void *d2)
{
return QSORT_CMP(e2->execfreq, e1->execfreq);
}
static int cmp_edges_outedge_penalty(const void *d1, const void *d2)
{
- const edge_t *e1 = d1;
- const edge_t *e2 = d2;
+ const edge_t *e1 =
(const edge_t*)
d1;
+ const edge_t *e2 =
(const edge_t*)
d2;
/* reverse sorting as penalties are negative */
return QSORT_CMP(e1->outedge_penalty_freq, e2->outedge_penalty_freq);
}
/* reverse sorting as penalties are negative */
return QSORT_CMP(e1->outedge_penalty_freq, e2->outedge_penalty_freq);
}
@@
-260,8
+260,8
@@
static void coalesce_blocks(blocksched_env_t *env)
continue;
pred_block = get_Block_cfgpred_block(block, pos);
continue;
pred_block = get_Block_cfgpred_block(block, pos);
- entry = get_irn_link(block);
- pred_entry = get_irn_link(pred_block);
+ entry =
(blocksched_entry_t*)
get_irn_link(block);
+ pred_entry =
(blocksched_entry_t*)
get_irn_link(pred_block);
if (pred_entry->next != NULL || entry->prev != NULL)
continue;
if (pred_entry->next != NULL || entry->prev != NULL)
continue;
@@
-299,8
+299,8
@@
static void coalesce_blocks(blocksched_env_t *env)
continue;
pred_block = get_Block_cfgpred_block(block, pos);
continue;
pred_block = get_Block_cfgpred_block(block, pos);
- entry = get_irn_link(block);
- pred_entry = get_irn_link(pred_block);
+ entry =
(blocksched_entry_t*)
get_irn_link(block);
+ pred_entry =
(blocksched_entry_t*)
get_irn_link(pred_block);
if (pred_entry->next != NULL || entry->prev != NULL)
continue;
if (pred_entry->next != NULL || entry->prev != NULL)
continue;
@@
-341,8
+341,8
@@
static void coalesce_blocks(blocksched_env_t *env)
continue;
pred_block = get_Block_cfgpred_block(block, pos);
continue;
pred_block = get_Block_cfgpred_block(block, pos);
- entry = get_irn_link(block);
- pred_entry = get_irn_link(pred_block);
+ entry =
(blocksched_entry_t*)
get_irn_link(block);
+ pred_entry =
(blocksched_entry_t*)
get_irn_link(pred_block);
/* is 1 of the blocks already attached to another block? */
if (pred_entry->next != NULL || entry->prev != NULL)
/* is 1 of the blocks already attached to another block? */
if (pred_entry->next != NULL || entry->prev != NULL)
@@
-380,7
+380,7
@@
static void pick_block_successor(blocksched_entry_t *entry, blocksched_env_t *en
/* we only need to put the first of a series of already connected
* blocks into the worklist */
/* we only need to put the first of a series of already connected
* blocks into the worklist */
- succ_entry = get_irn_link(succ_block);
+ succ_entry =
(blocksched_entry_t*)
get_irn_link(succ_block);
while (succ_entry->prev != NULL) {
/* break cycles... */
if (succ_entry->prev->block == succ_block) {
while (succ_entry->prev != NULL) {
/* break cycles... */
if (succ_entry->prev->block == succ_block) {
@@
-416,7
+416,7
@@
static void pick_block_successor(blocksched_entry_t *entry, blocksched_env_t *en
if (irn_visited(succ_block))
continue;
if (irn_visited(succ_block))
continue;
- succ_entry = get_irn_link(succ_block);
+ succ_entry =
(blocksched_entry_t*)
get_irn_link(succ_block);
if (succ_entry->prev != NULL)
continue;
if (succ_entry->prev != NULL)
continue;
@@
-435,11
+435,11
@@
static void pick_block_successor(blocksched_entry_t *entry, blocksched_env_t *en
DB((dbg, LEVEL_1, "worklist empty\n"));
return;
}
DB((dbg, LEVEL_1, "worklist empty\n"));
return;
}
- succ = pdeq_getl(env->worklist);
+ succ =
(ir_node*)
pdeq_getl(env->worklist);
} while (irn_visited(succ));
}
} while (irn_visited(succ));
}
- succ_entry = get_irn_link(succ);
+ succ_entry =
(blocksched_entry_t*)
get_irn_link(succ);
entry->next = succ_entry;
succ_entry->prev = entry;
entry->next = succ_entry;
succ_entry->prev = entry;
@@
-450,7
+450,7
@@
static blocksched_entry_t *finish_block_schedule(blocksched_env_t *env)
{
ir_graph *irg = env->irg;
ir_node *startblock = get_irg_start_block(irg);
{
ir_graph *irg = env->irg;
ir_node *startblock = get_irg_start_block(irg);
- blocksched_entry_t *entry = get_irn_link(startblock);
+ blocksched_entry_t *entry =
(blocksched_entry_t*)
get_irn_link(startblock);
ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
inc_irg_visited(irg);
ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
inc_irg_visited(irg);
@@
-726,9
+726,8
@@
BE_REGISTER_MODULE_CONSTRUCTOR(be_init_blocksched);
void be_init_blocksched(void)
{
lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
void be_init_blocksched(void)
{
lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
- lc_opt_entry_t *blocksched_grp = lc_opt_get_grp(be_grp, "blocksched");
- lc_opt_add_table(b
locksched
_grp, be_blocksched_options);
+ lc_opt_add_table(b
e
_grp, be_blocksched_options);
FIRM_DBG_REGISTER(dbg, "firm.be.blocksched");
}
FIRM_DBG_REGISTER(dbg, "firm.be.blocksched");
}