dsr behavior

Author: coder114514

emulator/src/Chipset/CPU.cpp

@@ -6,6 +6,7 @@
 #include "Chipset.hpp"
 #include "MMU.hpp"
 
+#include <cstdint>
 #include <iomanip>
 #include <sstream>
 
@@ -468,4 +469,12 @@ namespace casioemu {
         }
         return output.str();
     }
+
+    uint8_t CPU::GetDSR() const {
+        return impl_last_dsr;
+    }
+
+    void CPU::SetDSR(uint8_t dsr) {
+        impl_last_dsr = dsr;
+    }
 } // namespace casioemu

emulator/src/Chipset/CPU.hpp

@@ -18,7 +18,6 @@ namespace casioemu {
         struct RegisterStub {
             size_t type_size;
             std::string name;
-
             uint16_t raw;
         };
 
@@ -28,32 +27,25 @@ namespace casioemu {
                 type_size = sizeof(value_type);
                 name = "?";
             }
-
             operator value_type() {
                 return raw;
             }
-
             Register<value_type> &operator=(value_type value) {
                 raw = value;
                 return *this;
             }
-
             Register<value_type> &operator&=(value_type value) {
                 return *this = raw & value;
             }
-
             Register<value_type> &operator|=(value_type value) {
                 return *this = raw | value;
             }
-
             Register<value_type> &operator^=(value_type value) {
                 return *this = raw ^ value;
             }
-
             Register<value_type> &operator+=(value_type value) {
                 return *this = raw + value;
             }
-
             Register<value_type> &operator-=(value_type value) {
                 return *this = raw - value;
             }
@@ -120,6 +112,8 @@ namespace casioemu {
         size_t GetExceptionLevel();
         bool GetMasterInterruptEnable();
         std::string GetBacktrace() const;
+        uint8_t GetDSR() const;
+        void SetDSR(uint8_t);
 
     private:
         struct StackFrame {

emulator/src/Chipset/MMU.cpp

@@ -8,15 +8,16 @@
 
 namespace casioemu {
     const uint8_t UNMAPPED_VALUE = 0x00;
+    const size_t NSEGS = 0x100;
 
     MMU::MMU(Emulator &_emulator) : emulator(_emulator) {
-        segment_dispatch = new MemoryByte *[0x10];
-        for (size_t ix = 0; ix != 0x10; ++ix)
+        segment_dispatch = new MemoryByte *[NSEGS];
+        for (size_t ix = 0; ix != NSEGS; ++ix)
             segment_dispatch[ix] = nullptr;
     }
 
     MMU::~MMU() {
-        for (size_t ix = 0; ix != 0x10; ++ix)
+        for (size_t ix = 0; ix != NSEGS; ++ix)
             if (segment_dispatch[ix])
                 delete[] segment_dispatch[ix];
         delete[] segment_dispatch;

emulator/src/Peripheral/Miscellaneous.cpp

@@ -14,8 +14,8 @@ namespace casioemu {
     void Miscellaneous::Initialise() {
         region_dsr.Setup(
             0xF000, 1, "Miscellaneous/DSR", this,
-            [](MMURegion *region, size_t) { return (uint8_t)((Miscellaneous *)region->userdata)->emulator.chipset.cpu.reg_dsr; },
-            [](MMURegion *region, size_t, uint8_t data) { ((Miscellaneous *)region->userdata)->emulator.chipset.cpu.reg_dsr = data; },
+            [](MMURegion *region, size_t) { return ((Miscellaneous *)region->userdata)->emulator.chipset.cpu.GetDSR(); },
+            [](MMURegion *region, size_t, uint8_t data) { ((Miscellaneous *)region->userdata)->emulator.chipset.cpu.SetDSR(data); },
             emulator);
 
         // * TODO: figure out what these are