diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2018-05-20 22:18:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-20 22:18:40 +0200 |
| commit | 7563c82162cf0924f81f00161fae9ae583b46c5d (patch) | |
| tree | 6b413bc39352fa8d171ffec3842971e76bd7f28c /Source | |
| parent | 8af8c58eb95c1b5994c530a9ec0d8de906b49c81 (diff) | |
| parent | edb38ff1445b9012be028e769af80cd15386a638 (diff) | |
Merge pull request #6921 from lioncash/mmu
MMU: Avoid sign conversions in EFB_Read and EFB_Write
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/PowerPC/MMU.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp index 1a816e5508..d8a07780d3 100644 --- a/Source/Core/Core/PowerPC/MMU.cpp +++ b/Source/Core/Core/PowerPC/MMU.cpp @@ -117,8 +117,8 @@ static u32 EFB_Read(const u32 addr) u32 var = 0; // Convert address to coordinates. It's possible that this should be done // differently depending on color depth, especially regarding PeekColor. - int x = (addr & 0xfff) >> 2; - int y = (addr >> 12) & 0x3ff; + const u32 x = (addr & 0xfff) >> 2; + const u32 y = (addr >> 12) & 0x3ff; if (addr & 0x00800000) { @@ -127,12 +127,12 @@ static u32 EFB_Read(const u32 addr) else if (addr & 0x00400000) { var = g_video_backend->Video_AccessEFB(EFBAccessType::PeekZ, x, y, 0); - DEBUG_LOG(MEMMAP, "EFB Z Read @ %i, %i\t= 0x%08x", x, y, var); + DEBUG_LOG(MEMMAP, "EFB Z Read @ %u, %u\t= 0x%08x", x, y, var); } else { var = g_video_backend->Video_AccessEFB(EFBAccessType::PeekColor, x, y, 0); - DEBUG_LOG(MEMMAP, "EFB Color Read @ %i, %i\t= 0x%08x", x, y, var); + DEBUG_LOG(MEMMAP, "EFB Color Read @ %u, %u\t= 0x%08x", x, y, var); } return var; @@ -140,8 +140,8 @@ static u32 EFB_Read(const u32 addr) static void EFB_Write(u32 data, u32 addr) { - int x = (addr & 0xfff) >> 2; - int y = (addr >> 12) & 0x3ff; + const u32 x = (addr & 0xfff) >> 2; + const u32 y = (addr >> 12) & 0x3ff; if (addr & 0x00800000) { @@ -152,12 +152,12 @@ static void EFB_Write(u32 data, u32 addr) else if (addr & 0x00400000) { g_video_backend->Video_AccessEFB(EFBAccessType::PokeZ, x, y, data); - DEBUG_LOG(MEMMAP, "EFB Z Write %08x @ %i, %i", data, x, y); + DEBUG_LOG(MEMMAP, "EFB Z Write %08x @ %u, %u", data, x, y); } else { g_video_backend->Video_AccessEFB(EFBAccessType::PokeColor, x, y, data); - DEBUG_LOG(MEMMAP, "EFB Color Write %08x @ %i, %i", data, x, y); + DEBUG_LOG(MEMMAP, "EFB Color Write %08x @ %u, %u", data, x, y); } } |