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 #6527 from lioncash/typedef 

DSPTables: Remove opc_t typedef
This commit is contained in:
Léo Lam 2018-03-26 12:39:27 +02:00 committed by GitHub
parent 8e8603fcc9 8c421ffbb7
commit ccfdea696a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/DSP/DSPAssembler.cpp
View File

@ -430,7 +430,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;
@ -467,7 +467,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++)
{
@ -713,7 +714,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++)
@ -994,7 +995,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;
@ -1002,7 +1003,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)
{

6
Source/Core/Core/DSP/DSPAssembler.h
View File

@ -97,9 +97,9 @@ private:
void ShowError(AssemblerError 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;

2
Source/Core/Core/DSP/DSPTables.h
View File

@ -88,8 +88,6 @@ struct DSPOPCTemplate
bool updates_sr;
};
typedef DSPOPCTemplate opc_t;
// Opcodes
extern const DSPOPCTemplate cw;