Merge pull request #7123 from lioncash/enum

DSPCore: Convert core type enum into an enum class
This commit is contained in:
Léo Lam 2018-06-15 19:52:57 +02:00 committed by GitHub
commit 0ee9b884ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions

View File

@ -170,7 +170,7 @@ bool DSPCore_Init(const DSPInitOptions& opts)
Common::WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false); Common::WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
// Initialize JIT, if necessary // Initialize JIT, if necessary
if (opts.core_type == DSPInitOptions::CORE_JIT) if (opts.core_type == DSPInitOptions::CoreType::JIT64)
g_dsp_jit = std::make_unique<JIT::x64::DSPEmitter>(); g_dsp_jit = std::make_unique<JIT::x64::DSPEmitter>();
g_dsp_cap.reset(opts.capture_logger); g_dsp_cap.reset(opts.capture_logger);

View File

@ -329,19 +329,19 @@ struct DSPInitOptions
std::array<u16, DSP_COEF_SIZE> coef_contents; std::array<u16, DSP_COEF_SIZE> coef_contents;
// Core used to emulate the DSP. // Core used to emulate the DSP.
// Default: CORE_JIT. // Default: JIT64.
enum CoreType enum class CoreType
{ {
CORE_INTERPRETER, Interpreter,
CORE_JIT, JIT64,
}; };
CoreType core_type; CoreType core_type = CoreType::JIT64;
// Optional capture logger used to log internal DSP data transfers. // Optional capture logger used to log internal DSP data transfers.
// Default: dummy implementation, does nothing. // Default: dummy implementation, does nothing.
DSPCaptureLogger* capture_logger; DSPCaptureLogger* capture_logger;
DSPInitOptions() : core_type(CORE_JIT), capture_logger(new DefaultDSPCaptureLogger()) {} DSPInitOptions() : capture_logger(new DefaultDSPCaptureLogger()) {}
}; };
// Initializes the DSP emulator using the provided options. Takes ownership of // Initializes the DSP emulator using the provided options. Takes ownership of

View File

@ -153,10 +153,10 @@ static bool FillDSPInitOptions(DSPInitOptions* opts)
if (!LoadDSPRom(opts->coef_contents.data(), coef_file, DSP_COEF_BYTE_SIZE)) if (!LoadDSPRom(opts->coef_contents.data(), coef_file, DSP_COEF_BYTE_SIZE))
return false; return false;
opts->core_type = DSPInitOptions::CORE_INTERPRETER; opts->core_type = DSPInitOptions::CoreType::Interpreter;
#ifdef _M_X86 #ifdef _M_X86
if (SConfig::GetInstance().m_DSPEnableJIT) if (SConfig::GetInstance().m_DSPEnableJIT)
opts->core_type = DSPInitOptions::CORE_JIT; opts->core_type = DSPInitOptions::CoreType::JIT64;
#endif #endif
if (SConfig::GetInstance().m_DSPCaptureLog) if (SConfig::GetInstance().m_DSPCaptureLog)