Moved clear_DC_IC_Cache to commonfunctions.cpp

Author: Zephiles

ttyd-tools/rel/include/clearcache.h

@@ -42,6 +42,7 @@ bool checkIfBadgeEquipped(int16_t badge);
 void recheckJumpAndHammerLevels();
 uint32_t getCurrentPitFloor();
 void clearGSWFsRange(uint32_t lowerBound, uint32_t upperBound);
+void clear_DC_IC_Cache(void *ptr, uint32_t size);
 bool checkIfPointerIsValid(void *ptr);
 void *getLastPointerFromPath(void *address, int32_t *offset, uint32_t offsetAmount);;
 

ttyd-tools/rel/include/commonfunctions.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "clearcache.h"
+#include "commonfunctions.h"
 
 #include <cstdint>
 
@@ -17,7 +17,7 @@ Func hookFunction(Func function, Dest destination)
 
 	// Original instruction
 	trampoline[0] = instructions[0];
-	clearcache::clear_DC_IC_Cache(&trampoline[0], sizeof(uint32_t));
+	clear_DC_IC_Cache(&trampoline[0], sizeof(uint32_t));
 
 	// Branch to original function past hook
 	writeBranch(&trampoline[1], &instructions[1]);

ttyd-tools/rel/include/patch.h

@@ -1,6 +1,7 @@
 #include "commonfunctions.h"
 #include "global.h"
 
+#include <gc/OSCache.h>
 #include <ttyd/system.h>
 #include <ttyd/seqdrv.h>
 #include <ttyd/battle.h>
@@ -284,6 +285,12 @@ void clearGSWFsRange(uint32_t lowerBound, uint32_t upperBound)
 	}
 }
 
+void clear_DC_IC_Cache(void *ptr, uint32_t size)
+{
+	gc::OSCache::DCFlushRange(ptr, size);
+	gc::OSCache::ICInvalidateRange(ptr, size);
+}
+
 bool checkIfPointerIsValid(void *ptr)
 {
 	uint32_t ptrRaw = reinterpret_cast<uint32_t>(ptr);

ttyd-tools/rel/source/clearcache.cpp

@@ -1,5 +1,5 @@
 #include "patch.h"
-#include "clearcache.h"
+#include "commonfunctions.h"
 
 #include <cstdint>
 
@@ -14,7 +14,7 @@ void writeBranch(void *ptr, void *destination)
 	uint32_t *p = reinterpret_cast<uint32_t *>(ptr);
 	*p = value;
 
-	clearcache::clear_DC_IC_Cache(ptr, sizeof(uint32_t));
+	clear_DC_IC_Cache(ptr, sizeof(uint32_t));
 }
 
 }