From 2328b343086479948878aa56d663e62f17c98db0 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Tue, 19 May 2015 22:25:45 -0700
Subject: [PATCH] Cleaning up some old flags.

---
 src/xenia/cpu/cpu-private.h         |  6 +-----
 src/xenia/cpu/cpu.cc                | 12 +-----------
 src/xenia/cpu/processor.cc          |  4 ++--
 src/xenia/kernel/xboxkrnl_module.cc |  9 ---------
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/xenia/cpu/cpu-private.h b/src/xenia/cpu/cpu-private.h
index 65f7845dd..3342c0a36 100644
--- a/src/xenia/cpu/cpu-private.h
+++ b/src/xenia/cpu/cpu-private.h
@@ -12,13 +12,10 @@
 
 #include <gflags/gflags.h>
 
-DECLARE_string(processor_backend);
+DECLARE_string(cpu);
 
 DECLARE_string(load_module_map);
 
-DECLARE_string(dump_path);
-DECLARE_bool(dump_module_map);
-
 DECLARE_bool(debug);
 DECLARE_bool(always_disasm);
 DECLARE_bool(disassemble_functions);
@@ -31,7 +28,6 @@ DECLARE_bool(trace_function_data);
 DECLARE_bool(validate_hir);
 
 DECLARE_uint64(break_on_instruction);
-DECLARE_uint64(break_on_memory);
 DECLARE_bool(break_on_debugbreak);
 
 #endif  // XENIA_CPU_PRIVATE_H_
diff --git a/src/xenia/cpu/cpu.cc b/src/xenia/cpu/cpu.cc
index bd3079517..9366004d6 100644
--- a/src/xenia/cpu/cpu.cc
+++ b/src/xenia/cpu/cpu.cc
@@ -9,21 +9,13 @@
 
 #include "xenia/cpu/cpu-private.h"
 
-DEFINE_string(processor_backend, "any", "CPU backend [any, x64].");
+DEFINE_string(cpu, "any", "CPU backend [any, x64].");
 
-// Debugging:
 DEFINE_string(
     load_module_map, "",
     "Loads a .map for symbol names and to diff with the generated symbol "
     "database.");
 
-// Dumping:
-DEFINE_string(dump_path, "build/",
-              "Directory that dump files are placed into.");
-DEFINE_bool(dump_module_bitcode, true,
-            "Writes the module bitcode both before and after optimizations.");
-DEFINE_bool(dump_module_map, true, "Dumps the module symbol database.");
-
 #if 0 && DEBUG
 #define DEFAULT_DEBUG_FLAG true
 #else
@@ -53,6 +45,4 @@ DEFINE_bool(validate_hir, false,
 // Breakpoints:
 DEFINE_uint64(break_on_instruction, 0,
               "int3 before the given guest address is executed.");
-DEFINE_uint64(break_on_memory, 0,
-              "int3 on read/write to the given memory address.");
 DEFINE_bool(break_on_debugbreak, true, "int3 on JITed __debugbreak requests.");
diff --git a/src/xenia/cpu/processor.cc b/src/xenia/cpu/processor.cc
index 04f90c497..ce3dc45c1 100644
--- a/src/xenia/cpu/processor.cc
+++ b/src/xenia/cpu/processor.cc
@@ -122,11 +122,11 @@ bool Processor::Setup() {
   std::unique_ptr<xe::cpu::backend::Backend> backend;
   if (!backend) {
 #if defined(XENIA_HAS_X64_BACKEND) && XENIA_HAS_X64_BACKEND
-    if (FLAGS_processor_backend == "x64") {
+    if (FLAGS_cpu == "x64") {
       backend.reset(new xe::cpu::backend::x64::X64Backend(this));
     }
 #endif  // XENIA_HAS_X64_BACKEND
-    if (FLAGS_processor_backend == "any") {
+    if (FLAGS_cpu == "any") {
 #if defined(XENIA_HAS_X64_BACKEND) && XENIA_HAS_X64_BACKEND
       if (!backend) {
         backend.reset(new xe::cpu::backend::x64::X64Backend(this));
diff --git a/src/xenia/kernel/xboxkrnl_module.cc b/src/xenia/kernel/xboxkrnl_module.cc
index e1f856bbe..015a5978b 100644
--- a/src/xenia/kernel/xboxkrnl_module.cc
+++ b/src/xenia/kernel/xboxkrnl_module.cc
@@ -18,9 +18,6 @@
 #include "xenia/kernel/xboxkrnl_private.h"
 #include "xenia/kernel/objects/xuser_module.h"
 
-DEFINE_bool(abort_before_entry, false,
-            "Abort execution right before launching the module.");
-
 namespace xe {
 namespace kernel {
 
@@ -187,12 +184,6 @@ int XboxkrnlModule::LaunchModule(const char* path) {
   // Set as the main module, while running.
   kernel_state_->SetExecutableModule(module);
 
-  if (FLAGS_abort_before_entry) {
-    XELOGI("--abort_before_entry causing an early exit");
-    module->Release();
-    return 0;
-  }
-
   // Launch the module.
   // NOTE: this won't return until the module exits.
   result_code = module->Launch(0);