Merge pull request #4534 from lioncash/jitarm

JitArm64: Add missing override specifiers
This commit is contained in:
Markus Wick 2016-12-21 00:09:56 +01:00 committed by GitHub
commit 7620dd88d3
2 changed files with 13 additions and 13 deletions

View File

@ -25,22 +25,22 @@ class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock, public CommonA
public:
JitArm64() : code_buffer(32000), m_float_emit(this) {}
~JitArm64() {}
void Init();
void Shutdown();
void Init() override;
void Shutdown() override;
JitBaseBlockCache* GetBlockCache() { return &blocks; }
JitBaseBlockCache* GetBlockCache() override { return &blocks; }
bool IsInCodeSpace(u8* ptr) const { return IsInSpace(ptr); }
bool HandleFault(uintptr_t access_address, SContext* ctx) override;
void ClearCache();
void ClearCache() override;
CommonAsmRoutinesBase* GetAsmRoutines() override { return this; }
void Run();
void SingleStep();
void Run() override;
void SingleStep() override;
void Jit(u32);
void Jit(u32) override;
const char* GetName() { return "JITARM64"; }
const char* GetName() override { return "JITARM64"; }
// OPCODES
void FallBackToInterpreter(UGeckoInstruction inst);
void DoNothing(UGeckoInstruction inst);

View File

@ -206,10 +206,10 @@ class Arm64GPRCache : public Arm64RegCache
{
public:
~Arm64GPRCache() {}
void Start(PPCAnalyst::BlockRegStats& stats);
void Start(PPCAnalyst::BlockRegStats& stats) override;
// Flushes the register cache in different ways depending on the mode
void Flush(FlushMode mode, PPCAnalyst::CodeOp* op = nullptr);
void Flush(FlushMode mode, PPCAnalyst::CodeOp* op = nullptr) override;
// Returns a guest register inside of a host register
// Will dump an immediate to the host register as well
@ -228,7 +228,7 @@ public:
protected:
// Get the order of the host registers
void GetAllocationOrder();
void GetAllocationOrder() override;
// Flushes a guest register by host provided
void FlushByHost(ARM64Reg host_reg) override;
@ -246,7 +246,7 @@ class Arm64FPRCache : public Arm64RegCache
public:
~Arm64FPRCache() {}
// Flushes the register cache in different ways depending on the mode
void Flush(FlushMode mode, PPCAnalyst::CodeOp* op = nullptr);
void Flush(FlushMode mode, PPCAnalyst::CodeOp* op = nullptr) override;
// Returns a guest register inside of a host register
// Will dump an immediate to the host register as well
@ -262,7 +262,7 @@ public:
protected:
// Get the order of the host registers
void GetAllocationOrder();
void GetAllocationOrder() override;
// Flushes a guest register by host provided
void FlushByHost(ARM64Reg host_reg) override;