#include "iroptimize.h"
#include "scalar_replace.h"
+#include "opt_init.h"
#include "irflag_t.h"
#include "irouts.h"
#include "set.h"
* An access path, used to assign value numbers
* to variables that will be scalar replaced.
*/
-typedef struct _path_t {
+typedef struct path_t {
unsigned vnum; /**< The value number. */
unsigned path_len; /**< The length of the access path. */
path_elem_t path[1]; /**< The path. */
/** The size of a path in bytes. */
#define PATH_SIZE(p) (sizeof(*(p)) + sizeof((p)->path[0]) * ((p)->path_len - 1))
-typedef struct _scalars_t {
+typedef struct scalars_t {
ir_entity *ent; /**< A entity for scalar replacement. */
- ir_type *ent_owner; /**< The owner of this entity. */
} scalars_t;
DEBUG_ONLY(static firm_dbg_module_t *dbg;)
*
* @return 0 if they are identically
*/
-static int path_cmp(const void *elt, const void *key, size_t size) {
+static int path_cmp(const void *elt, const void *key, size_t size)
+{
const path_t *p1 = elt;
const path_t *p2 = key;
(void) size;
*
* @return 0 if they are identically
*/
-static int ent_cmp(const void *elt, const void *key, size_t size) {
+static int ent_cmp(const void *elt, const void *key, size_t size)
+{
const scalars_t *c1 = elt;
const scalars_t *c2 = key;
(void) size;
/**
* Calculate a hash value for a path.
*/
-static unsigned path_hash(const path_t *path) {
+static unsigned path_hash(const path_t *path)
+{
unsigned hash = 0;
unsigned i;
*
* @param sel the Sel node that will be checked
*/
-static int is_const_sel(ir_node *sel) {
+static int is_const_sel(ir_node *sel)
+{
int i, n = get_Sel_n_indexs(sel);
for (i = 0; i < n; ++i) {
* @param mode the mode of the Load/Store
* @param ent_mode the mode of the accessed entity
*/
-static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode) {
+static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode)
+{
if (ent_mode != mode) {
if (ent_mode == NULL ||
get_mode_size_bits(ent_mode) != get_mode_size_bits(mode) ||
* @param ent the entity that will be scalar replaced
* @param sel a Sel node that selects some fields of this entity
*/
-static int link_all_leave_sels(ir_entity *ent, ir_node *sel) {
+static int link_all_leave_sels(ir_entity *ent, ir_node *sel)
+{
int i, is_leave = 1;
for (i = get_irn_n_outs(sel) - 1; i >= 0; --i) {
* @return non-zero if at least one entity could be replaced
* potentially
*/
-static int find_possible_replacements(ir_graph *irg) {
+static int find_possible_replacements(ir_graph *irg)
+{
ir_node *irg_frame;
ir_type *frame_tp;
int i, j, k, static_link_arg;
* @param sel the Sel node
* @param len the length of the path so far
*/
-static path_t *find_path(ir_node *sel, unsigned len) {
+static path_t *find_path(ir_node *sel, unsigned len)
+{
int pos, i, n;
path_t *res;
ir_node *pred = get_Sel_ptr(sel);
/**
* A list entry for the fixing lists
*/
-typedef struct _list_entry_t {
+typedef struct list_entry_t {
ir_node *node; /**< the node that must be fixed */
unsigned vnum; /**< the value number of this node */
} list_entry_t;
/**
* environment for memory walker
*/
-typedef struct _env_t {
+typedef struct env_t {
int nvals; /**< number of values */
ir_mode **modes; /**< the modes of the values */
pset *sels; /**< A set of all Sel nodes that have a value number */
/**
* topological post-walker.
*/
-static void topologic_walker(ir_node *node, void *ctx) {
+static void topologic_walker(ir_node *node, void *ctx)
+{
env_t *env = ctx;
ir_node *adr, *block, *mem, *val;
ir_mode *mode;
* @param modes A flexible array, containing all the modes of
* the value numbers.
*/
-static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes) {
+static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes)
+{
env_t env;
ssa_cons_start(current_ir_graph, nvals);
*
* @param irg The current ir graph.
*/
-int scalar_replacement_opt(ir_graph *irg) {
+int scalar_replacement_opt(ir_graph *irg)
+{
unsigned nvals;
int i;
scalars_t key, *value;
ir_graph *rem;
int res = 0;
- if (! get_opt_scalar_replacement())
- return 0;
-
rem = current_ir_graph;
current_ir_graph = irg;
ent_type = get_entity_type(ent);
key.ent = ent;
- key.ent_owner = get_entity_owner(ent);
set_insert(set_ent, &key, sizeof(key), HASH_PTR(key.ent));
#ifdef DEBUG_libfirm
do_scalar_replacements(sels, nvals, modes);
foreach_set(set_ent, value) {
- remove_class_member(value->ent_owner, value->ent);
+ free_entity(value->ent);
}
/*
return res;
}
-ir_graph_pass_t *scalar_replacement_opt_pass(const char *name) {
+ir_graph_pass_t *scalar_replacement_opt_pass(const char *name)
+{
return def_graph_pass_ret(name ? name : "scalar_rep",
scalar_replacement_opt);
}
-void firm_init_scalar_replace(void) {
+void firm_init_scalar_replace(void)
+{
FIRM_DBG_REGISTER(dbg, "firm.opt.scalar_replace");
}
projects / libfirm / blobdiff