projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix irio not working correctly anymore after MacroBlocks were removed
[libfirm]
/
ir
/
opt
/
tropt.c
diff --git
a/ir/opt/tropt.c
b/ir/opt/tropt.c
index
999735d
..
c312470
100644
(file)
--- a/
ir/opt/tropt.c
+++ b/
ir/opt/tropt.c
@@
-32,7
+32,6
@@
#include "irprog.h"
#include "irtypeinfo.h"
#include "irgwalk.h"
#include "irprog.h"
#include "irtypeinfo.h"
#include "irgwalk.h"
-#include "irsimpletype.h"
#include "trouts.h"
#include "ircons.h"
#include "irgmod.h"
#include "trouts.h"
#include "ircons.h"
#include "irgmod.h"
@@
-61,30
+60,29
@@
static gen_pointer_type_to_func gen_pointer_type_to = default_gen_pointer_type_t
* Find a pointer type to a given type.
* Uses and updates trouts if available.
*/
* Find a pointer type to a given type.
* Uses and updates trouts if available.
*/
-static ir_type *default_gen_pointer_type_to(ir_type *tp) {
+static ir_type *default_gen_pointer_type_to(ir_type *tp)
+{
ir_type *res = NULL;
if (get_trouts_state() == outs_consistent) {
if (get_type_n_pointertypes_to(tp) > 0) {
res = get_type_pointertype_to(tp, 0);
} else {
ir_type *res = NULL;
if (get_trouts_state() == outs_consistent) {
if (get_type_n_pointertypes_to(tp) > 0) {
res = get_type_pointertype_to(tp, 0);
} else {
- ir_mode *mode = is_Method_type(tp) ? mode_P_code : mode_P_data;
-
- res = new_type_pointer(id_mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode);
+ res = new_type_pointer(tp);
/* Update trout for pointer types, so we can use it in next call. */
add_type_pointertype_to(tp, res);
}
/* Update trout for pointer types, so we can use it in next call. */
add_type_pointertype_to(tp, res);
}
- }
- else {
+ } else {
res = find_pointer_type_to_type(tp);
if (res == firm_unknown_type)
res = find_pointer_type_to_type(tp);
if (res == firm_unknown_type)
- res = new_type_pointer(
id_mangle_u(get_type_ident(tp), ptr_type_suffix), tp, mode_P_data
);
+ res = new_type_pointer(
tp
);
}
return res;
}
/** Return a type that is a depth times pointer to type. */
}
return res;
}
/** Return a type that is a depth times pointer to type. */
-static ir_type *pointerize_type(ir_type *tp, int depth) {
+static ir_type *pointerize_type(ir_type *tp, int depth)
+{
for (; depth > 0; --depth) {
tp = gen_pointer_type_to(tp);
}
for (; depth > 0; --depth) {
tp = gen_pointer_type_to(tp);
}
@@
-92,9
+90,11
@@
static ir_type *pointerize_type(ir_type *tp, int depth) {
}
}
-static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
+static ir_node *normalize_values_type(ir_type *totype, ir_node *pred)
+{
ir_type *fromtype = get_irn_typeinfo_type(pred);
ir_node *new_cast = pred;
ir_type *fromtype = get_irn_typeinfo_type(pred);
ir_node *new_cast = pred;
+ ir_node *block;
int ref_depth = 0;
if (totype == fromtype) return pred; /* Case for optimization! */
int ref_depth = 0;
if (totype == fromtype) return pred; /* Case for optimization! */
@@
-114,7
+114,7
@@
static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
return pred;
}
return pred;
}
-
set_cur_block(get_nodes_block(pred)
);
+
block = get_nodes_block(pred
);
if (is_SubClass_of(totype, fromtype)) {
/* downcast */
if (is_SubClass_of(totype, fromtype)) {
/* downcast */
@@
-131,7
+131,7
@@
static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
assert(new_type);
fromtype = new_type;
new_type = pointerize_type(new_type, ref_depth);
assert(new_type);
fromtype = new_type;
new_type = pointerize_type(new_type, ref_depth);
- new_cast = new_
Cast(
pred, new_type);
+ new_cast = new_
r_Cast(block,
pred, new_type);
pred = new_cast;
n_casts_normalized ++;
set_irn_typeinfo_type(new_cast, new_type); /* keep type information up to date. */
pred = new_cast;
n_casts_normalized ++;
set_irn_typeinfo_type(new_cast, new_type); /* keep type information up to date. */
@@
-152,7
+152,7
@@
static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
assert(new_type);
fromtype = new_type;
new_type = pointerize_type(new_type, ref_depth);
assert(new_type);
fromtype = new_type;
new_type = pointerize_type(new_type, ref_depth);
- new_cast = new_
Cast(
pred, new_type);
+ new_cast = new_
r_Cast(block,
pred, new_type);
pred = new_cast;
n_casts_normalized ++;
set_irn_typeinfo_type(new_cast, new_type); /* keep type information up to date. */
pred = new_cast;
n_casts_normalized ++;
set_irn_typeinfo_type(new_cast, new_type); /* keep type information up to date. */
@@
-165,7
+165,8
@@
static ir_node *normalize_values_type(ir_type *totype, ir_node *pred) {
/**
* Post-Walker.
*/
/**
* Post-Walker.
*/
-static void normalize_irn_class_cast(ir_node *n, void *env) {
+static void normalize_irn_class_cast(ir_node *n, void *env)
+{
ir_node *res;
(void) env;
if (is_Cast(n)) {
ir_node *res;
(void) env;
if (is_Cast(n)) {
@@
-184,7
+185,8
@@
static void normalize_irn_class_cast(ir_node *n, void *env) {
}
}
-static void pure_normalize_irg_class_casts(ir_graph *irg) {
+static void pure_normalize_irg_class_casts(ir_graph *irg)
+{
assert(get_irg_class_cast_state(irg) != ir_class_casts_any &&
"Cannot normalize irregular casts.");
if (get_irg_class_cast_state(irg) == ir_class_casts_normalized) {
assert(get_irg_class_cast_state(irg) != ir_class_casts_any &&
"Cannot normalize irregular casts.");
if (get_irg_class_cast_state(irg) == ir_class_casts_normalized) {
@@
-197,7
+199,8
@@
static void pure_normalize_irg_class_casts(ir_graph *irg) {
}
}
-void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct) {
+void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct)
+{
assert(get_irp_typeinfo_state() == ir_typeinfo_consistent);
if (gppt_fct) gen_pointer_type_to = gppt_fct;
assert(get_irp_typeinfo_state() == ir_typeinfo_consistent);
if (gppt_fct) gen_pointer_type_to = gppt_fct;
@@
-210,12
+213,15
@@
void normalize_irg_class_casts(ir_graph *irg, gen_pointer_type_to_func gppt_fct)
gen_pointer_type_to = default_gen_pointer_type_to;
}
gen_pointer_type_to = default_gen_pointer_type_to;
}
-void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct) {
+void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct)
+{
int i;
if (gppt_fct) gen_pointer_type_to = gppt_fct;
int i;
if (gppt_fct) gen_pointer_type_to = gppt_fct;
+#if 0
if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
simple_analyse_types();
if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
simple_analyse_types();
+#endif
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
pure_normalize_irg_class_casts(get_irp_irg(i));
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
pure_normalize_irg_class_casts(get_irp_irg(i));
@@
-244,10
+250,10
@@
void normalize_irp_class_casts(gen_pointer_type_to_func gppt_fct) {
*
* @return 1 if the cast was changed
*/
*
* @return 1 if the cast was changed
*/
-static int cancel_out_casts(ir_node *cast) {
+static int cancel_out_casts(ir_node *cast)
+{
ir_node *orig, *pred = get_Cast_op(cast);
ir_type *tp_cast, *tp_pred, *tp_orig;
ir_node *orig, *pred = get_Cast_op(cast);
ir_type *tp_cast, *tp_pred, *tp_orig;
- int ref_depth = 0;
if (!is_Cast(pred)) return 0;
orig = get_Cast_op(pred);
if (!is_Cast(pred)) return 0;
orig = get_Cast_op(pred);
@@
-262,7
+268,6
@@
static int cancel_out_casts(ir_node *cast) {
tp_cast = get_pointer_points_to_type(tp_cast);
tp_pred = get_pointer_points_to_type(tp_pred);
tp_orig = get_pointer_points_to_type(tp_orig);
tp_cast = get_pointer_points_to_type(tp_cast);
tp_pred = get_pointer_points_to_type(tp_pred);
tp_orig = get_pointer_points_to_type(tp_orig);
- ref_depth++;
}
if (!is_Class_type(tp_cast) || !is_Class_type(tp_pred) || !is_Class_type(tp_orig))
}
if (!is_Class_type(tp_cast) || !is_Class_type(tp_pred) || !is_Class_type(tp_orig))
@@
-301,7
+306,8
@@
static int cancel_out_casts(ir_node *cast) {
*
* @return 1 if Cast's where removed
*/
*
* @return 1 if Cast's where removed
*/
-static int concretize_selected_entity(ir_node *sel) {
+static int concretize_selected_entity(ir_node *sel)
+{
ir_node *cast, *ptr = get_Sel_ptr(sel);
ir_type *orig_tp, *cast_tp;
ir_entity *new_ent, *sel_ent;
ir_node *cast, *ptr = get_Sel_ptr(sel);
ir_type *orig_tp, *cast_tp;
ir_entity *new_ent, *sel_ent;
@@
-409,7
+415,9
@@
static int concretize_Phi_type(ir_node *phi)
*
* @return 1 if Cast's where removed
*/
*
* @return 1 if Cast's where removed
*/
-static int remove_Cmp_Null_cast(ir_node *cmp) {
+static int remove_Cmp_Null_cast(ir_node *cmp)
+{
+ ir_graph *irg;
ir_node *cast, *null, *new_null;
int cast_pos, null_pos;
ir_type *fromtype;
ir_node *cast, *null, *new_null;
int cast_pos, null_pos;
ir_type *fromtype;
@@
-438,9
+446,10
@@
static int remove_Cmp_Null_cast(ir_node *cmp) {
return 0;
/* Transform Cmp */
return 0;
/* Transform Cmp */
+ irg = get_irn_irg(cmp);
set_irn_n(cmp, cast_pos, get_Cast_op(cast));
fromtype = get_irn_typeinfo_type(get_Cast_op(cast));
set_irn_n(cmp, cast_pos, get_Cast_op(cast));
fromtype = get_irn_typeinfo_type(get_Cast_op(cast));
- new_null = new_
Const_type(get_Const_tarval(null), fromtype
);
+ new_null = new_
r_Const(irg, get_Const_tarval(null)
);
set_irn_typeinfo_type(new_null, fromtype);
set_irn_n(cmp, null_pos, new_null);
++n_casts_removed;
set_irn_typeinfo_type(new_null, fromtype);
set_irn_n(cmp, null_pos, new_null);
++n_casts_removed;
@@
-450,8
+459,9
@@
static int remove_Cmp_Null_cast(ir_node *cmp) {
/**
* Post-Walker: Optimize class casts (mostly by trying to remove them)
*/
/**
* Post-Walker: Optimize class casts (mostly by trying to remove them)
*/
-static void irn_optimize_class_cast(ir_node *n, void *env) {
- int *changed = env;
+static void irn_optimize_class_cast(ir_node *n, void *env)
+{
+ int *changed = (int*)env;
if (is_Cast(n))
*changed |= cancel_out_casts(n);
if (is_Cast(n))
*changed |= cancel_out_casts(n);
@@
-463,11
+473,14
@@
static void irn_optimize_class_cast(ir_node *n, void *env) {
*changed |= remove_Cmp_Null_cast(n);
}
*changed |= remove_Cmp_Null_cast(n);
}
-void optimize_class_casts(void) {
+void optimize_class_casts(void)
+{
int changed;
int changed;
+#if 0
if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
simple_analyse_types();
if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
simple_analyse_types();
+#endif
changed = 0;
all_irg_walk(NULL, irn_optimize_class_cast, &changed);
changed = 0;
all_irg_walk(NULL, irn_optimize_class_cast, &changed);
@@
-484,6
+497,7
@@
void optimize_class_casts(void) {
n_casts_removed, n_sels_concretized));
}
n_casts_removed, n_sels_concretized));
}
-void firm_init_class_casts_opt(void) {
+void firm_init_class_casts_opt(void)
+{
FIRM_DBG_REGISTER(dbg, "firm.opt.tropt");
}
FIRM_DBG_REGISTER(dbg, "firm.opt.tropt");
}