X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=driver%2Ffirm_opt.c;h=5843af7b88c21fa2a9184aa300d5ffcf80bd9206;hb=ed1ed2b5fb813fd8de24b2eaa6fffce033246a8c;hp=7b0e3a6be6bd8e6689e6ecd08b81426dbe709195;hpb=02f47f268839c472e23095ac0025e5ccbb5ed70a;p=cparser

diff --git a/driver/firm_opt.c b/driver/firm_opt.c
index 7b0e3a6..5843af7 100644
--- a/driver/firm_opt.c
+++ b/driver/firm_opt.c
@@ -6,6 +6,9 @@
  *
  * $Id$
  */
+
+#include <config.h>
+
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,14 +24,10 @@
 #include "firm_timing.h"
 #include "ast2firm.h"
 
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
-
 #if defined(_DEBUG) || defined(FIRM_DEBUG)
 #define DBG(x)  dbg_printf x
 #else
-#define DBG(x)
+#define DBG(x) ((void)0)
 #endif /* _DEBUG || FIRM_DEBUG */
 
 
@@ -113,8 +112,6 @@ static create_intrinsic_fkt *arch_create_intrinsic = NULL;
 static void *create_intrinsic_ctx = NULL;
 static const ir_settings_if_conv_t *if_conv_info = NULL;
 
-ir_mode *firm_imm_fp_mode = NULL;
-
 /* entities of runtime functions */
 ir_entity_ptr rts_entities[rts_max];
 
@@ -909,22 +906,18 @@ void gen_firm_init(void)
   params.cc_mask               = 0; /* no regparam, cdecl */
   params.builtin_dbg           = NULL;
 
-  init_firm(&params);
+  ir_init(&params);
 
   if (firm_be_opt.selection == BE_FIRM_BE) {
     const backend_params *be_params = be_get_backend_param();
 
     firm_opt.lower_ll       = (a_byte) be_params->do_dw_lowering;
-    params.arch_op_settings = be_params->arch_op_settings;
 
     arch_create_intrinsic   = be_params->arch_create_intrinsic_fkt;
     create_intrinsic_ctx    = be_params->create_intrinsic_ctx;
 
     ad_param                = be_params->dep_param;
     if_conv_info            = be_params->if_conv_info;
-
-    if (be_params->has_imm_fp_mode)
-      firm_imm_fp_mode = be_params->imm_fp_mode;
   }
 
   dbg_init(NULL, NULL, dbg_snprint);
@@ -1081,5 +1074,4 @@ void firm_early_init(void)
 {
   /* arg: need this here for command line options */
   be_opt_register();
-  firm_init_options(NULL, 0, NULL);
 }