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

sys_process: Fix sys_process_get_id, add error_code (#7246)

Browse source
This commit is contained in:
Eladash 2020-01-14 20:32:41 +02:00 • committed by Ivan
parent 8bbda3dedb
commit 01035d35bd
5 changed files with 57 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/Modules/cellSpurs.cpp
View file

@ -949,7 +949,7 @@ s32 _spurs::initialize(ppu_thread& ppu, vm::ptr<CellSpurs> spurs, u32 revision,
return CELL_SPURS_CORE_ERROR_INVAL; return CELL_SPURS_CORE_ERROR_INVAL;
} }
if (sys_process_is_spu_lock_line_reservation_address(spurs.addr(), SYS_MEMORY_ACCESS_RIGHT_SPU_THR) != CELL_OK) if (process_is_spu_lock_line_reservation_address(spurs.addr(), SYS_MEMORY_ACCESS_RIGHT_SPU_THR) != CELL_OK)
{ {
return CELL_SPURS_CORE_ERROR_PERM; return CELL_SPURS_CORE_ERROR_PERM;
} }

2
rpcs3/Emu/Cell/PPUFunction.cpp
View file

@ -22,7 +22,7 @@ extern std::string ppu_get_syscall_name(u64 code)
case 25: return "sys_process_get_sdk_version"; case 25: return "sys_process_get_sdk_version";
case 26: return "_sys_process_exit2"; case 26: return "_sys_process_exit2";
case 28: return "_sys_process_get_number_of_object"; case 28: return "_sys_process_get_number_of_object";
case 29: return "sys_process_get_id"; case 29: return "sys_process_get_id2";
case 30: return "_sys_process_get_paramsfo"; case 30: return "_sys_process_get_paramsfo";
case 31: return "sys_process_get_ppu_guid"; case 31: return "sys_process_get_ppu_guid";
case 41: return "_sys_ppu_thread_exit"; case 41: return "_sys_ppu_thread_exit";

2
rpcs3/Emu/Cell/lv2/lv2.cpp
View file

@ -97,7 +97,7 @@ const std::array<ppu_function_t, 1024> s_ppu_syscall_table
BIND_FUNC(_sys_process_exit2), //26 (0x01A) BIND_FUNC(_sys_process_exit2), //26 (0x01A)
null_func,//BIND_FUNC(), //27 (0x01B) DBG null_func,//BIND_FUNC(), //27 (0x01B) DBG
null_func,//BIND_FUNC(_sys_process_get_number_of_object)//28 (0x01C) ROOT null_func,//BIND_FUNC(_sys_process_get_number_of_object)//28 (0x01C) ROOT
BIND_FUNC(sys_process_get_id), //29 (0x01D) ROOT BIND_FUNC(sys_process_get_id2), //29 (0x01D) ROOT
BIND_FUNC(_sys_process_get_paramsfo), //30 (0x01E) BIND_FUNC(_sys_process_get_paramsfo), //30 (0x01E)
null_func,//BIND_FUNC(sys_process_get_ppu_guid), //31 (0x01F) null_func,//BIND_FUNC(sys_process_get_ppu_guid), //31 (0x01F)

60
rpcs3/Emu/Cell/lv2/sys_process.cpp
View file

@ -71,7 +71,7 @@ u32 idm_get_count()
return idm::select<T, Get>([&](u32, Get&) {}); return idm::select<T, Get>([&](u32, Get&) {});
} }
s32 sys_process_get_number_of_object(u32 object, vm::ptr<u32> nump) error_code sys_process_get_number_of_object(u32 object, vm::ptr<u32> nump)
{ {
sys_process.error("sys_process_get_number_of_object(object=0x%x, nump=*0x%x)", object, nump); sys_process.error("sys_process_get_number_of_object(object=0x%x, nump=*0x%x)", object, nump);
@ -117,10 +117,8 @@ void idm_get_set(std::set<u32>& out)
}); });
} }
s32 sys_process_get_id(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> set_size) static error_code process_get_id(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> set_size)
{ {
sys_process.error("sys_process_get_id(object=0x%x, buffer=*0x%x, size=%d, set_size=*0x%x)", object, buffer, size, set_size);
std::set<u32> objects; std::set<u32> objects;
switch (object) switch (object)
@ -143,8 +141,7 @@ s32 sys_process_get_id(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> s
case SYS_FS_FD_OBJECT: idm_get_set<lv2_fs_object, lv2_fs_object>(objects); break; case SYS_FS_FD_OBJECT: idm_get_set<lv2_fs_object, lv2_fs_object>(objects); break;
case SYS_LWCOND_OBJECT: idm_get_set<lv2_obj, lv2_lwcond>(objects); break; case SYS_LWCOND_OBJECT: idm_get_set<lv2_obj, lv2_lwcond>(objects); break;
case SYS_EVENT_FLAG_OBJECT: idm_get_set<lv2_obj, lv2_event_flag>(objects); break; case SYS_EVENT_FLAG_OBJECT: idm_get_set<lv2_obj, lv2_event_flag>(objects); break;
case SYS_SPUPORT_OBJECT: fmt::throw_exception("SYS_SPUPORT_OBJECT" HERE);
case SYS_SPUPORT_OBJECT: // Unallowed
default: default:
{ {
return CELL_EINVAL; return CELL_EINVAL;
@ -153,7 +150,8 @@ s32 sys_process_get_id(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> s
u32 i = 0; u32 i = 0;
for (auto id = objects.begin(); i < size && id != objects.end(); id++, i++) // NOTE: Treats negative and 0 values as 1 due to signed checks and "do-while" behavior of fw
for (auto id = objects.begin(); i < std::max<s32>(size, 1) + 0u && id != objects.end(); id++, i++)
{ {
buffer[i] = *id; buffer[i] = *id;
} }
@ -163,7 +161,33 @@ s32 sys_process_get_id(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> s
return CELL_OK; return CELL_OK;
} }
s32 process_is_spu_lock_line_reservation_address(u32 addr, u64 flags) error_code sys_process_get_id(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> set_size)
{
sys_process.error("sys_process_get_id(object=0x%x, buffer=*0x%x, size=%d, set_size=*0x%x)", object, buffer, size, set_size);
if (object == SYS_SPUPORT_OBJECT)
{
// Unallowed for this syscall
return CELL_EINVAL;
}
return process_get_id(object, buffer, size, set_size);
}
error_code sys_process_get_id2(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> set_size)
{
sys_process.error("sys_process_get_id2(object=0x%x, buffer=*0x%x, size=%d, set_size=*0x%x)", object, buffer, size, set_size);
if (!g_ps3_process_info.has_root_perm())
{
// This syscall is more capable than sys_process_get_id but also needs a root perm check
return CELL_ENOSYS;
}
return process_get_id(object, buffer, size, set_size);
}
error_code process_is_spu_lock_line_reservation_address(u32 addr, u64 flags)
{ {
if (!flags || flags & ~(SYS_MEMORY_ACCESS_RIGHT_SPU_THR | SYS_MEMORY_ACCESS_RIGHT_RAW_SPU)) if (!flags || flags & ~(SYS_MEMORY_ACCESS_RIGHT_SPU_THR | SYS_MEMORY_ACCESS_RIGHT_RAW_SPU))
{ {
@ -174,14 +198,14 @@ s32 process_is_spu_lock_line_reservation_address(u32 addr, u64 flags)
return CELL_OK; return CELL_OK;
} }
s32 sys_process_is_spu_lock_line_reservation_address(u32 addr, u64 flags) error_code sys_process_is_spu_lock_line_reservation_address(u32 addr, u64 flags)
{ {
sys_process.warning("sys_process_is_spu_lock_line_reservation_address(addr=0x%x, flags=0x%llx)", addr, flags); sys_process.warning("sys_process_is_spu_lock_line_reservation_address(addr=0x%x, flags=0x%llx)", addr, flags);
return process_is_spu_lock_line_reservation_address(addr, flags); return process_is_spu_lock_line_reservation_address(addr, flags);
} }
s32 _sys_process_get_paramsfo(vm::ptr<char> buffer) error_code _sys_process_get_paramsfo(vm::ptr<char> buffer)
{ {
sys_process.warning("_sys_process_get_paramsfo(buffer=0x%x)", buffer); sys_process.warning("_sys_process_get_paramsfo(buffer=0x%x)", buffer);
@ -204,15 +228,15 @@ s32 process_get_sdk_version(u32 pid, s32& ver)
return CELL_OK; return CELL_OK;
} }
s32 sys_process_get_sdk_version(u32 pid, vm::ptr<s32> version) error_code sys_process_get_sdk_version(u32 pid, vm::ptr<s32> version)
{ {
sys_process.warning("sys_process_get_sdk_version(pid=0x%x, version=*0x%x)", pid, version); sys_process.warning("sys_process_get_sdk_version(pid=0x%x, version=*0x%x)", pid, version);
s32 sdk_ver; s32 sdk_ver;
s32 ret = process_get_sdk_version(pid, sdk_ver); const s32 ret = process_get_sdk_version(pid, sdk_ver);
if (ret != CELL_OK) if (ret != CELL_OK)
{ {
return ret; // error code return CellError{ret + 0u}; // error code
} }
else else
{ {
@ -221,34 +245,34 @@ s32 sys_process_get_sdk_version(u32 pid, vm::ptr<s32> version)
} }
} }
s32 sys_process_kill(u32 pid) error_code sys_process_kill(u32 pid)
{ {
sys_process.todo("sys_process_kill(pid=0x%x)", pid); sys_process.todo("sys_process_kill(pid=0x%x)", pid);
return CELL_OK; return CELL_OK;
} }
s32 sys_process_wait_for_child(u32 pid, vm::ptr<u32> status, u64 unk) error_code sys_process_wait_for_child(u32 pid, vm::ptr<u32> status, u64 unk)
{ {
sys_process.todo("sys_process_wait_for_child(pid=0x%x, status=*0x%x, unk=0x%llx", pid, status, unk); sys_process.todo("sys_process_wait_for_child(pid=0x%x, status=*0x%x, unk=0x%llx", pid, status, unk);
return CELL_OK; return CELL_OK;
} }
s32 sys_process_wait_for_child2(u64 unk1, u64 unk2, u64 unk3, u64 unk4, u64 unk5, u64 unk6) error_code sys_process_wait_for_child2(u64 unk1, u64 unk2, u64 unk3, u64 unk4, u64 unk5, u64 unk6)
{ {
sys_process.todo("sys_process_wait_for_child2(unk1=0x%llx, unk2=0x%llx, unk3=0x%llx, unk4=0x%llx, unk5=0x%llx, unk6=0x%llx)", sys_process.todo("sys_process_wait_for_child2(unk1=0x%llx, unk2=0x%llx, unk3=0x%llx, unk4=0x%llx, unk5=0x%llx, unk6=0x%llx)",
unk1, unk2, unk3, unk4, unk5, unk6); unk1, unk2, unk3, unk4, unk5, unk6);
return CELL_OK; return CELL_OK;
} }
s32 sys_process_get_status(u64 unk) error_code sys_process_get_status(u64 unk)
{ {
sys_process.todo("sys_process_get_status(unk=0x%llx)", unk); sys_process.todo("sys_process_get_status(unk=0x%llx)", unk);
//vm::write32(CPU.gpr[4], GetPPUThreadStatus(CPU)); //vm::write32(CPU.gpr[4], GetPPUThreadStatus(CPU));
return CELL_OK; return CELL_OK;
} }
s32 sys_process_detach_child(u64 unk) error_code sys_process_detach_child(u64 unk)
{ {
sys_process.todo("sys_process_detach_child(unk=0x%llx)", unk); sys_process.todo("sys_process_detach_child(unk=0x%llx)", unk);
return CELL_OK; return CELL_OK;

23
rpcs3/Emu/Cell/lv2/sys_process.h
View file

@ -54,20 +54,21 @@ extern ps3_process_info_t g_ps3_process_info;
// Auxiliary functions // Auxiliary functions
s32 process_getpid(); s32 process_getpid();
s32 process_get_sdk_version(u32 pid, s32& ver); s32 process_get_sdk_version(u32 pid, s32& ver);
s32 process_is_spu_lock_line_reservation_address(u32 addr, u64 flags); error_code process_is_spu_lock_line_reservation_address(u32 addr, u64 flags);
// SysCalls // SysCalls
s32 sys_process_getpid(); s32 sys_process_getpid();
s32 sys_process_getppid(); s32 sys_process_getppid();
s32 sys_process_get_number_of_object(u32 object, vm::ptr<u32> nump); error_code sys_process_get_number_of_object(u32 object, vm::ptr<u32> nump);
s32 sys_process_get_id(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> set_size); error_code sys_process_get_id(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> set_size);
s32 _sys_process_get_paramsfo(vm::ptr<char> buffer); error_code sys_process_get_id2(u32 object, vm::ptr<u32> buffer, u32 size, vm::ptr<u32> set_size);
s32 sys_process_get_sdk_version(u32 pid, vm::ptr<s32> version); error_code _sys_process_get_paramsfo(vm::ptr<char> buffer);
s32 sys_process_get_status(u64 unk); error_code sys_process_get_sdk_version(u32 pid, vm::ptr<s32> version);
s32 sys_process_is_spu_lock_line_reservation_address(u32 addr, u64 flags); error_code sys_process_get_status(u64 unk);
s32 sys_process_kill(u32 pid); error_code sys_process_is_spu_lock_line_reservation_address(u32 addr, u64 flags);
s32 sys_process_wait_for_child(u32 pid, vm::ptr<u32> status, u64 unk); error_code sys_process_kill(u32 pid);
s32 sys_process_wait_for_child2(u64 unk1, u64 unk2, u64 unk3, u64 unk4, u64 unk5, u64 unk6); error_code sys_process_wait_for_child(u32 pid, vm::ptr<u32> status, u64 unk);
s32 sys_process_detach_child(u64 unk); error_code sys_process_wait_for_child2(u64 unk1, u64 unk2, u64 unk3, u64 unk4, u64 unk5, u64 unk6);
error_code sys_process_detach_child(u64 unk);
void _sys_process_exit(ppu_thread& ppu, s32 status, u32 arg2, u32 arg3); void _sys_process_exit(ppu_thread& ppu, s32 status, u32 arg2, u32 arg3);
void _sys_process_exit2(ppu_thread& ppu, s32 status, vm::ptr<sys_exit2_param> arg, u32 arg_size, u32 arg4); void _sys_process_exit2(ppu_thread& ppu, s32 status, vm::ptr<sys_exit2_param> arg, u32 arg_size, u32 arg4);