Shuffling --debug around and making it work.

src/xenia/cpu/backend/x64/x64_emitter.cc

@@ -9,10 +9,10 @@
 
 #include "xenia/cpu/backend/x64/x64_emitter.h"
 
-#include <cstring>
-
 #include <gflags/gflags.h>
 
+#include <cstring>
+
 #include "xenia/base/assert.h"
 #include "xenia/base/atomic.h"
 #include "xenia/base/debugging.h"
@@ -30,6 +30,7 @@
 #include "xenia/cpu/processor.h"
 #include "xenia/cpu/symbol_info.h"
 #include "xenia/cpu/thread_state.h"
+#include "xenia/debug/debugger.h"
 #include "xenia/profiling.h"
 
 DEFINE_bool(enable_debugprint_log, false,

src/xenia/cpu/cpu_flags.cc

@@ -16,14 +16,6 @@ DEFINE_string(
     "Loads a .map for symbol names and to diff with the generated symbol "
     "database.");
 
-#if 0 && DEBUG
-#define DEFAULT_DEBUG_FLAG true
-#else
-#define DEFAULT_DEBUG_FLAG false
-#endif
-
-DEFINE_bool(debug, DEFAULT_DEBUG_FLAG,
-            "Allow debugging and retain debug information.");
 DEFINE_bool(disassemble_functions, false,
             "Disassemble functions during generation.");
 

src/xenia/cpu/cpu_flags.h

@@ -16,7 +16,6 @@ DECLARE_string(cpu);
 
 DECLARE_string(load_module_map);
 
-DECLARE_bool(debug);
 DECLARE_bool(disassemble_functions);
 
 DECLARE_bool(trace_functions);