/*
- * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved.
- *
* This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
*/
/**
*/
static void dump_partition(const char *msg, const partition_t *part)
{
- const block_t *block;
- int first = 1;
+ int first = 1;
DB((dbg, LEVEL_2, " %s part%u (%u blocks) {\n ", msg, part->nr, part->n_blocks));
list_for_each_entry(block_t, block, &part->blocks, block_list) {
first = 0;
}
DB((dbg, LEVEL_2, "\n }\n"));
-} /* dump_partition */
+}
/**
* Dumps a list.
first = 0;
}
DB((dbg, LEVEL_3, "\n }\n"));
-} /* do_dump_list */
+}
#else
#define dump_partition(msg, part)
#define dump_list(msg, block)
(void) size;
return e1->id != e2->id;
-} /* listmap_cmp_ptr */
+}
/**
* Initializes a listmap.
{
map->map = new_set(listmap_cmp_ptr, 16);
map->values = NULL;
-} /* listmap_init */
+}
/**
* Terminates a listmap.
static void listmap_term(listmap_t *map)
{
del_set(map->map);
-} /* listmap_term */
+}
/**
* Return the associated listmap entry for a given id.
key.id = id;
key.list = NULL;
key.next = NULL;
- entry = (listmap_entry_t*)set_insert(map->map, &key, sizeof(key), HASH_PTR(id));
+ entry = set_insert(listmap_entry_t, map->map, &key, sizeof(key), hash_ptr(id));
if (entry->list == NULL) {
/* a new entry, put into the list */
map->values = entry;
}
return entry;
-} /* listmap_find */
+}
/**
* Calculate the hash value for an opcode map entry.
static unsigned opcode_hash(const opcode_key_t *entry)
{
/* assume long >= int */
- return (unsigned)(PTR_TO_INT(entry->mode) * 9 + entry->code + entry->u.proj * 3 + HASH_PTR(entry->u.addr) + entry->arity);
-} /* opcode_hash */
+ return (unsigned)(PTR_TO_INT(entry->mode) * 9 + entry->code + entry->u.proj * 3 + hash_ptr(entry->u.addr) + entry->arity);
+}
/**
* Compare two entries in the opcode map.
return o1->code != o2->code || o1->mode != o2->mode ||
o1->arity != o2->arity ||
o1->u.proj != o2->u.proj || o1->u.addr != o2->u.addr;
-} /* cmp_opcode */
+}
/**
* Creates a new empty partition and put in on the
DEBUG_ONLY(part->nr = part_nr++;)
list_add_tail(&part->part_list, &env->partitions);
return part;
-} /* create_partition */
+}
/**
* Allocate a new block in the given partition.
env->all_blocks = bl;
return bl;
-} /* create_block */
+}
/**
* Allocate a new node and add it to a blocks wait queue.
list_add_tail(&node->node_list, &block->nodes);
return node;
-} /* create_node */
+}
/**
* Add an input pair to a block.
pair->ins = NULL;
block->input_pairs = pair;
-} /* add_pair */
+}
/**
* Add a Phi to a block.
node->ins = NULL;
block->phis = node;
-} /** add_phi */
+}
/**
* Creates an opcode from a node.
case iro_Const:
key.u.tv = get_Const_tarval(irn);
break;
- case iro_Conv:
- key.u.intVal = get_Conv_strict(irn);
- break;
case iro_Load:
key.mode = get_Load_mode(irn);
break;
break;
}
- entry = (opcode_key_t*)set_insert(env->opcode2id_map, &key, sizeof(key), opcode_hash(&key));
+ entry = set_insert(opcode_key_t, env->opcode2id_map, &key, sizeof(key), opcode_hash(&key));
return entry;
-} /* opcode */
+}
/**
* Split a partition by a local list.
dump_partition("Now ", Z);
dump_partition("Created new ", Z_prime);
return Z_prime;
-} /* split */
+}
/**
* Return non-zero if pred should be tread as a input node.
if (! is_Call(irn))
return 1;
return 0;
-} /* is_input_node */
+}
/**
* Propagate nodes on all wait queues of the given partition.
{
block_t *ready_blocks = NULL;
unsigned n_ready = 0;
- block_t *bl, *next;
listmap_t map;
listmap_entry_t *iter;
for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(irn, i);
ir_node *block = get_nodes_block(skip_Proj(pred));
- node_t *p_node;
if (block != bl->block) {
- p_node = create_node(pred, bl, env);
+ node_t *p_node = create_node(pred, bl, env);
if (is_input_node(pred, irn, i)) {
/* is a block live input */
p_node->is_input = 1;
}
} else if (! irn_visited_else_mark(pred)) {
/* not yet visited, ok */
- p_node = create_node(pred, bl, env);
+ create_node(pred, bl, env);
if (is_Phi(pred)) {
/* update the Phi list */
split(part, S, env);
}
listmap_term(&map);
-} /* propagate_blocks */
+}
/**
* Propagate nodes on all wait queues.
*/
static void propagate(environment_t *env)
{
- partition_t *part, *next;
-
list_for_each_entry_safe(partition_t, part, next, &env->partitions, part_list) {
if (part->n_blocks < 2) {
/* zero or one block left, kill this partition */
} else
propagate_blocks(part, env);
}
-} /* propagate */
+}
/**
* Map a block to the phi[block->input] live-trough.
if (get_nodes_block(input) == bl->block)
return NULL;
return input;
-} /* live_throughs */
+}
/**
* Split partition by live-outs and live-troughs.
static void propagate_blocks_live_troughs(partition_t *part, environment_t *env)
{
const ir_node *meet_block = part->meet_block;
- block_t *bl, *next;
listmap_t map;
listmap_entry_t *iter;
const ir_node *phi;
}
listmap_term(&map);
}
-} /* propagate_blocks_live_troughs */
+}
/**
* Propagate live-troughs on all partitions on the partition list.
*/
static void propagate_live_troughs(environment_t *env)
{
- partition_t *part, *next;
-
list_for_each_entry_safe(partition_t, part, next, &env->partitions, part_list) {
propagate_blocks_live_troughs(part, env);
}
-} /* propagate_live_troughs */
+}
/**
* Apply analysis results by replacing all blocks of a partition
static void apply(ir_graph *irg, partition_t *part)
{
block_t *repr = list_entry(part->blocks.next, block_t, block_list);
- block_t *bl;
ir_node *block, *end, *meet_block, *p, *next;
ir_node **ins, **phi_ins;
phi_t *repr_phi, *phi;
/* fix inputs of the meet block */
set_irn_in(meet_block, j, ins);
DEL_ARR_F(ins);
-} /* apply */
+}
/**
* Create a partition for a the end block.
}
dump_partition("Created", part);
-} /* partition_for_end_block */
+}
#ifdef GENERAL_SHAPE
/**
}
dump_partition("Created", part);
-} /* partition_for_block */
+}
/**
* Walker: clear the links of all block phi lists and normal
set_Block_phis(irn, NULL);
set_irn_link(irn, NULL);
}
-} /* clear_phi_links */
+}
/**
* Walker, detect live-out nodes.
live_outs[idx] = pred_block;
}
}
-} /* find_liveouts */
+}
/**
* Check if the current block is the meet block of its predecessors.
if (k > 1)
partition_for_block(block, preds, k, env);
-} /* check_for_cf_meet */
+}
/**
* Compare two nodes for root ordering.
idx_b = get_irn_idx(irn_b);
return (idx_a > idx_b) - (idx_a < idx_b);
-} /* cmp_nodes */
+}
/**
* Add the roots to all blocks.
for (bl = env->all_blocks; bl != NULL; bl = bl->all_next) {
size_t i, n = ARR_LEN(bl->roots);
-#if 1
/* TODO: is this really needed? The roots are already in
idx-order by construction, which might be good enough. */
qsort(bl->roots, n, sizeof(bl->roots[0]), cmp_nodes);
-#endif
DB((dbg, LEVEL_2, " Adding Roots for block %+F\n ", bl->block));
/* ok, add them sorted */
DEL_ARR_F(bl->roots);
bl->roots = NULL;
}
-} /* add_roots */
+}
#endif /* GENERAL_SHAPE */
/* Combines congruent end blocks into one. */
-int shape_blocks(ir_graph *irg)
+void shape_blocks(ir_graph *irg)
{
environment_t env;
- partition_t *part;
block_t *bl;
int res, n;
env.opcode2id_map = new_set(cmp_opcode, iro_Last * 4);
n = get_irg_last_idx(irg);
- env.live_outs = NEW_ARR_F(ir_node *, n);
- memset(env.live_outs, 0, sizeof(*env.live_outs) * n);
+ env.live_outs = NEW_ARR_FZ(ir_node*, n);
env.all_blocks = NULL;
if (res) {
/* control flow changed */
- clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE
- | IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS);
+ clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE);
}
for (bl = env.all_blocks; bl != NULL; bl = bl->all_next) {
DEL_ARR_F(env.live_outs);
del_set(env.opcode2id_map);
obstack_free(&env.obst, NULL);
-
- return res;
-} /* shape_blocks */
+}
ir_graph_pass_t *shape_blocks_pass(const char *name)
{
- return def_graph_pass_ret(name ? name : "shape_blocks", shape_blocks);
-} /* shape_blocks_pass */
+ return def_graph_pass(name ? name : "shape_blocks", shape_blocks);
+}
projects / libfirm / blobdiff