Added alignment for stack params

ir/be/beabi.c

@@ -8,7 +8,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
 #include "obst.h"
+#include "offset.h"
 
 #include "type.h"
 #include "irgopt.h"
@@ -40,6 +42,7 @@ typedef struct _be_abi_call_arg_t {
 	int pos;
 	const arch_register_t *reg;
 	entity *stack_ent;
+	unsigned alignment;
 } be_abi_call_arg_t;
 
 struct _be_abi_call_t {
@@ -96,10 +99,8 @@ struct _be_abi_irg_t {
 	arch_irn_ops_t     irn_ops;
 };
 
-#define abi_offset_of(type,member) ((char *) &(((type *) 0)->member) - (char *) 0)
-#define abi_get_relative(ptr, member) ((void *) ((char *) (ptr) - abi_offset_of(be_abi_irg_t, member)))
-#define get_abi_from_handler(ptr) abi_get_relative(ptr, irn_handler)
-#define get_abi_from_ops(ptr)     abi_get_relative(ptr, irn_ops)
+#define get_abi_from_handler(ptr) firm_container_of(ptr, be_abi_irg_t, irn_handler)
+#define get_abi_from_ops(ptr)     firm_container_of(ptr, be_abi_irg_t, irn_ops)
 
 /* Forward, since be need it in be_abi_introduce(). */
 static const arch_irn_ops_if_t abi_irn_ops;
@@ -149,10 +150,12 @@ void be_abi_call_set_flags(be_abi_call_t *call, be_abi_call_flags_t flags, const
 	call->cb           = cb;
 }
 
-void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos)
+void be_abi_call_param_stack(be_abi_call_t *call, int arg_pos, unsigned alignment)
 {
 	be_abi_call_arg_t *arg = get_or_set_call_arg(call, 0, arg_pos, 1);
-	arg->on_stack = 1;
+	arg->on_stack  = 1;
+	arg->alignment = alignment;
+	assert(alignment > 0 && "Alignment must be greater than 0");
 }
 
 void be_abi_call_param_reg(be_abi_call_t *call, int arg_pos, const arch_register_t *reg)
@@ -923,6 +926,7 @@ static ir_type *compute_arg_type(be_abi_irg_t *env, be_abi_call_t *call, ir_type
 		if(arg->on_stack) {
 			snprintf(buf, sizeof(buf), "param_%d", i);
 			arg->stack_ent = new_entity(res, new_id_from_str(buf), param_type);
+			ofs = round_up2(ofs, arg->alignment);
 			set_entity_offset_bytes(arg->stack_ent, ofs);
 			ofs += get_type_size_bytes(param_type);
 		}
@@ -1355,7 +1359,7 @@ be_abi_irg_t *be_abi_introduce(be_irg_t *birg)
 	env->stack_phis       = pset_new_ptr(16);
 	env->init_sp = dummy  = new_r_Unknown(irg, env->isa->sp->reg_class->mode);
 
-	env->cb = env->call->cb->init(env->call, env->isa, irg);
+	env->cb = env->call->cb->init(env->call, birg->main_env->arch_env, irg);
 
 	obstack_init(&env->obst);
 

ir/be/beabi.h

@@ -19,8 +19,7 @@ struct _be_abi_call_flags_bits_t {
 	unsigned try_omit_fp           : 1;  /**< Try to omit the frame pointer. */
 	unsigned fp_free               : 1;  /**< The function can use any register as frame pointer. */
 	unsigned call_has_imm          : 1;  /**< A call can take the callee's address as an immediate. */
-	unsigned irg_is_leaf           : 1;  /**< 1
-	, if the IRG is a leaf function. */
+	unsigned irg_is_leaf           : 1;  /**< 1, if the IRG is a leaf function. */
 };
 
 union _be_abi_call_flags_t {
@@ -32,11 +31,11 @@ struct _be_abi_callbacks_t {
 	/**
 	 * Initialize the callback object.
 	 * @param call The call object.
-	 * @param isa  The current ISA.
+	 * @param aenv The architecture environment.
 	 * @param irg  The graph with the method.
 	 * @return     Some pointer. This pointer is passed to all other callback functions as self object.
 	 */
-	void *(*init)(const be_abi_call_t *call, const arch_isa_t *isa, ir_graph *irg);
+	void *(*init)(const be_abi_call_t *call, const arch_env_t *aenv, ir_graph *irg);
 
 	/**
 	 * Destroy the callback object.
@@ -91,13 +90,13 @@ struct _be_abi_callbacks_t {
 void be_abi_call_set_flags(be_abi_call_t *call, be_abi_call_flags_t flags, const be_abi_callbacks_t *cb);
 
 
-void be_abi_call_param_stack(be_abi_call_t *call, int pos);
+void be_abi_call_param_stack(be_abi_call_t *call, int pos, unsigned alignment);
 void be_abi_call_param_reg(be_abi_call_t *call, int pos, const arch_register_t *reg);
 void be_abi_call_res_reg(be_abi_call_t *call, int pos, const arch_register_t *reg);
 
 /**
  * Get the flags of a ABI call object.
- * Note that the flags must not be the same as set by be_abi_call_set_flags(). Alayses may have
+ * Note that the flags must not be the same as set by be_abi_call_set_flags(). Analyses may have
  * altered several flags, so getting them from the call object is always a good idea.
  * @param call The call object.
  * @return The flags.