From 09ea858dbf2eabf26ce0ab1a275c6350a54626b7 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 24 Aug 2024 01:19:11 +0300 Subject: [PATCH] Minor fixes --- rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp | 8 ++++---- rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp index 4dec233dbc..765c9f7e04 100644 --- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp +++ b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp @@ -73,11 +73,11 @@ namespace aarch64 { 0x61, 0x22, "armv8.5-a", "M1", "Firestorm" }, { 0x61, 0x23, "armv8.5-a", "M1", "IceStorm" }, { 0x61, 0x28, "armv8.5-a", "M1 Max", "Firestorm" }, - { 0x61, 0x28, "armv8.5-a", "M1 Max", "Icestorm" }, + { 0x61, 0x29, "armv8.5-a", "M1 Max", "Icestorm" }, { 0x61, 0x24, "armv8.5-a", "M1 Pro", "Firestorm" }, { 0x61, 0x25, "armv8.5-a", "M1 Pro", "Icestorm" }, { 0x61, 0x32, "armv8.5-a", "M2", "Avalanche" }, - { 0x61, 0x32, "armv8.5-a", "M2", "Blizzard" }, + { 0x61, 0x33, "armv8.5-a", "M2", "Blizzard" }, // QUALCOMM { 0x51, 0x01, "armv8.5-a", "Snapdragon", "X-Elite" }, @@ -110,10 +110,10 @@ namespace aarch64 } // Read main ID register - static u64 read_MIDR_EL1(u32 cpu_id) + static u64 read_MIDR_EL1([[maybe_unused]] u32 cpu_id) { #if defined(__linux__) - std::string path = fmt::format("/sys/devices/system/cpu/cpu%u/regs/identification/midr_el1", cpu_id); + const std::string path = fmt::format("/sys/devices/system/cpu/cpu%u/regs/identification/midr_el1", cpu_id); if (!fs::is_file(path)) { return umax; diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp index 2d51db5a76..6d3004e82d 100644 --- a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp +++ b/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp @@ -54,7 +54,7 @@ namespace aarch64 return esr_ctx ? esr_ctx->esr : 0; } #else - u64 _read_ESR_EL1(const ucontext_t* uctx) + u64 _read_ESR_EL1(const ucontext_t*) { // Unimplemented return 0;