From fbfdbe730e55417238ad3e15d63987f2376ac329 Mon Sep 17 00:00:00 2001
From: SimoneN64 <simococo03@gmail.com>
Date: Sun, 19 Mar 2023 17:16:58 +0100
Subject: [PATCH] Small improvements

---
 src/backend/core/mmio/PIF.cpp       | 8 ++++----
 src/backend/core/mmio/PIF.hpp       | 8 ++++----
 src/backend/core/registers/Cop0.cpp | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/backend/core/mmio/PIF.cpp b/src/backend/core/mmio/PIF.cpp
index 04abbeac..b3b90058 100644
--- a/src/backend/core/mmio/PIF.cpp
+++ b/src/backend/core/mmio/PIF.cpp
@@ -206,7 +206,7 @@ void PIF::ProcessCommands(Mem &mem) {
   }
 }
 
-void PIF::MempakRead(u8* cmd, u8* res) {
+void PIF::MempakRead(u8* cmd, u8* res) const {
   u16 offset = cmd[3] << 8;
   offset |= cmd[4];
 
@@ -236,7 +236,7 @@ void PIF::MempakRead(u8* cmd, u8* res) {
   res[32] = data_crc(&res[0]);
 }
 
-void PIF::MempakWrite(u8* cmd, u8* res) {
+void PIF::MempakWrite(u8* cmd, u8* res) const {
   // First two bytes in the command are the offset
   u16 offset = cmd[3] << 8;
   offset |= cmd[4];
@@ -262,7 +262,7 @@ void PIF::MempakWrite(u8* cmd, u8* res) {
   res[0] = data_crc(&cmd[5]);
 }
 
-void PIF::EepromRead(u8* cmd, u8* res, const Mem& mem) {
+void PIF::EepromRead(u8* cmd, u8* res, const Mem& mem) const {
   assert(mem.saveType == SAVE_EEPROM_4k || mem.saveType == SAVE_EEPROM_16k);
   if (channel == 4) {
     u8 offset = cmd[3];
@@ -279,7 +279,7 @@ void PIF::EepromRead(u8* cmd, u8* res, const Mem& mem) {
   }
 }
 
-void PIF::EepromWrite(u8* cmd, u8* res, const Mem& mem) {
+void PIF::EepromWrite(u8* cmd, u8* res, const Mem& mem) const {
   assert(mem.saveType == SAVE_EEPROM_4k || mem.saveType == SAVE_EEPROM_16k);
   if (channel == 4) {
     u8 offset = cmd[3];
diff --git a/src/backend/core/mmio/PIF.hpp b/src/backend/core/mmio/PIF.hpp
index bacf8f7d..3263c615 100644
--- a/src/backend/core/mmio/PIF.hpp
+++ b/src/backend/core/mmio/PIF.hpp
@@ -102,10 +102,10 @@ struct PIF {
   void UpdateController();
   bool ReadButtons(u8*) const;
   void ControllerID(u8*) const;
-  void MempakRead(u8*, u8*);
-  void MempakWrite(u8*, u8*);
-  void EepromRead(u8*, u8*, const Mem&);
-  void EepromWrite(u8*, u8*, const Mem&);
+  void MempakRead(u8*, u8*) const;
+  void MempakWrite(u8*, u8*) const;
+  void EepromRead(u8*, u8*, const Mem&) const;
+  void EepromWrite(u8*, u8*, const Mem&) const;
 
   bool gamepadConnected = false;
   SDL_GameController* gamepad{};
diff --git a/src/backend/core/registers/Cop0.cpp b/src/backend/core/registers/Cop0.cpp
index 274ff331..596e65d8 100644
--- a/src/backend/core/registers/Cop0.cpp
+++ b/src/backend/core/registers/Cop0.cpp
@@ -169,7 +169,7 @@ void Cop0::SetReg64(u8 addr, u64 value) {
   }
 }
 
-u64 getVPN(u64 addr, u64 pageMask) {
+static inline u64 getVPN(u64 addr, u64 pageMask) {
   u64 mask = pageMask | 0x1fff;
   u64 vpn = (addr & 0xFFFFFFFFFF) | ((addr >> 22) & 0x30000000000);