- beo_* Opcodes are now defined in irop.h, and no more dynamically allocated

- simplified be_node_classify()

[r19711]

diff --git a/include/libfirm/irop.h b/include/libfirm/irop.h
index f3ed758..36d4724 100644 (file)
--- a/include/libfirm/irop.h
+++ b/include/libfirm/irop.h
@@ -95,7 +95,31 @@ typedef enum {
        iro_Pin,
        iro_ASM,
        iro_Anchor,
-       iro_MaxOpcode
+       /* last middleend node number */
+       iro_Last,
+       /* first backend node number */
+       beo_First = iro_Last,
+       /* backend specific nodes */
+       beo_Spill = beo_First,
+       beo_Reload,
+       beo_Perm,
+       beo_MemPerm,
+       beo_Copy,
+       beo_Keep,
+       beo_CopyKeep,
+       beo_Call,
+       beo_Return,
+       beo_AddSP,
+       beo_SubSP,
+       beo_IncSP,
+       beo_RegParams,
+       beo_FrameAddr,
+       beo_Barrier,
+       beo_Unwind,
+       /* last backend node number */
+       beo_Last,
+       /* last fixed number. Dynamic node numbers start here */
+       iro_MaxOpcode = beo_Last
 } ir_opcode;
 
 extern ir_op *op_Block;           ir_op *get_op_Block     (void);

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 7c55b6a..74b4d1e 100644 (file)
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -136,8 +136,6 @@ ir_op *op_be_FrameAddr;
 ir_op *op_be_Barrier;
 ir_op *op_be_Unwind;
 
-static int beo_base = -1;
-
 static const ir_op_ops be_node_op_ops;
 
 #define N   irop_flag_none
@@ -297,24 +295,22 @@ void be_node_init(void) {
        inited = 1;
 
        /* Acquire all needed opcodes. */
-       beo_base = get_next_ir_opcodes(beo_Last);
-
-       op_be_Spill      = new_ir_op(beo_base + beo_Spill,     "be_Spill",     op_pin_state_pinned, N,   oparity_unary,    0, sizeof(be_frame_attr_t),   &be_node_op_ops);
-       op_be_Reload     = new_ir_op(beo_base + beo_Reload,    "be_Reload",    op_pin_state_pinned, N,   oparity_zero,     0, sizeof(be_frame_attr_t),   &be_node_op_ops);
-       op_be_Perm       = new_ir_op(beo_base + beo_Perm,      "be_Perm",      op_pin_state_pinned, N,   oparity_variable, 0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_MemPerm    = new_ir_op(beo_base + beo_MemPerm,   "be_MemPerm",   op_pin_state_pinned, N,   oparity_variable, 0, sizeof(be_memperm_attr_t), &be_node_op_ops);
-       op_be_Copy       = new_ir_op(beo_base + beo_Copy,      "be_Copy",      op_pin_state_floats, N,   oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_Keep       = new_ir_op(beo_base + beo_Keep,      "be_Keep",      op_pin_state_pinned, K,   oparity_dynamic,  0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_CopyKeep   = new_ir_op(beo_base + beo_CopyKeep,  "be_CopyKeep",  op_pin_state_pinned, K,   oparity_variable, 0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_Call       = new_ir_op(beo_base + beo_Call,      "be_Call",      op_pin_state_pinned, F|M, oparity_variable, 0, sizeof(be_call_attr_t),    &be_node_op_ops);
-       op_be_Return     = new_ir_op(beo_base + beo_Return,    "be_Return",    op_pin_state_pinned, X,   oparity_dynamic,  0, sizeof(be_return_attr_t),  &be_node_op_ops);
-       op_be_AddSP      = new_ir_op(beo_base + beo_AddSP,     "be_AddSP",     op_pin_state_pinned, N,   oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_SubSP      = new_ir_op(beo_base + beo_SubSP,     "be_SubSP",     op_pin_state_pinned, N,   oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_IncSP      = new_ir_op(beo_base + beo_IncSP,     "be_IncSP",     op_pin_state_pinned, N,   oparity_unary,    0, sizeof(be_incsp_attr_t),   &be_node_op_ops);
-       op_be_RegParams  = new_ir_op(beo_base + beo_RegParams, "be_RegParams", op_pin_state_pinned, N,   oparity_zero,     0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_FrameAddr  = new_ir_op(beo_base + beo_FrameAddr, "be_FrameAddr", op_pin_state_floats, N,   oparity_unary,    0, sizeof(be_frame_attr_t),   &be_node_op_ops);
-       op_be_Barrier    = new_ir_op(beo_base + beo_Barrier,   "be_Barrier",   op_pin_state_pinned, N,   oparity_dynamic,  0, sizeof(be_node_attr_t),    &be_node_op_ops);
-       op_be_Unwind     = new_ir_op(beo_base + beo_Unwind,    "be_Unwind",    op_pin_state_pinned, X,   oparity_zero,     0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_Spill      = new_ir_op(beo_Spill,     "be_Spill",     op_pin_state_pinned, N,   oparity_unary,    0, sizeof(be_frame_attr_t),   &be_node_op_ops);
+       op_be_Reload     = new_ir_op(beo_Reload,    "be_Reload",    op_pin_state_pinned, N,   oparity_zero,     0, sizeof(be_frame_attr_t),   &be_node_op_ops);
+       op_be_Perm       = new_ir_op(beo_Perm,      "be_Perm",      op_pin_state_pinned, N,   oparity_variable, 0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_MemPerm    = new_ir_op(beo_MemPerm,   "be_MemPerm",   op_pin_state_pinned, N,   oparity_variable, 0, sizeof(be_memperm_attr_t), &be_node_op_ops);
+       op_be_Copy       = new_ir_op(beo_Copy,      "be_Copy",      op_pin_state_floats, N,   oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_Keep       = new_ir_op(beo_Keep,      "be_Keep",      op_pin_state_pinned, K,   oparity_dynamic,  0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_CopyKeep   = new_ir_op(beo_CopyKeep,  "be_CopyKeep",  op_pin_state_pinned, K,   oparity_variable, 0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_Call       = new_ir_op(beo_Call,      "be_Call",      op_pin_state_pinned, F|M, oparity_variable, 0, sizeof(be_call_attr_t),    &be_node_op_ops);
+       op_be_Return     = new_ir_op(beo_Return,    "be_Return",    op_pin_state_pinned, X,   oparity_dynamic,  0, sizeof(be_return_attr_t),  &be_node_op_ops);
+       op_be_AddSP      = new_ir_op(beo_AddSP,     "be_AddSP",     op_pin_state_pinned, N,   oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_SubSP      = new_ir_op(beo_SubSP,     "be_SubSP",     op_pin_state_pinned, N,   oparity_unary,    0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_IncSP      = new_ir_op(beo_IncSP,     "be_IncSP",     op_pin_state_pinned, N,   oparity_unary,    0, sizeof(be_incsp_attr_t),   &be_node_op_ops);
+       op_be_RegParams  = new_ir_op(beo_RegParams, "be_RegParams", op_pin_state_pinned, N,   oparity_zero,     0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_FrameAddr  = new_ir_op(beo_FrameAddr, "be_FrameAddr", op_pin_state_floats, N,   oparity_unary,    0, sizeof(be_frame_attr_t),   &be_node_op_ops);
+       op_be_Barrier    = new_ir_op(beo_Barrier,   "be_Barrier",   op_pin_state_pinned, N,   oparity_dynamic,  0, sizeof(be_node_attr_t),    &be_node_op_ops);
+       op_be_Unwind     = new_ir_op(beo_Unwind,    "be_Unwind",    op_pin_state_pinned, X,   oparity_zero,     0, sizeof(be_node_attr_t),    &be_node_op_ops);
 
        set_op_tag(op_be_Spill,      &be_node_tag);
        op_be_Spill->ops.node_cmp_attr = FrameAddr_cmp_attr;
@@ -384,11 +380,6 @@ int is_be_node(const ir_node *irn)
        return get_op_tag(get_irn_op(irn)) == &be_node_tag;
 }
 
-be_opcode_t be_get_irn_opcode(const ir_node *irn)
-{
-       return is_be_node(irn) ? (be_opcode_t) get_irn_opcode(irn) - beo_base : beo_NoBeOp;
-}
-
 /**
  * Skip Proj nodes and return their Proj numbers.
  *
@@ -958,26 +949,9 @@ ir_node *be_new_Unwind(dbg_info *dbg, ir_graph *irg, ir_node *block,
        return res;
 }
 
-int be_is_Spill         (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Spill          ; }
-int be_is_Reload        (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Reload         ; }
-int be_is_Copy          (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Copy           ; }
-int be_is_CopyKeep      (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_CopyKeep       ; }
-int be_is_Perm          (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Perm           ; }
-int be_is_MemPerm       (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_MemPerm        ; }
-int be_is_Keep          (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Keep           ; }
-int be_is_Call          (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Call           ; }
-int be_is_Return        (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Return         ; }
-int be_is_IncSP         (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_IncSP          ; }
-int be_is_AddSP         (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_AddSP          ; }
-int be_is_SubSP         (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_SubSP          ; }
-int be_is_RegParams     (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_RegParams      ; }
-int be_is_FrameAddr     (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_FrameAddr      ; }
-int be_is_Barrier       (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Barrier        ; }
-int be_is_Unwind        (const ir_node *irn) { return be_get_irn_opcode(irn) == beo_Unwind         ; }
-
 int be_has_frame_entity(const ir_node *irn)
 {
-       switch (be_get_irn_opcode(irn)) {
+       switch (get_irn_opcode(irn)) {
        case beo_Spill:
        case beo_Reload:
        case beo_FrameAddr:
@@ -1255,19 +1229,27 @@ be_node_get_irn_reg(const void *self, const ir_node *irn)
 
 static arch_irn_class_t be_node_classify(const void *self, const ir_node *irn)
 {
-       redir_proj((const ir_node **) &irn);
-
        (void) self;
-       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);
-               XXX(Return, branch);
+
+restart:
+       switch (get_irn_opcode(irn)) {
+#define XXX(a,b) case a: return b
+               XXX(beo_Spill, arch_irn_class_spill);
+               XXX(beo_Reload, arch_irn_class_reload);
+               XXX(beo_Perm, arch_irn_class_perm);
+               XXX(beo_Copy, arch_irn_class_copy);
+               XXX(beo_Return, arch_irn_class_branch);
 #undef XXX
+               case iro_Proj:
+                       irn = get_Proj_pred(irn);
+                       if (is_Proj(irn)) {
+                               assert(get_irn_mode(irn) == mode_T);
+                               irn = get_Proj_pred(irn);
+                       }
+                       goto restart;
+                       break;
                default:
-               return arch_irn_class_normal;
+                       return arch_irn_class_normal;
        }
 
        return 0;
@@ -1357,7 +1339,13 @@ static const arch_irn_ops_t be_node_irn_ops = {
 
 const void *be_node_get_irn_ops(const arch_irn_handler_t *self, const ir_node *irn)
 {
-       redir_proj((const ir_node **) &irn);
+       if (is_Proj(irn)) {
+               irn = get_Proj_pred(irn);
+               if (is_Proj(irn)) {
+                       assert(get_irn_mode(irn) == mode_T);
+                       irn = get_Proj_pred(irn);
+               }
+       }
        (void) self;
        return is_be_node(irn) ? &be_node_irn_ops : NULL;
 }
@@ -1736,7 +1724,7 @@ static int dump_node(ir_node *irn, FILE *f, dump_reason_t reason)
 
                        }
 
-                       switch(be_get_irn_opcode(irn)) {
+                       switch (get_irn_opcode(irn)) {
                        case beo_IncSP:
                                {
                                        be_incsp_attr_t *a = (be_incsp_attr_t *) at;

diff --git a/ir/be/benode_t.h b/ir/be/benode_t.h
index c7d7567..54abbce 100644 (file)
--- a/ir/be/benode_t.h
+++ b/ir/be/benode_t.h
@@ -33,7 +33,7 @@
 #include <limits.h>
 
 #include "firm_types.h"
-#include "irnode.h"
+#include "irnode_t.h"
 #include "bearch.h"
 
 #define BE_OUT_POS(p) (-((p) + 1))
@@ -58,27 +58,6 @@ extern ir_op *op_be_FrameAddr;
 extern ir_op *op_be_Barrier;
 extern ir_op *op_be_Unwind;
 
-typedef enum {
-       beo_NoBeOp = -1,
-       beo_Spill,
-       beo_Reload,
-       beo_Perm,
-       beo_MemPerm,
-       beo_Copy,
-       beo_Keep,
-       beo_CopyKeep,
-       beo_Call,
-       beo_Return,
-       beo_AddSP,
-       beo_SubSP,
-       beo_IncSP,
-       beo_RegParams,
-       beo_FrameAddr,
-       beo_Barrier,
-       beo_Unwind,
-       beo_Last
-} be_opcode_t;
-
 /** Not used yet. */
 typedef enum {
        be_frame_flag_spill = 1,
@@ -453,24 +432,7 @@ ir_node *be_get_Unwind_sp(const ir_node *irn);
  * @param irn The node.
  * @return The backend opcode.
  */
-be_opcode_t be_get_irn_opcode(const ir_node *irn);
-
-int be_is_Spill(const ir_node *irn);
-int be_is_Reload(const ir_node *irn);
-int be_is_Copy(const ir_node *irn);
-int be_is_Perm(const ir_node *irn);
-int be_is_MemPerm(const ir_node *irn);
-int be_is_Keep(const ir_node *irn);
-int be_is_CopyKeep(const ir_node *irn);
-int be_is_Call(const ir_node *irn);
-int be_is_Return(const ir_node *irn);
-int be_is_IncSP(const ir_node *irn);
-int be_is_AddSP(const ir_node *irn);
-int be_is_SubSP(const ir_node *irn);
-int be_is_RegParams(const ir_node *irn);
-int be_is_FrameAddr(const ir_node *irn);
-int be_is_Barrier(const ir_node *irn);
-int be_is_Unwind(const ir_node *irn);
+#define be_get_irn_opcode(irn) get_irn_opcode(irn)
 
 /**
  * Returns the frame entity of a be node.
@@ -578,4 +540,21 @@ void be_set_phi_flags(const arch_env_t *arch_env, ir_node *phi,
  */
 extern const arch_irn_handler_t be_node_irn_handler;
 
+static INLINE int be_is_Spill    (const ir_node *irn) { return get_irn_opcode(irn) == beo_Spill    ; }
+static INLINE int be_is_Reload   (const ir_node *irn) { return get_irn_opcode(irn) == beo_Reload   ; }
+static INLINE int be_is_Copy     (const ir_node *irn) { return get_irn_opcode(irn) == beo_Copy     ; }
+static INLINE int be_is_CopyKeep (const ir_node *irn) { return get_irn_opcode(irn) == beo_CopyKeep ; }
+static INLINE int be_is_Perm     (const ir_node *irn) { return get_irn_opcode(irn) == beo_Perm     ; }
+static INLINE int be_is_MemPerm  (const ir_node *irn) { return get_irn_opcode(irn) == beo_MemPerm  ; }
+static INLINE int be_is_Keep     (const ir_node *irn) { return get_irn_opcode(irn) == beo_Keep     ; }
+static INLINE int be_is_Call     (const ir_node *irn) { return get_irn_opcode(irn) == beo_Call     ; }
+static INLINE int be_is_Return   (const ir_node *irn) { return get_irn_opcode(irn) == beo_Return   ; }
+static INLINE int be_is_IncSP    (const ir_node *irn) { return get_irn_opcode(irn) == beo_IncSP    ; }
+static INLINE int be_is_AddSP    (const ir_node *irn) { return get_irn_opcode(irn) == beo_AddSP    ; }
+static INLINE int be_is_SubSP    (const ir_node *irn) { return get_irn_opcode(irn) == beo_SubSP    ; }
+static INLINE int be_is_RegParams(const ir_node *irn) { return get_irn_opcode(irn) == beo_RegParams; }
+static INLINE int be_is_FrameAddr(const ir_node *irn) { return get_irn_opcode(irn) == beo_FrameAddr; }
+static INLINE int be_is_Barrier  (const ir_node *irn) { return get_irn_opcode(irn) == beo_Barrier  ; }
+static INLINE int be_is_Unwind   (const ir_node *irn) { return get_irn_opcode(irn) == beo_Unwind   ; }
+
 #endif /* FIRM_BE_BENODE_T_H */

diff --git a/ir/be/ia32/ia32_intrinsics.c b/ir/be/ia32/ia32_intrinsics.c
index 3f0b256..08ceb82 100644 (file)
--- a/ir/be/ia32/ia32_intrinsics.c
+++ b/ir/be/ia32/ia32_intrinsics.c
@@ -44,8 +44,8 @@
 /** The array of all intrinsics that must be mapped. */
 static i_record *intrinsics;
 
-/** An array to cache all entities */
-static ir_entity *i_ents[iro_MaxOpcode];
+/** An array to cache all entities. */
+static ir_entity *i_ents[iro_Last];
 
 /*
  * Maps all intrinsic calls that the backend support

diff --git a/ir/be/ia32/ia32_optimize.c b/ir/be/ia32/ia32_optimize.c
index ff8e7fc..3e7eb29 100644 (file)
--- a/ir/be/ia32/ia32_optimize.c
+++ b/ir/be/ia32/ia32_optimize.c
@@ -326,7 +326,7 @@ static void peephole_ia32_Return(ir_node *node) {
 
        /* check if this return is the first on the block */
        sched_foreach_reverse_from(node, irn) {
-               switch (be_get_irn_opcode(irn)) {
+               switch (get_irn_opcode(irn)) {
                case beo_Return:
                        /* the return node itself, ignore */
                        continue;
@@ -338,9 +338,9 @@ static void peephole_ia32_Return(ir_node *node) {
                        if (be_get_IncSP_offset(irn) == 0)
                                continue;
                        return;
+               case iro_Phi:
+                       continue;
                default:
-                       if (is_Phi(irn))
-                               continue;
                        return;
                }
        }

diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c
index a0cd50f..11e2125 100644 (file)
--- a/ir/lower/lower_dw.c
+++ b/ir/lower/lower_dw.c
@@ -2346,7 +2346,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
        if (! prim_types)
                prim_types = pmap_create();
        if (! intrinsic_fkt)
-               intrinsic_fkt = new_set(cmp_op_mode, iro_MaxOpcode);
+               intrinsic_fkt = new_set(cmp_op_mode, iro_Last);
        if (! conv_types)
                conv_types = new_set(cmp_conv_tp, 16);
        if (! lowered_type)