ia32: Clean up ia32_get_op_estimated_cost().

[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 8763064..bdaabd3 100644 (file)
--- a/ir/be/ia32/bearch_ia32_t.h
+++ b/ir/be/ia32/bearch_ia32_t.h
@@ -1,27 +1,12 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
  * @file
  * @brief       This is the main ia32 firm backend driver.
  * @author      Christian Wuerdig
- * @version     $Id$
  */
 #ifndef FIRM_BE_IA32_BEARCH_IA32_T_H
 #define FIRM_BE_IA32_BEARCH_IA32_T_H
@@ -34,8 +19,8 @@
 #include "pdeq.h"
 
 #include "be.h"
-#include "bemachine.h"
 #include "beemitter.h"
+#include "beirg.h"
 #include "gen_ia32_regalloc_if.h"
 
 #ifdef NDEBUG
@@ -49,11 +34,11 @@ typedef struct ia32_irn_ops_t        ia32_irn_ops_t;
 typedef struct ia32_intrinsic_env_t  ia32_intrinsic_env_t;
 
 typedef struct ia32_irg_data_t {
-       ir_node  **blk_sched;    /**< an array containing the scheduled blocks */
-       unsigned do_x87_sim:1;   /**< set to 1 if x87 simulation should be enforced */
-       unsigned dump:1;         /**< set to 1 if graphs should be dumped */
+       ir_node  **blk_sched;     /**< an array containing the scheduled blocks */
+       unsigned do_x87_sim:1;    /**< set to 1 if x87 simulation should be enforced */
+       unsigned dump:1;          /**< set to 1 if graphs should be dumped */
        ir_node  *noreg_gp;       /**< unique NoReg_GP node */
-       ir_node  *noreg_vfp;      /**< unique NoReg_VFP node */
+       ir_node  *noreg_fp;       /**< unique NoReg_FP node */
        ir_node  *noreg_xmm;      /**< unique NoReg_XMM node */
 
        ir_node  *fpu_trunc_mode; /**< truncate fpu mode */
@@ -66,7 +51,6 @@ typedef struct ia32_irg_data_t {
 struct ia32_isa_t {
        arch_env_t             base;     /**< must be derived from arch_env_t */
        pmap                  *tv_ent;   /**< A map of entities that store const tarvals */
-       const be_machine_t    *cpu;      /**< the abstract machine */
        int                    fpu_arch; /**< FPU architecture */
 };
 
@@ -74,8 +58,6 @@ struct ia32_isa_t {
  * A helper type collecting needed info for IA32 intrinsic lowering.
  */
 struct ia32_intrinsic_env_t {
-       ia32_isa_t *isa;     /**< the isa object */
-       ir_graph   *irg;     /**< the irg, these entities belong to */
        ir_entity  *divdi3;  /**< entity for __divdi3 library call */
        ir_entity  *moddi3;  /**< entity for __moddi3 library call */
        ir_entity  *udivdi3; /**< entity for __udivdi3 library call */
@@ -109,12 +91,18 @@ static inline ia32_irg_data_t *ia32_get_irg_data(const ir_graph *irg)
        return (ia32_irg_data_t*) be_birg_from_irg(irg)->isa_link;
 }
 
+static inline void ia32_request_x87_sim(ir_graph const *const irg)
+{
+       ia32_irg_data_t *const d = ia32_get_irg_data(irg);
+       d->do_x87_sim = true;
+}
+
 /**
  * Returns the unique per irg GP NoReg node.
  */
 ir_node *ia32_new_NoReg_gp(ir_graph *irg);
 ir_node *ia32_new_NoReg_xmm(ir_graph *irg);
-ir_node *ia32_new_NoReg_vfp(ir_graph *irg);
+ir_node *ia32_new_NoReg_fp(ir_graph *irg);
 
 /**
  * Returns the unique per irg FPU truncation mode node.