core: Consolidate core and system state, remove system module & cleanups.
bunnei
parent
707cc66362
commit
232ef55c1a
@ -1,90 +0,0 @@
|
|||||||
// Copyright 2014 Citra Emulator Project
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#include "audio_core/audio_core.h"
|
|
||||||
#include "core/core.h"
|
|
||||||
#include "core/core_timing.h"
|
|
||||||
#include "core/gdbstub/gdbstub.h"
|
|
||||||
#include "core/hle/hle.h"
|
|
||||||
#include "core/hle/kernel/kernel.h"
|
|
||||||
#include "core/hle/kernel/memory.h"
|
|
||||||
#include "core/hw/hw.h"
|
|
||||||
#include "core/system.h"
|
|
||||||
#include "video_core/video_core.h"
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
|
|
||||||
/*static*/ System System::s_instance;
|
|
||||||
|
|
||||||
System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
|
|
||||||
Core::Init();
|
|
||||||
CoreTiming::Init();
|
|
||||||
Memory::Init();
|
|
||||||
HW::Init();
|
|
||||||
Kernel::Init(system_mode);
|
|
||||||
HLE::Init();
|
|
||||||
AudioCore::Init();
|
|
||||||
GDBStub::Init();
|
|
||||||
|
|
||||||
if (!VideoCore::Init(emu_window)) {
|
|
||||||
return ResultStatus::ErrorVideoCore;
|
|
||||||
}
|
|
||||||
|
|
||||||
is_powered_on = true;
|
|
||||||
|
|
||||||
return ResultStatus::Success;
|
|
||||||
}
|
|
||||||
|
|
||||||
void System::Shutdown() {
|
|
||||||
GDBStub::Shutdown();
|
|
||||||
AudioCore::Shutdown();
|
|
||||||
VideoCore::Shutdown();
|
|
||||||
HLE::Shutdown();
|
|
||||||
Kernel::Shutdown();
|
|
||||||
HW::Shutdown();
|
|
||||||
CoreTiming::Shutdown();
|
|
||||||
Core::Shutdown();
|
|
||||||
|
|
||||||
is_powered_on = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) {
|
|
||||||
state.app_loader = Loader::GetLoader(filepath);
|
|
||||||
|
|
||||||
if (!state.app_loader) {
|
|
||||||
LOG_CRITICAL(Frontend, "Failed to obtain loader for %s!", filepath.c_str());
|
|
||||||
return ResultStatus::ErrorGetLoader;
|
|
||||||
}
|
|
||||||
|
|
||||||
boost::optional<u32> system_mode{ state.app_loader->LoadKernelSystemMode() };
|
|
||||||
if (!system_mode) {
|
|
||||||
LOG_CRITICAL(Frontend, "Failed to determine system mode!");
|
|
||||||
return ResultStatus::ErrorSystemMode;
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultStatus init_result{ Init(emu_window, system_mode.get()) };
|
|
||||||
if (init_result != ResultStatus::Success) {
|
|
||||||
LOG_CRITICAL(Frontend, "Failed to initialize system (Error %i)!", init_result);
|
|
||||||
System::Shutdown();
|
|
||||||
return init_result;
|
|
||||||
}
|
|
||||||
|
|
||||||
const Loader::ResultStatus load_result{ state.app_loader->Load() };
|
|
||||||
if (Loader::ResultStatus::Success != load_result) {
|
|
||||||
LOG_CRITICAL(Frontend, "Failed to load ROM (Error %i)!", load_result);
|
|
||||||
System::Shutdown();
|
|
||||||
|
|
||||||
switch (load_result) {
|
|
||||||
case Loader::ResultStatus::ErrorEncrypted:
|
|
||||||
return ResultStatus::ErrorLoader_ErrorEncrypted;
|
|
||||||
case Loader::ResultStatus::ErrorInvalidFormat:
|
|
||||||
return ResultStatus::ErrorLoader_ErrorInvalidFormat;
|
|
||||||
default:
|
|
||||||
return ResultStatus::ErrorLoader;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ResultStatus::Success;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Core
|
|
||||||
@ -1,83 +0,0 @@
|
|||||||
// Copyright 2014 Citra Emulator Project
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#include "core/loader/loader.h"
|
|
||||||
|
|
||||||
class EmuWindow;
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
|
|
||||||
class System {
|
|
||||||
public:
|
|
||||||
struct State {
|
|
||||||
std::unique_ptr<Loader::AppLoader> app_loader;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the instance of the System singleton class.
|
|
||||||
* @returns Reference to the instance of the System singleton class.
|
|
||||||
*/
|
|
||||||
static System& GetInstance() {
|
|
||||||
return s_instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Enumeration representing the return values of the System Initialize and Load process.
|
|
||||||
enum class ResultStatus : u32 {
|
|
||||||
Success, ///< Succeeded
|
|
||||||
ErrorGetLoader, ///< Error finding the correct application loader
|
|
||||||
ErrorSystemMode, ///< Error determining the system mode
|
|
||||||
ErrorLoader, ///< Error loading the specified application
|
|
||||||
ErrorLoader_ErrorEncrypted, ///< Error loading the specified application due to encryption
|
|
||||||
ErrorLoader_ErrorInvalidFormat, ///< Error loading the specified application due to an invalid format
|
|
||||||
ErrorVideoCore, ///< Error in the video core
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize the emulated system.
|
|
||||||
* @param emu_window Pointer to the host-system window used for video output and keyboard input.
|
|
||||||
* @param system_mode The system mode.
|
|
||||||
* @returns ResultStatus code, indicating if the operation succeeded.
|
|
||||||
*/
|
|
||||||
ResultStatus Init(EmuWindow* emu_window, u32 system_mode);
|
|
||||||
|
|
||||||
/// Shutdown the emulated system.
|
|
||||||
void Shutdown();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load an executable application.
|
|
||||||
* @param emu_window Pointer to the host-system window used for video output and keyboard input.
|
|
||||||
* @param filepath String path to the executable application to load on the host file system.
|
|
||||||
* @returns ResultStatus code, indicating if the operation succeeded.
|
|
||||||
*/
|
|
||||||
ResultStatus Load(EmuWindow* emu_window, const std::string& filepath);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicates if the emulated system is powered on (all subsystems initialized and able to run an
|
|
||||||
* application).
|
|
||||||
* @returns True if the emulated system is powered on, otherwise false.
|
|
||||||
*/
|
|
||||||
bool IsPoweredOn() const {
|
|
||||||
return is_powered_on;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the internal state of the emulated system.
|
|
||||||
* @returns The internal state of the emulated system
|
|
||||||
*/
|
|
||||||
State& GetState() {
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool is_powered_on{};
|
|
||||||
State state;
|
|
||||||
|
|
||||||
static System s_instance;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace Core
|
|
||||||
Loading…
Reference in New Issue