diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/Emu/Cell/PPUTranslator.cpp index 8072219c94..dd85b12e58 100644 --- a/rpcs3/Emu/Cell/PPUTranslator.cpp +++ b/rpcs3/Emu/Cell/PPUTranslator.cpp @@ -730,7 +730,7 @@ void PPUTranslator::WriteMemory(Value* addr, Value* value, bool is_be, u32 align { if (ppu_test_address_may_be_mmio(std::span(ptr->insts))) { - ppu_log.notice("LLVM: Detected potential MMIO32 write at [0x%08x]", m_addr + m_reloc ? m_reloc->addr : 0); + ppu_log.notice("LLVM: Detected potential MMIO32 write at [0x%08x]", m_addr + (m_reloc ? m_reloc->addr : 0)); Call(GetType(), "__write_maybe_mmio32", m_base, addr, value); return; } diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 140c7c67ac..c6e179b001 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -6193,7 +6193,7 @@ spu_exec_object spu_thread::capture_memory_as_elf(std::span(diff))) + if (bits != umax && !bits.bit_test_set(static_cast(diff))) { break; } diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index 5d404aeeb8..340f82641e 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -295,8 +295,8 @@ namespace r = upload_untouched_naive(src.data(), dst.data(), count); #endif - min_index = ::narrow(r); - max_index = ::narrow(r >> 32); + min_index = static_cast(r); + max_index = static_cast(r >> 32); return std::make_tuple(min_index, max_index, count); } @@ -401,8 +401,8 @@ namespace r = upload_untouched_naive(src.data(), dst.data(), count, restart_index); #endif - min_index = ::narrow(r); - max_index = ::narrow(r >> 32); + min_index = static_cast(r); + max_index = static_cast(r >> 32); return std::make_tuple(min_index, max_index, count); } diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/util/vm_native.cpp index 87a1781f34..4e04678da5 100644 --- a/rpcs3/util/vm_native.cpp +++ b/rpcs3/util/vm_native.cpp @@ -464,7 +464,8 @@ namespace utils , m_size(utils::align(size, 0x10000)) { #ifdef _WIN32 - m_handle = ensure(::CreateFileMappingW(INVALID_HANDLE_VALUE, nullptr, PAGE_EXECUTE_READWRITE, 0, ::narrow(m_size), nullptr)); + const ULARGE_INTEGER max_size{ .QuadPart = m_size }; + m_handle = ensure(::CreateFileMappingW(INVALID_HANDLE_VALUE, nullptr, PAGE_EXECUTE_READWRITE, max_size.HighPart, max_size.LowPart, nullptr)); #elif defined(__linux__) || defined(__FreeBSD__) m_file = -1;