do not pad return after a fall-through Jmp

[libfirm] / ir / be / benode_t.h

diff --git a/ir/be/benode_t.h b/ir/be/benode_t.h
index e8096b9..cc00d18 100644 (file)
--- a/ir/be/benode_t.h
+++ b/ir/be/benode_t.h
@@ -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.
  *
@@ -53,10 +53,10 @@ extern ir_op *op_be_Return;
 extern ir_op *op_be_IncSP;
 extern ir_op *op_be_AddSP;
 extern ir_op *op_be_SubSP;
-extern ir_op *op_be_SetSP;
 extern ir_op *op_be_RegParams;
 extern ir_op *op_be_FrameAddr;
 extern ir_op *op_be_Barrier;
+extern ir_op *op_be_Unwind;
 
 typedef enum {
        beo_NoBeOp = -1,
@@ -72,10 +72,10 @@ typedef enum {
        beo_AddSP,
        beo_SubSP,
        beo_IncSP,
-       beo_SetSP,
        beo_RegParams,
        beo_FrameAddr,
        beo_Barrier,
+       beo_Unwind,
        beo_Last
 } be_opcode_t;
 
@@ -247,8 +247,6 @@ enum {
  */
 ir_node *be_new_SubSP(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);
-
 /**
  * Make a stack pointer increase/decrease node.
  * @param sp     The stack pointer register.
@@ -261,7 +259,8 @@ ir_node *be_new_SetSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_
  * @return       A new stack pointer increment/decrement node.
  * @note         This node sets a register constraint to the @p sp register on its output.
  */
-ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl, ir_node *old_sp, int offset);
+ir_node *be_new_IncSP(const arch_register_t *sp, ir_graph *irg, ir_node *bl,
+                      ir_node *old_sp, int offset, int align);
 
 /** Returns the previous node that computes the stack pointer. */
 ir_node *be_get_IncSP_pred(ir_node *incsp);
@@ -279,6 +278,7 @@ void     be_set_IncSP_offset(ir_node *irn, int offset);
 
 /** Gets the offset from a IncSP node. */
 int be_get_IncSP_offset(const ir_node *irn);
+int be_get_IncSP_align(const ir_node *irn);
 
 /** Gets the call entity or NULL if this is no static call. */
 ir_entity  *be_Call_get_entity(const ir_node *call);
@@ -289,6 +289,10 @@ ir_type *be_Call_get_type(ir_node *call);
 /** Sets the call type. */
 void     be_Call_set_type(ir_node *call, ir_type *call_tp);
 
+void     be_Call_set_pop(ir_node *call, unsigned pop);
+
+unsigned be_Call_get_pop(const ir_node *call);
+
 /**
  * Position numbers for the be_Call inputs.
  */
@@ -304,7 +308,8 @@ enum {
  */
 typedef enum {
        pn_be_Call_M_regular = pn_Call_M_regular,  /**< The memory result of a be_Call. */
-       pn_be_Call_first_res = pn_Call_max         /**< The first result proj number of a be_Call. */
+       pn_be_Call_sp        = pn_Call_max,
+       pn_be_Call_first_res                      /**< The first result proj number of a be_Call. */
 } pn_be_Call;
 
 /**
@@ -335,16 +340,26 @@ enum {
 
 /**
  * Construct a new be_Return.
+ *
+ * @param dbg    debug info
  * @param irg    the graph where the new node will be placed
  * @param bl     the block where the new node will be placed
  * @param n_res  number of "real" results
  * @param n      number of inputs
+ * @param pop    pop number of bytes on return
  * @param in     input array
  */
-ir_node *be_new_Return(dbg_info *dbg, ir_graph *irg, ir_node *bl, int n_res, int n, ir_node *in[]);
+ir_node *be_new_Return(dbg_info *dbg, ir_graph *irg, ir_node *bl, int n_res, unsigned pop, int n, ir_node *in[]);
 
 /** Returns the number of real returns values */
-int be_Return_get_n_rets(ir_node *ret);
+int be_Return_get_n_rets(const ir_node *ret);
+
+/**
+ * Return the number of bytes that should be popped from stack when executing the Return.
+ *
+ * @param ret  the be_Return node
+ */
+unsigned be_Return_get_pop(const ir_node *ret);
 
 /** appends a node to the return node, returns the position of the node */
 int be_Return_append_node(ir_node *ret, ir_node *node);
@@ -375,7 +390,7 @@ ir_node *be_RegParams_append_out_reg(ir_node *regparams,
  * @param spill_ctx The context in which the spill is introduced (This is mostly == irn up to the case of Phis).
  * @return          The new spill node.
  */
-ir_node *be_spill(const arch_env_t *arch_env, ir_node *irn);
+ir_node *be_spill(const arch_env_t *arch_env, ir_node *block, ir_node *irn);
 
 /**
  * Make a reload and insert it into the schedule.
@@ -397,6 +412,28 @@ ir_node *be_new_CopyKeep_single(const arch_register_class_t *cls, ir_graph *irg,
 ir_node *be_get_CopyKeep_op(const ir_node *cpy);
 void be_set_CopyKeep_op(ir_node *cpy, ir_node *op);
 
+/**
+ * Position numbers for the be_Unwind inputs.
+ */
+enum {
+       be_pos_Unwind_mem  = 0,     /**< memory input of a be_Unwind node */
+       be_pos_Unwind_sp   = 1,     /**< stack pointer input of a be_Unwind node */
+};
+
+/**
+ * Construct a new be_Unwind.
+ *
+ * @param dbg    debug info
+ * @param irg    the graph where the new node will be placed
+ * @param bl     the block where the new node will be placed
+ * @param mem    the memory input
+ * @param sp     the stack pointer input
+ */
+ir_node *be_new_Unwind(dbg_info *dbg, ir_graph *irg, ir_node *bl, ir_node *mem, ir_node *sp);
+
+ir_node *be_get_Unwind_mem(const ir_node *irn);
+ir_node *be_get_Unwind_sp(const ir_node *irn);
+
 /**
  * Get the backend opcode of a backend node.
  * @param irn The node.
@@ -414,17 +451,18 @@ 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_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);
 
 /**
+ * Returns the frame entity of a be node.
  * Try to avoid this function and better call arch_get_frame_entity!
  *
- * Returns the frame entity used by the be node
+ * @return the frame entity used by the be node
  */
 ir_entity *be_get_frame_entity(const ir_node *irn);
 
@@ -472,6 +510,8 @@ void be_set_constr_limited(ir_node *irn, int pos, const arch_register_req_t *req
  */
 void be_node_set_flags(ir_node *irn, int pos, arch_irn_flags_t flags);
 
+void be_node_add_flags(ir_node *irn, int pos, arch_irn_flags_t flags);
+
 /**
  * Set the register class of a node.
  * @param irn The node itself.