From a809a76b2869f87f994e7bb24bfffe72a2f92b2a Mon Sep 17 00:00:00 2001
From: SimoneN64 <simococo03@gmail.com>
Date: Tue, 25 Jul 2023 09:48:45 +0200
Subject: [PATCH] oops, duplicated registers and mem member objects

---
 src/backend/core/Interpreter.hpp |  2 --
 src/backend/core/Mem.cpp         | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/backend/core/Interpreter.hpp b/src/backend/core/Interpreter.hpp
index 1b995196..8ba28b76 100644
--- a/src/backend/core/Interpreter.hpp
+++ b/src/backend/core/Interpreter.hpp
@@ -10,8 +10,6 @@ struct Interpreter : BaseCPU {
   ~Interpreter() override = default;
   int Step() override;
   void Reset() override;
-  Registers regs;
-  Mem mem;
 private:
   u64 cop2Latch{};
   friend struct Cop1;
diff --git a/src/backend/core/Mem.cpp b/src/backend/core/Mem.cpp
index 2d375fba..79c917b1 100644
--- a/src/backend/core/Mem.cpp
+++ b/src/backend/core/Mem.cpp
@@ -187,13 +187,13 @@ u8 Mem::Read8(n64::Registers &regs, u32 paddr) {
       case RDRAM_REGION:
         return mmio.rdp.rdram[BYTE_ADDRESS(paddr)];
       case DMEM_REGION:
-          return mmio.rsp.dmem[BYTE_ADDRESS(paddr) - DMEM_REGION_START];
+        return mmio.rsp.dmem[BYTE_ADDRESS(paddr) - DMEM_REGION_START];
       case IMEM_REGION:
-          return mmio.rsp.imem[BYTE_ADDRESS(paddr) - IMEM_REGION_START];
+        return mmio.rsp.imem[BYTE_ADDRESS(paddr) - IMEM_REGION_START];
       case 0x04040000 ... 0x040FFFFF:
       case 0x04100000 ... 0x041FFFFF:
       case 0x04600000 ... 0x048FFFFF:
-      case 0x04300000 ...  0x044FFFFF:
+      case 0x04300000 ... 0x044FFFFF:
         Util::panic("MMIO Read8!\n");
       case AI_REGION: {
         u32 w = mmio.ai.Read(paddr & ~3);
@@ -288,9 +288,9 @@ u32 Mem::Read32(n64::Registers &regs, u32 paddr) {
       case RDRAM_REGION:
         return Util::ReadAccess<u32>(mmio.rdp.rdram, paddr);
       case DMEM_REGION:
-          return Util::ReadAccess<u32>(mmio.rsp.dmem, paddr & DMEM_DSIZE);
+        return Util::ReadAccess<u32>(mmio.rsp.dmem, paddr & DMEM_DSIZE);
       case IMEM_REGION:
-          return Util::ReadAccess<u32>(mmio.rsp.imem, paddr & IMEM_DSIZE);
+        return Util::ReadAccess<u32>(mmio.rsp.imem, paddr & IMEM_DSIZE);
       case MMIO_REGION:
         return mmio.Read(paddr);
       case CART_REGION_1_2: