ShuriZma
/
FPPS4
mirror of https://github.com/red-prig/fpPS4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small refractoring

This commit is contained in:
Pavel 2022-12-16 14:06:02 +03:00
parent 17a0ea750e
commit 495036f660
5 changed files with 239 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

222
kernel/ps4_kernel_file.pas
View File

@ -178,29 +178,6 @@ begin
Result:=px2sce(Result);
end;
function _sys_lseek(fd:Integer;offset:Int64;whence:Integer):Int64;
var
f:TCustomFile;
begin
Result:=0;
if (fd<0) then Exit(-EINVAL);
case whence of
SEEK_SET,
SEEK_CUR,
SEEK_END:;
else
Exit(-EINVAL);
end;
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.lseek(offset,whence);
f.Release;
end;
function ps4_lseek(fd:Integer;offset:Int64;whence:Integer):Int64; SysV_ABI_CDecl;
begin
_sig_lock;
@ -233,31 +210,6 @@ begin
end;
end;
function _sys_read(fd:Integer;data:Pointer;size:Int64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (size=0) then //zero check
begin
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
f.Release;
Exit(0);
end;
if (data=nil) then Exit(-EFAULT);
if (size<=0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.read(data,size);
f.Release;
end;
function ps4_read(fd:Integer;data:Pointer;size:Int64):Int64; SysV_ABI_CDecl;
begin
_sig_lock;
@ -290,32 +242,6 @@ begin
end;
end;
function _sys_pread(fd:Integer;data:Pointer;size,offset:Int64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (size=0) then //zero check
begin
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
f.Release;
Exit(0);
end;
if (data=nil) then Exit(-EFAULT);
if (size<=0) then Exit(-EINVAL);
if (offset<0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.pread(data,size,offset);
f.Release;
end;
function ps4_pread(fd:Integer;data:Pointer;size,offset:Int64):Int64; SysV_ABI_CDecl;
begin
_sig_lock;
@ -348,29 +274,6 @@ begin
end;
end;
function _sys_readv(fd:Integer;vector:p_iovec;count:Integer):Int64;
var
f:TCustomFile;
i:Integer;
begin
if (fd<0) then Exit(-EINVAL);
if (vector=nil) then Exit(-EFAULT);
if (count<=0) then Exit(-EINVAL);
For i:=0 to count-1 do
begin
if (vector[i].iov_base=nil) then Exit(-EFAULT);
if (vector[i].iov_len<=0) then Exit(-EINVAL);
end;
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.readv(vector,count);
f.Release;
end;
function ps4_readv(fd:Integer;vector:p_iovec;count:Integer):Int64; SysV_ABI_CDecl;
begin
_sig_lock;
@ -403,31 +306,6 @@ begin
end;
end;
function _sys_write(fd:Integer;data:Pointer;size:Int64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (size=0) then //zero check
begin
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
f.Release;
Exit(0);
end;
if (data=nil) then Exit(-EFAULT);
if (size<=0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.write(data,size);
f.Release;
end;
function ps4_write(fd:Integer;data:Pointer;size:Int64):Int64; SysV_ABI_CDecl;
begin
_sig_lock;
@ -460,32 +338,6 @@ begin
end;
end;
function _sys_pwrite(fd:Integer;data:Pointer;size,offset:Int64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (size=0) then //zero check
begin
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
f.Release;
Exit(0);
end;
if (data=nil) then Exit(-EFAULT);
if (size<=0) then Exit(-EINVAL);
if (offset<0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.pwrite(data,size,offset);
f.Release;
end;
function ps4_pwrite(fd:Integer;data:Pointer;size,offset:Int64):Int64; SysV_ABI_CDecl;
begin
_sig_lock;
@ -518,21 +370,6 @@ begin
end;
end;
function _sys_ftruncate(fd:Integer;size:Int64):Integer;
var
f:TCustomFile;
begin
if (fd<0) then Exit(EINVAL);
if (size<=0) then Exit(EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(EBADF);
Result:=f.ftruncate(size);
f.Release;
end;
function ps4_ftruncate(fd:Integer;size:Int64):Integer; SysV_ABI_CDecl;
begin
_sig_lock;
@ -550,21 +387,6 @@ begin
Result:=px2sce(Result);
end;
function _sys_fstat(fd:Integer;stat:PSceKernelStat):Integer;
var
f:TCustomFile;
begin
if (fd<0) then Exit(EINVAL);
if (stat=nil) then Exit(EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(EBADF);
Result:=f.fstat(stat);
f.Release;
end;
function ps4_fstat(fd:Integer;stat:PSceKernelStat):Integer; SysV_ABI_CDecl;
begin
_sig_lock;
@ -582,22 +404,6 @@ begin
Result:=px2sce(Result);
end;
function _sys_getdirentries(fd:Integer;buf:Pointer;nbytes:Int64;basep:PInt64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (buf=nil) then Exit(-EFAULT);
if (nbytes<=0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.getdirentries(buf,nbytes,basep);
f.Release;
end;
function ps4_getdirentries(fd:Integer;buf:Pointer;nbytes:Int64;basep:PInt64):Int64; SysV_ABI_CDecl;
begin
_sig_lock;
@ -662,20 +468,6 @@ begin
end;
end;
function _sys_fsync(fd:Integer):Integer;
var
f:TCustomFile;
begin
if (fd<0) then Exit(EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(EBADF);
Result:=f.fsync;
f.Release;
end;
function ps4_fsync(fd:Integer):Integer; SysV_ABI_CDecl;
begin
_sig_lock;
@ -693,20 +485,6 @@ begin
Result:=px2sce(Result);
end;
function _sys_fcntl(fd,cmd:Integer;param1:ptruint):Integer;
var
f:TCustomFile;
begin
if (fd<0) then Exit(EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(EBADF);
Result:=f.fcntl(cmd,param1);
f.Release;
end;
function ps4_fcntl(fd,cmd:Integer;param1:ptruint):Integer; SysV_ABI_CDecl;
begin
_sig_lock;

4
sys/sys_dev.pas
View File

@ -74,9 +74,7 @@ begin
Exit(-ENOENT);
end;
f.status:=flags and O_FL_STATUS;
Result:=_sys_open_fd(f);
Result:=_sys_open_fd(f,flags);
if (Result<0) then
begin

3
sys/sys_dir.pas
View File

@ -140,7 +140,6 @@ begin
end;
f:=TDirFile.Create;
f.status:=flags and O_FL_STATUS;
f.path:=path;
if (h<>INVALID_HANDLE_VALUE) then
@ -183,7 +182,7 @@ begin
Windows.FindClose(h);
end;
Result:=_sys_open_fd(f);
Result:=_sys_open_fd(f,flags);
if (Result<0) then
begin

238
sys/sys_fd.pas
View File

@ -214,9 +214,20 @@ type
end;
function _sys_get_osfhandle(fd:Integer):THandle;
function _sys_open_fd(f:TCustomFile):Integer;
function _sys_open_fd(f:TCustomFile;flags:Integer):Integer;
function _sys_acqure_fd(fd:Integer):TCustomFile;
function _sys_close(fd:Integer):Integer;
function _sys_lseek(fd:Integer;offset:Int64;whence:Integer):Int64;
function _sys_read(fd:Integer;data:Pointer;size:Int64):Int64;
function _sys_pread(fd:Integer;data:Pointer;size,offset:Int64):Int64;
function _sys_readv(fd:Integer;vector:p_iovec;count:Integer):Int64;
function _sys_write(fd:Integer;data:Pointer;size:Int64):Int64;
function _sys_pwrite(fd:Integer;data:Pointer;size,offset:Int64):Int64;
function _sys_ftruncate(fd:Integer;size:Int64):Integer;
function _sys_fstat(fd:Integer;stat:PSceKernelStat):Integer;
function _sys_getdirentries(fd:Integer;buf:Pointer;nbytes:Int64;basep:PInt64):Int64;
function _sys_fsync(fd:Integer):Integer;
function _sys_fcntl(fd,cmd:Integer;param1:ptruint):Integer;
implementation
@ -309,12 +320,13 @@ begin
end;
end;
function _sys_open_fd(f:TCustomFile):Integer;
function _sys_open_fd(f:TCustomFile;flags:Integer):Integer;
begin
if (f=nil) then Exit(-EINVAL);
if FileHandles.New(f,Result) then
begin
f.fd:=Result;
f.status:=flags and O_FL_STATUS;
end else
begin
Result:=-EMFILE;
@ -333,6 +345,228 @@ begin
if not FileHandles.Delete(fd) then Exit(EBADF);
end;
function _sys_lseek(fd:Integer;offset:Int64;whence:Integer):Int64;
var
f:TCustomFile;
begin
Result:=0;
if (fd<0) then Exit(-EINVAL);
case whence of
SEEK_SET,
SEEK_CUR,
SEEK_END:;
else
Exit(-EINVAL);
end;
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.lseek(offset,whence);
f.Release;
end;
function _sys_read(fd:Integer;data:Pointer;size:Int64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (size=0) then //zero check
begin
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
f.Release;
Exit(0);
end;
if (data=nil) then Exit(-EFAULT);
if (size<=0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.read(data,size);
f.Release;
end;
function _sys_pread(fd:Integer;data:Pointer;size,offset:Int64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (size=0) then //zero check
begin
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
f.Release;
Exit(0);
end;
if (data=nil) then Exit(-EFAULT);
if (size<=0) then Exit(-EINVAL);
if (offset<0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.pread(data,size,offset);
f.Release;
end;
function _sys_readv(fd:Integer;vector:p_iovec;count:Integer):Int64;
var
f:TCustomFile;
i:Integer;
begin
if (fd<0) then Exit(-EINVAL);
if (vector=nil) then Exit(-EFAULT);
if (count<=0) then Exit(-EINVAL);
For i:=0 to count-1 do
begin
if (vector[i].iov_base=nil) then Exit(-EFAULT);
if (vector[i].iov_len<=0) then Exit(-EINVAL);
end;
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.readv(vector,count);
f.Release;
end;
function _sys_write(fd:Integer;data:Pointer;size:Int64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (size=0) then //zero check
begin
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
f.Release;
Exit(0);
end;
if (data=nil) then Exit(-EFAULT);
if (size<=0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.write(data,size);
f.Release;
end;
function _sys_pwrite(fd:Integer;data:Pointer;size,offset:Int64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (size=0) then //zero check
begin
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
f.Release;
Exit(0);
end;
if (data=nil) then Exit(-EFAULT);
if (size<=0) then Exit(-EINVAL);
if (offset<0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.pwrite(data,size,offset);
f.Release;
end;
function _sys_ftruncate(fd:Integer;size:Int64):Integer;
var
f:TCustomFile;
begin
if (fd<0) then Exit(EINVAL);
if (size<=0) then Exit(EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(EBADF);
Result:=f.ftruncate(size);
f.Release;
end;
function _sys_fstat(fd:Integer;stat:PSceKernelStat):Integer;
var
f:TCustomFile;
begin
if (fd<0) then Exit(EINVAL);
if (stat=nil) then Exit(EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(EBADF);
Result:=f.fstat(stat);
f.Release;
end;
function _sys_getdirentries(fd:Integer;buf:Pointer;nbytes:Int64;basep:PInt64):Int64;
var
f:TCustomFile;
begin
if (fd<0) then Exit(-EINVAL);
if (buf=nil) then Exit(-EFAULT);
if (nbytes<=0) then Exit(-EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(-EBADF);
Result:=f.getdirentries(buf,nbytes,basep);
f.Release;
end;
function _sys_fsync(fd:Integer):Integer;
var
f:TCustomFile;
begin
if (fd<0) then Exit(EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(EBADF);
Result:=f.fsync;
f.Release;
end;
function _sys_fcntl(fd,cmd:Integer;param1:ptruint):Integer;
var
f:TCustomFile;
begin
if (fd<0) then Exit(EINVAL);
f:=_sys_acqure_fd(fd);
if (f=nil) then Exit(EBADF);
Result:=f.fcntl(cmd,param1);
f.Release;
end;
//
initialization

3
sys/sys_file.pas
View File

@ -127,7 +127,6 @@ begin
f:=TFile.Create;
f.Handle:=h;
f.status:=flags and O_FL_STATUS;
end;
function _sys_file_open(const path:RawByteString;flags,mode:Integer):Integer;
@ -138,7 +137,7 @@ begin
Result:=__sys_file_open(path,flags,mode,f);
if (Result<>0) then Exit;
Result:=_sys_open_fd(f);
Result:=_sys_open_fd(f,flags);
if (Result<0) then
begin