[Merge]: Merge newer decoder-experimental (#34)

* [Formatting]: Fix build & formatting errors * [Config]: Fix option var for ODD
xenon-emu · Feb 10, 2025 · 12a924b · 12a924b
1 parent 8a954a9
commit 12a924b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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;
 	}