-removed unused entities from the intrinsic environment

[libfirm] / ir / be / ia32 / bearch_ia32_t.h

diff --git a/ir/be/ia32/bearch_ia32_t.h b/ir/be/ia32/bearch_ia32_t.h
index 68243d0..110f239 100644 (file)
--- a/ir/be/ia32/bearch_ia32_t.h
+++ b/ir/be/ia32/bearch_ia32_t.h
@@ -26,8 +26,7 @@
 #ifndef FIRM_BE_IA32_BEARCH_IA32_T_H
 #define FIRM_BE_IA32_BEARCH_IA32_T_H
 
-#include "firm_config.h"
-
+#include "config.h"
 #include "pmap.h"
 #include "debug.h"
 #include "ia32_nodes_attr.h"
@@ -41,7 +40,7 @@
 #ifdef NDEBUG
 #define SET_IA32_ORIG_NODE(n, o)
 #else  /* ! NDEBUG */
-#define SET_IA32_ORIG_NODE(n, o) set_ia32_orig_node(n, o);
+#define SET_IA32_ORIG_NODE(n, o) set_ia32_orig_node(n, o)
 #endif /* NDEBUG */
 
 /* some typedefs */
@@ -60,7 +59,6 @@ typedef struct ia32_intrinsic_env_t  ia32_intrinsic_env_t;
 struct ia32_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 non-ia32 nodes (e.g. phi nodes) */
        ia32_isa_t                     *isa;           /**< for fast access to the isa object */
        be_irg_t                       *birg;          /**< The be-irg (contains additional information about the irg) */
@@ -104,17 +102,28 @@ struct ia32_isa_t {
 struct ia32_intrinsic_env_t {
        ia32_isa_t *isa;          /**< the isa object */
        ir_graph   *irg;          /**< the irg, these entities belong to */
-       ir_entity  *ll_div_op1;   /**< entity for first div operand (move into FPU) */
-       ir_entity  *ll_div_op2;   /**< entity for second div operand (move into FPU) */
-       ir_entity  *ll_d_conv;    /**< entity for converts ll -> d */
-       ir_entity  *d_ll_conv;    /**< entity for converts d -> ll */
        ir_entity  *divdi3;       /**< entity for __divdi3 library call */
        ir_entity  *moddi3;       /**< entity for __moddi3 library call */
        ir_entity  *udivdi3;      /**< entity for __udivdi3 library call */
        ir_entity  *umoddi3;      /**< entity for __umoddi3 library call */
-       tarval     *u64_bias;     /**< bias value for conversion from float to unsigned 64 */
 };
 
+typedef enum transformer_t {
+       TRANSFORMER_DEFAULT,
+#ifdef FIRM_GRGEN_BE
+       TRANSFORMER_PBQP,
+       TRANSFORMER_RAND
+#endif
+} transformer_t;
+
+#ifdef FIRM_GRGEN_BE
+/** The selected transformer. */
+extern transformer_t be_transformer;
+
+#else
+#define be_transformer TRANSFORMER_DEFAULT
+#endif
+
 /** The mode for the floating point control word. */
 extern ir_mode *mode_fpcw;
 
@@ -142,9 +151,10 @@ ir_node *ia32_new_Unknown_vfp(ia32_code_gen_t *cg);
 ir_node *ia32_new_Fpu_truncate(ia32_code_gen_t *cg);
 
 /**
- * Returns gp_noreg or fp_noreg, depending on input requirements.
+ * Split instruction with source AM into Load and separate instruction.
+ * @return result of the Load
  */
-ir_node *ia32_get_admissible_noreg(ia32_code_gen_t *cg, ir_node *irn, int pos);
+ir_node *turn_back_am(ir_node *node);
 
 /**
  * Maps all intrinsic calls that the backend support