Implement N64 register mirroring (#1344)

Also slightly improve PI latch emulation.
ares-emulator · Dec 14, 2023 · ed3083d · ed3083d
1 parent 6d5ef62
commit ed3083d
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 20 deletions.
diff --git a/ares/n64/ai/io.cpp b/ares/n64/ai/io.cpp
@@ -1,5 +1,5 @@
 auto AI::readWord(u32 address, Thread& thread) -> u32 {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data;
 
   if(address != 3) {
@@ -22,7 +22,7 @@ auto AI::readWord(u32 address, Thread& thread) -> u32 {
 }
 
 auto AI::writeWord(u32 address, u32 data_, Thread& thread) -> void {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data = data_;
 
   if(address == 0) {

diff --git a/ares/n64/mi/io.cpp b/ares/n64/mi/io.cpp
@@ -1,5 +1,5 @@
 auto MI::readWord(u32 address, Thread& thread) -> u32 {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0xf) >> 2;
   n32 data;
 
   if(address == 0) {
@@ -43,7 +43,7 @@ auto MI::readWord(u32 address, Thread& thread) -> u32 {
 }
 
 auto MI::writeWord(u32 address, u32 data_, Thread& thread) -> void {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0xf) >> 2;
   n32 data = data_;
 
   if(address == 0) {

diff --git a/ares/n64/pi/bus.hpp b/ares/n64/pi/bus.hpp
@@ -6,7 +6,8 @@ inline auto PI::readWord(u32 address, Thread& thread) -> u32 {
     return io.busLatch;
   }
   thread.step(250 * 2);
-  return busRead<Word>(address);
+  io.busLatch = busRead<Word>(address);
+  return io.busLatch;
 }
 
 template <u32 Size>

diff --git a/ares/n64/pi/io.cpp b/ares/n64/pi/io.cpp
@@ -1,5 +1,5 @@
 auto PI::ioRead(u32 address) -> u32 {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x3f) >> 2;
   n32 data;
 
   if(address == 0) {
@@ -70,12 +70,20 @@ auto PI::ioRead(u32 address) -> u32 {
     data.bit(0,7) = bsd2.releaseDuration;
   }
 
+  if(address == 13) {
+    data.bit(0,31) = io.busLatch;
+  }
+
+  if(address == 14) {
+    data.bit(0,31) = io.busLatch;
+  }
+
   debugger.io(Read, address, data);
   return data;
 }
 
 auto PI::ioWrite(u32 address, u32 data_) -> void {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x3f) >> 2;
   n32 data = data_;
 
   //only PI_STATUS can be written while PI is busy

diff --git a/ares/n64/rdp/io.cpp b/ares/n64/rdp/io.cpp
@@ -1,5 +1,5 @@
 auto RDP::readWord(u32 address, Thread& thread) -> u32 {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data;
 
   if(address == 0) {
@@ -57,7 +57,7 @@ auto RDP::readWord(u32 address, Thread& thread) -> u32 {
 }
 
 auto RDP::writeWord(u32 address, u32 data_, Thread& thread) -> void {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data = data_;
 
   if(address == 0) {

diff --git a/ares/n64/ri/io.cpp b/ares/n64/ri/io.cpp
@@ -1,5 +1,5 @@
 auto RI::readWord(u32 address, Thread& thread) -> u32 {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data = 0;
 
   if(address == 0) {
@@ -59,7 +59,7 @@ auto RI::readWord(u32 address, Thread& thread) -> u32 {
 }
 
 auto RI::writeWord(u32 address, u32 data_, Thread& thread) -> void {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data = data_;
 
   if(address == 0) {

diff --git a/ares/n64/rsp/io.cpp b/ares/n64/rsp/io.cpp
@@ -7,7 +7,7 @@ auto RSP::readWord(u32 address, Thread& thread) -> u32 {
 }
 
 auto RSP::ioRead(u32 address, Thread &thread) -> u32 {
-  address = (address & 0x3ffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data;
 
   if(address == 0) {
@@ -76,8 +76,7 @@ auto RSP::writeWord(u32 address, u32 data, Thread& thread) -> void {
 }
 
 auto RSP::ioWrite(u32 address, u32 data_, Thread& thread) -> void {
-
-  address = (address & 0x3ffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data = data_;
 
   if(address == 0) {
@@ -162,7 +161,7 @@ auto RSP::ioWrite(u32 address, u32 data_, Thread& thread) -> void {
 }
 
 auto RSP::Status::readWord(u32 address, Thread& thread) -> u32 {
-  address = (address & 0x7ffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data;
 
   if(address == 0) {
@@ -183,7 +182,7 @@ auto RSP::Status::readWord(u32 address, Thread& thread) -> u32 {
 }
 
 auto RSP::Status::writeWord(u32 address, u32 data_, Thread& thread) -> void {
-  address = (address & 0x7ffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data = data_;
 
   if(address == 0) {

diff --git a/ares/n64/si/io.cpp b/ares/n64/si/io.cpp
@@ -9,7 +9,7 @@ auto SI::readWord(u32 address, Thread& thread) -> u32 {
 }
 
 auto SI::ioRead(u32 address) -> u32 {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data;
 
   if(address == 0) {
@@ -68,7 +68,7 @@ auto SI::writeWord(u32 address, u32 data, Thread& thread) -> void {
 }
 
 auto SI::ioWrite(u32 address, u32 data_) -> void {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x1f) >> 2;
   n32 data = data_;
 
   if(address == 0) {

diff --git a/ares/n64/vi/io.cpp b/ares/n64/vi/io.cpp
@@ -1,5 +1,5 @@
 auto VI::readWord(u32 address, Thread& thread) -> u32 {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x3f) >> 2;
   n32 data;
 
   if(address == 0) {
@@ -96,7 +96,7 @@ auto VI::readWord(u32 address, Thread& thread) -> u32 {
 }
 
 auto VI::writeWord(u32 address, u32 data_, Thread& thread) -> void {
-  address = (address & 0xfffff) >> 2;
+  address = (address & 0x3f) >> 2;
   n32 data = data_;
 
   #if defined(VULKAN)