From 4b47b24afdb9cfb67fd1829a29aae8b544a6ae62 Mon Sep 17 00:00:00 2001
From: Sajid <sajidur78@gmail.com>
Date: Sun, 24 Nov 2024 16:16:08 +0600
Subject: [PATCH] Allow overloads of ppc load/store macros

---
 PowerRecomp/recompiler.cpp |  6 ++++
 PowerUtils/ppc_context.h   | 61 ++++++++++++++++++++++++++++++++++----
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/PowerRecomp/recompiler.cpp b/PowerRecomp/recompiler.cpp
index ebf0375..e330293 100644
--- a/PowerRecomp/recompiler.cpp
+++ b/PowerRecomp/recompiler.cpp
@@ -2388,6 +2388,12 @@ void Recompiler::Recompile()
         if (config.nonVolatileRegistersAsLocalVariables)
             println("#define PPC_CONFIG_NON_VOLATILE_AS_LOCAL");
 
+        println("");
+
+        println("#ifdef PPC_INCLUDE_DETAIL");
+        println("#include \"ppc_detail.h\"");
+        println("#endif");
+
         println("\n#endif");
 
         SaveCurrentOutData("ppc_config.h");
diff --git a/PowerUtils/ppc_context.h b/PowerUtils/ppc_context.h
index 212ca6a..64c257d 100644
--- a/PowerUtils/ppc_context.h
+++ b/PowerUtils/ppc_context.h
@@ -24,34 +24,83 @@
 
 #define PPC_FUNC_PROLOGUE() __builtin_assume(((size_t)base & 0xFFFFFFFF) == 0)
 
+#ifndef PPC_LOAD_U8
 #define PPC_LOAD_U8(x) *(volatile uint8_t*)(base + (x))
+#endif
+
+#ifndef PPC_LOAD_U16
 #define PPC_LOAD_U16(x) __builtin_bswap16(*(volatile uint16_t*)(base + (x)))
+#endif
+
+#ifndef PPC_LOAD_U32
 #define PPC_LOAD_U32(x) __builtin_bswap32(*(volatile uint32_t*)(base + (x)))
+#endif
+
+#ifndef PPC_LOAD_U64
 #define PPC_LOAD_U64(x) __builtin_bswap64(*(volatile uint64_t*)(base + (x)))
+#endif
 
 // TODO: Implement.
 // These are currently unused. However, MMIO loads could possibly be handled statically with some profiling and a fallback.
 // The fallback would be a runtime exception handler which will intercept reads from MMIO regions 
 // and log the PC for compiling to static code later.
+#ifndef PPC_MM_LOAD_U8
 #define PPC_MM_LOAD_U8(x)  PPC_LOAD_U8 (x)
-#define PPC_MM_LOAD_U16(x) PPC_LOAD_U16(x)
-#define PPC_MM_LOAD_U32(x) PPC_LOAD_U32(x)
-#define PPC_MM_LOAD_U64(x) PPC_LOAD_U64(x)
+#endif
 
+#ifndef PPC_MM_LOAD_U16
+#define PPC_MM_LOAD_U16(x) PPC_LOAD_U16(x)
+#endif
+
+#ifndef PPC_MM_LOAD_U32
+#define PPC_MM_LOAD_U32(x) PPC_LOAD_U32(x)
+#endif
+
+#ifndef PPC_MM_LOAD_U64
+#define PPC_MM_LOAD_U64(x) PPC_LOAD_U64(x)
+#endif
+
+#ifndef PPC_STORE_U8
 #define PPC_STORE_U8(x, y) *(volatile uint8_t*)(base + (x)) = (y)
+#endif
+
+#ifndef PPC_STORE_U16
 #define PPC_STORE_U16(x, y) *(volatile uint16_t*)(base + (x)) = __builtin_bswap16(y)
+#endif
+
+#ifndef PPC_STORE_U32
 #define PPC_STORE_U32(x, y) *(volatile uint32_t*)(base + (x)) = __builtin_bswap32(y)
+#endif
+
+#ifndef PPC_STORE_U64
 #define PPC_STORE_U64(x, y) *(volatile uint64_t*)(base + (x)) = __builtin_bswap64(y)
+#endif
 
 // MMIO Store handling is completely reliant on being preeceded by eieio.
 // TODO: Verify if that's always the case.
+#ifndef PPC_MM_STORE_U8
 #define PPC_MM_STORE_U8(x, y)   PPC_STORE_U8 (x, y)
-#define PPC_MM_STORE_U16(x, y)  PPC_STORE_U16(x, y)
-#define PPC_MM_STORE_U32(x, y)  PPC_STORE_U32(x, y)
-#define PPC_MM_STORE_U64(x, y)  PPC_STORE_U64(x, y)
+#endif
 
+#ifndef PPC_MM_STORE_U16
+#define PPC_MM_STORE_U16(x, y)  PPC_STORE_U16(x, y)
+#endif
+
+#ifndef PPC_MM_STORE_U32
+#define PPC_MM_STORE_U32(x, y)  PPC_STORE_U32(x, y)
+#endif
+
+#ifndef PPC_MM_STORE_U64
+#define PPC_MM_STORE_U64(x, y)  PPC_STORE_U64(x, y)
+#endif
+
+#ifndef PPC_CALL_FUNC
 #define PPC_CALL_FUNC(x) x(ctx, base)
+#endif
+
+#ifndef PPC_CALL_INDIRECT_FUNC
 #define PPC_CALL_INDIRECT_FUNC(x) (*(PPCFunc**)(ctx.fn + uint64_t(x) * 2))(ctx, base)
+#endif
 
 typedef void PPCFunc(struct PPCContext& __restrict__ ctx, uint8_t* base);