diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index 5eba199e26..6d9ea05c9e 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -394,7 +394,7 @@ namespace fmt } #if !defined(_MSC_VER) || defined(__clang__) - [[noreturn]] ~throw_exception(); + [[noreturn]] ~throw_exception() = default; #endif }; diff --git a/rpcs3/Crypto/utils.cpp b/rpcs3/Crypto/utils.cpp index 7432acbf62..8d2fd4e9aa 100644 --- a/rpcs3/Crypto/utils.cpp +++ b/rpcs3/Crypto/utils.cpp @@ -157,7 +157,7 @@ std::array sc_combine_laid_paid(s64 laid, s64 paid) { const std::string paid_laid = fmt::format("%016llx%016llx", laid, paid); std::array out{}; - hex_to_bytes(out.data(), paid_laid.c_str(), PASSPHRASE_KEY_LEN * 2); + hex_to_bytes(out.data(), paid_laid, PASSPHRASE_KEY_LEN * 2); return out; } diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h index 0c48623fda..6f7d88c148 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h +++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.h @@ -3,7 +3,6 @@ #include "util/types.hpp" #include "Emu/Memory/vm_ptr.h" #include "Emu/Cell/ErrorCodes.h" -#include #include #include diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp index 629aae88ae..e59f14892b 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.cpp +++ b/rpcs3/Emu/Cell/PPUTranslator.cpp @@ -416,7 +416,6 @@ Function* PPUTranslator::GetSymbolResolver(const ppu_module& info) assert(ptr_inst->getResultElementType() == m_ir->getPtrTy()); const auto faddr = m_ir->CreateLoad(ptr_inst->getResultElementType(), ptr_inst); - const auto faddr_int = m_ir->CreatePtrToInt(faddr, get_type()); const auto pos_32 = m_reloc ? m_ir->CreateAdd(func_pc, m_seg0) : func_pc; const auto pos = m_ir->CreateShl(pos_32, 1); const auto ptr = m_ir->CreatePtrAdd(m_exec, pos); @@ -427,7 +426,7 @@ Function* PPUTranslator::GetSymbolResolver(const ppu_module& info) const auto seg_val = m_ir->CreateTrunc(m_ir->CreateLShr(m_seg0, 13), get_type()); // Store to jumptable - m_ir->CreateStore(faddr_int, ptr); + m_ir->CreateStore(faddr, ptr); m_ir->CreateStore(seg_val, seg_ptr); // Increment index and branch back to loop diff --git a/rpcs3/util/asm.hpp b/rpcs3/util/asm.hpp index deca38b413..8942dc2a09 100644 --- a/rpcs3/util/asm.hpp +++ b/rpcs3/util/asm.hpp @@ -60,7 +60,7 @@ namespace utils #if defined(ARCH_X64) return _m_prefetchw(const_cast(ptr)); #else - return __builtin_prefetch(ptr, 1, 0); + return __builtin_prefetch(ptr, 1, 3); #endif }