RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some cleanup

Browse source
This commit is contained in:
Nekotekina 2014-07-07 21:22:36 +04:00
parent faab4ed6db
commit d1fff053c2
23 changed files with 278 additions and 850 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Memory/MemoryBlock.h
View file

@ -24,7 +24,6 @@ struct MemBlockInfo : public MemInfo
MemBlockInfo(u64 _addr, u32 _size, void* base_addr)
: MemInfo(_addr, PAGE_4K(_size))
//, mem(_aligned_malloc(PAGE_4K(_size), 128))
, mem(VirtualAlloc((void*)((u64)base_addr + _addr), PAGE_4K(_size), MEM_COMMIT, PAGE_READWRITE))
{
if(!mem)
@ -44,7 +43,6 @@ struct MemBlockInfo : public MemInfo
MemBlockInfo& operator =(MemBlockInfo &&other){
this->addr = other.addr;
this->size = other.size;
//if (this->mem) _aligned_free(mem);
if (this->mem) VirtualFree(this->mem, this->size, MEM_DECOMMIT);
this->mem = other.mem;
other.mem = nullptr;
@ -53,7 +51,6 @@ struct MemBlockInfo : public MemInfo
~MemBlockInfo()
{
//if(mem) _aligned_free(mem);
if (mem) VirtualFree(mem, size, MEM_DECOMMIT);
mem = nullptr;
}
@ -207,7 +204,6 @@ class DynamicMemoryBlockBase : public PT
mutable std::mutex m_lock;
std::vector<MemBlockInfo> m_allocated; // allocation info
std::vector<u8*> m_pages; // real addresses of every 4096 byte pages (array size should be fixed)
std::vector<u8*> m_locked; // locked pages should be moved here
u32 m_max_size;