Small simplification.

[libfirm] / ir / be / becopyheur3.c

diff --git a/ir/be/becopyheur3.c b/ir/be/becopyheur3.c
index b9d8784..18cae39 100644 (file)
--- a/ir/be/becopyheur3.c
+++ b/ir/be/becopyheur3.c
@@ -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.
  *
@@ -28,8 +28,10 @@
 #include "config.h"
 #endif
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#ifdef WITH_JVM
+
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #include <stdlib.h>
 #include <limits.h>
@@ -80,7 +82,7 @@ static lc_opt_enum_mask_var_t dump_var = {
 static const lc_opt_table_entry_t options[] = {
        LC_OPT_ENT_ENUM_MASK("dump", "dump ifg cloud",                              &dump_var),
        LC_OPT_ENT_INT      ("dbg",  "debug level for the Java coalescer",          &dbg_level),
-       LC_OPT_ENT_NULL
+       LC_OPT_LAST
 };
 
 void be_init_copyheur3(void)
@@ -148,8 +150,8 @@ int co_solve_heuristic_java(copy_opt_t *co)
                }
        }
 
-       node_map     = malloc((get_irg_last_idx(co->irg) + 1) * sizeof(node_map[0]));
-       inv_node_map = malloc((get_irg_last_idx(co->irg) + 1) * sizeof(inv_node_map[0]));
+       node_map     = xmalloc((get_irg_last_idx(co->irg) + 1) * sizeof(node_map[0]));
+       inv_node_map = xmalloc((get_irg_last_idx(co->irg) + 1) * sizeof(inv_node_map[0]));
 
        curr_idx = 0;
        be_ifg_foreach_node(ifg, nodes_it, n) {
@@ -237,3 +239,5 @@ int co_solve_heuristic_java(copy_opt_t *co)
        bitset_free(nodes);
        return 0;
 }
+
+#endif