Run code through clang-modernize -add-override to add 'override' decls.
This commit is contained in:
1 parent
c579637eaf
commit
21610c2e54
45 files changed
+296
-296
No files matched your search
@@ -15,33 +15,33 @@ class PPCDebugInterface : public DebugInterface
|
||||
{
|
||||
public:
|
||||
PPCDebugInterface(){}
|
||||
virtual void disasm(unsigned int address, char *dest, int max_size);
|
||||
virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size);
|
||||
virtual int getInstructionSize(int /*instruction*/) {return 4;}
|
||||
virtual bool isAlive();
|
||||
virtual bool isBreakpoint(unsigned int address);
|
||||
virtual void setBreakpoint(unsigned int address);
|
||||
virtual void clearBreakpoint(unsigned int address);
|
||||
virtual void clearAllBreakpoints();
|
||||
virtual void toggleBreakpoint(unsigned int address);
|
||||
virtual bool isMemCheck(unsigned int address);
|
||||
virtual void toggleMemCheck(unsigned int address);
|
||||
virtual unsigned int readMemory(unsigned int address);
|
||||
virtual void disasm(unsigned int address, char *dest, int max_size) override;
|
||||
virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
|
||||
virtual int getInstructionSize(int /*instruction*/) override {return 4;}
|
||||
virtual bool isAlive() override;
|
||||
virtual bool isBreakpoint(unsigned int address) override;
|
||||
virtual void setBreakpoint(unsigned int address) override;
|
||||
virtual void clearBreakpoint(unsigned int address) override;
|
||||
virtual void clearAllBreakpoints() override;
|
||||
virtual void toggleBreakpoint(unsigned int address) override;
|
||||
virtual bool isMemCheck(unsigned int address) override;
|
||||
virtual void toggleMemCheck(unsigned int address) override;
|
||||
virtual unsigned int readMemory(unsigned int address) override;
|
||||
|
||||
enum {
|
||||
EXTRAMEM_ARAM = 1,
|
||||
};
|
||||
virtual unsigned int readExtraMemory(int memory, unsigned int address);
|
||||
virtual unsigned int readInstruction(unsigned int address);
|
||||
virtual unsigned int getPC();
|
||||
virtual void setPC(unsigned int address);
|
||||
virtual void step() {}
|
||||
virtual void breakNow();
|
||||
virtual void runToBreakpoint();
|
||||
virtual void insertBLR(unsigned int address, unsigned int value);
|
||||
virtual int getColor(unsigned int address);
|
||||
virtual std::string getDescription(unsigned int address);
|
||||
virtual void showJitResults(u32 address);
|
||||
virtual unsigned int readExtraMemory(int memory, unsigned int address) override;
|
||||
virtual unsigned int readInstruction(unsigned int address) override;
|
||||
virtual unsigned int getPC() override;
|
||||
virtual void setPC(unsigned int address) override;
|
||||
virtual void step() override {}
|
||||
virtual void breakNow() override;
|
||||
virtual void runToBreakpoint() override;
|
||||
virtual void insertBLR(unsigned int address, unsigned int value) override;
|
||||
virtual int getColor(unsigned int address) override;
|
||||
virtual std::string getDescription(unsigned int address) override;
|
||||
virtual void showJitResults(u32 address) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -16,24 +16,24 @@ class DSPHLE : public DSPEmulator {
|
||||
public:
|
||||
DSPHLE();
|
||||
|
||||
virtual bool Initialize(bool bWii, bool bDSPThread);
|
||||
virtual void Shutdown();
|
||||
virtual bool IsLLE() { return false; }
|
||||
virtual bool Initialize(bool bWii, bool bDSPThread) override;
|
||||
virtual void Shutdown() override;
|
||||
virtual bool IsLLE() override { return false ; }
|
||||
|
||||
virtual void DoState(PointerWrap &p);
|
||||
virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
|
||||
virtual void DoState(PointerWrap &p) override;
|
||||
virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
|
||||
|
||||
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short);
|
||||
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short);
|
||||
virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox);
|
||||
virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox);
|
||||
virtual unsigned short DSP_ReadControlRegister();
|
||||
virtual unsigned short DSP_WriteControlRegister(unsigned short);
|
||||
virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples);
|
||||
virtual void DSP_Update(int cycles);
|
||||
virtual void DSP_StopSoundStream();
|
||||
virtual void DSP_ClearAudioBuffer(bool mute);
|
||||
virtual u32 DSP_UpdateRate();
|
||||
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
|
||||
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
|
||||
virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
|
||||
virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
|
||||
virtual unsigned short DSP_ReadControlRegister() override;
|
||||
virtual unsigned short DSP_WriteControlRegister(unsigned short) override;
|
||||
virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples) override;
|
||||
virtual void DSP_Update(int cycles) override;
|
||||
virtual void DSP_StopSoundStream() override;
|
||||
virtual void DSP_ClearAudioBuffer(bool mute) override;
|
||||
virtual u32 DSP_UpdateRate() override;
|
||||
|
||||
CMailHandler& AccessMailHandler() { return m_MailHandler; }
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ public:
|
||||
HLEMixer(DSPHLE *dsp_hle, unsigned int AISampleRate = 48000, unsigned int DACSampleRate = 48000, unsigned int BackendSampleRate = 32000)
|
||||
: CMixer(AISampleRate, DACSampleRate, BackendSampleRate), m_DSPHLE(dsp_hle) {};
|
||||
|
||||
virtual void Premix(short *samples, unsigned int numSamples);
|
||||
virtual void Premix(short *samples, unsigned int numSamples) override;
|
||||
private:
|
||||
DSPHLE *m_DSPHLE;
|
||||
};
|
||||
|
||||
@@ -56,11 +56,11 @@ public:
|
||||
CUCode_AX(DSPHLE* dsp_hle, u32 crc);
|
||||
virtual ~CUCode_AX();
|
||||
|
||||
virtual void HandleMail(u32 mail);
|
||||
virtual void MixAdd(short* out_buffer, int nsamples);
|
||||
virtual void Update(int cycles);
|
||||
virtual void DoState(PointerWrap& p);
|
||||
u32 GetUpdateMs();
|
||||
virtual void HandleMail(u32 mail) override;
|
||||
virtual void MixAdd(short* out_buffer, int nsamples) override;
|
||||
virtual void Update(int cycles) override;
|
||||
virtual void DoState(PointerWrap& p) override;
|
||||
u32 GetUpdateMs() override;
|
||||
|
||||
// Needed because StdThread.h std::thread implem does not support member
|
||||
// pointers. TODO(delroth): obsolete.
|
||||
|
||||
@@ -12,9 +12,9 @@ class CUCode_AXWii : public CUCode_AX
|
||||
public:
|
||||
CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC);
|
||||
virtual ~CUCode_AXWii();
|
||||
u32 GetUpdateMs();
|
||||
u32 GetUpdateMs() override;
|
||||
|
||||
virtual void DoState(PointerWrap &p);
|
||||
virtual void DoState(PointerWrap &p) override;
|
||||
|
||||
protected:
|
||||
// Additional AUX buffers
|
||||
@@ -56,7 +56,7 @@ protected:
|
||||
// but this gives better precision and nicer code.
|
||||
void GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals);
|
||||
|
||||
virtual void HandleCommandList();
|
||||
virtual void HandleCommandList() override;
|
||||
|
||||
void SetupProcessing(u32 init_addr);
|
||||
void AddToLR(u32 val_addr, bool neg);
|
||||
|
||||
@@ -12,10 +12,10 @@ class CUCode_CARD : public IUCode
|
||||
public:
|
||||
CUCode_CARD(DSPHLE *dsp_hle, u32 crc);
|
||||
virtual ~CUCode_CARD();
|
||||
u32 GetUpdateMs();
|
||||
u32 GetUpdateMs() override;
|
||||
|
||||
void HandleMail(u32 _uMail);
|
||||
void Update(int cycles);
|
||||
void HandleMail(u32 _uMail) override;
|
||||
void Update(int cycles) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -10,8 +10,8 @@ struct CUCode_GBA : public IUCode
|
||||
{
|
||||
CUCode_GBA(DSPHLE *dsp_hle, u32 crc);
|
||||
virtual ~CUCode_GBA();
|
||||
u32 GetUpdateMs();
|
||||
u32 GetUpdateMs() override;
|
||||
|
||||
void HandleMail(u32 _uMail);
|
||||
void Update(int cycles);
|
||||
void HandleMail(u32 _uMail) override;
|
||||
void Update(int cycles) override;
|
||||
};
|
||||
@@ -12,10 +12,10 @@ class CUCode_InitAudioSystem : public IUCode
|
||||
public:
|
||||
CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc);
|
||||
virtual ~CUCode_InitAudioSystem();
|
||||
u32 GetUpdateMs();
|
||||
u32 GetUpdateMs() override;
|
||||
|
||||
void HandleMail(u32 _uMail);
|
||||
void Update(int cycles);
|
||||
void HandleMail(u32 _uMail) override;
|
||||
void Update(int cycles) override;
|
||||
void Init();
|
||||
};
|
||||
|
||||
|
||||
@@ -12,12 +12,12 @@ class CUCode_Rom : public IUCode
|
||||
public:
|
||||
CUCode_Rom(DSPHLE *dsp_hle, u32 _crc);
|
||||
virtual ~CUCode_Rom();
|
||||
u32 GetUpdateMs();
|
||||
u32 GetUpdateMs() override;
|
||||
|
||||
void HandleMail(u32 _uMail);
|
||||
void Update(int cycles);
|
||||
void HandleMail(u32 _uMail) override;
|
||||
void Update(int cycles) override;
|
||||
|
||||
void DoState(PointerWrap &p);
|
||||
void DoState(PointerWrap &p) override;
|
||||
|
||||
private:
|
||||
struct SUCode
|
||||
|
||||
@@ -120,20 +120,20 @@ class CUCode_Zelda : public IUCode
|
||||
public:
|
||||
CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC);
|
||||
virtual ~CUCode_Zelda();
|
||||
u32 GetUpdateMs();
|
||||
u32 GetUpdateMs() override;
|
||||
|
||||
void HandleMail(u32 _uMail);
|
||||
void HandleMail(u32 _uMail) override;
|
||||
void HandleMail_LightVersion(u32 _uMail);
|
||||
void HandleMail_SMSVersion(u32 _uMail);
|
||||
void HandleMail_NormalVersion(u32 _uMail);
|
||||
|
||||
void Update(int cycles);
|
||||
void MixAdd(short* buffer, int size);
|
||||
void Update(int cycles) override;
|
||||
void MixAdd(short* buffer, int size) override;
|
||||
|
||||
void CopyPBsFromRAM();
|
||||
void CopyPBsToRAM();
|
||||
|
||||
void DoState(PointerWrap &p);
|
||||
void DoState(PointerWrap &p) override;
|
||||
|
||||
int *templbuffer;
|
||||
int *temprbuffer;
|
||||
|
||||
@@ -16,7 +16,7 @@ public:
|
||||
DSPSymbolDB() {}
|
||||
~DSPSymbolDB() {}
|
||||
|
||||
Symbol *GetSymbolFromAddr(u32 addr);
|
||||
Symbol *GetSymbolFromAddr(u32 addr) override;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ class CEXIDummy : public IEXIDevice
|
||||
{
|
||||
std::string m_strName;
|
||||
|
||||
void TransferByte(u8& _byte) {}
|
||||
void TransferByte(u8& _byte) override {}
|
||||
|
||||
public:
|
||||
CEXIDummy(const std::string& _strName) :
|
||||
@@ -81,10 +81,10 @@ public:
|
||||
|
||||
virtual ~CEXIDummy(){}
|
||||
|
||||
void ImmWrite(u32 data, u32 size) {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmWrite: %08x", m_strName.c_str(), data);}
|
||||
u32 ImmRead (u32 size) {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmRead", m_strName.c_str()); return 0;}
|
||||
void DMAWrite(u32 addr, u32 size) {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMAWrite: %08x bytes, from %08x to device", m_strName.c_str(), size, addr);}
|
||||
void DMARead (u32 addr, u32 size) {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMARead: %08x bytes, from device to %08x", m_strName.c_str(), size, addr);}
|
||||
void ImmWrite(u32 data, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmWrite: %08x", m_strName.c_str(), data);}
|
||||
u32 ImmRead (u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmRead", m_strName.c_str()); return 0;}
|
||||
void DMAWrite(u32 addr, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMAWrite: %08x bytes, from %08x to device", m_strName.c_str(), size, addr);}
|
||||
void DMARead (u32 addr, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMARead: %08x bytes, from device to %08x", m_strName.c_str(), size, addr);}
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -9,9 +9,9 @@ class CEXIAD16 : public IEXIDevice
|
||||
{
|
||||
public:
|
||||
CEXIAD16();
|
||||
virtual void SetCS(int _iCS);
|
||||
virtual bool IsPresent();
|
||||
virtual void DoState(PointerWrap &p);
|
||||
virtual void SetCS(int _iCS) override;
|
||||
virtual bool IsPresent() override;
|
||||
virtual void DoState(PointerWrap &p) override;
|
||||
|
||||
private:
|
||||
enum
|
||||
@@ -32,7 +32,7 @@ private:
|
||||
u32 m_uCommand;
|
||||
UAD16Reg m_uAD16Register;
|
||||
|
||||
virtual void TransferByte(u8& _uByte);
|
||||
virtual void TransferByte(u8& _uByte) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -10,13 +10,13 @@ class CEXIAMBaseboard : public IEXIDevice
|
||||
public:
|
||||
CEXIAMBaseboard();
|
||||
|
||||
virtual void SetCS(int _iCS);
|
||||
virtual bool IsPresent();
|
||||
virtual bool IsInterruptSet();
|
||||
virtual void DoState(PointerWrap &p);
|
||||
virtual void SetCS(int _iCS) override;
|
||||
virtual bool IsPresent() override;
|
||||
virtual bool IsInterruptSet() override;
|
||||
virtual void DoState(PointerWrap &p) override;
|
||||
|
||||
private:
|
||||
virtual void TransferByte(u8& _uByte);
|
||||
virtual void TransferByte(u8& _uByte) override;
|
||||
int m_position;
|
||||
bool m_have_irq;
|
||||
unsigned char m_command[4];
|
||||
|
||||
@@ -189,14 +189,14 @@ class CEXIETHERNET : public IEXIDevice
|
||||
public:
|
||||
CEXIETHERNET();
|
||||
virtual ~CEXIETHERNET();
|
||||
void SetCS(int cs);
|
||||
bool IsPresent();
|
||||
bool IsInterruptSet();
|
||||
void ImmWrite(u32 data, u32 size);
|
||||
u32 ImmRead(u32 size);
|
||||
void DMAWrite(u32 addr, u32 size);
|
||||
void DMARead(u32 addr, u32 size);
|
||||
void DoState(PointerWrap &p);
|
||||
void SetCS(int cs) override;
|
||||
bool IsPresent() override;
|
||||
bool IsInterruptSet() override;
|
||||
void ImmWrite(u32 data, u32 size) override;
|
||||
u32 ImmRead(u32 size) override;
|
||||
void DMAWrite(u32 addr, u32 size) override;
|
||||
void DMARead(u32 addr, u32 size) override;
|
||||
void DoState(PointerWrap &p) override;
|
||||
|
||||
//private:
|
||||
struct
|
||||
|
||||
@@ -48,8 +48,8 @@ class CEXIGecko
|
||||
{
|
||||
public:
|
||||
CEXIGecko() {}
|
||||
bool IsPresent() { return true; }
|
||||
void ImmReadWrite(u32 &_uData, u32 _uSize);
|
||||
bool IsPresent() override { return true; }
|
||||
void ImmReadWrite(u32 &_uData, u32 _uSize) override;
|
||||
|
||||
private:
|
||||
enum
|
||||
|
||||
@@ -21,13 +21,13 @@ class CEXIMemoryCard : public IEXIDevice
|
||||
public:
|
||||
CEXIMemoryCard(const int index);
|
||||
virtual ~CEXIMemoryCard();
|
||||
void SetCS(int cs);
|
||||
void Update();
|
||||
bool IsInterruptSet();
|
||||
bool IsPresent();
|
||||
void DoState(PointerWrap &p);
|
||||
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
|
||||
IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1);
|
||||
void SetCS(int cs) override;
|
||||
void Update() override;
|
||||
bool IsInterruptSet() override;
|
||||
bool IsPresent() override;
|
||||
void DoState(PointerWrap &p) override;
|
||||
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
|
||||
IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) override;
|
||||
|
||||
private:
|
||||
// This is scheduled whenever a page write is issued. The this pointer is passed
|
||||
@@ -89,7 +89,7 @@ private:
|
||||
std::thread flushThread;
|
||||
|
||||
protected:
|
||||
virtual void TransferByte(u8 &byte);
|
||||
virtual void TransferByte(u8 &byte) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -20,9 +20,9 @@ public:
|
||||
|
||||
bool GetMicButton() const;
|
||||
|
||||
std::string GetName() const;
|
||||
std::string GetName() const override;
|
||||
|
||||
void LoadDefaults(const ControllerInterface& ciface);
|
||||
void LoadDefaults(const ControllerInterface& ciface) override;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -44,15 +44,15 @@ public:
|
||||
CSIDevice_Null(SIDevices device, int _iDeviceNumber) : ISIDevice(device, _iDeviceNumber) {}
|
||||
virtual ~CSIDevice_Null() {}
|
||||
|
||||
int RunBuffer(u8* _pBuffer, int _iLength) {
|
||||
int RunBuffer(u8* _pBuffer, int _iLength) override {
|
||||
reinterpret_cast<u32*>(_pBuffer)[0] = SI_ERROR_NO_RESPONSE;
|
||||
return 4;
|
||||
}
|
||||
bool GetData(u32& _Hi, u32& _Low) {
|
||||
bool GetData(u32& _Hi, u32& _Low) override {
|
||||
_Hi = 0x80000000;
|
||||
return true;
|
||||
}
|
||||
void SendCommand(u32 _Cmd, u8 _Poll) {}
|
||||
void SendCommand(u32 _Cmd, u8 _Poll) override {}
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -20,13 +20,13 @@ public:
|
||||
CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber);
|
||||
|
||||
// run the SI Buffer
|
||||
virtual int RunBuffer(u8* _pBuffer, int _iLength);
|
||||
virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
|
||||
|
||||
// return true on new data
|
||||
virtual bool GetData(u32& _Hi, u32& _Low);
|
||||
virtual bool GetData(u32& _Hi, u32& _Low) override;
|
||||
|
||||
// send a command directly
|
||||
virtual void SendCommand(u32 _Cmd, u8 _Poll);
|
||||
virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
|
||||
};
|
||||
|
||||
#endif // _SIDEVICE_AMBASEBOARD_H
|
||||
@@ -86,20 +86,20 @@ public:
|
||||
CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber);
|
||||
|
||||
// Run the SI Buffer
|
||||
virtual int RunBuffer(u8* _pBuffer, int _iLength);
|
||||
virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
|
||||
|
||||
// Send and Receive pad input from network
|
||||
static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
|
||||
static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
|
||||
|
||||
// Return true on new data
|
||||
virtual bool GetData(u32& _Hi, u32& _Low);
|
||||
virtual bool GetData(u32& _Hi, u32& _Low) override;
|
||||
|
||||
// Send a command directly
|
||||
virtual void SendCommand(u32 _Cmd, u8 _Poll);
|
||||
virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
|
||||
|
||||
// Savestate support
|
||||
virtual void DoState(PointerWrap& p);
|
||||
virtual void DoState(PointerWrap& p) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -39,10 +39,10 @@ public:
|
||||
~CSIDevice_GBA() {}
|
||||
|
||||
// Run the SI Buffer
|
||||
virtual int RunBuffer(u8* _pBuffer, int _iLength);
|
||||
virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
|
||||
|
||||
virtual bool GetData(u32& _Hi, u32& _Low) { return true; }
|
||||
virtual void SendCommand(u32 _Cmd, u8 _Poll) {}
|
||||
virtual bool GetData(u32& _Hi, u32& _Low) override { return true; }
|
||||
virtual void SendCommand(u32 _Cmd, u8 _Poll) override {}
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -18,7 +18,7 @@ public:
|
||||
|
||||
virtual void GetState( u8* const data, const bool focus = true ) {}
|
||||
void Reset();
|
||||
std::string GetName() const;
|
||||
std::string GetName() const override;
|
||||
|
||||
const char* const name;
|
||||
WiimoteEmu::ExtensionReg& reg;
|
||||
|
||||
@@ -11,7 +11,7 @@ class Guitar : public Attachment
|
||||
{
|
||||
public:
|
||||
Guitar(WiimoteEmu::ExtensionReg& _reg);
|
||||
void GetState( u8* const data, const bool focus );
|
||||
void GetState( u8* const data, const bool focus ) override;
|
||||
|
||||
enum
|
||||
{
|
||||
|
||||
@@ -17,7 +17,7 @@ class Nunchuk : public Attachment
|
||||
public:
|
||||
Nunchuk(UDPWrapper * wrp, WiimoteEmu::ExtensionReg& _reg);
|
||||
|
||||
virtual void GetState( u8* const data, const bool focus );
|
||||
virtual void GetState( u8* const data, const bool focus ) override;
|
||||
|
||||
enum
|
||||
{
|
||||
@@ -25,7 +25,7 @@ public:
|
||||
BUTTON_Z = 0x01,
|
||||
};
|
||||
|
||||
void LoadDefaults(const ControllerInterface& ciface);
|
||||
void LoadDefaults(const ControllerInterface& ciface) override;
|
||||
|
||||
private:
|
||||
Tilt* m_tilt;
|
||||
|
||||
@@ -11,7 +11,7 @@ class Turntable : public Attachment
|
||||
{
|
||||
public:
|
||||
Turntable(WiimoteEmu::ExtensionReg& _reg);
|
||||
void GetState(u8* const data, const bool focus);
|
||||
void GetState(u8* const data, const bool focus) override;
|
||||
|
||||
enum
|
||||
{
|
||||
|
||||
@@ -19,15 +19,15 @@
|
||||
class Interpreter : public CPUCoreBase
|
||||
{
|
||||
public:
|
||||
void Init();
|
||||
void Shutdown();
|
||||
void Init() override;
|
||||
void Shutdown() override;
|
||||
void Reset();
|
||||
void SingleStep();
|
||||
void SingleStep() override;
|
||||
int SingleStepInner();
|
||||
|
||||
void Run();
|
||||
void ClearCache();
|
||||
const char *GetName();
|
||||
void Run() override;
|
||||
void ClearCache() override;
|
||||
const char *GetName() override;
|
||||
|
||||
typedef void (*_interpreterInstruction)(UGeckoInstruction instCode);
|
||||
|
||||
|
||||
@@ -62,30 +62,30 @@ public:
|
||||
Jit64() : code_buffer(32000) {}
|
||||
~Jit64() {}
|
||||
|
||||
void Init();
|
||||
void Shutdown();
|
||||
void Init() override;
|
||||
void Shutdown() override;
|
||||
|
||||
// Jit!
|
||||
|
||||
void Jit(u32 em_address);
|
||||
void Jit(u32 em_address) override;
|
||||
const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b);
|
||||
|
||||
u32 RegistersInUse();
|
||||
|
||||
JitBlockCache *GetBlockCache() { return &blocks; }
|
||||
JitBlockCache *GetBlockCache() override { return &blocks; }
|
||||
|
||||
void Trace();
|
||||
|
||||
void ClearCache();
|
||||
void ClearCache() override;
|
||||
|
||||
const u8 *GetDispatcher() {
|
||||
return asm_routines.dispatcher;
|
||||
}
|
||||
const CommonAsmRoutines *GetAsmRoutines() {
|
||||
const CommonAsmRoutines *GetAsmRoutines() override {
|
||||
return &asm_routines;
|
||||
}
|
||||
|
||||
const char *GetName() {
|
||||
const char *GetName() override {
|
||||
#ifdef _M_X64
|
||||
return "JIT64";
|
||||
#else
|
||||
@@ -94,8 +94,8 @@ public:
|
||||
}
|
||||
// Run!
|
||||
|
||||
void Run();
|
||||
void SingleStep();
|
||||
void Run() override;
|
||||
void SingleStep() override;
|
||||
|
||||
// Utilities for use by opcodes
|
||||
|
||||
|
||||
@@ -121,11 +121,11 @@ public:
|
||||
class GPRRegCache : public RegCache
|
||||
{
|
||||
public:
|
||||
void Start(PPCAnalyst::BlockRegStats &stats);
|
||||
void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true);
|
||||
void StoreFromRegister(int preg);
|
||||
OpArg GetDefaultLocation(int reg) const;
|
||||
const int *GetAllocationOrder(int &count);
|
||||
void Start(PPCAnalyst::BlockRegStats &stats) override;
|
||||
void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override;
|
||||
void StoreFromRegister(int preg) override;
|
||||
OpArg GetDefaultLocation(int reg) const override;
|
||||
const int *GetAllocationOrder(int &count) override;
|
||||
void SetImmediate32(int preg, u32 immValue);
|
||||
};
|
||||
|
||||
@@ -133,11 +133,11 @@ public:
|
||||
class FPURegCache : public RegCache
|
||||
{
|
||||
public:
|
||||
void Start(PPCAnalyst::BlockRegStats &stats);
|
||||
void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true);
|
||||
void StoreFromRegister(int preg);
|
||||
const int *GetAllocationOrder(int &count);
|
||||
OpArg GetDefaultLocation(int reg) const;
|
||||
void Start(PPCAnalyst::BlockRegStats &stats) override;
|
||||
void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override;
|
||||
void StoreFromRegister(int preg) override;
|
||||
const int *GetAllocationOrder(int &count) override;
|
||||
OpArg GetDefaultLocation(int reg) const override;
|
||||
};
|
||||
|
||||
#endif // _JIT64REGCACHE_H
|
||||
@@ -70,31 +70,31 @@ public:
|
||||
|
||||
// Initialization, etc
|
||||
|
||||
void Init();
|
||||
void Shutdown();
|
||||
void Init() override;
|
||||
void Shutdown() override;
|
||||
|
||||
// Jit!
|
||||
|
||||
void Jit(u32 em_address);
|
||||
void Jit(u32 em_address) override;
|
||||
const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b);
|
||||
|
||||
void Trace();
|
||||
|
||||
JitBlockCache *GetBlockCache() { return &blocks; }
|
||||
JitBlockCache *GetBlockCache() override { return &blocks; }
|
||||
|
||||
const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) { return NULL; };
|
||||
const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) override { return NULL; };
|
||||
|
||||
bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); }
|
||||
bool IsInCodeSpace(u8 *ptr) override { return IsInSpace(ptr); }
|
||||
|
||||
void ClearCache();
|
||||
void ClearCache() override;
|
||||
const u8 *GetDispatcher() {
|
||||
return asm_routines.dispatcher; // asm_routines.dispatcher
|
||||
}
|
||||
const CommonAsmRoutines *GetAsmRoutines() {
|
||||
const CommonAsmRoutines *GetAsmRoutines() override {
|
||||
return &asm_routines;
|
||||
}
|
||||
|
||||
const char *GetName() {
|
||||
const char *GetName() override {
|
||||
#ifdef _M_X64
|
||||
return "JIT64IL";
|
||||
#else
|
||||
@@ -104,8 +104,8 @@ public:
|
||||
|
||||
// Run!
|
||||
|
||||
void Run();
|
||||
void SingleStep();
|
||||
void Run() override;
|
||||
void SingleStep() override;
|
||||
|
||||
// Utilities for use by opcodes
|
||||
|
||||
@@ -128,16 +128,16 @@ public:
|
||||
void WriteCode();
|
||||
|
||||
// OPCODES
|
||||
void unknown_instruction(UGeckoInstruction _inst);
|
||||
void Default(UGeckoInstruction _inst);
|
||||
void DoNothing(UGeckoInstruction _inst);
|
||||
void HLEFunction(UGeckoInstruction _inst);
|
||||
void unknown_instruction(UGeckoInstruction _inst) override;
|
||||
void Default(UGeckoInstruction _inst) override;
|
||||
void DoNothing(UGeckoInstruction _inst) override;
|
||||
void HLEFunction(UGeckoInstruction _inst) override;
|
||||
|
||||
void DynaRunTable4(UGeckoInstruction _inst);
|
||||
void DynaRunTable19(UGeckoInstruction _inst);
|
||||
void DynaRunTable31(UGeckoInstruction _inst);
|
||||
void DynaRunTable59(UGeckoInstruction _inst);
|
||||
void DynaRunTable63(UGeckoInstruction _inst);
|
||||
void DynaRunTable4(UGeckoInstruction _inst) override;
|
||||
void DynaRunTable19(UGeckoInstruction _inst) override;
|
||||
void DynaRunTable31(UGeckoInstruction _inst) override;
|
||||
void DynaRunTable59(UGeckoInstruction _inst) override;
|
||||
void DynaRunTable63(UGeckoInstruction _inst) override;
|
||||
};
|
||||
|
||||
void Jit(u32 em_address);
|
||||
|
||||
@@ -95,11 +95,11 @@ protected:
|
||||
JitBlockCache blocks;
|
||||
TrampolineCache trampolines;
|
||||
public:
|
||||
JitBlockCache *GetBlockCache() { return &blocks; }
|
||||
JitBlockCache *GetBlockCache() override { return &blocks; }
|
||||
|
||||
const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx);
|
||||
const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) override;
|
||||
|
||||
bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); }
|
||||
bool IsInCodeSpace(u8 *ptr) override { return IsInSpace(ptr); }
|
||||
};
|
||||
|
||||
extern JitBase *jit;
|
||||
|
||||
@@ -128,7 +128,7 @@ public:
|
||||
class JitBlockCache : public JitBaseBlockCache
|
||||
{
|
||||
private:
|
||||
void WriteLinkBlock(u8* location, const u8* address);
|
||||
void WriteDestroyBlock(const u8* location, u32 address);
|
||||
void WriteLinkBlock(u8* location, const u8* address) override;
|
||||
void WriteDestroyBlock(const u8* location, u32 address) override;
|
||||
};
|
||||
#endif
|
||||
@@ -23,10 +23,10 @@ public:
|
||||
PPCSymbolDB();
|
||||
~PPCSymbolDB();
|
||||
|
||||
Symbol *AddFunction(u32 startAddr);
|
||||
Symbol *AddFunction(u32 startAddr) override;
|
||||
void AddKnownSymbol(u32 startAddr, u32 size, const char *name, int type = Symbol::SYMBOL_FUNCTION);
|
||||
|
||||
Symbol *GetSymbolFromAddr(u32 addr);
|
||||
Symbol *GetSymbolFromAddr(u32 addr) override;
|
||||
|
||||
const char *GetDescription(u32 addr);
|
||||
|
||||
|
||||
Reference in new issue
Block a user