diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc index 3525f0742..81fe5cf57 100644 --- a/src/xenia/emulator.cc +++ b/src/xenia/emulator.cc @@ -201,10 +201,13 @@ X_STATUS Emulator::Setup( } } +#define LOAD_KERNEL_MODULE(t) \ + static_cast(kernel_state_->LoadKernelModule()) // HLE kernel modules. - kernel_state_->LoadKernelModule(); - kernel_state_->LoadKernelModule(); - kernel_state_->LoadKernelModule(); + LOAD_KERNEL_MODULE(xboxkrnl::XboxkrnlModule); + LOAD_KERNEL_MODULE(xam::XamModule); + LOAD_KERNEL_MODULE(xbdm::XbdmModule); +#undef LOAD_KERNEL_MODULE // Initialize emulator fallback exception handling last. ExceptionHandler::Install(Emulator::ExceptionCallbackThunk, this);