#include "irprog.h"
#include "irtypeinfo.h"
#include "irgwalk.h"
-#include "irsimpletype.h"
#include "trouts.h"
#include "ircons.h"
#include "irgmod.h"
#include "irflag_t.h"
#include "xmalloc.h"
#include "debug.h"
-#include "tropt.h"
+#include "opt_init.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg;)
* 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_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);
}
- }
- else {
+ } else {
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. */
-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);
}
}
-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_node *block;
int ref_depth = 0;
if (totype == fromtype) return pred; /* Case for optimization! */
return pred;
}
- set_cur_block(get_nodes_block(pred));
+ block = get_nodes_block(pred);
if (is_SubClass_of(totype, fromtype)) {
/* downcast */
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. */
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. */
/**
* 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)) {
}
-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) {
}
-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;
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;
+#if 0
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));
*
* @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;
- int ref_depth = 0;
if (!is_Cast(pred)) return 0;
orig = get_Cast_op(pred);
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))
*
* @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;
*
* @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;
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));
- 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;
/**
* Post-Walker: Optimize class casts (mostly by trying to remove them)
*/
-static void irn_optimize_class_cast(ir_node *n, void *env) {
+static void irn_optimize_class_cast(ir_node *n, void *env)
+{
int *changed = env;
if (is_Cast(n))
*changed |= remove_Cmp_Null_cast(n);
}
-void optimize_class_casts(void) {
+void optimize_class_casts(void)
+{
int changed;
+#if 0
if (get_irp_typeinfo_state() != ir_typeinfo_consistent)
simple_analyse_types();
+#endif
changed = 0;
all_irg_walk(NULL, irn_optimize_class_cast, &changed);
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");
}
projects / libfirm / blobdiff