Partially undo r20786: Emit ret $0 especially when its BB is only reached by a fallt...

[libfirm] / ir / be / arm / bearch_arm_t.h

diff --git a/ir/be/arm/bearch_arm_t.h b/ir/be/arm/bearch_arm_t.h
index 4bebbfe..4d16a8a 100644 (file)
--- 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.
  *
@@ -65,7 +65,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,
@@ -125,7 +125,9 @@ enum arm_fp_architectures {
 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,
@@ -151,18 +153,10 @@ typedef struct _arm_code_gen_t {
 
 
 struct _arm_isa_t {
-       arch_isa_t     arch_isa;      /**< must be derived from arch_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 */
        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. */
 };
 
-
-typedef struct _arm_irn_ops_t {
-       const arch_irn_ops_if_t *impl;
-       arm_code_gen_t          *cg;
-} arm_irn_ops_t;
-
-
 #endif