X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_nodes_attr.h;h=75159cdb83aadc622e8fcdb83b7c81b51e55a296;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=3b97fe7beeff14ada8b8fc637c52a0548e98a91d;hpb=ab182d4b9ed44239ab3ff1d08b2f8e14a3699ccf;p=libfirm

diff --git a/ir/be/arm/arm_nodes_attr.h b/ir/be/arm/arm_nodes_attr.h
index 3b97fe7be..75159cdb8 100644
--- a/ir/be/arm/arm_nodes_attr.h
+++ b/ir/be/arm/arm_nodes_attr.h
@@ -21,14 +21,13 @@
  * @file
  * @brief   declarations for ARM node attributes
  * @author  Oliver Richter, Tobias Gneist, Michael Beck
- * @version $Id$
  */
 #ifndef FIRM_BE_ARM_ARM_NODES_ATTR_H
 #define FIRM_BE_ARM_ARM_NODES_ATTR_H
 
 #include "firm_types.h"
 #include "irnode_t.h"
-#include "../bearch.h"
+#include "bearch.h"
 
 /**
  * Possible ARM "shifter operand" addressing mode types.
@@ -64,7 +63,6 @@ enum fpa_immediates {
 /** Generic ARM node attributes. */
 typedef struct arm_attr_t {
 	except_attr                 exc;                /**< the exception attribute. MUST be the first one. */
-	const arch_register_req_t **in_req;             /**< register requirements for arguments */
 	bool                        is_load_store : 1;  /**< if set, this is a load or store instruction */
 } arm_attr_t;
 
@@ -108,14 +106,13 @@ typedef struct arm_SymConst_attr_t {
 /** Attributes for a CondJmp */
 typedef struct arm_CondJmp_attr_t {
 	arm_attr_t  base;
-	pn_Cmp      pnc;
+	ir_relation relation;
 } arm_CondJmp_attr_t;
 
 /** Attributes for a SwitchJmp */
 typedef struct arm_SwitchJmp_attr_t {
-	arm_attr_t  base;
-	int         n_projs;
-	long        default_proj_num;
+	arm_attr_t             base;
+	const ir_switch_table *table;
 } arm_SwitchJmp_attr_t;
 
 /** CopyB attributes */
@@ -127,7 +124,7 @@ typedef struct arm_CopyB_attr_t {
 /** Attributes for a fConst */
 typedef struct arm_fConst_attr_t {
 	arm_attr_t  base;
-	tarval     *tv;              /**< the tarval representing the FP const */
+	ir_tarval  *tv;              /**< the tarval representing the FP const */
 } arm_fConst_attr_t;
 
 /** attributes for floatingpoint arithmetic operations */
@@ -136,11 +133,6 @@ typedef struct arm_farith_attr_t {
 	ir_mode    *mode; /* operation mode */
 } arm_farith_attr_t;
 
-/**
- * Return the fpa immediate from the encoding.
- */
-const char *arm_get_fpa_imm_name(long imm_value);
-
 #define CAST_ARM_ATTR(type,ptr)        ((type *)(ptr))
 #define CONST_CAST_ARM_ATTR(type,ptr)  ((const type *)(ptr))