From 8c421ffbb7c26500b5be2fa918b26a7255ee0a3f Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 25 Mar 2018 17:53:21 -0400
Subject: [PATCH] DSPTables: Remove opc_t typedef
This was only ever used by the DSP assembler, and even then it was
sparsely used. Get rid of it to be consistent with types in other
sections of the DSP code.
---
Source/Core/Core/DSP/DSPAssembler.cpp | 11 ++++++-----
Source/Core/Core/DSP/DSPAssembler.h | 6 +++---
Source/Core/Core/DSP/DSPTables.h | 2 --
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp
index 50ed09337d..7805393225 100644
--- a/Source/Core/Core/DSP/DSPAssembler.cpp
+++ b/Source/Core/Core/DSP/DSPAssembler.cpp
@@ -429,7 +429,7 @@ u32 DSPAssembler::GetParams(char* parstr, param_t* par)
return count;
}
-const opc_t* DSPAssembler::FindOpcode(std::string name, size_t par_count, OpcodeType type)
+const DSPOPCTemplate* DSPAssembler::FindOpcode(std::string name, size_t par_count, OpcodeType type)
{
if (name[0] == 'C' && name[1] == 'W')
return &cw;
@@ -466,7 +466,8 @@ static u16 get_mask_shifted_down(u16 mask)
return mask;
}
-bool DSPAssembler::VerifyParams(const opc_t* opc, param_t* par, size_t count, OpcodeType type)
+bool DSPAssembler::VerifyParams(const DSPOPCTemplate* opc, param_t* par, size_t count,
+ OpcodeType type)
{
for (size_t i = 0; i < count; i++)
{
@@ -712,7 +713,7 @@ bool DSPAssembler::VerifyParams(const opc_t* opc, param_t* par, size_t count, Op
}
// Merge opcode with params.
-void DSPAssembler::BuildCode(const opc_t* opc, param_t* par, u32 par_count, u16* outbuf)
+void DSPAssembler::BuildCode(const DSPOPCTemplate* opc, param_t* par, u32 par_count, u16* outbuf)
{
outbuf[m_cur_addr] |= opc->opcode;
for (u32 i = 0; i < par_count; i++)
@@ -993,7 +994,7 @@ bool DSPAssembler::AssemblePass(const std::string& text, int pass)
continue;
}
- const opc_t* opc = FindOpcode(opcode, params_count, OpcodeType::Primary);
+ const DSPOPCTemplate* opc = FindOpcode(opcode, params_count, OpcodeType::Primary);
if (!opc)
opc = &cw;
@@ -1001,7 +1002,7 @@ bool DSPAssembler::AssemblePass(const std::string& text, int pass)
VerifyParams(opc, params, params_count, OpcodeType::Primary);
- const opc_t* opc_ext = nullptr;
+ const DSPOPCTemplate* opc_ext = nullptr;
// Check for opcode extensions.
if (opc->extended)
{
diff --git a/Source/Core/Core/DSP/DSPAssembler.h b/Source/Core/Core/DSP/DSPAssembler.h
index aab86f92e9..68b0bdbf58 100644
--- a/Source/Core/Core/DSP/DSPAssembler.h
+++ b/Source/Core/Core/DSP/DSPAssembler.h
@@ -98,9 +98,9 @@ private:
// void ShowWarning(err_t err_code, const char *extra_info = nullptr);
char* FindBrackets(char* src, char* dst);
- const opc_t* FindOpcode(std::string name, size_t par_count, OpcodeType type);
- bool VerifyParams(const opc_t* opc, param_t* par, size_t count, OpcodeType type);
- void BuildCode(const opc_t* opc, param_t* par, u32 par_count, u16* outbuf);
+ const DSPOPCTemplate* FindOpcode(std::string name, size_t par_count, OpcodeType type);
+ bool VerifyParams(const DSPOPCTemplate* opc, param_t* par, size_t count, OpcodeType type);
+ void BuildCode(const DSPOPCTemplate* opc, param_t* par, u32 par_count, u16* outbuf);
std::vector<u16> m_output_buffer;
diff --git a/Source/Core/Core/DSP/DSPTables.h b/Source/Core/Core/DSP/DSPTables.h
index def79f28af..b36ac50bca 100644
--- a/Source/Core/Core/DSP/DSPTables.h
+++ b/Source/Core/Core/DSP/DSPTables.h
@@ -88,8 +88,6 @@ struct DSPOPCTemplate
bool updates_sr;
};
-typedef DSPOPCTemplate opc_t;
-
// Opcodes
extern const DSPOPCTemplate cw;