X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbemodule.c;h=ec8c5748a2be2b28ea1c402a1bbdbd74b7a419be;hb=5124cba7e9aa4ef891804bb6124812c1eafd7705;hp=9d3e1d199a663f2d1ed1b9c4baa49464b5a115bb;hpb=6d7f1c2e372dd4cbbd2496f8501aa2b25f2f4db8;p=libfirm

diff --git a/ir/be/bemodule.c b/ir/be/bemodule.c
index 9d3e1d199..ec8c5748a 100644
--- a/ir/be/bemodule.c
+++ b/ir/be/bemodule.c
@@ -24,9 +24,7 @@
  * @date        29.09.2005
  * @version     $Id$
  */
-#include <config.h>
-
-#include "firm_config.h"
+#include "config.h"
 
 #include <stdlib.h>
 
@@ -43,7 +41,6 @@ void be_init_chordal(void);
 void be_init_chordal_main(void);
 void be_init_copycoal(void);
 void be_init_copyheur2(void);
-void be_init_copyheur3(void);
 void be_init_copyheur4(void);
 void be_init_copyheur5(void);
 void be_init_copystat(void);
@@ -57,12 +54,12 @@ void be_init_arch_sta(void);
 void be_init_arch_TEMPLATE(void);
 void be_init_ilpsched(void);
 void be_init_copyilp(void);
-void be_init_javacoal(void);
 void be_init_peephole(void);
 void be_init_ra(void);
 void be_init_spillbelady(void);
 void be_init_spillbelady2(void);
 void be_init_spillbelady3(void);
+//void be_init_spilllinearscan(void);
 void be_init_ssaconstr(void);
 void be_init_stabs(void);
 void be_init_ifg(void);
@@ -74,6 +71,7 @@ void be_init_state(void);
 void be_init_pbqp(void);
 
 void be_quit_copystat(void);
+void be_quit_pbqp(void);
 
 /**
  * Driver for module initialization.
@@ -110,6 +108,7 @@ void be_init_modules(void)
 	be_init_spillbelady();
 	be_init_spillbelady2();
 	be_init_spillbelady3();
+//	be_init_spilllinearscan();
 	be_init_daemelspill();
 	be_init_ssaconstr();
 	be_init_state();
@@ -120,18 +119,13 @@ void be_init_modules(void)
 	be_init_arch_ppc32();
 	be_init_arch_mips();
 	be_init_arch_arm();
-	/* do NOT call be_init_arch_TEMPLATE() here, this is NOT a backend :-) */
+	be_init_arch_TEMPLATE();
 
 #ifdef WITH_ILP
 	be_init_ilpsched();
 	be_init_copyilp();
 #endif /* WITH_ILP */
 
-#ifdef WITH_JVM
-	be_init_copyheur3();
-	be_init_javacoal();
-#endif /* WITH_JVM */
-
 #if PLUGIN_IR_BE_STA
 	be_init_arch_sta();
 #endif /* PLUGIN_IR_BE_STA */
@@ -144,6 +138,9 @@ void be_init_modules(void)
 void be_quit_modules(void)
 {
 	be_quit_copystat();
+#ifdef FIRM_GRGEN_BE
+	be_quit_pbqp();
+#endif
 }
 
 //---------------------------------------------------------------------------
@@ -244,9 +241,7 @@ int dump_opt_module_vals(char *buf, size_t buflen, const char *name,
 void be_add_module_to_list(be_module_list_entry_t **list_head, const char *name,
                            void *module)
 {
-	be_module_list_entry_t *entry;
-
-    entry       = xmalloc(sizeof(entry[0]));
+	be_module_list_entry_t *entry = XMALLOC(be_module_list_entry_t);
 	entry->name = name;
 	entry->data = module;
 	entry->next = *list_head;
@@ -261,9 +256,7 @@ void be_add_module_list_opt(lc_opt_entry_t *grp, const char *name,
                             be_module_list_entry_t * const * list_head,
                             void **var)
 {
-	module_opt_data_t *moddata;
-
-	moddata            = xmalloc(sizeof(moddata[0]));
+	module_opt_data_t *moddata = XMALLOC(module_opt_data_t);
 	moddata->var       = var;
 	moddata->list_head = list_head;