diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 4 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedtbbmallocproxytypes.h | 3 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 2 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 1 | ||||
| -rw-r--r-- | src/wrapped/wrappedtbbmallocproxy_private.h | 2 |
5 files changed, 3 insertions, 9 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index e34f0a04..4d6d44e4 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -9,7 +9,6 @@ #() vFL #() vFp #() vFS -#() vFP #() cFv #() cFi #() cFu @@ -3976,9 +3975,8 @@ wrappedsoftokn3: wrappedssl3: wrappedtbbmallocproxy: - vFp: - - _ZdlPv -- vFP: - _ZdaPv + - _ZdlPv - pFL: - _Znam - _Znwm diff --git a/src/wrapped/generated/wrappedtbbmallocproxytypes.h b/src/wrapped/generated/wrappedtbbmallocproxytypes.h index f26554a8..41d5a922 100644 --- a/src/wrapped/generated/wrappedtbbmallocproxytypes.h +++ b/src/wrapped/generated/wrappedtbbmallocproxytypes.h @@ -12,14 +12,13 @@ #endif typedef void (*vFp_t)(void*); -typedef void (*vFP_t)(void*); typedef void* (*pFL_t)(uintptr_t); typedef void (*vFpp_t)(void*, void*); typedef void* (*pFLp_t)(uintptr_t, void*); #define SUPER() ADDED_FUNCTIONS() \ + GO(_ZdaPv, vFp_t) \ GO(_ZdlPv, vFp_t) \ - GO(_ZdaPv, vFP_t) \ GO(_Znam, pFL_t) \ GO(_Znwm, pFL_t) \ GO(_ZdaPvRKSt9nothrow_t, vFpp_t) \ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index 5a65456b..56986195 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -43,7 +43,6 @@ typedef void (*vFl_t)(intptr_t); typedef void (*vFL_t)(uintptr_t); typedef void (*vFp_t)(void*); typedef void (*vFS_t)(void*); -typedef void (*vFP_t)(void*); typedef int8_t (*cFv_t)(void); typedef int8_t (*cFi_t)(int64_t); typedef int8_t (*cFu_t)(uint64_t); @@ -2239,7 +2238,6 @@ void vFl(x64emu_t *emu, uintptr_t fcn) { vFl_t fn = (vFl_t)fcn; fn((intptr_t)R_R void vFL(x64emu_t *emu, uintptr_t fcn) { vFL_t fn = (vFL_t)fcn; fn((uintptr_t)R_RDI); } void vFp(x64emu_t *emu, uintptr_t fcn) { vFp_t fn = (vFp_t)fcn; fn((void*)R_RDI); } void vFS(x64emu_t *emu, uintptr_t fcn) { vFS_t fn = (vFS_t)fcn; fn(io_convert((void*)R_RDI)); } -void vFP(x64emu_t *emu, uintptr_t fcn) { vFP_t fn = (vFP_t)fcn; fn(*(void**)(R_RSP + 8)); } void cFv(x64emu_t *emu, uintptr_t fcn) { cFv_t fn = (cFv_t)fcn; R_RAX=fn(); } void cFi(x64emu_t *emu, uintptr_t fcn) { cFi_t fn = (cFi_t)fcn; R_RAX=fn((int64_t)R_RDI); } void cFu(x64emu_t *emu, uintptr_t fcn) { cFu_t fn = (cFu_t)fcn; R_RAX=fn((uint64_t)R_RDI); } diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index ad572e3a..fcd7b5e7 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -42,7 +42,6 @@ void vFl(x64emu_t *emu, uintptr_t fnc); void vFL(x64emu_t *emu, uintptr_t fnc); void vFp(x64emu_t *emu, uintptr_t fnc); void vFS(x64emu_t *emu, uintptr_t fnc); -void vFP(x64emu_t *emu, uintptr_t fnc); void cFv(x64emu_t *emu, uintptr_t fnc); void cFi(x64emu_t *emu, uintptr_t fnc); void cFu(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappedtbbmallocproxy_private.h b/src/wrapped/wrappedtbbmallocproxy_private.h index bf1eefa9..08ef1a97 100644 --- a/src/wrapped/wrappedtbbmallocproxy_private.h +++ b/src/wrapped/wrappedtbbmallocproxy_private.h @@ -24,7 +24,7 @@ //GO(__TBB_internal_find_original_malloc, //GO(__TBB_malloc_proxy, //GO(valloc, -GOM(_ZdaPv, vFP) //%noE +GOM(_ZdaPv, vFp) //%noE GOM(_ZdaPvRKSt9nothrow_t, vFpp) //%noE GOM(_ZdlPv, vFp) //%noE GOM(_ZdlPvRKSt9nothrow_t, vFpp) //%noE |