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

Setup the processor before doing anything else (and return an actual error code if it fails)

This commit is contained in:
Dr. Chat 2015-11-04 06:47:38 -06:00
parent f3fe260a17
commit 4ca62bf02c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/emulator.cc
View File

@ -105,6 +105,9 @@ X_STATUS Emulator::Setup(ui::Window* display_window) {
// Initialize the CPU. // Initialize the CPU.
processor_ = std::make_unique<xe::cpu::Processor>( processor_ = std::make_unique<xe::cpu::Processor>(
memory_.get(), export_resolver_.get(), debugger_.get()); memory_.get(), export_resolver_.get(), debugger_.get());
if (!processor_->Setup()) {
return X_STATUS_UNSUCCESSFUL;
}
// Initialize the APU. // Initialize the APU.
audio_system_ = xe::apu::AudioSystem::Create(processor_.get()); audio_system_ = xe::apu::AudioSystem::Create(processor_.get());
@ -140,9 +143,6 @@ X_STATUS Emulator::Setup(ui::Window* display_window) {
kernel_state_ = std::make_unique<xe::kernel::KernelState>(this); kernel_state_ = std::make_unique<xe::kernel::KernelState>(this);
// Setup the core components. // Setup the core components.
if (!processor_->Setup()) {
return result;
}
result = graphics_system_->Setup(processor_.get(), display_window_->loop(), result = graphics_system_->Setup(processor_.get(), display_window_->loop(),
display_window_); display_window_);
if (result) { if (result) {