From 12a924b2a8a9faf1e1f9846d99644592a6b7159b Mon Sep 17 00:00:00 2001
From: Vali <78507032+Vali0004@users.noreply.github.com>
Date: Mon, 10 Feb 2025 05:12:22 -0500
Subject: [PATCH] [Merge]: Merge newer decoder-experimental (#34)

* [Formatting]: Fix build & formatting errors

* [Config]: Fix option var for ODD
---
 Xenon/Base/Config.cpp                   | 2 +-
 Xenon/Base/Types.h                      | 6 +++---
 Xenon/Core/XCPU/Interpreter/PPC_FPU.cpp | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Xenon/Base/Config.cpp b/Xenon/Base/Config.cpp
index 057096b..0b4b514 100644
--- a/Xenon/Base/Config.cpp
+++ b/Xenon/Base/Config.cpp
@@ -176,7 +176,7 @@ void saveConfig(const std::filesystem::path &path) {
   data["Paths"]["Fuses"] = fusesTxtPath;
   data["Paths"]["OneBL"] = oneBlBinPath;
   data["Paths"]["Nand"] = nandBinPath;
-  data["Paths"]["ISO"] = oddDiscImagePath;
+  data["Paths"]["ODDImage"] = oddDiscImagePath;
 
   // HighlyExperimental.
   if (data["HighlyExperimental"].comments().empty()) {
diff --git a/Xenon/Base/Types.h b/Xenon/Base/Types.h
index c9aacfc..440b16c 100644
--- a/Xenon/Base/Types.h
+++ b/Xenon/Base/Types.h
@@ -25,13 +25,13 @@ using f32 = float;
 using f64 = double;
 
 // UDLs for memory size values
-inline [[nodiscard]] constexpr u64 operator""_KB(const u64 x) {
+[[nodiscard]] inline constexpr u64 operator""_KB(const u64 x) {
     return 1024ULL * x;
 }
-inline [[nodiscard]] constexpr u64 operator""_MB(const u64 x) {
+[[nodiscard]] inline constexpr u64 operator""_MB(const u64 x) {
     return 1024_KB * x;
 }
-inline [[nodiscard]] constexpr u64 operator""_GB(const u64 x) {
+[[nodiscard]] inline constexpr u64 operator""_GB(const u64 x) {
     return 1024_MB * x;
 }
 
diff --git a/Xenon/Core/XCPU/Interpreter/PPC_FPU.cpp b/Xenon/Core/XCPU/Interpreter/PPC_FPU.cpp
index 5995e26..782555d 100644
--- a/Xenon/Core/XCPU/Interpreter/PPC_FPU.cpp
+++ b/Xenon/Core/XCPU/Interpreter/PPC_FPU.cpp
@@ -8,8 +8,7 @@
 #define SET_FPSCR(x)	hCore->ppuThread[hCore->currentThread].FPSCR.FPSCR_Hex = x
 
 static inline void checkFpuAvailable(PPU_STATE* hCore) {
-	if (hCore->ppuThread[hCore->currentThread].SPR.MSR.FP != 1)
-	{
+	if (hCore->ppuThread[hCore->currentThread].SPR.MSR.FP != 1) {
 		hCore->ppuThread[hCore->currentThread].exceptReg |= PPU_EX_FPU;
 		return;
 	}