diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-09-10 19:20:43 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-09-10 19:20:43 +0200 |
| commit | 1bfb50f29a9bb41416036df4afbde6093a3b031d (patch) | |
| tree | 7ba3cfc0214cf87e78c38e2efd6c7397a4e51eb1 /src | |
| parent | 8187c35ea8ffa4d115b53306f6d530cea47ea412 (diff) | |
| download | box64-1bfb50f29a9bb41416036df4afbde6093a3b031d.tar.gz box64-1bfb50f29a9bb41416036df4afbde6093a3b031d.zip | |
[WRAPPER] Updat generated wrapper files
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 6 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedlibctypes.h | 5 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 2 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index abbdbb89..e6566da1 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -36,7 +36,6 @@ #() iFp #() iFO #() iFS -#() iFP #() iFb #() IFv #() IFi @@ -4205,6 +4204,9 @@ wrappedlibc: - vFpV: - warn - warnx +- vFpA: + - vwarn + - vwarnx - iFip: - fstat - fstat64 @@ -4304,7 +4306,6 @@ wrappedlibc: - execve - iFppV: - __asprintf - - __isoc23_fscanf - __isoc23_sscanf - __isoc99_fscanf - __isoc99_sscanf @@ -4327,6 +4328,7 @@ wrappedlibc: - open - open64 - iFSpV: + - __isoc23_fscanf - fprintf - fscanf - fwprintf diff --git a/src/wrapped/generated/wrappedlibctypes.h b/src/wrapped/generated/wrappedlibctypes.h index 1e5daf98..d6049eb6 100644 --- a/src/wrapped/generated/wrappedlibctypes.h +++ b/src/wrapped/generated/wrappedlibctypes.h @@ -25,6 +25,7 @@ typedef void (*vFpi_t)(void*, int32_t); typedef void (*vFpu_t)(void*, uint32_t); typedef void (*vFpp_t)(void*, void*); typedef void (*vFpV_t)(void*, ...); +typedef void (*vFpA_t)(void*, va_list); typedef int32_t (*iFip_t)(int32_t, void*); typedef int32_t (*iFup_t)(uint32_t, void*); typedef int32_t (*iFpi_t)(void*, int32_t); @@ -140,6 +141,8 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void* GO(twalk, vFpp_t) \ GO(warn, vFpV_t) \ GO(warnx, vFpV_t) \ + GO(vwarn, vFpA_t) \ + GO(vwarnx, vFpA_t) \ GO(fstat, iFip_t) \ GO(fstat64, iFip_t) \ GO(setrlimit, iFup_t) \ @@ -214,7 +217,6 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void* GO(__vsscanf, iFppp_t) \ GO(execve, iFppp_t) \ GO(__asprintf, iFppV_t) \ - GO(__isoc23_fscanf, iFppV_t) \ GO(__isoc23_sscanf, iFppV_t) \ GO(__isoc99_fscanf, iFppV_t) \ GO(__isoc99_sscanf, iFppV_t) \ @@ -234,6 +236,7 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void* GO(__open, iFpON_t) \ GO(open, iFpON_t) \ GO(open64, iFpON_t) \ + GO(__isoc23_fscanf, iFSpV_t) \ GO(fprintf, iFSpV_t) \ GO(fscanf, iFSpV_t) \ GO(fwprintf, iFSpV_t) \ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index 7bdff045..b1869647 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -86,7 +86,6 @@ typedef int32_t (*iFL_t)(uintptr_t); typedef int32_t (*iFp_t)(void*); typedef int32_t (*iFO_t)(int32_t); typedef int32_t (*iFS_t)(void*); -typedef int32_t (*iFP_t)(void*); typedef int32_t (*iFb_t)(void*); typedef int64_t (*IFv_t)(void); typedef int64_t (*IFi_t)(int32_t); @@ -3281,7 +3280,6 @@ void iFL(x64emu_t *emu, uintptr_t fcn) { iFL_t fn = (iFL_t)fcn; R_RAX=(int32_t)f void iFp(x64emu_t *emu, uintptr_t fcn) { iFp_t fn = (iFp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI); } void iFO(x64emu_t *emu, uintptr_t fcn) { iFO_t fn = (iFO_t)fcn; R_RAX=(int32_t)fn(of_convert((int32_t)R_RDI)); } void iFS(x64emu_t *emu, uintptr_t fcn) { iFS_t fn = (iFS_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI)); } -void iFP(x64emu_t *emu, uintptr_t fcn) { iFP_t fn = (iFP_t)fcn; R_RAX=(int32_t)fn(*(void**)(R_RSP + 8)); } void iFb(x64emu_t *emu, uintptr_t fcn) { iFb_t fn = (iFb_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(int32_t)fn(aligned_xcb); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); } void IFv(x64emu_t *emu, uintptr_t fcn) { IFv_t fn = (IFv_t)fcn; R_RAX=(int64_t)fn(); } void IFi(x64emu_t *emu, uintptr_t fcn) { IFi_t fn = (IFi_t)fcn; R_RAX=(int64_t)fn((int32_t)R_RDI); } diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index d6f75c92..3a83ab0b 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -73,7 +73,6 @@ void iFL(x64emu_t *emu, uintptr_t fnc); void iFp(x64emu_t *emu, uintptr_t fnc); void iFO(x64emu_t *emu, uintptr_t fnc); void iFS(x64emu_t *emu, uintptr_t fnc); -void iFP(x64emu_t *emu, uintptr_t fnc); void iFb(x64emu_t *emu, uintptr_t fnc); void IFv(x64emu_t *emu, uintptr_t fnc); void IFi(x64emu_t *emu, uintptr_t fnc); |