archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 20:01:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

CachedInterpreter: Use an enum class for instruction type

Browse source
This commit is contained in:
Lioncash 2018-03-25 01:20:40 -04:00
parent b68952f45c
commit 9829083241
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp
View file

@ -20,29 +20,32 @@ struct CachedInterpreter::Instruction
typedef void (*CommonCallback)(UGeckoInstruction); typedef void (*CommonCallback)(UGeckoInstruction);
typedef bool (*ConditionalCallback)(u32 data); typedef bool (*ConditionalCallback)(u32 data);
Instruction() : type(INSTRUCTION_ABORT) {} Instruction() {}
Instruction(const CommonCallback c, UGeckoInstruction i) 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) 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 union
{ {
const CommonCallback common_callback; const CommonCallback common_callback;
const ConditionalCallback conditional_callback; const ConditionalCallback conditional_callback;
}; };
u32 data;
enum u32 data = 0;
{ Type type = Type::Abort;
INSTRUCTION_ABORT,
INSTRUCTION_TYPE_COMMON,
INSTRUCTION_TYPE_CONDITIONAL,
} type;
}; };
CachedInterpreter::CachedInterpreter() : code_buffer(32000) CachedInterpreter::CachedInterpreter() : code_buffer(32000)
@ -86,15 +89,15 @@ void CachedInterpreter::ExecuteOneBlock()
const Instruction* code = reinterpret_cast<const Instruction*>(normal_entry); 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) switch (code->type)
{ {
case Instruction::INSTRUCTION_TYPE_COMMON: case Instruction::Type::Common:
code->common_callback(UGeckoInstruction(code->data)); code->common_callback(UGeckoInstruction(code->data));
break; break;
case Instruction::INSTRUCTION_TYPE_CONDITIONAL: case Instruction::Type::Conditional:
if (code->conditional_callback(code->data)) if (code->conditional_callback(code->data))
return; return;
break; break;