iris/kaizen
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

COP0 open bus

Browse Source
This commit is contained in:
CocoSimone
2022-09-20 23:02:17 +02:00
parent 8c97be3619
commit b1aeab3425
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/n64/core/cpu/registers/Cop0.cpp
View File

@@ -46,7 +46,7 @@ u32 Cop0::GetReg32(u8 addr) {
case COP0_REG_ERROREPC: return ErrorEPC; case COP0_REG_ERROREPC: return ErrorEPC;
case 7: case 21: case 22: case 7: case 21: case 22:
case 23: case 24: case 25: case 23: case 24: case 25:
case 31: return 0; case 31: return openbus;
default: default:
util::panic("Unsupported word read from COP0 register {}\n", index); util::panic("Unsupported word read from COP0 register {}\n", index);
} }
@@ -65,12 +65,16 @@ u64 Cop0::GetReg64(u8 addr) {
case COP0_REG_LLADDR: return LLAddr; case COP0_REG_LLADDR: return LLAddr;
case COP0_REG_XCONTEXT: return xcontext.raw & 0xFFFFFFFFFFFFFFF0; case COP0_REG_XCONTEXT: return xcontext.raw & 0xFFFFFFFFFFFFFFF0;
case COP0_REG_ERROREPC: return ErrorEPC; case COP0_REG_ERROREPC: return ErrorEPC;
case 7: case 21: case 22:
case 23: case 24: case 25:
case 31: return openbus;
default: default:
util::panic("Unsupported word read from COP0 register {}\n", index); util::panic("Unsupported word read from COP0 register {}\n", index);
} }
} }
void Cop0::SetReg32(u8 addr, u32 value) { void Cop0::SetReg32(u8 addr, u32 value) {
openbus = value & 0xFFFFFFFF;
switch(addr) { switch(addr) {
case COP0_REG_INDEX: index = value; break; case COP0_REG_INDEX: index = value; break;
case COP0_REG_RANDOM: break; case COP0_REG_RANDOM: break;
@@ -132,6 +136,7 @@ void Cop0::SetReg32(u8 addr, u32 value) {
} }
void Cop0::SetReg64(u8 addr, u64 value) { void Cop0::SetReg64(u8 addr, u64 value) {
openbus = value;
switch(addr) { switch(addr) {
case COP0_REG_ENTRYLO0: entryLo0.raw = value & ENTRY_LO_MASK; break; case COP0_REG_ENTRYLO0: entryLo0.raw = value & ENTRY_LO_MASK; break;
case COP0_REG_ENTRYLO1: entryLo1.raw = value & ENTRY_LO_MASK; break; case COP0_REG_ENTRYLO1: entryLo1.raw = value & ENTRY_LO_MASK; break;

1
src/n64/core/cpu/registers/Cop0.hpp
View File

@@ -211,6 +211,7 @@ struct Cop0 {
u32 r31{}; u32 r31{};
TLBEntry tlb[32]{}; TLBEntry tlb[32]{};
TLBError tlbError = NONE; TLBError tlbError = NONE;
s64 openbus{};
void decode(Registers&, Mem&, u32); void decode(Registers&, Mem&, u32);
private: private:
inline u32 GetWired() { return wired & 0x3F; } inline u32 GetWired() { return wired & 0x3F; }