ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1568 from rohit-n/android-warnings 

Android: Silence a few warnings.
This commit is contained in:
Lioncash 2014-11-19 12:17:13 -05:00
parent a3f9f21e08 8ec791c4f3
commit 19dabee326
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/Memmap.cpp
View File

@ -205,7 +205,7 @@ void CopyFromEmu(void* data, u32 address, size_t size)
{ {
if (!ValidCopyRange(address, size)) if (!ValidCopyRange(address, size))
{ {
PanicAlert("Invalid range in CopyFromEmu. %lx bytes from 0x%08x", size, address); PanicAlert("Invalid range in CopyFromEmu. %lx bytes from 0x%08x", (unsigned long)size, address);
return; return;
} }
memcpy(data, GetPointer(address), size); memcpy(data, GetPointer(address), size);
@ -215,7 +215,7 @@ void CopyToEmu(u32 address, const void* data, size_t size)
{ {
if (!ValidCopyRange(address, size)) if (!ValidCopyRange(address, size))
{ {
PanicAlert("Invalid range in CopyToEmu. %lx bytes to 0x%08x", size, address); PanicAlert("Invalid range in CopyToEmu. %lx bytes to 0x%08x", (unsigned long)size, address);
return; return;
} }
memcpy(GetPointer(address), data, size); memcpy(GetPointer(address), data, size);

4
Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp
View File

@ -86,8 +86,8 @@ void JitArm::SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 regOffset,
ARMReg rA = gpr.GetReg(); ARMReg rA = gpr.GetReg();
ARMReg rB = gpr.GetReg(); ARMReg rB = gpr.GetReg();
ARMReg rC = gpr.GetReg(); ARMReg rC = gpr.GetReg();
ARMReg RA; ARMReg RA = INVALID_REG;
ARMReg RB; ARMReg RB = INVALID_REG;
if (dest != -1) if (dest != -1)
RA = gpr.R(dest); RA = gpr.R(dest);
if (regOffset != -1) if (regOffset != -1)