ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaning up some old flags.

This commit is contained in:
Ben Vanik 2015-05-19 22:25:45 -07:00
parent 9e685a1453
commit 2328b34308
4 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/cpu/cpu-private.h
View File

@ -12,13 +12,10 @@
#include <gflags/gflags.h> #include <gflags/gflags.h>
DECLARE_string(processor_backend); DECLARE_string(cpu);
DECLARE_string(load_module_map); DECLARE_string(load_module_map);
DECLARE_string(dump_path);
DECLARE_bool(dump_module_map);
DECLARE_bool(debug); DECLARE_bool(debug);
DECLARE_bool(always_disasm); DECLARE_bool(always_disasm);
DECLARE_bool(disassemble_functions); DECLARE_bool(disassemble_functions);
@ -31,7 +28,6 @@ DECLARE_bool(trace_function_data);
DECLARE_bool(validate_hir); DECLARE_bool(validate_hir);
DECLARE_uint64(break_on_instruction); DECLARE_uint64(break_on_instruction);
DECLARE_uint64(break_on_memory);
DECLARE_bool(break_on_debugbreak); DECLARE_bool(break_on_debugbreak);
#endif // XENIA_CPU_PRIVATE_H_ #endif // XENIA_CPU_PRIVATE_H_

12
src/xenia/cpu/cpu.cc
View File

@ -9,21 +9,13 @@
#include "xenia/cpu/cpu-private.h" #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( DEFINE_string(
load_module_map, "", load_module_map, "",
"Loads a .map for symbol names and to diff with the generated symbol " "Loads a .map for symbol names and to diff with the generated symbol "
"database."); "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 #if 0 && DEBUG
#define DEFAULT_DEBUG_FLAG true #define DEFAULT_DEBUG_FLAG true
#else #else
@ -53,6 +45,4 @@ DEFINE_bool(validate_hir, false,
// Breakpoints: // Breakpoints:
DEFINE_uint64(break_on_instruction, 0, DEFINE_uint64(break_on_instruction, 0,
"int3 before the given guest address is executed."); "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."); DEFINE_bool(break_on_debugbreak, true, "int3 on JITed __debugbreak requests.");

4
src/xenia/cpu/processor.cc
View File

@ -122,11 +122,11 @@ bool Processor::Setup() {
std::unique_ptr<xe::cpu::backend::Backend> backend; std::unique_ptr<xe::cpu::backend::Backend> backend;
if (!backend) { if (!backend) {
#if defined(XENIA_HAS_X64_BACKEND) && XENIA_HAS_X64_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)); backend.reset(new xe::cpu::backend::x64::X64Backend(this));
} }
#endif // XENIA_HAS_X64_BACKEND #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 defined(XENIA_HAS_X64_BACKEND) && XENIA_HAS_X64_BACKEND
if (!backend) { if (!backend) {
backend.reset(new xe::cpu::backend::x64::X64Backend(this)); backend.reset(new xe::cpu::backend::x64::X64Backend(this));

9
src/xenia/kernel/xboxkrnl_module.cc
View File

@ -18,9 +18,6 @@
#include "xenia/kernel/xboxkrnl_private.h" #include "xenia/kernel/xboxkrnl_private.h"
#include "xenia/kernel/objects/xuser_module.h" #include "xenia/kernel/objects/xuser_module.h"
DEFINE_bool(abort_before_entry, false,
"Abort execution right before launching the module.");
namespace xe { namespace xe {
namespace kernel { namespace kernel {
@ -187,12 +184,6 @@ int XboxkrnlModule::LaunchModule(const char* path) {
// Set as the main module, while running. // Set as the main module, while running.
kernel_state_->SetExecutableModule(module); kernel_state_->SetExecutableModule(module);
if (FLAGS_abort_before_entry) {
XELOGI("--abort_before_entry causing an early exit");
module->Release();
return 0;
}
// Launch the module. // Launch the module.
// NOTE: this won't return until the module exits. // NOTE: this won't return until the module exits.
result_code = module->Launch(0); result_code = module->Launch(0);