X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_new_nodes.c;h=67715e470e33514af7201d64c7a164d931ca0c22;hb=09efa2a5b39ea665e263421e91a67b1ab03b87a8;hp=437f0c83522613dfebf1be143302f32c7c4c437d;hpb=1752786900095fecb07aa28fa6eeb75e0e3f8d1a;p=libfirm

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index 437f0c835..67715e470 100644
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -153,7 +153,7 @@ static void dump_reg_req(FILE *F, ir_node *n, const ia32_register_req_t **reqs,
  * @param reason   indicates which kind of information should be dumped
  * @return 0 on success or != 0 on failure
  */
-static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) {
+static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
 	ir_mode     *mode = NULL;
 	int          bad  = 0;
 	int          i, n_res, am_flav, flags;
@@ -177,7 +177,7 @@ static int dump_node_ia32(ir_node *n, FILE *F, dump_reason_t reason) {
 
 		case dump_node_nodeattr_txt:
 			if (is_ia32_ImmConst(n) || is_ia32_ImmSymConst(n) || is_ia32_Cnst(n)) {
-				char       *pref = is_ia32_ImmSymConst(n) || (get_ia32_op_type(n) == ia32_SymConst) ? "SymC" : "";
+				char       *pref = is_ia32_ImmSymConst(n) || (get_ia32_op_type(n) == ia32_SymConst) ? "SymC " : "";
 				const char *cnst = get_ia32_cnst(n);
 
 				fprintf(F, "[%s%s]", pref, cnst ? cnst : "NONE");
@@ -718,13 +718,37 @@ void clear_ia32_emit_cl(ir_node *node) {
 }
 
 /**
- * Checks if node is commutative.
+ * Checks if node needs %cl.
  */
 int is_ia32_emit_cl(const ir_node *node) {
 	ia32_attr_t *attr = get_ia32_attr(node);
 	return attr->data.emit_cl;
 }
 
+/**
+ * Sets node got_lea.
+ */
+void set_ia32_got_lea(ir_node *node) {
+	ia32_attr_t *attr  = get_ia32_attr(node);
+	attr->data.got_lea = 1;
+}
+
+/**
+ * Clears node got_lea.
+ */
+void clear_ia32_got_lea(ir_node *node) {
+	ia32_attr_t *attr  = get_ia32_attr(node);
+	attr->data.got_lea = 0;
+}
+
+/**
+ * Checks if node got lea.
+ */
+int is_ia32_got_lea(const ir_node *node) {
+	ia32_attr_t *attr = get_ia32_attr(node);
+	return attr->data.got_lea;
+}
+
 /**
  * Gets the mode of the stored/loaded value (only set for Store/Load)
  */
@@ -1178,33 +1202,19 @@ const arch_register_t *get_ia32_out_reg(const ir_node *node, int pos) {
 	return attr->slots[pos];
 }
 
-/**
- * Allocates num register slots for node.
- */
-void alloc_ia32_reg_slots(ir_node *node, int num) {
-	ia32_attr_t *attr = get_ia32_attr(node);
-
-	if (num) {
-		attr->slots = (const arch_register_t **)NEW_ARR_D(arch_register_t*, get_irg_obstack(get_irn_irg(node)), num);
-		memset(attr->slots, 0, sizeof(attr->slots[0]) * num);
-	}
-	else {
-		attr->slots = NULL;
-	}
-
-	attr->data.n_res = num;
-}
-
 /**
  * Initializes the nodes attributes.
  */
 void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_register_req_t **in_reqs,
 						  const ia32_register_req_t **out_reqs, int n_res)
 {
+	ia32_attr_t *attr = get_ia32_attr(node);
 	set_ia32_flags(node, flags);
 	set_ia32_in_req_all(node, in_reqs);
 	set_ia32_out_req_all(node, out_reqs);
-	alloc_ia32_reg_slots(node, n_res);
+
+	attr->data.n_res = n_res;
+	memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0]));
 }
 
 /***************************************************************************************
@@ -1241,31 +1251,5 @@ int ia32_compare_conv_attr(ia32_attr_t *a, ia32_attr_t *b) {
 	return !equ;
 }
 
-/* copies the ia32 attributes */
-static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) {
-	ia32_attr_t    *attr_old = get_ia32_attr(old_node);
-	ia32_attr_t    *attr_new = get_ia32_attr(new_node);
-	int             n_res    = get_ia32_n_res(old_node);
-
-	/* copy the attributes */
-	memcpy(attr_new, attr_old, sizeof(*attr_new));
-
-	/* copy the register slots */
-	attr_new->slots = (const arch_register_t **)NEW_ARR_D(arch_register_t*, get_irg_obstack(get_irn_irg(new_node)), n_res);
-	memcpy((void *)attr_new->slots, (void *)attr_old->slots, sizeof(attr_new->slots[0]) * n_res);
-}
-
-/**
- * Registers the ia32_copy_attr function for all ia32 opcodes.
- */
-void ia32_register_copy_attr_func(void) {
-	unsigned i, f = get_ia32_opcode_first(), l = get_ia32_opcode_last();
-
-	for (i = f; i < l; i++) {
-		ir_op *op = get_irp_opcode(i);
-		op->ops.copy_attr = ia32_copy_attr;
-	}
-}
-
 /* Include the generated constructor functions */
 #include "gen_ia32_new_nodes.c.inl"