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

Change Cell->RSX map/unmap notifications

Browse source 
This allows for further flexibility on the RSX side, allowing us to fix
some bugs and crashes in later commits.
This commit is contained in:
Rui Pinheiro 2018-09-22 15:45:55 +01:00 • committed by kd-11
parent a07cbaca8e
commit f3029b2b42
3 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rpcs3/Emu/Memory/vm.cpp
View file

@ -292,6 +292,14 @@ namespace vm
}
}
// Notify rsx that range has become valid
// Note: This must be done *before* memory gets mapped while holding the vm lock, otherwise
// the RSX might try to invalidate memory that got unmapped and remapped
if (const auto rsxthr = fxm::check_unlocked<GSRender>())
{
rsxthr->on_notify_memory_mapped(addr, size);
}
if (!shm)
{
utils::memory_protect(g_base_addr + addr, size, utils::protection::rw);
@ -413,6 +421,15 @@ namespace vm
}
}
// Notify rsx to invalidate range
// Note: This must be done *before* memory gets unmapped while holding the vm lock, otherwise
// the RSX might try to call VirtualProtect on memory that is already unmapped
if (const auto rsxthr = fxm::check_unlocked<GSRender>())
{
rsxthr->on_notify_memory_unmapped(addr, size);
}
// Actually unmap memory
if (!shm)
{
utils::memory_protect(g_base_addr + addr, size, utils::protection::no);
@ -581,12 +598,6 @@ namespace vm
m_common->unmap_critical(vm::base(addr));
}
}
// Notify rsx to invalidate range (TODO)
if (const auto rsxthr = fxm::check_unlocked<GSRender>())
{
rsxthr->on_notify_memory_unmapped(addr, size);
}
}
u32 block_t::alloc(const u32 orig_size, u32 align, const std::shared_ptr<utils::shm>* src)
@ -718,12 +729,6 @@ namespace vm
m_map.erase(found);
}
// Notify rsx to invalidate range (TODO)
if (const auto rsxthr = fxm::check_unlocked<GSRender>())
{
rsxthr->on_notify_memory_unmapped(addr, result);
}
return result;
}