Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-06-06 10:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Implement read

Browse source 
Also fixes error behavior
This commit is contained in:
Stephen Miller 2025-02-17 19:04:03 -06:00
parent 5e04d7aa91
commit db695fe3a3
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/core/libraries/kernel/file_system.cpp
View file

@ -385,17 +385,18 @@ s64 PS4_SYSV_ABI posix_lseek(s32 fd, s64 offset, s32 whence) {
s64 PS4_SYSV_ABI sceKernelLseek(s32 fd, s64 offset, s32 whence) { s64 PS4_SYSV_ABI sceKernelLseek(s32 fd, s64 offset, s32 whence) {
s64 result = posix_lseek(fd, offset, whence); s64 result = posix_lseek(fd, offset, whence);
if (result < 0) { if (result < 0) {
LOG_ERROR(Kernel_Fs, "lseek: error = {}", *__Error()); LOG_ERROR(Kernel_Fs, "error = {}", *__Error());
return ErrnoToSceKernelError(*__Error()); return ErrnoToSceKernelError(*__Error());
} }
return result; return result;
} }
s64 PS4_SYSV_ABI sceKernelRead(int d, void* buf, size_t nbytes) { s64 PS4_SYSV_ABI read(s32 fd, void* buf, size_t nbytes) {
auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance(); auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
auto* file = h->GetFile(d); auto* file = h->GetFile(fd);
if (file == nullptr) { if (file == nullptr) {
return ORBIS_KERNEL_ERROR_EBADF; *__Error() = POSIX_EBADF;
return -1;
} }
std::scoped_lock lk{file->m_mutex}; std::scoped_lock lk{file->m_mutex};
@ -405,12 +406,15 @@ s64 PS4_SYSV_ABI sceKernelRead(int d, void* buf, size_t nbytes) {
return ReadFile(file->f, buf, nbytes); return ReadFile(file->f, buf, nbytes);
} }
int PS4_SYSV_ABI posix_read(int d, void* buf, size_t nbytes) { s64 PS4_SYSV_ABI posix_read(s32 fd, void* buf, size_t nbytes) {
int result = sceKernelRead(d, buf, nbytes); return read(fd, buf, nbytes);
}
s64 PS4_SYSV_ABI sceKernelRead(s32 fd, void* buf, size_t nbytes) {
s64 result = read(fd, buf, nbytes);
if (result < 0) { if (result < 0) {
LOG_ERROR(Kernel_Pthread, "posix_read: error = {}", result); LOG_ERROR(Kernel_Fs, "error = {}", *__Error());
ErrSceToPosix(result); return ErrnoToSceKernelError(*__Error());
return -1;
} }
return result; return result;
} }
@ -865,7 +869,7 @@ void RegisterFileSystem(Core::Loader::SymbolsResolver* sym) {
LIB_FUNCTION("Oy6IpwgtYOk", "libkernel", 1, "libkernel", 1, 1, posix_lseek); LIB_FUNCTION("Oy6IpwgtYOk", "libkernel", 1, "libkernel", 1, 1, posix_lseek);
LIB_FUNCTION("oib76F-12fk", "libkernel", 1, "libkernel", 1, 1, sceKernelLseek); LIB_FUNCTION("oib76F-12fk", "libkernel", 1, "libkernel", 1, 1, sceKernelLseek);
// LIB_FUNCTION("DRuBt2pvICk", "libkernel", 1, "libkernel", 1, 1, read); LIB_FUNCTION("DRuBt2pvICk", "libkernel", 1, "libkernel", 1, 1, read);
LIB_FUNCTION("AqBioC2vF3I", "libScePosix", 1, "libkernel", 1, 1, posix_read); LIB_FUNCTION("AqBioC2vF3I", "libScePosix", 1, "libkernel", 1, 1, posix_read);
LIB_FUNCTION("AqBioC2vF3I", "libkernel", 1, "libkernel", 1, 1, posix_read); LIB_FUNCTION("AqBioC2vF3I", "libkernel", 1, "libkernel", 1, 1, posix_read);
LIB_FUNCTION("Cg4srZ6TKbU", "libkernel", 1, "libkernel", 1, 1, sceKernelRead); LIB_FUNCTION("Cg4srZ6TKbU", "libkernel", 1, "libkernel", 1, 1, sceKernelRead);