Debugger compilation fixed: CBus -> IBus

This commit is contained in:
Bart Trzynadlowski 2016-04-11 03:39:19 +00:00
parent 2524f2e837
commit ef87093824
6 changed files with 22 additions and 22 deletions

View file

@ -158,7 +158,7 @@
} }
} }
// CBus methods // IBus methods
UINT8 CMusashi68KDebug::Read8(UINT32 addr) UINT8 CMusashi68KDebug::Read8(UINT32 addr)
{ {

View file

@ -39,7 +39,7 @@ using namespace Debugger;
/* /*
* CCPUDebug implementation for the Musashi Motorola 68000 emulator. * CCPUDebug implementation for the Musashi Motorola 68000 emulator.
*/ */
class CMusashi68KDebug : public C68KDebug, public ::CBus class CMusashi68KDebug : public C68KDebug, public ::IBus
{ {
private: private:
static UINT32 GetReg(CCPUDebug *cpu, unsigned id); static UINT32 GetReg(CCPUDebug *cpu, unsigned id);
@ -51,7 +51,7 @@ using namespace Debugger;
M68KCtx m_savedCtx; M68KCtx m_savedCtx;
::CBus *m_bus; ::IBus *m_bus;
void SetM68KContext(); void SetM68KContext();
@ -85,7 +85,7 @@ using namespace Debugger;
bool WriteMem(UINT32 addr, unsigned dataSize, UINT64 data); bool WriteMem(UINT32 addr, unsigned dataSize, UINT64 data);
// CBus methods // IBus methods
UINT8 Read8(UINT32 addr); UINT8 Read8(UINT32 addr);

View file

@ -175,7 +175,7 @@ namespace Debugger
::ppc_attach_debugger(this); ::ppc_attach_debugger(this);
} }
::CBus *CPPCDebug::AttachBus(::CBus *bus) ::IBus *CPPCDebug::AttachBus(::IBus *bus)
{ {
m_bus = bus; m_bus = bus;
return this; return this;
@ -186,9 +186,9 @@ namespace Debugger
::ppc_detach_debugger(); ::ppc_detach_debugger();
} }
::CBus *CPPCDebug::DetachBus() ::IBus *CPPCDebug::DetachBus()
{ {
::CBus *bus = m_bus; ::IBus *bus = m_bus;
m_bus = NULL; m_bus = NULL;
return bus; return bus;
} }
@ -496,7 +496,7 @@ namespace Debugger
return true; return true;
} }
// CBus methods // IBus methods
UINT8 CPPCDebug::Read8(UINT32 addr) UINT8 CPPCDebug::Read8(UINT32 addr)
{ {

View file

@ -40,14 +40,14 @@ namespace Debugger
/* /*
* CCPUDebug implementation for the PowerPC PPC603 emulator. * CCPUDebug implementation for the PowerPC PPC603 emulator.
*/ */
class CPPCDebug : public CCPUDebug, public ::CBus class CPPCDebug : public CCPUDebug, public ::IBus
{ {
private: private:
char m_crNames[32][5]; char m_crNames[32][5];
char m_gprNames[32][4]; char m_gprNames[32][4];
char m_fprNames[32][4]; char m_fprNames[32][4];
::CBus *m_bus; ::IBus *m_bus;
UINT8 m_irqState; UINT8 m_irqState;
@ -60,11 +60,11 @@ namespace Debugger
void AttachToCPU(); void AttachToCPU();
::CBus *AttachBus(::CBus *bus); ::IBus *AttachBus(::IBus *bus);
void DetachFromCPU(); void DetachFromCPU();
::CBus *DetachBus(); ::IBus *DetachBus();
void CheckException(UINT16 exCode); void CheckException(UINT16 exCode);
@ -94,7 +94,7 @@ namespace Debugger
bool GetHandlerAddr(CInterrupt *in, UINT32 &handlerAddr); bool GetHandlerAddr(CInterrupt *in, UINT32 &handlerAddr);
// CBus methods // IBus methods
UINT8 Read8(UINT32 addr); UINT8 Read8(UINT32 addr);

View file

@ -301,7 +301,7 @@ namespace Debugger
m_z80->AttachDebugger(this); m_z80->AttachDebugger(this);
} }
::CBus *CZ80Debug::AttachBus(::CBus *bus) ::IBus *CZ80Debug::AttachBus(::IBus *bus)
{ {
m_bus = bus; m_bus = bus;
return this; return this;
@ -312,9 +312,9 @@ namespace Debugger
m_z80->DetachDebugger(); m_z80->DetachDebugger();
} }
::CBus *CZ80Debug::DetachBus() ::IBus *CZ80Debug::DetachBus()
{ {
::CBus *bus = m_bus; ::IBus *bus = m_bus;
m_bus = NULL; m_bus = NULL;
return bus; return bus;
} }
@ -695,7 +695,7 @@ namespace Debugger
return true; return true;
} }
// CBus methods // IBus methods
UINT8 CZ80Debug::Read8(UINT32 addr) UINT8 CZ80Debug::Read8(UINT32 addr)
{ {

View file

@ -38,7 +38,7 @@ namespace Debugger
/* /*
* CCPUDebug implementation for the Zilog Z80 emulator. * CCPUDebug implementation for the Zilog Z80 emulator.
*/ */
class CZ80Debug : public CCPUDebug, public ::CBus class CZ80Debug : public CCPUDebug, public ::IBus
{ {
private: private:
static UINT8 ReadReg8(CCPUDebug *cpu, unsigned reg8); static UINT8 ReadReg8(CCPUDebug *cpu, unsigned reg8);
@ -50,7 +50,7 @@ namespace Debugger
static bool WriteReg16(CCPUDebug *cpu, unsigned reg16, UINT16 value); static bool WriteReg16(CCPUDebug *cpu, unsigned reg16, UINT16 value);
CZ80 *m_z80; CZ80 *m_z80;
::CBus *m_bus; ::IBus *m_bus;
char m_vecIds[256][5]; char m_vecIds[256][5];
char m_vecNames[256][22]; char m_vecNames[256][22];
@ -65,11 +65,11 @@ namespace Debugger
void AttachToCPU(); void AttachToCPU();
::CBus *AttachBus(::CBus *bus); ::IBus *AttachBus(::IBus *bus);
void DetachFromCPU(); void DetachFromCPU();
::CBus *DetachBus(); ::IBus *DetachBus();
UINT32 GetResetAddr(); UINT32 GetResetAddr();
@ -103,7 +103,7 @@ namespace Debugger
bool GetHandlerAddr(CInterrupt *in, UINT32 &handlerAddr); bool GetHandlerAddr(CInterrupt *in, UINT32 &handlerAddr);
// CBus methods // IBus methods
UINT8 Read8(UINT32 addr); UINT8 Read8(UINT32 addr);