mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-21 18:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make MemoryBase::Unmap() return a value.

Browse Source
This commit is contained in:
Unknown W. Brackets 2014-04-27 20:27:36 -07:00
parent 2f7fbf01cf
commit b550ccfc73
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpcs3/Emu/Memory/Memory.h
View File

@ -474,6 +474,7 @@ public:
bool Unmap(const u64 addr) bool Unmap(const u64 addr)
{ {
bool result = false;
for(uint i=0; i<MemoryBlocks.size(); ++i) for(uint i=0; i<MemoryBlocks.size(); ++i)
{ {
if(MemoryBlocks[i]->IsMirror()) if(MemoryBlocks[i]->IsMirror())
@ -482,9 +483,11 @@ public:
{ {
delete MemoryBlocks[i]; delete MemoryBlocks[i];
MemoryBlocks.erase(MemoryBlocks.begin() + i); MemoryBlocks.erase(MemoryBlocks.begin() + i);
return true;
} }
} }
} }
return false;
} }
u8* operator + (const u64 vaddr) u8* operator + (const u64 vaddr)

2
rpcs3/Emu/Memory/MemoryBlock.h
View File

@ -28,7 +28,7 @@ struct MemBlockInfo : public MemInfo
{ {
if(!mem) if(!mem)
{ {
ConLog.Error("Not enought free memory."); ConLog.Error("Not enough free memory.");
assert(0); assert(0);
} }
memset(mem, 0, size); memset(mem, 0, size);