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

noexcept usage fixed

Browse source 
thread_t renamed to named_thread_t
This commit is contained in:
Nekotekina 2015-08-19 14:04:58 +03:00
parent 168cd9bb7a
commit 5e14310071
26 changed files with 82 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,7 +154,7 @@ namespace vm
std::mutex g_waiter_list_mutex;
waiter_t* _add_waiter(thread_t& thread, u32 addr, u32 size)
waiter_t* _add_waiter(named_thread_t& thread, u32 addr, u32 size)
{
std::lock_guard<std::mutex> lock(g_waiter_list_mutex);
@ -248,7 +248,7 @@ namespace vm
return true;
}
waiter_lock_t::waiter_lock_t(thread_t& thread, u32 addr, u32 size)
waiter_lock_t::waiter_lock_t(named_thread_t& thread, u32 addr, u32 size)
: m_waiter(_add_waiter(thread, addr, size))
, m_lock(thread.mutex, std::adopt_lock) // must be locked in _add_waiter
{
@ -346,7 +346,7 @@ namespace vm
void start()
{
// start notification thread
thread_t(COPY_EXPR("vm::start thread"), []()
named_thread_t(COPY_EXPR("vm::start thread"), []()
{
while (!Emu.IsStopped())
{
@ -766,6 +766,23 @@ namespace vm
return block->dealloc(addr);
}
void dealloc_verbose_nothrow(u32 addr, memory_location_t location) noexcept
{
const auto block = get(location, addr);
if (!block)
{
LOG_ERROR(MEMORY, "%s(): invalid memory location (%d, addr=0x%x)\n", __func__, location, addr);
return;
}
if (!block->dealloc(addr))
{
LOG_ERROR(MEMORY, "%s(): deallocation failed (addr=0x%x)\n", __func__, addr);
return;
}
}
bool block_t::try_alloc(u32 addr, u32 size)
{
// check if memory area is already mapped