From d6baac6fbe8e02c97d211351813d079f7e2ccfbd Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 27 Apr 2014 23:23:29 -0700 Subject: [PATCH] Fix reseved -> reserved typo. --- rpcs3/Emu/Memory/Memory.cpp | 10 +++++----- rpcs3/Emu/Memory/MemoryBlock.h | 2 +- rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp index b71bea4e6c..1061072c1f 100644 --- a/rpcs3/Emu/Memory/Memory.cpp +++ b/rpcs3/Emu/Memory/Memory.cpp @@ -549,7 +549,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) @@ -582,7 +582,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; @@ -744,7 +744,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; @@ -753,14 +753,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; } diff --git a/rpcs3/Emu/Memory/MemoryBlock.h b/rpcs3/Emu/Memory/MemoryBlock.h index 3813341803..df985ebec5 100644 --- a/rpcs3/Emu/Memory/MemoryBlock.h +++ b/rpcs3/Emu/Memory/MemoryBlock.h @@ -272,7 +272,7 @@ public: virtual bool Unreserve(u32 size); // Return the total amount of reserved memory - virtual u32 GetResevedAmount(); + virtual u32 GetReservedAmount(); virtual bool Read8(const u64 addr, u8* value); virtual bool Read16(const u64 addr, u16* value); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index f58dd38f0a..2a463daa48 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -562,7 +562,7 @@ int32_t cellGcmAddressToOffset(u64 address, mem32_t offset) uint32_t cellGcmGetMaxIoMapSize() { - return Memory.RSXIOMem.GetEndAddr() - Memory.RSXIOMem.GetStartAddr() - Memory.RSXIOMem.GetResevedAmount(); + return Memory.RSXIOMem.GetEndAddr() - Memory.RSXIOMem.GetStartAddr() - Memory.RSXIOMem.GetReservedAmount(); } void cellGcmGetOffsetTable(mem_ptr_t table) @@ -730,7 +730,7 @@ int32_t cellGcmUnreserveIoMapSize(u32 size) if (size & 0xFFFFF) return CELL_GCM_ERROR_INVALID_ALIGNMENT; - if (size > Memory.RSXIOMem.GetResevedAmount()) + if (size > Memory.RSXIOMem.GetReservedAmount()) return CELL_GCM_ERROR_INVALID_VALUE; Memory.RSXIOMem.Unreserve(size);