From e59e094b609ef8ce89319205d4e9c01d131b5cf7 Mon Sep 17 00:00:00 2001
From: Matthias Braun <matze@braunis.de>
Date: Mon, 25 Jun 2007 23:10:30 +0000
Subject: [PATCH] warning fixes and use of attribute copy function

[r14760]
---
 ir/be/arm/arm_map_regs.c  |  3 ++-
 ir/be/arm/arm_new_nodes.c | 13 -------------
 ir/be/arm/arm_new_nodes.h |  5 -----
 ir/be/arm/arm_spec.pl     |  1 +
 ir/be/arm/bearch_arm.c    |  1 -
 5 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/ir/be/arm/arm_map_regs.c b/ir/be/arm/arm_map_regs.c
index 19a3ff169..325e8090b 100644
--- a/ir/be/arm/arm_map_regs.c
+++ b/ir/be/arm/arm_map_regs.c
@@ -54,9 +54,10 @@ struct arm_irn_reg_assoc {
 	const arch_register_t *reg;
 };
 
-int arm_cmp_irn_reg_assoc(const void *a, const void *b, size_t len) {
+int arm_cmp_irn_reg_assoc(const void *a, const void *b, size_t size) {
 	const struct arm_irn_reg_assoc *x = a;
 	const struct arm_irn_reg_assoc *y = b;
+	(void) size;
 
 	return x->irn != y->irn;
 }
diff --git a/ir/be/arm/arm_new_nodes.c b/ir/be/arm/arm_new_nodes.c
index 80d84bac4..f7e0aec1f 100644
--- a/ir/be/arm/arm_new_nodes.c
+++ b/ir/be/arm/arm_new_nodes.c
@@ -650,16 +650,3 @@ static void arm_copy_attr(const ir_node *old_node, ir_node *new_node) {
 
 /* Include the generated constructor functions */
 #include "gen_arm_new_nodes.c.inl"
-
-/**
- * Registers the arm_copy_attr function for all ARM opcodes.
- */
-void arm_register_copy_attr_func(void) {
-	int i;
-
-	for (i = get_irp_n_opcodes() - 1; i >= 0; --i) {
-		ir_op *op = get_irp_opcode(i);
-		if (is_arm_op(op))
-			op->ops.copy_attr = arm_copy_attr;
-	}
-}
diff --git a/ir/be/arm/arm_new_nodes.h b/ir/be/arm/arm_new_nodes.h
index 3116c2b9b..b5c02b32b 100644
--- a/ir/be/arm/arm_new_nodes.h
+++ b/ir/be/arm/arm_new_nodes.h
@@ -206,11 +206,6 @@ arm_shift_modifier get_arm_shift_modifier(const ir_node *node);
  */
 unsigned int arm_decode_imm_w_shift(tarval *tv);
 
-/**
- * Registers the arm_copy_attr function for all ARM opcodes.
- */
-void arm_register_copy_attr_func(void);
-
 /* Include the generated headers */
 #include "gen_arm_new_nodes.h"
 
diff --git a/ir/be/arm/arm_spec.pl b/ir/be/arm/arm_spec.pl
index 9b923ff26..04ebd1f32 100644
--- a/ir/be/arm/arm_spec.pl
+++ b/ir/be/arm/arm_spec.pl
@@ -176,6 +176,7 @@ $mode_fpa     = "mode_E";
 #--------------------------------------------------#
 
 $default_attr_type = "arm_attr_t";
+$default_attr_copy = "arm_copy_attr";
 
 %init_attr = (
 	arm_attr_t           => "\tinit_arm_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res, latency);",
diff --git a/ir/be/arm/bearch_arm.c b/ir/be/arm/bearch_arm.c
index d63e732b1..512e90d9e 100644
--- a/ir/be/arm/bearch_arm.c
+++ b/ir/be/arm/bearch_arm.c
@@ -784,7 +784,6 @@ static void *arm_init(FILE *file_handle) {
 	be_emit_init_env(&isa->emit, file_handle);
 
 	arm_create_opcodes();
-	arm_register_copy_attr_func();
 	arm_handle_intrinsics();
 
 	/* we mark referenced global entities, so we can only emit those which
-- 
2.20.1