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 #6521 from lioncash/enum 

CachedInterpreter: Use an enum class for instruction type
This commit is contained in:
Léo Lam 2018-03-25 11:10:41 +02:00 committed by GitHub
parent b68952f45c 48e2e9a41d
commit df3309228c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp
View File

@ -17,32 +17,35 @@
struct CachedInterpreter::Instruction
{
typedef void (*CommonCallback)(UGeckoInstruction);
typedef bool (*ConditionalCallback)(u32 data);
using CommonCallback = void (*)(UGeckoInstruction);
using ConditionalCallback = bool (*)(u32);
Instruction() : type(INSTRUCTION_ABORT) {}
Instruction() {}
Instruction(const CommonCallback c, UGeckoInstruction i)
: common_callback(c), data(i.hex), type(INSTRUCTION_TYPE_COMMON)
: common_callback(c), data(i.hex), type(Type::Common)
{
}
Instruction(const ConditionalCallback c, u32 d)
: conditional_callback(c), data(d), type(INSTRUCTION_TYPE_CONDITIONAL)
: conditional_callback(c), data(d), type(Type::Conditional)
{
}
enum class Type
{
Abort,
Common,
Conditional,
};
union
{
const CommonCallback common_callback;
const ConditionalCallback conditional_callback;
};
u32 data;
enum
{
INSTRUCTION_ABORT,
INSTRUCTION_TYPE_COMMON,
INSTRUCTION_TYPE_CONDITIONAL,
} type;
u32 data = 0;
Type type = Type::Abort;
};
CachedInterpreter::CachedInterpreter() : code_buffer(32000)
@ -86,15 +89,15 @@ void CachedInterpreter::ExecuteOneBlock()
const Instruction* code = reinterpret_cast<const Instruction*>(normal_entry);
for (; code->type != Instruction::INSTRUCTION_ABORT; ++code)
for (; code->type != Instruction::Type::Abort; ++code)
{
switch (code->type)
{
case Instruction::INSTRUCTION_TYPE_COMMON:
case Instruction::Type::Common:
code->common_callback(UGeckoInstruction(code->data));
break;
case Instruction::INSTRUCTION_TYPE_CONDITIONAL:
case Instruction::Type::Conditional:
if (code->conditional_callback(code->data))
return;
break;