X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespilloptions.c;h=f6cfb73166e1940ae82bbc046039f33afd0eb7ef;hb=bc7b5ee69d084e629590a6977b79a2fab7cd1aa1;hp=caf9ab37970191227cd3847a08cf57d56dfd5c3d;hpb=79ed89a676afd08eb739330d46b85b1d1532aec1;p=libfirm

diff --git a/ir/be/bespilloptions.c b/ir/be/bespilloptions.c
index caf9ab379..f6cfb7316 100644
--- a/ir/be/bespilloptions.c
+++ b/ir/be/bespilloptions.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.
  *
@@ -24,9 +24,7 @@
  * @date        29.09.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "irtools.h"
 
@@ -34,50 +32,44 @@
 #include "bemodule.h"
 #include "be.h"
 
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 int be_coalesce_spill_slots = 1;
 int be_do_remats = 1;
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
-#include <libcore/lc_timing.h>
-
 static const lc_opt_table_entry_t be_spill_options[] = {
 	LC_OPT_ENT_BOOL ("coalesce_slots", "coalesce the spill slots", &be_coalesce_spill_slots),
 	LC_OPT_ENT_BOOL ("remat", "try to rematerialize values instead of reloading", &be_do_remats),
 	LC_OPT_LAST
 };
-#endif /* WITH_LIBCORE */
 
 static be_module_list_entry_t *spillers = NULL;
-static be_spiller_t *selected_spiller = NULL;
+static const be_spiller_t *selected_spiller = NULL;
 
 void be_register_spiller(const char *name, be_spiller_t *spiller)
 {
-	if(selected_spiller == NULL)
+	if (selected_spiller == NULL)
 		selected_spiller = spiller;
 	be_add_module_to_list(&spillers, name, spiller);
 }
 
-void be_do_spill(be_irg_t *birg, const arch_register_class_t* cls)
+void be_do_spill(be_irg_t *birg, const arch_register_class_t *cls)
 {
 	assert(selected_spiller != NULL);
-	if(selected_spiller != NULL) {
+	if (selected_spiller != NULL) {
 		selected_spiller->spill(birg, cls);
 	}
 }
 
 void be_init_spilloptions(void)
 {
-#ifdef WITH_LIBCORE
 	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
 	lc_opt_entry_t *spill_grp = lc_opt_get_grp(be_grp, "spill");
 
 	lc_opt_add_table(spill_grp, be_spill_options);
 	be_add_module_list_opt(spill_grp, "spiller", "spill algorithm",
 	                       &spillers, (void**) &selected_spiller);
-#endif /* WITH_LIBCORE */
 }
 
 BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spilloptions);