X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firflag.c;h=abe334f78a6c02fef4198f222fc4dcd240409827;hb=95cfa6465fa7fadda4af7b97c3678acf1010ff8b;hp=30b98ce9776023b8f1ab9703b680264dbb2f7786;hpb=a142727aca4ef56cf754045fc0129b6d1b840a63;p=libfirm

diff --git a/ir/ir/irflag.c b/ir/ir/irflag.c
index 30b98ce97..abe334f78 100644
--- a/ir/ir/irflag.c
+++ b/ir/ir/irflag.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.
  *
@@ -20,18 +20,13 @@
 /**
  * @file
  * @brief   Flags to control optimizations.
- * @author  Christian Schaefer, Goetz Lindenmaier
- * @version $Id$
+ * @author  Michael Beck, Sebastian Hack
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#endif
+#include "lc_opts.h"
 
 #include "firm_common.h"
 #include "irtools.h"
@@ -39,12 +34,13 @@
 
 /* DISABLE - don't do this optimization
    ENABLE  - lets see, if there is a better graph */
-#define ON	(-1)
-#define OFF  (0)
+#define ON   -1
+#define OFF   0
 
-#define FLAG(name, value, def)	(irf_##name & def) |
-#define E_FLAG(name, value, def)	FLAG(name, value, def)
-#define I_FLAG(name, value, def)	FLAG(name, value, def)
+#define FLAG(name, value, def)     (irf_##name & def) |
+#define E_FLAG(name, value, def)    FLAG(name, value, def)
+#define I_FLAG(name, value, def)    FLAG(name, value, def)
+#define R_FLAG(name, value)
 
 optimization_state_t libFIRM_opt =
 #include "irflag_t.def"
@@ -53,13 +49,16 @@ optimization_state_t libFIRM_opt =
 #undef FLAG
 #undef E_FLAG
 #undef I_FLAG
+#undef R_FLAG
 
+/** The bitset of currently running phases. */
+optimization_state_t libFIRM_running = 0;
 
 /* verbose is always off on default */
 optimization_state_t libFIRM_verb = 0;
 
-/** The Firm verbosity level */
-int firm_verbosity_level;
+/* silence warnings */
+void set_opt_optimize(int value);
 
 /* an external flag can be set and get from outside */
 #define E_FLAG(name, value, def)           \
@@ -67,12 +66,8 @@ void set_opt_##name(int flag) {            \
   if (flag) libFIRM_opt |= irf_##name;     \
   else      libFIRM_opt &= ~irf_##name;    \
 }                                          \
-void set_opt_##name##_verbose(int flag) {  \
-  if (flag) libFIRM_verb |= irf_##name;    \
-  else      libFIRM_verb &= ~irf_##name;   \
-}                                          \
 int (get_opt_##name)(void) {               \
-  return _get_opt_##name();                \
+  return get_opt_##name##_();              \
 }
 
 /* an internal flag can only be set from outside */
@@ -81,96 +76,83 @@ void set_opt_##name(int flag) {           \
   if (flag) libFIRM_opt |= irf_##name;    \
   else      libFIRM_opt &= ~irf_##name;   \
 }                                         \
-void set_opt_##name##_verbose(int flag) { \
-  if (flag) libFIRM_verb |= irf_##name;   \
-  else      libFIRM_verb &= ~irf_##name;  \
-}
+
+#define R_FLAG(name, value)
 
 /* generate them */
 #include "irflag_t.def"
 
 #undef I_FLAG
 #undef E_FLAG
+#undef R_FLAG
 
 /* for compatibility reasons */
-void set_optimize(int value) {
-  if (value) libFIRM_opt |= irf_optimize;
-  else       libFIRM_opt &= ~irf_optimize;
-}
-
-int (get_optimize)(void) {
-  return get_opt_optimize();
-}
-
-void set_opt_control_flow(int value)
+void set_optimize(int value)
 {
-  set_opt_control_flow_straightening(value);
-  set_opt_control_flow_weak_simplification(value);
-  set_opt_control_flow_strong_simplification(value);
-}
-
-void set_firm_verbosity (int value) {
-  firm_verbosity_level = value;
+	set_opt_optimize(value);
 }
 
-int  (get_firm_verbosity) (void) {
-  return _get_firm_verbosity();
+int (get_optimize)(void)
+{
+	return get_opt_optimize();
 }
 
 /* Save the current optimization state. */
 void save_optimization_state(optimization_state_t *state)
 {
-  *state = libFIRM_opt;
+	*state = libFIRM_opt;
 }
 
 /* Restore the current optimization state. */
 void restore_optimization_state(const optimization_state_t *state)
 {
-  libFIRM_opt = *state;
+	libFIRM_opt = *state;
 }
 
 /* Switches ALL optimizations off */
 void all_optimizations_off(void)
 {
-  libFIRM_opt = 0;
+	libFIRM_opt = 0;
 }
 
 #ifdef _DEBUG
 /* only for debugging */
-void firm_show_flags(FILE *f) {
-  if (! f)
-    f = stdout;
-  printf("Firm optimization state:\n");
+void firm_show_flags(FILE *f)
+{
+	if (! f)
+		f = stdout;
+	printf("Firm optimization state:\n");
 #define E_FLAG(name, value, def) printf(" %-20s = %s\n", #name, get_opt_##name() ? "ON" : "OFF");
 #define I_FLAG(name, value, def) printf(" %-20s = %s\n", #name, get_opt_##name() ? "ON" : "OFF");
+#define R_FLAG(name, value)      printf(" %-20s = %s\n", #name, is_##name##_running() ? "is running" : "not running");
 #include "irflag_t.def"
 #undef I_FLAG
 #undef E_FLAG
-  printf("\n");
+#undef R_FLAG
+	printf("\n");
 }
 #endif
 
-#ifdef WITH_LIBCORE
 static const lc_opt_table_entry_t firm_flags[] = {
 #define I_FLAG(name, val, def) LC_OPT_ENT_BIT(#name, #name, &libFIRM_opt, (1 << val)),
 #define E_FLAG(name, val, def) LC_OPT_ENT_BIT(#name, #name, &libFIRM_opt, (1 << val)),
+#define R_FLAG(name, val)
 #include "irflag_t.def"
 #undef I_FLAG
 #undef E_FLAG
-	{ NULL }
+#undef R_FLAG
+	LC_OPT_LAST
 };
-#endif
 
 void firm_init_flags(void)
 {
-#ifdef WITH_LIBCORE
 	lc_opt_entry_t *grp = lc_opt_get_grp(firm_opt_get_root(), "opt");
 	lc_opt_add_table(grp, firm_flags);
-#endif
 }
 
 firm_verification_t opt_do_node_verification = FIRM_VERIFICATION_ON;
 
-void do_node_verification(firm_verification_t mode) {
-  opt_do_node_verification = mode;
+void do_node_verification(firm_verification_t mode)
+{
+	opt_do_node_verification = mode;
 }