diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 443d6158..2e370621 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -2420,8 +2420,7 @@ #defined(HAVE_LD80BITS) DFDD #defined(HAVE_LD80BITS) DFDp #defined(HAVE_LD80BITS) DFppi -#defined(HAVE_LD80BITS) DFppu -#defined(HAVE_LD80BITS) DFppip +#defined(HAVE_LD80BITS) DFppp #defined(HAVE_LD80BITS) iFDipppL #defined(HAVE_LD80BITS) vFppippDDC #!defined(HAVE_LD80BITS) iFK @@ -2431,8 +2430,7 @@ #!defined(HAVE_LD80BITS) KFKp #!defined(HAVE_LD80BITS) KFpp #!defined(HAVE_LD80BITS) KFppi -#!defined(HAVE_LD80BITS) KFppu -#!defined(HAVE_LD80BITS) KFppip +#!defined(HAVE_LD80BITS) KFppp #!defined(HAVE_LD80BITS) iFKipppL #!defined(HAVE_LD80BITS) vFppippKKC #() iFEvpp -> iFEpp @@ -3247,7 +3245,8 @@ wrappedlibc: - __isoc23_strtoull - KFppi: - __strtold_internal -- KFppu: +- KFppp: + - __strtold_l - strtold_l - lFipL: - __read_nocancel @@ -3289,8 +3288,6 @@ wrappedlibc: - __isoc23_strtoll_l - UFppip: - __isoc23_strtoull_l -- KFppip: - - __strtold_l - lFipiI: - lFpupp: - vFpLLpp: diff --git a/src/wrapped/generated/wrappedlibctypes.h b/src/wrapped/generated/wrappedlibctypes.h index 0d26349c..0fe285e6 100644 --- a/src/wrapped/generated/wrappedlibctypes.h +++ b/src/wrapped/generated/wrappedlibctypes.h @@ -67,7 +67,7 @@ typedef int32_t (*iFpOV_t)(void*, int32_t, ...); typedef int64_t (*IFppi_t)(void*, void*, int32_t); typedef uint64_t (*UFppi_t)(void*, void*, int32_t); typedef double (*KFppi_t)(void*, void*, int32_t); -typedef double (*KFppu_t)(void*, void*, uint32_t); +typedef double (*KFppp_t)(void*, void*, void*); typedef intptr_t (*lFipL_t)(int32_t, void*, uintptr_t); typedef intptr_t (*lFppi_t)(void*, void*, int32_t); typedef void* (*pFpii_t)(void*, int32_t, int32_t); @@ -96,7 +96,6 @@ typedef int32_t (*iFppiV_t)(void*, void*, int32_t, ...); typedef int32_t (*iFpppp_t)(void*, void*, void*, void*); typedef int64_t (*IFppip_t)(void*, void*, int32_t, void*); typedef uint64_t (*UFppip_t)(void*, void*, int32_t, void*); -typedef double (*KFppip_t)(void*, void*, int32_t, void*); typedef intptr_t (*lFipiI_t)(int32_t, void*, int32_t, int64_t); typedef intptr_t (*lFpupp_t)(void*, uint32_t, void*, void*); typedef void (*vFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*); @@ -172,7 +171,8 @@ typedef int32_t (*iFpLiLppp_t)(void*, uintptr_t, int32_t, uintptr_t, void*, void GO(__isoc23_strtoll, IFppi_t) \ GO(__isoc23_strtoull, UFppi_t) \ GO(__strtold_internal, KFppi_t) \ - GO(strtold_l, KFppu_t) \ + GO(__strtold_l, KFppp_t) \ + GO(strtold_l, KFppp_t) \ GO(__read_nocancel, lFipL_t) \ GO(__isoc23_strtol, lFppi_t) \ GO(__syslog_chk, vFiipV_t) \ @@ -185,7 +185,6 @@ typedef int32_t (*iFpLiLppp_t)(void*, uintptr_t, int32_t, uintptr_t, void*, void GO(_IO_vfprintf, iFpppp_t) \ GO(__isoc23_strtoll_l, IFppip_t) \ GO(__isoc23_strtoull_l, UFppip_t) \ - GO(__strtold_l, KFppip_t) \ GO(prctl, iFiLLLL_t) \ GO(getopt_long, iFipppp_t) \ GO(getopt_long_only, iFipppp_t) diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index 2b26d150..63b93c13 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -2506,8 +2506,7 @@ typedef long double (*DFED_t)(x86emu_t*, long double); typedef long double (*DFDD_t)(long double, long double); typedef long double (*DFDp_t)(long double, void*); typedef long double (*DFppi_t)(void*, void*, int32_t); -typedef long double (*DFppu_t)(void*, void*, uint32_t); -typedef long double (*DFppip_t)(void*, void*, int32_t, void*); +typedef long double (*DFppp_t)(void*, void*, void*); typedef int32_t (*iFDipppL_t)(long double, int32_t, void*, void*, void*, uintptr_t); typedef void (*vFppippDDC_t)(void*, void*, int32_t, void*, void*, long double, long double, uint8_t); #endif @@ -2520,8 +2519,7 @@ typedef double (*KFKK_t)(double, double); typedef double (*KFKp_t)(double, void*); typedef double (*KFpp_t)(void*, void*); typedef double (*KFppi_t)(void*, void*, int32_t); -typedef double (*KFppu_t)(void*, void*, uint32_t); -typedef double (*KFppip_t)(void*, void*, int32_t, void*); +typedef double (*KFppp_t)(void*, void*, void*); typedef int32_t (*iFKipppL_t)(double, int32_t, void*, void*, void*, uintptr_t); typedef void (*vFppippKKC_t)(void*, void*, int32_t, void*, void*, double, double, uint8_t); #endif @@ -4962,8 +4960,7 @@ void DFED(x86emu_t *emu, uintptr_t fcn) { DFED_t fn = (DFED_t)fcn; long double l void DFDD(x86emu_t *emu, uintptr_t fcn) { DFDD_t fn = (DFDD_t)fcn; long double ld=fn(LD2localLD((void*)(R_ESP + 4)), LD2localLD((void*)(R_ESP + 16))); fpu_do_push(emu); ST0val = ld; } void DFDp(x86emu_t *emu, uintptr_t fcn) { DFDp_t fn = (DFDp_t)fcn; long double ld=fn(LD2localLD((void*)(R_ESP + 4)), *(void**)(R_ESP + 16)); fpu_do_push(emu); ST0val = ld; } void DFppi(x86emu_t *emu, uintptr_t fcn) { DFppi_t fn = (DFppi_t)fcn; long double ld=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12)); fpu_do_push(emu); ST0val = ld; } -void DFppu(x86emu_t *emu, uintptr_t fcn) { DFppu_t fn = (DFppu_t)fcn; long double ld=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(uint32_t*)(R_ESP + 12)); fpu_do_push(emu); ST0val = ld; } -void DFppip(x86emu_t *emu, uintptr_t fcn) { DFppip_t fn = (DFppip_t)fcn; long double ld=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(void**)(R_ESP + 16)); fpu_do_push(emu); ST0val = ld; } +void DFppp(x86emu_t *emu, uintptr_t fcn) { DFppp_t fn = (DFppp_t)fcn; long double ld=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12)); fpu_do_push(emu); ST0val = ld; } void iFDipppL(x86emu_t *emu, uintptr_t fcn) { iFDipppL_t fn = (iFDipppL_t)fcn; R_EAX=fn(LD2localLD((void*)(R_ESP + 4)), *(int32_t*)(R_ESP + 16), *(void**)(R_ESP + 20), *(void**)(R_ESP + 24), *(void**)(R_ESP + 28), *(uintptr_t*)(R_ESP + 32)); } void vFppippDDC(x86emu_t *emu, uintptr_t fcn) { vFppippDDC_t fn = (vFppippDDC_t)fcn; fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(void**)(R_ESP + 16), *(void**)(R_ESP + 20), LD2localLD((void*)(R_ESP + 24)), LD2localLD((void*)(R_ESP + 36)), *(uint8_t*)(R_ESP + 48)); } #endif @@ -4976,8 +4973,7 @@ void KFKK(x86emu_t *emu, uintptr_t fcn) { KFKK_t fn = (KFKK_t)fcn; double db=fn( void KFKp(x86emu_t *emu, uintptr_t fcn) { KFKp_t fn = (KFKp_t)fcn; double db=fn(FromLD((void*)(R_ESP + 4)), *(void**)(R_ESP + 16)); fpu_do_push(emu); ST0val = db; } void KFpp(x86emu_t *emu, uintptr_t fcn) { KFpp_t fn = (KFpp_t)fcn; double db=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8)); fpu_do_push(emu); ST0val = db; } void KFppi(x86emu_t *emu, uintptr_t fcn) { KFppi_t fn = (KFppi_t)fcn; double db=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12)); fpu_do_push(emu); ST0val = db; } -void KFppu(x86emu_t *emu, uintptr_t fcn) { KFppu_t fn = (KFppu_t)fcn; double db=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(uint32_t*)(R_ESP + 12)); fpu_do_push(emu); ST0val = db; } -void KFppip(x86emu_t *emu, uintptr_t fcn) { KFppip_t fn = (KFppip_t)fcn; double db=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(void**)(R_ESP + 16)); fpu_do_push(emu); ST0val = db; } +void KFppp(x86emu_t *emu, uintptr_t fcn) { KFppp_t fn = (KFppp_t)fcn; double db=fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(void**)(R_ESP + 12)); fpu_do_push(emu); ST0val = db; } void iFKipppL(x86emu_t *emu, uintptr_t fcn) { iFKipppL_t fn = (iFKipppL_t)fcn; R_EAX=fn(FromLD((void*)(R_ESP + 4)), *(int32_t*)(R_ESP + 16), *(void**)(R_ESP + 20), *(void**)(R_ESP + 24), *(void**)(R_ESP + 28), *(uintptr_t*)(R_ESP + 32)); } void vFppippKKC(x86emu_t *emu, uintptr_t fcn) { vFppippKKC_t fn = (vFppippKKC_t)fcn; fn(*(void**)(R_ESP + 4), *(void**)(R_ESP + 8), *(int32_t*)(R_ESP + 12), *(void**)(R_ESP + 16), *(void**)(R_ESP + 20), FromLD((void*)(R_ESP + 24)), FromLD((void*)(R_ESP + 36)), *(uint8_t*)(R_ESP + 48)); } #endif @@ -5049,8 +5045,7 @@ int isRetX87Wrapper(wrapper_t fun) { if (fun == &DFDD) return 1; if (fun == &DFDp) return 1; if (fun == &DFppi) return 1; - if (fun == &DFppu) return 1; - if (fun == &DFppip) return 1; + if (fun == &DFppp) return 1; #endif #if !defined(HAVE_LD80BITS) if (fun == &KFK) return 1; @@ -5058,8 +5053,7 @@ int isRetX87Wrapper(wrapper_t fun) { if (fun == &KFKp) return 1; if (fun == &KFpp) return 1; if (fun == &KFppi) return 1; - if (fun == &KFppu) return 1; - if (fun == &KFppip) return 1; + if (fun == &KFppp) return 1; #endif return 0; } diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index 72ccaa11..047cc8dd 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -2466,8 +2466,7 @@ void DFED(x86emu_t *emu, uintptr_t fnc); void DFDD(x86emu_t *emu, uintptr_t fnc); void DFDp(x86emu_t *emu, uintptr_t fnc); void DFppi(x86emu_t *emu, uintptr_t fnc); -void DFppu(x86emu_t *emu, uintptr_t fnc); -void DFppip(x86emu_t *emu, uintptr_t fnc); +void DFppp(x86emu_t *emu, uintptr_t fnc); void iFDipppL(x86emu_t *emu, uintptr_t fnc); void vFppippDDC(x86emu_t *emu, uintptr_t fnc); #endif @@ -2480,8 +2479,7 @@ void KFKK(x86emu_t *emu, uintptr_t fnc); void KFKp(x86emu_t *emu, uintptr_t fnc); void KFpp(x86emu_t *emu, uintptr_t fnc); void KFppi(x86emu_t *emu, uintptr_t fnc); -void KFppu(x86emu_t *emu, uintptr_t fnc); -void KFppip(x86emu_t *emu, uintptr_t fnc); +void KFppp(x86emu_t *emu, uintptr_t fnc); void iFKipppL(x86emu_t *emu, uintptr_t fnc); void vFppippKKC(x86emu_t *emu, uintptr_t fnc); #endif diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h index 9d85ac8a..9850b197 100755 --- a/src/wrapped/wrappedlibc_private.h +++ b/src/wrapped/wrappedlibc_private.h @@ -1744,13 +1744,13 @@ GO2(__isoc23_strtol, lFppi, strtol) #ifdef HAVE_LD80BITS GO(strtold, DFpp) GO(__strtold_internal, DFppi) -GO(__strtold_l, DFppip) -GOW(strtold_l, DFppu) +GO(__strtold_l, DFppp) +GOW(strtold_l, DFppp) #else GO(strtold, KFpp) GO2(__strtold_internal, KFppi, __strtod_internal) -GO2(__strtold_l, KFppip, __strtod_l) -GOW2(strtold_l, KFppu, strtod_l) +GO2(__strtold_l, KFppp, __strtod_l) +GOW2(strtold_l, KFppp, strtod_l) #endif GO(__strtol_internal, lFppi) GO(strtoll, IFppi)