From 40cee365a9b8d9cdb5d4b4e2db9c68ff8d649586 Mon Sep 17 00:00:00 2001
From: SimoneN64 <simococo03@gmail.com>
Date: Tue, 14 May 2024 21:31:50 +0200
Subject: [PATCH] Refactor smaller things

---
 CMakeLists.txt               | 2 +-
 src/backend/Core.cpp         | 1 -
 src/backend/core/Mem.hpp     | 2 +-
 src/backend/core/mmio/PI.cpp | 8 +++-----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 511a7379..a5fa7823 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.29)
 
 set(CMAKE_CXX_STANDARD 17)
 
diff --git a/src/backend/Core.cpp b/src/backend/Core.cpp
index f4ce5bb9..0b257145 100644
--- a/src/backend/Core.cpp
+++ b/src/backend/Core.cpp
@@ -10,7 +10,6 @@ void Core::Stop() {
   pause = true;
   romLoaded = false;
   cpu->Reset();
-  cpu->GetMem().Reset();
 }
 
 bool Core::LoadTAS(const fs::path &path) {
diff --git a/src/backend/core/Mem.hpp b/src/backend/core/Mem.hpp
index 273dd7d1..122c50c3 100644
--- a/src/backend/core/Mem.hpp
+++ b/src/backend/core/Mem.hpp
@@ -142,7 +142,7 @@ private:
   friend struct AI;
   friend struct RSP;
   friend struct Core;
-  u8 isviewer[ISVIEWER_SIZE]{};
+  std::array<u8, ISVIEWER_SIZE> isviewer{};
   std::string sramPath{};
   mio::mmap_sink saveData{};
   int mmioSize{}, flashSize{};
diff --git a/src/backend/core/mmio/PI.cpp b/src/backend/core/mmio/PI.cpp
index 33aabf8e..7eb73b05 100644
--- a/src/backend/core/mmio/PI.cpp
+++ b/src/backend/core/mmio/PI.cpp
@@ -269,11 +269,9 @@ template <> void PI::BusWrite<u32, false>(u32 addr, u32 val) {
           break;
         case CART_ISVIEWER_FLUSH: {
           if (val < CART_ISVIEWER_SIZE) {
-            char* message = (char*)malloc(val + 1);
-            memcpy(message, mem.isviewer, val);
-            message[val] = '\0';
-            printf("%s", message);
-            free(message);
+            std::string message(val + 1, 0);
+            std::copy(mem.isviewer.begin(), mem.isviewer.begin() + val, message.begin());
+            Util::print("{}", message);
           } else {
             Util::panic("ISViewer buffer size is emulated at {} bytes, but received a flush command for {} bytes!", CART_ISVIEWER_SIZE, val);
           }