archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 15:01:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #209 from unknownbrackets/warnings

Browse source 
Fix a bunch of warnings
This commit is contained in:
Hykem 2014-04-28 17:15:12 +01:00
commit 90896560bb
30 changed files with 72 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/Memory/Memory.cpp
View file

@ -521,7 +521,7 @@ MemoryBlock* VirtualMemoryBlock::SetRange(const u64 start, const u32 size)
bool VirtualMemoryBlock::IsInMyRange(const u64 addr)
{
return addr >= GetStartAddr() && addr < GetStartAddr() + GetSize() - GetResevedAmount();
return addr >= GetStartAddr() && addr < GetStartAddr() + GetSize() - GetReservedAmount();
}
bool VirtualMemoryBlock::IsInMyRange(const u64 addr, const u32 size)
@ -554,7 +554,7 @@ u64 VirtualMemoryBlock::Map(u64 realaddr, u32 size, u64 addr)
}
else
{
for(u64 addr = GetStartAddr(); addr <= GetEndAddr() - GetResevedAmount() - size;)
for(u64 addr = GetStartAddr(); addr <= GetEndAddr() - GetReservedAmount() - size;)
{
bool is_good_addr = true;
@ -718,7 +718,7 @@ void VirtualMemoryBlock::Delete()
bool VirtualMemoryBlock::Reserve(u32 size)
{
if(size + GetResevedAmount() > GetEndAddr() - GetStartAddr())
if(size + GetReservedAmount() > GetEndAddr() - GetStartAddr())
return false;
m_reserve_size += size;
@ -727,14 +727,14 @@ bool VirtualMemoryBlock::Reserve(u32 size)
bool VirtualMemoryBlock::Unreserve(u32 size)
{
if(size > GetResevedAmount())
if(size > GetReservedAmount())
return false;
m_reserve_size -= size;
return true;
}
u32 VirtualMemoryBlock::GetResevedAmount()
u32 VirtualMemoryBlock::GetReservedAmount()
{
return m_reserve_size;
}