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

Merge pull request #7128 from lioncash/dsp-ex 

DSPCore: Make DSPCore_SetException() take an enum type instead of a u8
This commit is contained in:
Markus Wick 2018-06-18 10:50:35 +02:00 committed by GitHub
parent 6bfbc1988e eb76dc9600
commit 29d51ff692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/DSP/DSPCore.cpp
View File

@ -8,6 +8,7 @@
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <memory> #include <memory>
#include <type_traits>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Event.h" #include "Common/Event.h"
@ -118,7 +119,7 @@ class LLEAccelerator final : public Accelerator
protected: protected:
u8 ReadMemory(u32 address) override { return Host::ReadHostMemory(address); } u8 ReadMemory(u32 address) override { return Host::ReadHostMemory(address); }
void WriteMemory(u32 address, u8 value) override { Host::WriteHostMemory(value, address); } void WriteMemory(u32 address, u8 value) override { Host::WriteHostMemory(value, address); }
void OnEndException() override { DSPCore_SetException(EXP_ACCOV); } void OnEndException() override { DSPCore_SetException(ExceptionType::AcceleratorOverflow); }
}; };
bool DSPCore_Init(const DSPInitOptions& opts) bool DSPCore_Init(const DSPInitOptions& opts)
@ -202,9 +203,9 @@ void DSPCore_Reset()
Analyzer::Analyze(); Analyzer::Analyze();
} }
void DSPCore_SetException(u8 level) void DSPCore_SetException(ExceptionType exception)
{ {
g_dsp.exceptions |= 1 << level; g_dsp.exceptions |= 1 << static_cast<std::underlying_type_t<ExceptionType>>(exception);
} }
// Notify that an external interrupt is pending (used by thread mode) // Notify that an external interrupt is pending (used by thread mode)
@ -220,7 +221,7 @@ void DSPCore_CheckExternalInterrupt()
return; return;
// Signal the SPU about new mail // Signal the SPU about new mail
DSPCore_SetException(EXP_INT); DSPCore_SetException(ExceptionType::ExternalInterrupt);
g_dsp.cr &= ~CR_EXTERNAL_INT; g_dsp.cr &= ~CR_EXTERNAL_INT;
} }
@ -236,7 +237,8 @@ void DSPCore_CheckExceptions()
// Seems exp int are not masked by sr_int_enable // Seems exp int are not masked by sr_int_enable
if (g_dsp.exceptions & (1 << i)) if (g_dsp.exceptions & (1 << i))
{ {
if (Interpreter::dsp_SR_is_flag_set(SR_INT_ENABLE) || (i == EXP_INT)) if (Interpreter::dsp_SR_is_flag_set(SR_INT_ENABLE) ||
i == static_cast<int>(ExceptionType::ExternalInterrupt))
{ {
// store pc and sr until RTI // store pc and sr until RTI
dsp_reg_store_stack(StackRegister::Call, g_dsp.pc); dsp_reg_store_stack(StackRegister::Call, g_dsp.pc);

18
Source/Core/Core/DSP/DSPCore.h
View File

@ -208,15 +208,15 @@ enum : u16
}; };
// Exception vectors // Exception vectors
enum : int enum class ExceptionType
{ {
EXP_STOVF = 1, // 0x0002 stack under/over flow StackOverflow = 1, // 0x0002 stack under/over flow
EXP_2 = 2, // 0x0004 EXP_2 = 2, // 0x0004
EXP_3 = 3, // 0x0006 EXP_3 = 3, // 0x0006
EXP_4 = 4, // 0x0008 EXP_4 = 4, // 0x0008
EXP_ACCOV = 5, // 0x000a accelerator address overflow AcceleratorOverflow = 5, // 0x000a accelerator address overflow
EXP_6 = 6, // 0x000c EXP_6 = 6, // 0x000c
EXP_INT = 7 // 0x000e external int (message from CPU) ExternalInterrupt = 7 // 0x000e external int (message from CPU)
}; };
struct DSP_Regs struct DSP_Regs
@ -356,7 +356,7 @@ void DSPCore_CheckExceptions();
void DSPCore_SetExternalInterrupt(bool val); void DSPCore_SetExternalInterrupt(bool val);
// sets a flag in the pending exception register. // sets a flag in the pending exception register.
void DSPCore_SetException(u8 level); void DSPCore_SetException(ExceptionType exception);
enum class State enum class State
{ {