From 50ec9a8a9e903d6d04069c5ff5612be2477497f1 Mon Sep 17 00:00:00 2001
From: CocoSimone <simococo03@gmail.com>
Date: Sun, 19 Feb 2023 12:17:21 +0100
Subject: [PATCH] small things

---
 src/backend/MemoryRegions.hpp |  8 +++++---
 src/backend/core/RSP.cpp      | 24 +++++++++++++-----------
 src/backend/core/mmio/VI.hpp  | 10 ----------
 src/frontend/imgui/Window.cpp |  2 --
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/backend/MemoryRegions.hpp b/src/backend/MemoryRegions.hpp
index 2525ba2b..27126c0c 100644
--- a/src/backend/MemoryRegions.hpp
+++ b/src/backend/MemoryRegions.hpp
@@ -1,4 +1,6 @@
 #pragma once
+#include <common.hpp>
+
 #define RDRAM_SIZE 0x800000
 #define RDRAM_DSIZE (RDRAM_SIZE - 1)
 #define SRAM_SIZE 0x8000000
@@ -44,15 +46,15 @@
 #define PIF_ROM_REGION 0x1FC00000 ... 0x1FC007BF
 #define PIF_RAM_REGION PIF_RAM_REGION_START ... PIF_RAM_REGION_END
 
-constexpr size_t operator""_kb(unsigned long long int x) {
+constexpr u64 operator""_kb(unsigned long long int x) {
   return 1024ULL * x;
 }
 
-constexpr size_t operator""_mb(unsigned long long int x) {
+constexpr u64 operator""_mb(unsigned long long int x) {
   return 1024_kb * x;
 }
 
-constexpr size_t operator""_gb(unsigned long long int x) {
+constexpr u64 operator""_gb(unsigned long long int x) {
   return 1024_mb * x;
 }
 
diff --git a/src/backend/core/RSP.cpp b/src/backend/core/RSP.cpp
index 51b1378a..2ab0995a 100644
--- a/src/backend/core/RSP.cpp
+++ b/src/backend/core/RSP.cpp
@@ -9,6 +9,8 @@ RSP::RSP() {
 }
 
 void RSP::Reset() {
+  lastSuccessfulSPAddr.raw = 0;
+  lastSuccessfulDRAMAddr.raw = 0;
   spStatus.raw = 0x1;
   spStatus.halt = true;
   oldPC = 0;
@@ -33,29 +35,29 @@ void RSP::Reset() {
 
 inline void logRSP(const RSP& rsp, const u32 instr) {
   Util::print("{:04X} {:08X} ", rsp.oldPC, instr);
-  for (int i = 0; i < 32; i++) {
-    Util::print("{:08X} ", (u32)rsp.gpr[i]);
+  for (auto gpr : rsp.gpr) {
+    Util::print("{:08X} ", gpr);
   }
 
-  for (int i = 0; i < 32; i++) {
-    for (int e = 0; e < 8; e++) {
-      Util::print("{:04X}", rsp.vpr[i].element[e]);
+  for (auto vpr : rsp.vpr) {
+    for (int i = 0; i < 8; i++) {
+      Util::print("{:04X}", vpr.element[i]);
     }
     Util::print(" ");
   }
 
-  for (int e = 0; e < 8; e++) {
-    Util::print("{:04X}", rsp.acc.h.element[e]);
+  for (int i = 0; i < 8; i++) {
+    Util::print("{:04X}", rsp.acc.h.element[i]);
   }
   Util::print(" ");
 
-  for (int e = 0; e < 8; e++) {
-    Util::print("{:04X}", rsp.acc.m.element[e]);
+  for (int i = 0; i < 8; i++) {
+    Util::print("{:04X}", rsp.acc.m.element[i]);
   }
   Util::print(" ");
 
-  for (int e = 0; e < 8; e++) {
-    Util::print("{:04X}", rsp.acc.l.element[e]);
+  for (int i = 0; i < 8; i++) {
+    Util::print("{:04X}", rsp.acc.l.element[i]);
   }
 
   Util::print(" {:04X} {:04X} {:02X}\n", rsp.GetVCC(), rsp.GetVCO(), rsp.GetVCE());
diff --git a/src/backend/core/mmio/VI.hpp b/src/backend/core/mmio/VI.hpp
index 89789c8e..1c2c1f6f 100644
--- a/src/backend/core/mmio/VI.hpp
+++ b/src/backend/core/mmio/VI.hpp
@@ -23,16 +23,6 @@ union VIHsyncLeap {
   u32 raw;
 } ;
 
-union VIVideo {
-  struct {
-    unsigned end:10;
-    unsigned:6;
-    unsigned start:10;
-    unsigned:6;
-  };
-  u32 raw;
-};
-
 union AxisScale {
   u32 raw;
   struct {
diff --git a/src/frontend/imgui/Window.cpp b/src/frontend/imgui/Window.cpp
index 20c6fcea..996c699a 100644
--- a/src/frontend/imgui/Window.cpp
+++ b/src/frontend/imgui/Window.cpp
@@ -5,8 +5,6 @@
 #include <Audio.hpp>
 #define SDL_MAIN_HANDLED
 #include <SDL2/SDL.h>
-#include <iostream>
-#include <fstream>
 #include <Discord.hpp>
 
 VkInstance instance{};