Corrected setting register classes of Return and Barrier nodes

[libfirm] / ir / be / benode_t.h

diff --git a/ir/be/benode_t.h b/ir/be/benode_t.h
index 3eb2686..1b422fd 100644 (file)
--- a/ir/be/benode_t.h
+++ b/ir/be/benode_t.h
@@ -22,6 +22,8 @@
 #include "be_t.h"
 #include "bearch.h"
 
+#define BE_OUT_POS(p) (-((p) + 1))
+
 /**
  * The benode op's.  Must be available to register emitter function.
  */
@@ -33,13 +35,14 @@ extern ir_op *op_be_Keep;
 extern ir_op *op_be_Call;
 extern ir_op *op_be_Return;
 extern ir_op *op_be_IncSP;
-extern ir_op *op_be_Alloca;
+extern ir_op *op_be_AddSP;
 extern ir_op *op_be_SetSP;
 extern ir_op *op_be_RegParams;
 extern ir_op *op_be_StackParam;
 extern ir_op *op_be_FrameAddr;
 extern ir_op *op_be_FrameLoad;
 extern ir_op *op_be_FrameStore;
+extern ir_op *op_be_Barrier;
 
 typedef enum {
        beo_NoBeOp = 0,
@@ -48,10 +51,10 @@ typedef enum {
        beo_Perm,
        beo_Copy,
        beo_Keep,
-       beo_NoReg,
+       beo_CopyKeep,
        beo_Call,
        beo_Return,
-       beo_Alloca,
+       beo_AddSP,
        beo_IncSP,
        beo_SetSP,
        beo_RegParams,
@@ -59,6 +62,7 @@ typedef enum {
        beo_FrameLoad,
        beo_FrameStore,
        beo_FrameAddr,
+       beo_Barrier,
        beo_Last
 } be_opcode_t;
 
@@ -85,8 +89,21 @@ void be_node_init(void);
 
 const arch_irn_handler_t be_node_irn_handler;
 
+enum {
+       be_pos_Spill_frame = 0,
+       be_pos_Spill_val   = 1
+};
 ir_node *be_new_Spill(const arch_register_class_t *cls, const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_node *frame, ir_node *node_to_spill, ir_node *ctx);
+
+enum {
+       be_pos_Reload_frame = 0,
+       be_pos_Reload_mem   = 1
+};
 ir_node *be_new_Reload(const arch_register_class_t *cls, const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_node *frame, ir_node *spill_node, ir_mode *mode);
+
+enum {
+       be_pos_Copy_orig = 0
+};
 ir_node *be_new_Copy(const arch_register_class_t *cls, ir_graph *irg, ir_node *block, ir_node *in);
 ir_node *be_new_Perm(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int arity, ir_node *in[]);
 ir_node *be_new_Keep(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, int arity, ir_node *in[]);
@@ -97,7 +114,25 @@ ir_node *be_new_FrameStore(const arch_register_class_t *cls_frame, const arch_re
                                                   ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *frame, ir_node *data, entity *ent);
 ir_node *be_new_FrameAddr(const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_node *frame, entity *ent);
 
-ir_node *be_new_Alloca(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *old_sp, ir_node *sz);
+enum {
+       be_pos_AddSP_old_sp = 0,
+       be_pos_AddSP_size   = 1,
+       be_pos_AddSP_last   = 2
+};
+
+/**
+ * Make a new AddSP node.
+ * An AddSP node expresses an increase of the stack pointer in the direction the stack
+ * grows. In contrast to IncSP, the amount of bytes the stack pointer is grown, is not
+ * given by a constant but an ordinary Firm node.
+ * @param sp     The stack pointer register.
+ * @param irg    The graph.
+ * @param bl     The block.
+ * @param old_sp The node representing the old stack pointer value.
+ * @param sz     The node expressing the size by which the stack pointer shall be grown.
+ * @return       A new AddSP node.
+ */
+ir_node *be_new_AddSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *sz);
 
 ir_node *be_new_SetSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *operand, ir_node *mem);
 
@@ -115,6 +150,8 @@ ir_node *be_new_SetSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_
  */
 ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, ir_node *mem, unsigned amount, be_stack_dir_t dir);
 
+
+
 void     be_set_IncSP_offset(ir_node *irn, unsigned offset);
 unsigned be_get_IncSP_offset(const ir_node *irn);
 
@@ -124,14 +161,26 @@ be_stack_dir_t be_get_IncSP_direction(const ir_node *irn);
 entity *be_Call_get_entity(const ir_node *call);
 void    be_Call_set_entity(ir_node *call, entity *ent);
 
+enum {
+       be_pos_Call_mem = 0,
+       be_pos_Call_sp  = 1,
+       be_pos_Call_ptr = 2
+};
+
 ir_node *be_new_Call(ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *sp, ir_node *ptr, int n_outs, int n, ir_node *in[]);
 ir_node *be_new_Return(ir_graph *irg, ir_node *bl, int n, ir_node *in[]);
 ir_node *be_new_StackParam(const arch_register_class_t *cls, const arch_register_class_t *cls_frame, ir_graph *irg, ir_node *bl, ir_mode *mode, ir_node *frame_pointer, entity *ent);
 ir_node *be_new_RegParams(ir_graph *irg, ir_node *bl, int n_out);
 
+ir_node *be_new_Barrier(ir_graph *irg, ir_node *bl, int n, ir_node *in[]);
+
 ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn,ir_node *spill_ctx);
 ir_node *be_reload(const arch_env_t *arch_env, const arch_register_class_t *cls, ir_node *reloader, ir_mode *mode, ir_node *spill);
 
+ir_node *be_new_CopyKeep(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, ir_node *src, int n, ir_node *in_keep[], ir_mode *mode);
+ir_node *be_new_CopyKeep_single(const arch_register_class_t *cls, ir_graph *irg, ir_node *bl, ir_node *src, ir_node *keep, ir_mode *mode);
+
+
 /**
  * Get the backend opcode of a backend node.
  * @param irn The node.
@@ -144,14 +193,18 @@ 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_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_SetSP(const ir_node *irn);
 int be_is_AddSP(const ir_node *irn);
 int be_is_RegParams(const ir_node *irn);
 int be_is_StackParam(const ir_node *irn);
 int be_is_FrameAddr(const ir_node *irn);
 int be_is_FrameLoad(const ir_node *irn);
 int be_is_FrameStore(const ir_node *irn);
+int be_is_Barrier(const ir_node *irn);
 
 /**
  * Get the entity on the stack frame the given node uses.