Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use error_code in mmapper_thread_recover_page_fault

Browse Source
This commit is contained in:
Eladash
2019-08-01 19:27:08 +03:00
committed by Ivan
parent 629d8e3a51
commit cd4e895c04
4 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/Cell/lv2/sys_mmapper.cpp
+2 -2
View File
@@ -486,7 +486,7 @@ error_code sys_mmapper_enable_page_fault_notification(ppu_thread& ppu, u32 start
return CELL_OK; return CELL_OK;
} }
CellError mmapper_thread_recover_page_fault(u32 id) error_code mmapper_thread_recover_page_fault(u32 id)
{ {
// We can only wake a thread if it is being suspended for a page fault. // We can only wake a thread if it is being suspended for a page fault.
auto pf_events = fxm::get_always<page_fault_event_entries>(); auto pf_events = fxm::get_always<page_fault_event_entries>();
@@ -504,5 +504,5 @@ CellError mmapper_thread_recover_page_fault(u32 id)
} }
pf_events->cond.notify_all(); pf_events->cond.notify_all();
return CellError(CELL_OK); return CELL_OK;
} }
rpcs3/Emu/Cell/lv2/sys_mmapper.h
+1 -1
View File
@@ -62,7 +62,7 @@ struct page_fault_event_entries
// Aux // Aux
class ppu_thread; class ppu_thread;
CellError mmapper_thread_recover_page_fault(u32 id); error_code mmapper_thread_recover_page_fault(u32 id);
// SysCalls // SysCalls
error_code sys_mmapper_allocate_address(ppu_thread&, u64 size, u64 flags, u64 alignment, vm::ptr<u32> alloc_addr); error_code sys_mmapper_allocate_address(ppu_thread&, u64 size, u64 flags, u64 alignment, vm::ptr<u32> alloc_addr);
rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
+1 -6
View File
@@ -434,12 +434,7 @@ error_code sys_ppu_thread_recover_page_fault(u32 thread_id)
return CELL_ESRCH; return CELL_ESRCH;
} }
if (auto res = mmapper_thread_recover_page_fault(thread_id)) return mmapper_thread_recover_page_fault(thread_id);
{
return res;
}
return CELL_OK;
} }
error_code sys_ppu_thread_get_page_fault_context(u32 thread_id, vm::ptr<sys_ppu_thread_icontext_t> ctxt) error_code sys_ppu_thread_get_page_fault_context(u32 thread_id, vm::ptr<sys_ppu_thread_icontext_t> ctxt)
rpcs3/Emu/Cell/lv2/sys_spu.cpp
+2 -12
View File
@@ -1355,12 +1355,7 @@ error_code sys_spu_thread_recover_page_fault(ppu_thread& ppu, u32 id)
return CELL_ESRCH; return CELL_ESRCH;
} }
if (auto res = mmapper_thread_recover_page_fault(id)) return mmapper_thread_recover_page_fault(id);
{
return res;
}
return CELL_OK;
} }
error_code sys_raw_spu_recover_page_fault(ppu_thread& ppu, u32 id) error_code sys_raw_spu_recover_page_fault(ppu_thread& ppu, u32 id)
@@ -1376,12 +1371,7 @@ error_code sys_raw_spu_recover_page_fault(ppu_thread& ppu, u32 id)
return CELL_ESRCH; return CELL_ESRCH;
} }
if (auto res = mmapper_thread_recover_page_fault(id)) return mmapper_thread_recover_page_fault(id);
{
return res;
}
return CELL_OK;
} }
error_code sys_raw_spu_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<void> attr) error_code sys_raw_spu_create(ppu_thread& ppu, vm::ptr<u32> id, vm::ptr<void> attr)