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

diff --git a/ir/be/arm/bearch_arm_t.h b/ir/be/arm/bearch_arm_t.h
index 0a3e73c11..4aafcc6ef 100644
--- a/ir/be/arm/bearch_arm_t.h
+++ b/ir/be/arm/bearch_arm_t.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -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 {
@@ -65,7 +60,7 @@ enum arm_cpu_extensions {
  * three more to cover cores prior to ARM6.  Finally, there are cores which
  * implement further extensions in the co-processor space.
  */
-enum arm_architectiures {
+enum arm_architectures {
 	ARM_ARCH_V1     = ARM_EXT_V1,
 	ARM_ARCH_V2     = ARM_ARCH_V1 | ARM_EXT_V2,
 	ARM_ARCH_V2S    = ARM_ARCH_V2 | ARM_EXT_V2S,
@@ -116,16 +111,18 @@ enum arm_fp_architectures {
 };
 
 /** Returns non-zero if FPA instructions should be issued. */
-#define USE_FPA(cg)	 ((cg)->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(cg)	 ((cg)->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 {
 	ARM_1      = ARM_ARCH_V1,
 	ARM_2      = ARM_ARCH_V2,
+	ARM_2a     = ARM_ARCH_V2,
 	ARM_3      = ARM_ARCH_V2S,
+	ARM_3G     = ARM_ARCH_V2S,
 	ARM_250    = ARM_ARCH_V2S,
 	ARM_6      = ARM_ARCH_V3,
 	ARM_7      = ARM_ARCH_V3,
@@ -134,32 +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 */
-	const arch_env_t               *arch_env;       /**< the arch env */
-	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 */
-	int                             have_fp;        /**< non-zero, if fp hardware instructions are emitted */
-	DEBUG_ONLY(firm_dbg_module_t   *mod;)            /**< debugging module */
-} arm_code_gen_t;
-
-
-struct _arm_isa_t {
-	arch_isa_t             arch_isa;      /**< must be derived from arch_isa_t */
-	int                    gen_reg_names; /**< use generic register names instead of SP, LR, PC */
-	int                    fpu_arch;      /**< FPU architecture */
-	arm_code_gen_t        *cg;            /**< current code generator */
-	be_emit_env_t          emit;          /**< An emitter environment for the GAS emitter. */
+struct arm_isa_t {
+	arch_env_t     base;      /**< must be derived from arch_env_t */
+	int            fpu_arch;      /**< FPU architecture */
 };
 
-
-typedef struct _arm_irn_ops_t {
-	const arch_irn_ops_if_t *impl;
-	arm_code_gen_t     *cg;
-} arm_irn_ops_t;
-
-
 #endif