fix things when WITH_JVM and WITH_ILP is defined

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

diff --git a/ir/be/ia32/ia32_new_nodes.c b/ir/be/ia32/ia32_new_nodes.c
index e95456f..87e98a2 100644 (file)
--- a/ir/be/ia32/ia32_new_nodes.c
+++ b/ir/be/ia32/ia32_new_nodes.c
@@ -29,6 +29,7 @@
 #include "firm_common_t.h"
 #include "irvrfy_t.h"
 #include "irprintf.h"
+#include "iredges.h"
 
 #include "../bearch.h"
 
@@ -423,24 +424,6 @@ static int ia32_dump_node(ir_node *n, FILE *F, dump_reason_t reason) {
                        }
                        fprintf(F, "\n");
 
-                       fprintf(F, "src_mode = ");
-                       if (get_ia32_src_mode(n)) {
-                               ir_fprintf(F, "%+F", get_ia32_src_mode(n));
-                       }
-                       else {
-                               fprintf(F, "n/a");
-                       }
-                       fprintf(F, "\n");
-
-                       fprintf(F, "tgt_mode = ");
-                       if (get_ia32_tgt_mode(n)) {
-                               ir_fprintf(F, "%+F", get_ia32_tgt_mode(n));
-                       }
-                       else {
-                               fprintf(F, "n/a");
-                       }
-                       fprintf(F, "\n");
-
 #ifndef NDEBUG
                        /* dump original ir node name */
                        fprintf(F, "orig node = ");
@@ -570,13 +553,21 @@ char *get_ia32_am_offs(const ir_node *node) {
 }
 
 /**
- * Gets the addressmode offset as long.
+ * Gets the addressmode offset as int.
  */
 int get_ia32_am_offs_int(const ir_node *node) {
        ia32_attr_t *attr = get_ia32_attr(node);
        return attr->am_offs;
 }
 
+/**
+ * Sets the addressmode offset from an int.
+ */
+void set_ia32_am_offs_int(ir_node *node, int offset) {
+       ia32_attr_t *attr = get_ia32_attr(node);
+       attr->am_offs = offset;
+}
+
 /**
  * Add an offset for addrmode.
  */
@@ -879,38 +870,6 @@ void set_ia32_res_mode(ir_node *node, ir_mode *mode) {
        attr->res_mode    = mode;
 }
 
-/**
- * Gets the source mode of conversion.
- */
-ir_mode *get_ia32_src_mode(const ir_node *node) {
-       ia32_attr_t *attr = get_ia32_attr(node);
-       return attr->src_mode;
-}
-
-/**
- * Sets the source mode of conversion.
- */
-void set_ia32_src_mode(ir_node *node, ir_mode *mode) {
-       ia32_attr_t *attr = get_ia32_attr(node);
-       attr->src_mode    = mode;
-}
-
-/**
- * Gets the target mode of conversion.
- */
-ir_mode *get_ia32_tgt_mode(const ir_node *node) {
-       ia32_attr_t *attr = get_ia32_attr(node);
-       return attr->tgt_mode;
-}
-
-/**
- * Sets the target mode of conversion.
- */
-void set_ia32_tgt_mode(ir_node *node, ir_mode *mode) {
-       ia32_attr_t *attr = get_ia32_attr(node);
-       attr->tgt_mode    = mode;
-}
-
 /**
  * Gets the frame entity assigned to this node.
  */
@@ -925,7 +884,10 @@ ir_entity *get_ia32_frame_ent(const ir_node *node) {
 void set_ia32_frame_ent(ir_node *node, ir_entity *ent) {
        ia32_attr_t *attr = get_ia32_attr(node);
        attr->frame_ent   = ent;
-       set_ia32_use_frame(node);
+       if(ent != NULL)
+               set_ia32_use_frame(node);
+       else
+               clear_ia32_use_frame(node);
 }
 
 
@@ -1372,6 +1334,33 @@ void init_ia32_attributes(ir_node *node, arch_irn_flags_t flags, const ia32_regi
        memset((void *)attr->slots, 0, n_res * sizeof(attr->slots[0]));
 }
 
+ir_node *get_ia32_result_proj(const ir_node *node)
+{
+       const ir_edge_t *edge;
+
+       foreach_out_edge(node, edge) {
+               ir_node *proj = get_edge_src_irn(edge);
+               if(get_Proj_proj(proj) == 0) {
+                       return proj;
+               }
+       }
+       return NULL;
+}
+
+ir_mode *get_ia32_Conv_src_mode(const ir_node *node)
+{
+       if(get_ia32_op_type(node) == ia32_AddrModeS) {
+               return get_ia32_ls_mode(node);
+       }
+
+       return get_irn_mode(get_irn_n(node, 2));
+}
+
+ir_mode *get_ia32_Conv_tgt_mode(const ir_node *node)
+{
+       return get_irn_mode(node);
+}
+
 /***************************************************************************************
  *                  _                            _                   _
  *                 | |                          | |                 | |
@@ -1412,15 +1401,6 @@ int ia32_compare_immop_attr(ia32_attr_t *a, ia32_attr_t *b) {
        return !equ;
 }
 
-/* compare converts */
-int ia32_compare_conv_attr(ia32_attr_t *a, ia32_attr_t *b) {
-       int equ = ! ia32_compare_immop_attr(a, b);
-
-       equ = equ ? (a->src_mode == b->src_mode) && (a->tgt_mode == b->tgt_mode) : equ;
-
-       return !equ;
-}
-
 /* copies the ia32 attributes */
 static void ia32_copy_attr(const ir_node *old_node, ir_node *new_node) {
        ia32_attr_t *attr_old = get_ia32_attr(old_node);