mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-03 13:31:27 +12:00
Small warnings cleanup (#6671)
* Ignore more warnings These are intentional * Signed/unsigned mismatch when comparing * Explictly cast values * Intentionally discard a nodiscard value * Change ppu_tid to u32 * Do not use POSIX function name on Windows * Qt: Use horizontalAdvance instead of width * Change progress variables to u32
This commit is contained in:
parent
89a2d04f96
commit
f3ed26e9db
17 changed files with 45 additions and 39 deletions
|
@ -1276,7 +1276,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
|
|||
return true;
|
||||
}
|
||||
|
||||
if (vm::check_addr(addr, std::max<std::size_t>(1, d_size), is_writing ? vm::page_writable : vm::page_readable))
|
||||
if (vm::check_addr(addr, std::max(1u, ::narrow<u32>(d_size)), is_writing ? vm::page_writable : vm::page_readable))
|
||||
{
|
||||
if (cpu && cpu->test_stopped())
|
||||
{
|
||||
|
@ -1331,12 +1331,12 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
|
|||
u64 data3;
|
||||
{
|
||||
vm::reader_lock rlock;
|
||||
if (vm::check_addr(addr, std::max<std::size_t>(1, d_size), is_writing ? vm::page_writable : vm::page_readable))
|
||||
if (vm::check_addr(addr, std::max(1u, ::narrow<u32>(d_size)), is_writing ? vm::page_writable : vm::page_readable))
|
||||
{
|
||||
// Memory was allocated inbetween, retry
|
||||
return true;
|
||||
}
|
||||
else if (vm::check_addr(addr, std::max<std::size_t>(1, d_size)))
|
||||
else if (vm::check_addr(addr, std::max(1u, ::narrow<u32>(d_size))))
|
||||
{
|
||||
data3 = SYS_MEMORY_PAGE_FAULT_CAUSE_READ_ONLY; // TODO
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue