implemened add esp, 4/8 -> push/push

[libfirm] / ir / be / bepeephole.c

diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c
index afb7d01..1f73806 100644 (file)
--- a/ir/be/bepeephole.c
+++ b/ir/be/bepeephole.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -92,12 +92,6 @@ static void set_reg_value(ir_node *node)
        reg_idx = arch_register_get_index(reg);
        cls_idx = arch_register_class_index(cls);
 
-#ifdef DEBUG_libfirm
-       {
-               ir_node *old_value = register_values[cls_idx][reg_idx];
-               assert(old_value == NULL || old_value == node);
-       }
-#endif
        DBG((dbg, LEVEL_1, "Set Register %s: %+F\n", reg->name, node));
        register_values[cls_idx][reg_idx] = node;
 }
@@ -137,8 +131,13 @@ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node)
 
        DBG((dbg, LEVEL_1, "About to exchange %+F with %+F\n", old_node, new_node));
 
-       if(old_node == current_node)
-               current_node = new_node;
+       if(old_node == current_node) {
+               if(is_Proj(new_node)) {
+                       current_node = get_Proj_pred(new_node);
+               } else {
+                       current_node = new_node;
+               }
+       }
 
        if(!mode_is_data(get_irn_mode(old_node)))
                return;
@@ -165,16 +164,15 @@ void be_peephole_after_exchange(ir_node *new_node)
 
 static void process_block(ir_node *block, void *data)
 {
-       arch_isa_t *isa = arch_env->isa;
        unsigned n_classes;
        unsigned i;
        int l;
        (void) data;
 
        /* construct initial register assignment */
-       n_classes = arch_isa_get_n_reg_class(isa);
+       n_classes = arch_env_get_n_reg_class(arch_env);
        for(i = 0; i < n_classes; ++i) {
-               const arch_register_class_t *cls    = arch_isa_get_reg_class(isa, i);
+               const arch_register_class_t *cls    = arch_env_get_reg_class(arch_env, i);
                unsigned                     n_regs = arch_register_class_n_regs(cls);
                memset(register_values[i], 0, sizeof(ir_node*) * n_regs);
        }
@@ -217,7 +215,6 @@ static void process_block(ir_node *block, void *data)
 
 void be_peephole_opt(be_irg_t *birg)
 {
-       arch_isa_t *isa;
        ir_graph   *irg = be_get_birg_irg(birg);
        unsigned n_classes;
        unsigned i;
@@ -229,12 +226,11 @@ void be_peephole_opt(be_irg_t *birg)
 
        arch_env = be_get_birg_arch_env(birg);
        lv       = be_get_birg_liveness(birg);
-       isa      = arch_env->isa;
 
-       n_classes = arch_isa_get_n_reg_class(isa);
+       n_classes = arch_env_get_n_reg_class(arch_env);
        register_values = alloca(sizeof(register_values[0]) * n_classes);
        for(i = 0; i < n_classes; ++i) {
-               const arch_register_class_t *cls    = arch_isa_get_reg_class(isa, i);
+               const arch_register_class_t *cls    = arch_env_get_reg_class(arch_env, i);
                unsigned                     n_regs = arch_register_class_n_regs(cls);
                register_values[i] = alloca(sizeof(ir_node*) * n_regs);
        }