X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Fbearch_arm_t.h;h=4aafcc6efd4db72d6a2eab0b6469de3e9b196d8f;hb=b59e22a229aa1227ef992c184c79fdafe34908cf;hp=3acd90249c09e9030d317012b7b73cfc3a23aff9;hpb=a9b27435be97b43614ca8ea0a97751bb9a60f9b5;p=libfirm

diff --git a/ir/be/arm/bearch_arm_t.h b/ir/be/arm/bearch_arm_t.h
index 3acd90249..4aafcc6ef 100644
--- a/ir/be/arm/bearch_arm_t.h
+++ b/ir/be/arm/bearch_arm_t.h
@@ -21,21 +21,16 @@
  * @file
  * @brief   declarations for arm backend -- private header
  * @author  Oliver Richter, Tobias Gneist
- * @version $Id$
  */
 #ifndef FIRM_BE_ARM_BEARCH_ARM_T_H
 #define FIRM_BE_ARM_BEARCH_ARM_T_H
 
 #include <stdio.h>
 
-#include "debug.h"
-#include "bearch_arm.h"
 #include "arm_nodes_attr.h"
 #include "be.h"
-#include "../beemitter.h"
-#include "set.h"
 
-typedef struct _arm_isa_t arm_isa_t;
+typedef struct arm_isa_t arm_isa_t;
 
 /** The following bitmasks control CPU extensions:  */
 enum arm_cpu_extensions {
@@ -116,10 +111,10 @@ enum arm_fp_architectures {
 };
 
 /** Returns non-zero if FPA instructions should be issued. */
-#define USE_FPA(isa)	 ((isa)->fpu_arch & ARM_FPU_FPA_EXT_V1)
+#define USE_FPA(isa)     ((isa)->fpu_arch & ARM_FPU_FPA_EXT_V1)
 
 /** Returns non-zero if VFP instructions should be issued. */
-#define USE_VFP(isa)	 ((isa)->fpu_arch & ARM_FPU_VFP_EXT_V1xD)
+#define USE_VFP(isa)     ((isa)->fpu_arch & ARM_FPU_VFP_EXT_V1xD)
 
 /** Types of processor to generate code for. */
 enum arm_processor_types {
@@ -136,24 +131,9 @@ enum arm_processor_types {
 	ARM_STRONG = ARM_ARCH_V4,
 };
 
-typedef struct _arm_code_gen_t {
-	const arch_code_generator_if_t *impl;           /**< implementation */
-	ir_graph                       *irg;            /**< current irg */
-	set                            *reg_set;        /**< set to memorize registers for FIRM nodes (e.g. phi) */
-	arm_isa_t                      *isa;            /**< the isa instance */
-	be_irg_t                       *birg;           /**< The be-irg (contains additional information about the irg) */
-	ir_type                        *int_tp;         /**< the int type, needed for Call conversion */
-	char                           have_fp_insn;    /**< non-zero, if fp hardware instructions are emitted */
-	char                           dump;            /**< set to 1 if graphs should be dumped */
-	DEBUG_ONLY(firm_dbg_module_t   *mod;)            /**< debugging module */
-} arm_code_gen_t;
-
-
-struct _arm_isa_t {
-	arch_env_t     arch_env;      /**< must be derived from arch_env_t */
-	int            gen_reg_names; /**< use generic register names instead of SP, LR, PC */
+struct arm_isa_t {
+	arch_env_t     base;      /**< must be derived from arch_env_t */
 	int            fpu_arch;      /**< FPU architecture */
-	arm_code_gen_t *cg;           /**< current code generator */
 };
 
 #endif