Fixed construction of spill-slots and frame type. Aligment was not taken into account...

[libfirm] / ir / be / benode.c

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 617f601..69e3dfd 100644 (file)
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -705,6 +705,11 @@ void be_node_set_req_type(ir_node *irn, int pos, arch_register_req_type_t type)
        r->req.type = type;
 }
 
+ir_node *be_get_IncSP_pred(ir_node *irn) {
+       assert(be_is_IncSP(irn));
+       return get_irn_n(irn, 0);
+}
+
 void be_set_IncSP_offset(ir_node *irn, unsigned offset)
 {
        be_stack_attr_t *a = get_irn_attr(irn);
@@ -854,7 +859,7 @@ ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn, ir_node *ctx)
         */
 
        insert = sched_next(irn);
-       if(bl == get_irg_start_block(irg) && insert != bl && sched_get_time_step(frame) >= sched_get_time_step(insert))
+       if(insert != bl && bl == get_irg_start_block(irg) && sched_get_time_step(frame) >= sched_get_time_step(insert))
                insert = sched_next(frame);
 
        while((is_Phi(insert) || is_Proj(insert)) && !sched_is_end(insert))
@@ -974,11 +979,12 @@ static arch_irn_class_t be_node_classify(const void *_self, const ir_node *irn)
        redir_proj((const ir_node **) &irn, -1);
 
        switch(be_get_irn_opcode(irn)) {
-#define XXX(a,b) case beo_ ## a: return arch_irn_class_ ## b;
-               XXX(Spill, spill)
-               XXX(Reload, reload)
-               XXX(Perm, perm)
-               XXX(Copy, copy)
+#define XXX(a,b) case beo_ ## a: return arch_irn_class_ ## b
+               XXX(Spill, spill);
+               XXX(Reload, reload);
+               XXX(Perm, perm);
+               XXX(Copy, copy);
+               XXX(Return, branch);
 #undef XXX
                default:
                return 0;
@@ -1295,8 +1301,11 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason)
 
                        if(be_has_frame_entity(irn)) {
                                be_frame_attr_t *a = (be_frame_attr_t *) at;
-                               if (a->ent)
-                                       ir_fprintf(f, "frame entity: %+F offset %x (%d)\n", a->ent, a->offset, a->offset);
+                               if (a->ent) {
+                                       int bits = get_type_size_bits(get_entity_type(a->ent));
+                                       ir_fprintf(f, "frame entity: %+F offset 0x%x (%d) size 0x%x %d\n",
+                                         a->ent, a->offset, a->offset, bits, bits);
+                               }
 
                        }