Replace all gflag implementations with cvar implementations

src/xenia/cpu/ppc/ppc_emit_control.cc

@@ -728,12 +728,12 @@ int InstrEmit_mtmsr(PPCHIRBuilder& f, const InstrData& i) {
         f.ZeroExtend(f.ZeroExtend(f.LoadGPR(i.X.RT), INT64_TYPE), INT64_TYPE));
     if (i.X.RT == 13) {
       // iff storing from r13 we are taking a lock (disable interrupts).
-      if (!FLAGS_disable_global_lock) {
+      if (!cvars::disable_global_lock) {
         f.CallExtern(f.builtins()->enter_global_lock);
       }
     } else {
       // Otherwise we are restoring interrupts (probably).
-      if (!FLAGS_disable_global_lock) {
+      if (!cvars::disable_global_lock) {
         f.CallExtern(f.builtins()->leave_global_lock);
       }
     }
@@ -753,12 +753,12 @@ int InstrEmit_mtmsrd(PPCHIRBuilder& f, const InstrData& i) {
                    f.ZeroExtend(f.LoadGPR(i.X.RT), INT64_TYPE));
     if (i.X.RT == 13) {
       // iff storing from r13 we are taking a lock (disable interrupts).
-      if (!FLAGS_disable_global_lock) {
+      if (!cvars::disable_global_lock) {
         f.CallExtern(f.builtins()->enter_global_lock);
       }
     } else {
       // Otherwise we are restoring interrupts (probably).
-      if (!FLAGS_disable_global_lock) {
+      if (!cvars::disable_global_lock) {
         f.CallExtern(f.builtins()->leave_global_lock);
       }
     }

src/xenia/cpu/ppc/ppc_hir_builder.cc

@@ -182,25 +182,25 @@ bool PPCHIRBuilder::Emit(GuestFunction* function, uint32_t flags) {
 }
 
 void PPCHIRBuilder::MaybeBreakOnInstruction(uint32_t address) {
-  if (address != FLAGS_break_on_instruction) {
+  if (address != cvars::break_on_instruction) {
     return;
   }
 
   Comment("--break-on-instruction target");
 
-  if (FLAGS_break_condition_gpr < 0) {
+  if (cvars::break_condition_gpr < 0) {
     DebugBreak();
     return;
   }
 
-  auto left = LoadGPR(FLAGS_break_condition_gpr);
-  auto right = LoadConstantUint64(FLAGS_break_condition_value);
-  if (FLAGS_break_condition_truncate) {
+  auto left = LoadGPR(cvars::break_condition_gpr);
+  auto right = LoadConstantUint64(cvars::break_condition_value);
+  if (cvars::break_condition_truncate) {
     left = Truncate(left, INT32_TYPE);
     right = Truncate(right, INT32_TYPE);
   }
 
-  auto op = FLAGS_break_condition_op.c_str();
+  auto op = cvars::break_condition_op.c_str();
   // TODO(rick): table?
   if (strcasecmp(op, "eq") == 0) {
     TrapTrue(CompareEQ(left, right));

src/xenia/cpu/ppc/ppc_translator.cc

@@ -9,8 +9,6 @@
 
 #include "xenia/cpu/ppc/ppc_translator.h"
 
-#include <gflags/gflags.h>
-
 #include "xenia/base/assert.h"
 #include "xenia/base/byte_order.h"
 #include "xenia/base/memory.h"
@@ -41,7 +39,7 @@ PPCTranslator::PPCTranslator(PPCFrontend* frontend) : frontend_(frontend) {
   assembler_ = backend->CreateAssembler();
   assembler_->Initialize();
 
-  bool validate = FLAGS_validate_hir;
+  bool validate = cvars::validate_hir;
 
   // Merge blocks early. This will let us use more context in other passes.
   // The CFG is required for simplification and dirtied by it.
@@ -108,19 +106,19 @@ bool PPCTranslator::Translate(GuestFunction* function,
   xe::make_reset_scope(&string_buffer_);
 
   // NOTE: we only want to do this when required, as it's expensive to build.
-  if (FLAGS_disassemble_functions) {
+  if (cvars::disassemble_functions) {
     debug_info_flags |= DebugInfoFlags::kDebugInfoAllDisasm;
   }
-  if (FLAGS_trace_functions) {
+  if (cvars::trace_functions) {
     debug_info_flags |= DebugInfoFlags::kDebugInfoTraceFunctions;
   }
-  if (FLAGS_trace_function_coverage) {
+  if (cvars::trace_function_coverage) {
     debug_info_flags |= DebugInfoFlags::kDebugInfoTraceFunctionCoverage;
   }
-  if (FLAGS_trace_function_references) {
+  if (cvars::trace_function_references) {
     debug_info_flags |= DebugInfoFlags::kDebugInfoTraceFunctionReferences;
   }
-  if (FLAGS_trace_function_data) {
+  if (cvars::trace_function_data) {
     debug_info_flags |= DebugInfoFlags::kDebugInfoTraceFunctionData;
   }
   std::unique_ptr<FunctionDebugInfo> debug_info;

src/xenia/cpu/ppc/testing/ppc_testing_main.cc

@@ -7,8 +7,6 @@
  ******************************************************************************
  */
 
-#include <gflags/gflags.h>
-
 #include "xenia/base/filesystem.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/main.h"
@@ -26,9 +24,9 @@
 #endif  // XE_COMPILER_MSVC
 
 DEFINE_string(test_path, "src/xenia/cpu/ppc/testing/",
-              "Directory scanned for test files.");
+              "Directory scanned for test files.", "Other");
 DEFINE_string(test_bin_path, "src/xenia/cpu/ppc/testing/bin/",
-              "Directory with binary outputs of the test files.");
+              "Directory with binary outputs of the test files.", "Other");
 
 namespace xe {
 namespace cpu {
@@ -54,8 +52,8 @@ class TestSuite {
     name = src_file_path.substr(src_file_path.find_last_of(xe::kPathSeparator) +
                                 1);
     name = ReplaceExtension(name, L"");
-    map_file_path = xe::to_wstring(FLAGS_test_bin_path) + name + L".map";
-    bin_file_path = xe::to_wstring(FLAGS_test_bin_path) + name + L".bin";
+    map_file_path = xe::to_wstring(cvars::test_bin_path) + name + L".map";
+    bin_file_path = xe::to_wstring(cvars::test_bin_path) + name + L".bin";
   }
 
   bool Load() {
@@ -192,11 +190,11 @@ class TestRunner {
     std::unique_ptr<xe::cpu::backend::Backend> backend;
     if (!backend) {
 #if defined(XENIA_HAS_X64_BACKEND) && XENIA_HAS_X64_BACKEND
-      if (FLAGS_cpu == "x64") {
+      if (cvars::cpu == "x64") {
         backend.reset(new xe::cpu::backend::x64::X64Backend());
       }
 #endif  // XENIA_HAS_X64_BACKEND
-      if (FLAGS_cpu == "any") {
+      if (cvars::cpu == "any") {
 #if defined(XENIA_HAS_X64_BACKEND) && XENIA_HAS_X64_BACKEND
         if (!backend) {
           backend.reset(new xe::cpu::backend::x64::X64Backend());
@@ -408,7 +406,7 @@ bool RunTests(const std::wstring& test_name) {
   int passed_count = 0;
 
   auto test_path_root =
-      xe::fix_path_separators(xe::to_wstring(FLAGS_test_path));
+      xe::fix_path_separators(xe::to_wstring(cvars::test_path));
   std::vector<std::wstring> test_files;
   if (!DiscoverTests(test_path_root, test_files)) {
     return false;

src/xenia/cpu/ppc/testing/ppc_testing_native_main.cc

@@ -7,8 +7,6 @@
  ******************************************************************************
  */
 
-#include <gflags/gflags.h>
-
 #include "xenia/base/filesystem.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/main.h"
@@ -58,8 +56,8 @@ class TestSuite {
     name = src_file_path.substr(src_file_path.find_last_of(xe::kPathSeparator) +
                                 1);
     name = ReplaceExtension(name, L"");
-    map_file_path = xe::to_wstring(FLAGS_test_bin_path) + name + L".map";
-    bin_file_path = xe::to_wstring(FLAGS_test_bin_path) + name + L".bin";
+    map_file_path = xe::to_wstring(cvars::test_bin_path) + name + L".map";
+    bin_file_path = xe::to_wstring(cvars::test_bin_path) + name + L".bin";
   }
 
   bool Load() {
@@ -454,7 +452,7 @@ bool RunTests(const std::wstring& test_name) {
   int passed_count = 0;
 
   auto test_path_root =
-      xe::fix_path_separators(xe::to_wstring(FLAGS_test_path));
+      xe::fix_path_separators(xe::to_wstring(cvars::test_path));
   std::vector<std::wstring> test_files;
   if (!DiscoverTests(test_path_root, test_files)) {
     return false;