again

[libfirm] / ir / tr / type.c

diff --git a/ir/tr/type.c b/ir/tr/type.c
index fa686cd..b79c4eb 100644 (file)
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -110,11 +110,11 @@ void firm_init_type(dbg_info *builtin_db, unsigned def_cc_mask) {
 }
 
 /** the global type visited flag */
-unsigned long firm_type_visited;
+ir_visited_t firm_type_visited;
 
-void (set_master_type_visited)(unsigned long val) { _set_master_type_visited(val); }
-unsigned long (get_master_type_visited)(void)     { return _get_master_type_visited(); }
-void (inc_master_type_visited)(void)              { _inc_master_type_visited(); }
+void (set_master_type_visited)(ir_visited_t val) { _set_master_type_visited(val); }
+ir_visited_t (get_master_type_visited)(void)     { return _get_master_type_visited(); }
+void (inc_master_type_visited)(void)             { _inc_master_type_visited(); }
 
 /*
  * Creates a new type representation.
@@ -423,11 +423,11 @@ set_type_state(ir_type *tp, ir_type_state state) {
                tp->flags &= ~tf_layout_fixed;
 }
 
-unsigned long (get_type_visited)(const ir_type *tp) {
+ir_visited_t (get_type_visited)(const ir_type *tp) {
        return _get_type_visited(tp);
 }
 
-void (set_type_visited)(ir_type *tp, unsigned long num) {
+void (set_type_visited)(ir_type *tp, ir_visited_t num) {
        _set_type_visited(tp, num);
 }
 
@@ -1191,10 +1191,10 @@ ir_type *new_d_type_method(ident *name, int n_param, int n_res, dbg_info *db) {
        res->flags                       |= tf_layout_fixed;
        res->size                         = get_mode_size_bytes(mode_P_code);
        res->attr.ma.n_params             = n_param;
-       res->attr.ma.params               = xcalloc(n_param, sizeof(res->attr.ma.params[0]));
+       res->attr.ma.params               = XMALLOCNZ(tp_ent_pair, n_param);
        res->attr.ma.value_params         = NULL;
        res->attr.ma.n_res                = n_res;
-       res->attr.ma.res_type             = xcalloc(n_res, sizeof(res->attr.ma.res_type[0]));
+       res->attr.ma.res_type             = XMALLOCNZ(tp_ent_pair, n_res);
        res->attr.ma.value_ress           = NULL;
        res->attr.ma.variadicity          = variadicity_non_variadic;
        res->attr.ma.first_variadic_param = -1;
@@ -1233,11 +1233,11 @@ ir_type *clone_type_method(ir_type *tp, ident *prefix) {
        res->assoc_type                    = tp->assoc_type;
        res->size                          = tp->size;
        res->attr.ma.n_params              = n_params;
-       res->attr.ma.params                = xcalloc(n_params, sizeof(res->attr.ma.params[0]));
+       res->attr.ma.params                = XMALLOCN(tp_ent_pair, n_params);
        memcpy(res->attr.ma.params, tp->attr.ma.params, n_params * sizeof(res->attr.ma.params[0]));
        res->attr.ma.value_params          = tp->attr.ma.value_params;
        res->attr.ma.n_res                 = n_res;
-       res->attr.ma.res_type              = xcalloc(n_res, sizeof(res->attr.ma.res_type[0]));
+       res->attr.ma.res_type              = XMALLOCN(tp_ent_pair, n_res);
        memcpy(res->attr.ma.res_type, tp->attr.ma.res_type, n_res * sizeof(res->attr.ma.res_type[0]));
        res->attr.ma.value_ress            = tp->attr.ma.value_ress;
        res->attr.ma.variadicity           = tp->attr.ma.variadicity;
@@ -1597,9 +1597,9 @@ ir_type *new_d_type_array(ident *name, int n_dimensions, ir_type *element_type,
 
        res = new_type(type_array, NULL, name, db);
        res->attr.aa.n_dimensions = n_dimensions;
-       res->attr.aa.lower_bound  = xcalloc(n_dimensions, sizeof(*res->attr.aa.lower_bound));
-       res->attr.aa.upper_bound  = xcalloc(n_dimensions, sizeof(*res->attr.aa.upper_bound));
-       res->attr.aa.order        = xcalloc(n_dimensions, sizeof(*res->attr.aa.order));
+       res->attr.aa.lower_bound  = XMALLOCNZ(ir_node*, n_dimensions);
+       res->attr.aa.upper_bound  = XMALLOCNZ(ir_node*, n_dimensions);
+       res->attr.aa.order        = XMALLOCNZ(int,      n_dimensions);
 
        current_ir_graph = get_const_code_irg();
        unk = new_Unknown(mode_Iu);
@@ -2152,6 +2152,13 @@ ir_entity *frame_alloc_area(ir_type *frame_type, int size, unsigned alignment, i
                /* calculate offset and new type size */
                offset = 0;
                frame_size += size;
+
+               /* increase size to match alignment... */
+               if (alignment > frame_align) {
+                       frame_align = alignment;
+                       set_type_alignment_bytes(frame_type, frame_align);
+                       frame_size  = (frame_size + frame_align - 1) & ~(frame_align - 1);
+               }
        } else {
                /* calculate offset and new type size */
                offset = (frame_size + alignment - 1) & ~(alignment - 1);