Misc cleanup

This commit is contained in:
Tillmann Karras 2020-05-10 07:22:01 +01:00
parent a660033e8c
commit e651592ef5
5 changed files with 7 additions and 12 deletions

View File

@ -21,7 +21,7 @@ namespace DSP
// clang-format off // clang-format off
const std::array<DSPOPCTemplate, 214> s_opcodes = const std::array<DSPOPCTemplate, 214> s_opcodes =
{{ {{
// # of parameters----+ {type, size, loc, lshift, mask} branch reads PC // instruction approximation // # of parameters----+ {type, size, loc, lshift, mask} branch reads PC // instruction approximation
// name opcode mask size-V V param 1 param 2 param 3 extendable uncond. updates SR // name opcode mask size-V V param 1 param 2 param 3 extendable uncond. updates SR
{"NOP", 0x0000, 0xfffc, 1, 0, {}, false, false, false, false, false}, // no operation {"NOP", 0x0000, 0xfffc, 1, 0, {}, false, false, false, false, false}, // no operation
@ -451,7 +451,7 @@ const std::array<pdlabel_t, 36> regnames =
{0x0c, "ST0", "Call stack",}, {0x0c, "ST0", "Call stack",},
{0x0d, "ST1", "Data stack",}, {0x0d, "ST1", "Data stack",},
{0x0e, "ST2", "Loop addr stack",}, {0x0e, "ST2", "Loop addr stack",},
{0x0f, "ST3", "Loop counter",}, {0x0f, "ST3", "Loop counter stack",},
{0x10, "AC0.H", "Accu High 0",}, {0x10, "AC0.H", "Accu High 0",},
{0x11, "AC1.H", "Accu High 1",}, {0x11, "AC1.H", "Accu High 1",},
{0x12, "CR", "Config Register",}, {0x12, "CR", "Config Register",},

View File

@ -120,7 +120,7 @@ static bool IsOverS32()
static bool IsLess() static bool IsLess()
{ {
return (!(g_dsp.r.sr & SR_OVERFLOW) != !(g_dsp.r.sr & SR_SIGN)); return (g_dsp.r.sr & SR_OVERFLOW) != (g_dsp.r.sr & SR_SIGN);
} }
static bool IsZero() static bool IsZero()

View File

@ -27,12 +27,6 @@ typedef void (*TPatchFunction)();
static std::map<u32, u32> s_original_instructions; static std::map<u32, u32> s_original_instructions;
enum
{
HLE_RETURNTYPE_BLR = 0,
HLE_RETURNTYPE_RFI = 1,
};
struct SPatch struct SPatch
{ {
char m_szPatchName[128]; char m_szPatchName[128];

View File

@ -186,8 +186,8 @@ void UCodeInterface::PrepareBootUCode(u32 mail)
if (SConfig::GetInstance().m_DumpUCode) if (SConfig::GetInstance().m_DumpUCode)
{ {
DSP::DumpDSPCode(static_cast<u8*>(Memory::GetPointer(m_next_ucode.iram_mram_addr)), DSP::DumpDSPCode(Memory::GetPointer(m_next_ucode.iram_mram_addr), m_next_ucode.iram_size,
m_next_ucode.iram_size, ector_crc); ector_crc);
} }
DEBUG_LOG(DSPHLE, "PrepareBootUCode 0x%08x", ector_crc); DEBUG_LOG(DSPHLE, "PrepareBootUCode 0x%08x", ector_crc);

View File

@ -265,7 +265,8 @@ void DSPLLE::DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value)
{ {
if (gdsp_mbox_peek(MAILBOX_CPU) & 0x80000000) if (gdsp_mbox_peek(MAILBOX_CPU) & 0x80000000)
{ {
ERROR_LOG(DSPLLE, "Mailbox isn't empty ... strange"); // the DSP didn't read the previous value
WARN_LOG(DSPLLE, "Mailbox isn't empty ... strange");
} }
#if PROFILE #if PROFILE