fix things when WITH_JVM and WITH_ILP is defined

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

diff --git a/ir/be/ia32/ia32_new_nodes.h b/ir/be/ia32/ia32_new_nodes.h
index b0abefe..59fb86a 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.h
+++ b/ir/be/ia32/ia32_new_nodes.h
@@ -9,7 +9,6 @@
 
 #include "firm_config.h"
 #include "ia32_nodes_attr.h"
-#include "gen_ia32_machine.h"
 
 /***************************************************************************************************
  *        _   _                   _       __        _                    _   _               _
@@ -82,6 +81,11 @@ char *get_ia32_am_offs(const ir_node *node);
  */
 int get_ia32_am_offs_int(const ir_node *node);
 
+/**
+ * Sets the addressmode offset
+ */
+void set_ia32_am_offs_int(ir_node *node, int offset);
+
 /**
  * Adds an offset for addrmode.
  */
@@ -254,35 +258,15 @@ ir_mode *get_ia32_res_mode(const ir_node *node);
  */
 void set_ia32_res_mode(ir_node *node, ir_mode *mode);
 
-/**
- * Gets the source mode of conversion.
- */
-ir_mode *get_ia32_src_mode(const ir_node *node);
-
-/**
- * Sets the source mode of conversion.
- */
-void set_ia32_src_mode(ir_node *node, ir_mode *mode);
-
-/**
- * Gets the target mode of conversion.
- */
-ir_mode *get_ia32_tgt_mode(const ir_node *node);
-
-/**
- * Sets the target mode of conversion.
- */
-void set_ia32_tgt_mode(ir_node *node, ir_mode *mode);
-
 /**
  * Gets the frame entity assigned to this node;
  */
-entity *get_ia32_frame_ent(const ir_node *node);
+ir_entity *get_ia32_frame_ent(const ir_node *node);
 
 /**
  * Sets the frame entity for this node;
  */
-void set_ia32_frame_ent(ir_node *node, entity *ent);
+void set_ia32_frame_ent(ir_node *node, ir_entity *ent);
 
 /**
  * Returns the argument register requirements of an ia32 node.
@@ -406,14 +390,9 @@ void set_ia32_out_flags(ir_node *node, arch_irn_flags_t flags, int pos);
 arch_irn_flags_t get_ia32_out_flags(const ir_node *node, int pos);
 
 /**
- * Set the number of available execution units for this node.
+ * Get the list of available execution units.
  */
-void set_ia32_n_exec_units(ir_node *node, unsigned n);
-
-/**
- * Get the number of available execution units for this node.
- */
-unsigned get_ia32_n_exec_units(const ir_node *node);
+const be_execution_unit_t ***get_ia32_exec_units(const ir_node *node);
 
 #ifndef NDEBUG
 
@@ -460,6 +439,22 @@ void set_ia32_Immop_attr(ir_node *node, ir_node *cnst);
  */
 void copy_ia32_Immop_attr(ir_node *node, ir_node *src);
 
+/**
+ * Returns the proj of the result value for nodes that have the usual
+ * (res, Mem) result tuple
+ */
+ir_node *get_ia32_result_proj(const ir_node *node);
+
+/**
+ * Returns the source mode for ia32 conv nodes
+ */
+ir_mode *get_ia32_Conv_src_mode(const ir_node *node);
+
+/**
+ * Returns the target mode for ia32 conv nodes
+ */
+ir_mode *get_ia32_Conv_tgt_mode(const ir_node *node);
+
 /**
  * Copy the attributes from a Const to an ia32_Const
  */
@@ -510,7 +505,12 @@ int is_ia32_Cnst(const ir_node *node);
  * Initializes the nodes attributes.
  */
 void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_register_req_t **in_reqs, \
-       const ia32_register_req_t **out_reqs, const be_execution_unit_t **execution_units, int n_res, unsigned latency);
+       const ia32_register_req_t **out_reqs, const be_execution_unit_t ***execution_units, int n_res, unsigned latency);
+
+/**
+ * Registers the ia32_copy_attr function for all ia32 opcodes.
+ */
+void ia32_register_copy_attr_func(void);
 
 /* Include the generated headers */
 #include "gen_ia32_new_nodes.h"