Move debug functionality to Debug.cpp/Debug.h

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7494 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 108 insertions, 24 deletions

diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp
new file mode 100644
index 0000000..57ed27a
--- /dev/null
+++ b/lib/Support/Debug.cpp
@@ -0,0 +1,53 @@
+//===-- Debug.cpp - An easy way to add debug output to your code ----------===//
+//
+// This file implements a handle way of adding debugging information to your
+// code, without it being enabled all of the time, and without having to add
+// command line options to enable it.
+//
+// In particular, just wrap your code with the DEBUG() macro, and it will be
+// enabled automatically if you specify '-debug' on the command-line.
+// Alternatively, you can also use the SET_DEBUG_TYPE("foo") macro to specify
+// that your debug code belongs to class "foo".  Then, on the command line, you
+// can specify '-debug-only=foo' to enable JUST the debug information for the
+// foo class.
+//
+// When compiling in release mode, the -debug-* options and all code in DEBUG()
+// statements disappears, so it does not effect the runtime of the code.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Support/Statistic.h"
+#include "Support/CommandLine.h"
+
+bool DebugFlag;  // DebugFlag - Exported boolean set by the -debug option
+
+namespace {
+#ifndef NDEBUG
+  // -debug - Command line option to enable the DEBUG statements in the passes.
+  // This flag may only be enabled in debug builds.
+  cl::opt<bool, true>
+  Debug("debug", cl::desc("Enable debug output"), cl::Hidden,
+        cl::location(DebugFlag));
+
+  std::string CurrentDebugType;
+  struct DebugOnlyOpt {
+    void operator=(const std::string &Val) const {
+      DebugFlag |= !Val.empty();
+      CurrentDebugType = Val;
+    }
+  } DebugOnlyOptLoc;
+
+  cl::opt<DebugOnlyOpt, true, cl::parser<std::string> >
+  DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"),
+            cl::Hidden, cl::value_desc("debug string"),
+            cl::location(DebugOnlyOptLoc), cl::ValueRequired);
+#endif
+}
+
+// isCurrentDebugType - Return true if the specified string is the debug type
+// specified on the command line, or if none was specified on the command line
+// with the -debug-only=X option.
+//
+bool isCurrentDebugType(const char *DebugType) {
+  return CurrentDebugType.empty() || DebugType == CurrentDebugType;
+}
diff --git a/lib/Support/Statistic.cpp b/lib/Support/Statistic.cpp
index 1141086..5c7cf63 100644
--- a/lib/Support/Statistic.cpp
+++ b/lib/Support/Statistic.cpp
@@ -16,15 +16,12 @@
 
 #include "Support/Statistic.h"
 #include "Support/CommandLine.h"
-#include <iostream>
 #include <sstream>
-#include <algorithm>
+#include <iostream>
 
 // GetLibSupportInfoOutputFile - Return a file stream to print our output on...
 std::ostream *GetLibSupportInfoOutputFile();
 
-bool DebugFlag;  // DebugFlag - Exported boolean set by the -debug option
-
 unsigned StatisticBase::NumStats = 0;
 
 // -stats - Command line option to cause transformations to emit stats about
@@ -33,14 +30,6 @@ unsigned StatisticBase::NumStats = 0;
 static cl::opt<bool>
 Enabled("stats", cl::desc("Enable statistics output from program"));
 
-#ifndef NDEBUG
-// -debug - Command line option to enable the DEBUG statements in the passes.
-// This flag may only be enabled in debug builds.
-static cl::opt<bool, true>
-Debug("debug", cl::desc("Enable debug output"), cl::Hidden,
-      cl::location(DebugFlag));
-#endif
-
 struct StatRecord {
   std::string Value;
   const char *Name, *Desc;
diff --git a/support/lib/Support/Debug.cpp b/support/lib/Support/Debug.cpp
new file mode 100644
index 0000000..57ed27a
--- /dev/null
+++ b/support/lib/Support/Debug.cpp
@@ -0,0 +1,53 @@
+//===-- Debug.cpp - An easy way to add debug output to your code ----------===//
+//
+// This file implements a handle way of adding debugging information to your
+// code, without it being enabled all of the time, and without having to add
+// command line options to enable it.
+//
+// In particular, just wrap your code with the DEBUG() macro, and it will be
+// enabled automatically if you specify '-debug' on the command-line.
+// Alternatively, you can also use the SET_DEBUG_TYPE("foo") macro to specify
+// that your debug code belongs to class "foo".  Then, on the command line, you
+// can specify '-debug-only=foo' to enable JUST the debug information for the
+// foo class.
+//
+// When compiling in release mode, the -debug-* options and all code in DEBUG()
+// statements disappears, so it does not effect the runtime of the code.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Support/Statistic.h"
+#include "Support/CommandLine.h"
+
+bool DebugFlag;  // DebugFlag - Exported boolean set by the -debug option
+
+namespace {
+#ifndef NDEBUG
+  // -debug - Command line option to enable the DEBUG statements in the passes.
+  // This flag may only be enabled in debug builds.
+  cl::opt<bool, true>
+  Debug("debug", cl::desc("Enable debug output"), cl::Hidden,
+        cl::location(DebugFlag));
+
+  std::string CurrentDebugType;
+  struct DebugOnlyOpt {
+    void operator=(const std::string &Val) const {
+      DebugFlag |= !Val.empty();
+      CurrentDebugType = Val;
+    }
+  } DebugOnlyOptLoc;
+
+  cl::opt<DebugOnlyOpt, true, cl::parser<std::string> >
+  DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"),
+            cl::Hidden, cl::value_desc("debug string"),
+            cl::location(DebugOnlyOptLoc), cl::ValueRequired);
+#endif
+}
+
+// isCurrentDebugType - Return true if the specified string is the debug type
+// specified on the command line, or if none was specified on the command line
+// with the -debug-only=X option.
+//
+bool isCurrentDebugType(const char *DebugType) {
+  return CurrentDebugType.empty() || DebugType == CurrentDebugType;
+}
diff --git a/support/lib/Support/Statistic.cpp b/support/lib/Support/Statistic.cpp
index 1141086..5c7cf63 100644
--- a/support/lib/Support/Statistic.cpp
+++ b/support/lib/Support/Statistic.cpp
@@ -16,15 +16,12 @@
 
 #include "Support/Statistic.h"
 #include "Support/CommandLine.h"
-#include <iostream>
 #include <sstream>
-#include <algorithm>
+#include <iostream>
 
 // GetLibSupportInfoOutputFile - Return a file stream to print our output on...
 std::ostream *GetLibSupportInfoOutputFile();
 
-bool DebugFlag;  // DebugFlag - Exported boolean set by the -debug option
-
 unsigned StatisticBase::NumStats = 0;
 
 // -stats - Command line option to cause transformations to emit stats about
@@ -33,14 +30,6 @@ unsigned StatisticBase::NumStats = 0;
 static cl::opt<bool>
 Enabled("stats", cl::desc("Enable statistics output from program"));
 
-#ifndef NDEBUG
-// -debug - Command line option to enable the DEBUG statements in the passes.
-// This flag may only be enabled in debug builds.
-static cl::opt<bool, true>
-Debug("debug", cl::desc("Enable debug output"), cl::Hidden,
-      cl::location(DebugFlag));
-#endif
-
 struct StatRecord {
   std::string Value;
   const char *Name, *Desc;