diff options
| author | Rohit Nirmal <rohitnirmal9@gmail.com> | 2014-11-17 19:21:38 +0000 |
|---|---|---|
| committer | Rohit Nirmal <rohitnirmal9@gmail.com> | 2014-11-17 19:21:38 +0000 |
| commit | 8ec791c4f357cc5e2bca2d12eb52e4afb9881503 (patch) | |
| tree | 029d3e672ab22f4ffbe4789cfc73f2f78c9a2471 /Source/Core | |
| parent | 05890fa752cd434643c45de75a5430ba8daf7b25 (diff) | |
Android: Silence a few warnings.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/Memmap.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index d89647592e..186ad67dd5 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -205,7 +205,7 @@ void CopyFromEmu(void* data, u32 address, size_t 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; } memcpy(data, GetPointer(address), size); @@ -215,7 +215,7 @@ void CopyToEmu(u32 address, const void* data, size_t 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; } memcpy(GetPointer(address), data, size); diff --git a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp index 602918615d..c1f13f288f 100644 --- a/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp @@ -86,8 +86,8 @@ void JitArm::SafeStoreFromReg(bool fastmem, s32 dest, u32 value, s32 regOffset, ARMReg rA = gpr.GetReg(); ARMReg rB = gpr.GetReg(); ARMReg rC = gpr.GetReg(); - ARMReg RA; - ARMReg RB; + ARMReg RA = INVALID_REG; + ARMReg RB = INVALID_REG; if (dest != -1) RA = gpr.R(dest); if (regOffset != -1) |