about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/generated/functions_list.txt117
-rw-r--r--src/wrapped/generated/wrappedlibctypes.h45
-rw-r--r--src/wrapped/generated/wrapper.c211
-rw-r--r--src/wrapped/generated/wrapper.h80
-rw-r--r--src/wrapped/wrappedlibc.c6
-rw-r--r--src/wrapped/wrappedlibc_private.h1174
6 files changed, 997 insertions, 636 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index a44ade19..db7b37e9 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -45,6 +45,7 @@
 #() IFf
 #() IFd
 #() IFp
+#() IFS
 #() CFv
 #() CFi
 #() CFC
@@ -60,10 +61,12 @@
 #() uFv
 #() uFi
 #() uFu
+#() uFU
 #() uFd
 #() uFl
 #() uFL
 #() uFp
+#() uFS
 #() uFb
 #() UFv
 #() UFu
@@ -86,6 +89,7 @@
 #() lFD
 #() lFl
 #() lFp
+#() lFS
 #() LFv
 #() LFi
 #() LFu
@@ -105,8 +109,10 @@
 #() pFL
 #() pFp
 #() pFV
+#() pFS
 #() pFA
 #() pFb
+#() SFv
 #() HFi
 #() HFp
 #() xFx
@@ -168,7 +174,9 @@
 #() vFpp
 #() vFpV
 #() vFpS
+#() vFpA
 #() vFSi
+#() vFSp
 #() vFbi
 #() vFbu
 #() vFbU
@@ -186,8 +194,8 @@
 #() iFiI
 #() iFiC
 #() iFiu
+#() iFiU
 #() iFil
-#() iFiL
 #() iFip
 #() iFiS
 #() iFui
@@ -213,15 +221,17 @@
 #() iFpl
 #() iFpL
 #() iFpp
+#() iFpV
 #() iFpO
+#() iFpS
+#() iFpA
 #() iFSi
-#() IFEi
+#() iFSp
 #() IFEf
 #() IFEd
 #() IFED
 #() IFEp
 #() IFip
-#() IFII
 #() IFpi
 #() IFpu
 #() IFpd
@@ -241,10 +251,11 @@
 #() uFEp
 #() uFii
 #() uFiu
-#() uFip
+#() uFiS
 #() uFui
 #() uFuu
 #() uFup
+#() uFuS
 #() uFuM
 #() uFpw
 #() uFpi
@@ -257,6 +268,7 @@
 #() uFpp
 #() uFbu
 #() UFEp
+#() UFii
 #() UFuu
 #() UFUp
 #() UFpi
@@ -300,7 +312,6 @@
 #() lFpp
 #() LFEL
 #() LFEp
-#() LFii
 #() LFuu
 #() LFUp
 #() LFLi
@@ -345,6 +356,8 @@
 #() pFbC
 #() pFbu
 #() pFbp
+#() SFip
+#() SFpp
 #() HFII
 #() HFll
 #() HFpi
@@ -383,6 +396,7 @@
 #() vFipu
 #() vFipL
 #() vFipp
+#() vFipA
 #() vFCCC
 #() vFWWW
 #() vFucc
@@ -468,6 +482,7 @@
 #() vFppL
 #() vFppp
 #() vFppV
+#() vFSpL
 #() cFpdp
 #() wFppp
 #() iFEiw
@@ -492,6 +507,7 @@
 #() iFiil
 #() iFiip
 #() iFiiO
+#() iFiII
 #() iFiCC
 #() iFiui
 #() iFiuu
@@ -571,7 +587,11 @@
 #() iFppp
 #() iFpOu
 #() iFpOM
+#() iFSIi
+#() iFSli
 #() iFSpL
+#() iFSpp
+#() iFSpA
 #() iFbpp
 #() IFiIi
 #() IFpIi
@@ -649,8 +669,8 @@
 #() DFDDD
 #() DFppi
 #() DFppp
+#() lFiIL
 #() lFili
-#() lFilL
 #() lFipi
 #() lFipL
 #() lFlll
@@ -661,6 +681,7 @@
 #() lFppu
 #() lFppL
 #() lFppp
+#() lFppS
 #() lFSpl
 #() LFEpA
 #() LFipL
@@ -671,7 +692,9 @@
 #() LFLpu
 #() LFLpL
 #() LFpii
+#() LFpip
 #() LFpCi
+#() LFpWp
 #() LFpuL
 #() LFpup
 #() LFpLi
@@ -728,6 +751,7 @@
 #() pFpil
 #() pFpiL
 #() pFpip
+#() pFpiS
 #() pFpCi
 #() pFpCu
 #() pFpWi
@@ -735,7 +759,6 @@
 #() pFpWp
 #() pFpui
 #() pFpuu
-#() pFpuL
 #() pFpup
 #() pFpUi
 #() pFpUu
@@ -769,6 +792,9 @@
 #() pFbpi
 #() pFbpu
 #() pFbpp
+#() SFEpp
+#() SFpLp
+#() SFppS
 #() vWpup
 #() iWEip
 #() iWEpp
@@ -967,29 +993,33 @@
 #() iFEppp
 #() iFEppV
 #() iFEppA
-#() iFEpOu
+#() iFEpON
+#() iFESpV
+#() iFESpA
 #() iFwwww
 #() iFwppp
 #() iFiiii
 #() iFiiiu
 #() iFiiip
 #() iFiiiN
+#() iFiiII
 #() iFiiui
 #() iFiill
 #() iFiipi
 #() iFiipp
+#() iFiIIi
+#() iFiIIu
 #() iFiWii
 #() iFiuwp
 #() iFiuup
 #() iFiupp
 #() iFilli
-#() iFillu
 #() iFiLpL
 #() iFipii
 #() iFipip
 #() iFipWp
 #() iFipui
-#() iFipuL
+#() iFipuU
 #() iFipLi
 #() iFipLu
 #() iFipLp
@@ -1083,7 +1113,6 @@
 #() iFppii
 #() iFppiu
 #() iFppiU
-#() iFppiL
 #() iFppip
 #() iFppIL
 #() iFppCC
@@ -1106,10 +1135,9 @@
 #() iFpppu
 #() iFpppL
 #() iFpppp
+#() iFSpiL
 #() iFbupp
 #() IFEpIi
-#() IFipUI
-#() IFipUp
 #() IFpIip
 #() IFppii
 #() IFppip
@@ -1164,6 +1192,7 @@
 #() lFEppp
 #() lFiiLu
 #() lFiipL
+#() lFipiI
 #() lFipil
 #() lFipLi
 #() lFipLI
@@ -1180,6 +1209,7 @@
 #() lFpLpp
 #() lFppii
 #() lFppip
+#() lFppiS
 #() lFpppL
 #() lFpppp
 #() LFEppL
@@ -1192,6 +1222,7 @@
 #() LFpupL
 #() LFpLCL
 #() LFpLLp
+#() LFpLLS
 #() LFpLpL
 #() LFpLpp
 #() LFppii
@@ -1515,7 +1546,6 @@
 #() iFEiipA
 #() iFEipip
 #() iFEippi
-#() iFEippL
 #() iFEippp
 #() iFEpiii
 #() iFEpipi
@@ -1528,7 +1558,6 @@
 #() iFEpLpA
 #() iFEppii
 #() iFEppip
-#() iFEppiV
 #() iFEppiA
 #() iFEpplp
 #() iFEpppi
@@ -1542,7 +1571,7 @@
 #() iFiippp
 #() iFiuuuu
 #() iFiuuup
-#() iFiuLip
+#() iFiuUip
 #() iFillLL
 #() iFipiii
 #() iFipiup
@@ -1614,7 +1643,6 @@
 #() iFpLlpp
 #() iFpLLii
 #() iFpLLup
-#() iFpLLpp
 #() iFpLpii
 #() iFpLpiL
 #() iFpLpuL
@@ -1662,6 +1690,7 @@
 #() iFppppl
 #() iFppppL
 #() iFppppp
+#() iFSppLp
 #() IFppIII
 #() uFEippp
 #() uFEpipp
@@ -1693,7 +1722,9 @@
 #() uFbuuWW
 #() uFbuuup
 #() UFuiiii
+#() lFEippL
 #() lFEuipp
+#() lFipiIi
 #() lFipili
 #() lFipLli
 #() lFipLlL
@@ -1702,7 +1733,6 @@
 #() lFpuipC
 #() lFpuuLL
 #() lFppupp
-#() lFppllp
 #() lFppLpL
 #() lFppLpp
 #() LFELppi
@@ -2004,6 +2034,8 @@
 #() iFiiiipp
 #() iFiiiuwp
 #() iFiWiipi
+#() iFiuuuup
+#() iFiuuppp
 #() iFiuUuUu
 #() iFilpppp
 #() iFiLpppi
@@ -2157,7 +2189,6 @@
 #() lFipLpLL
 #() lFpipill
 #() lFpuuLLp
-#() lFpplllp
 #() lFppLipp
 #() lFpppLpp
 #() LFEupppp
@@ -2378,9 +2409,12 @@
 #() iFEpppppL
 #() iFEpppppp
 #() iFiiiiiip
+#() iFiupuuup
+#() iFiupuppp
 #() iFipupupi
 #() iFippuIup
 #() iFipppppp
+#() iFuippLpp
 #() iFpiiiiii
 #() iFpiiiuwp
 #() iFpiiiuup
@@ -2477,6 +2511,7 @@
 #() LFpLLuupp
 #() LFpLLppuu
 #() pFEpupppp
+#() pFEpLiiiI
 #() pFEpLiiil
 #() pFEppuipp
 #() pFEppppip
@@ -2662,6 +2697,7 @@
 #() iFpLpppppp
 #() iFppiiipip
 #() iFppillppp
+#() iFppipiipi
 #() iFppippppp
 #() iFppIIIppp
 #() iFppuiiuuu
@@ -2824,6 +2860,7 @@
 #() iFpLpppupup
 #() iFpLppppppp
 #() iFppiiiiiii
+#() iFppipiiipi
 #() iFppippippp
 #() iFppuLLpupp
 #() iFppuppuuuu
@@ -3120,9 +3157,12 @@
 #!defined(NOALIGN) iFEiiip
 #!defined(NOALIGN) iFEipii
 #!defined(NOALIGN) iFEipiip
+#!defined(STATICBUILD) lFiV
 #!defined(STATICBUILD) iFlip
 #!defined(STATICBUILD) iFLLi
-#!defined(STATICBUILD) iFLLiW
+#!defined(STATICBUILD) iFLLii
+#!defined(STATICBUILD) WFpLLu
+#!defined(STATICBUILD) lFpLpV
 #!defined(STATICBUILD) iFEipup
 #!defined(STATICBUILD) iFEiipup
 #!defined(STATICBUILD) iFpipppL
@@ -4145,12 +4185,11 @@ wrappedlibc:
   - setjmp
   - stime
   - uname
-- IFi:
-  - sysconf
 - lFv:
   - syscall
 - lFi:
   - __sysconf
+  - sysconf
 - LFL:
   - getauxval
 - pFp:
@@ -4219,9 +4258,10 @@ wrappedlibc:
   - backtrace_symbols
 - pFpp:
   - __realpath_chk
+  - realpath
+- SFpp:
   - fopen
   - fopen64
-  - realpath
 - vFipV:
   - err
   - errx
@@ -4272,9 +4312,6 @@ wrappedlibc:
   - __isoc99_sscanf
   - __isoc99_swscanf
   - asprintf
-  - fprintf
-  - fscanf
-  - fwprintf
   - sprintf
   - sscanf
   - swscanf
@@ -4284,16 +4321,21 @@ wrappedlibc:
   - __isoc99_vswscanf
   - obstack_vprintf
   - vasprintf
-  - vfprintf
-  - vfscanf
-  - vfwprintf
   - vsprintf
   - vsscanf
   - vswscanf
-- iFpOu:
+- iFpON:
   - __open
   - open
   - open64
+- iFSpV:
+  - fprintf
+  - fscanf
+  - fwprintf
+- iFSpA:
+  - vfprintf
+  - vfscanf
+  - vfwprintf
 - lFipV:
   - __wprintf_chk
 - lFppL:
@@ -4316,6 +4358,8 @@ wrappedlibc:
   - __vsyslog_chk
 - vFpLLp:
   - qsort
+- vFppiV:
+  - makecontext
 - vFpppp:
   - __libc_init
 - iFiiip:
@@ -4333,8 +4377,6 @@ wrappedlibc:
 - iFippi:
   - fstatat
   - fstatat64
-- iFippL:
-  - readlinkat
 - iFpipp:
   - __vasprintf_chk
   - glob
@@ -4355,13 +4397,13 @@ wrappedlibc:
   - vswprintf
 - iFppii:
   - nftw64
-- iFppiV:
-  - makecontext
 - iFpppp:
   - __register_atfork
   - __vsprintf_chk
   - scandir
   - scandir64
+- lFippL:
+  - readlinkat
 - lFuipp:
   - ptrace
 - vFpLLpp:
@@ -4379,12 +4421,12 @@ wrappedlibc:
   - getopt_long
   - getopt_long_only
   - scandirat
+- iFpiipp:
+  - _obstack_begin
 - iFpilpV:
   - __sprintf_chk
 - iFpuppp:
   - __vswprintf_chk
-- iFpLLpp:
-  - _obstack_begin
 - pFpLLiN:
   - mremap
 - pFppLLp:
@@ -4400,9 +4442,10 @@ wrappedlibc:
 - iFpppppp:
   - posix_spawn
   - posix_spawnp
+- pFpLiiiI:
+  - mmap64
 - pFpLiiil:
   - mmap
-  - mmap64
 - iFpippppp:
   - __libc_start_main
 - iFppipppp:
diff --git a/src/wrapped/generated/wrappedlibctypes.h b/src/wrapped/generated/wrappedlibctypes.h
index 198a36f1..17fbeaea 100644
--- a/src/wrapped/generated/wrappedlibctypes.h
+++ b/src/wrapped/generated/wrappedlibctypes.h
@@ -17,7 +17,6 @@ typedef void (*vFp_t)(void*);
 typedef int32_t (*iFv_t)(void);
 typedef int32_t (*iFi_t)(int32_t);
 typedef int32_t (*iFp_t)(void*);
-typedef int64_t (*IFi_t)(int32_t);
 typedef intptr_t (*lFv_t)(void);
 typedef intptr_t (*lFi_t)(int32_t);
 typedef uintptr_t (*LFL_t)(uintptr_t);
@@ -37,6 +36,7 @@ typedef int32_t (*iFSp_t)(void*, void*);
 typedef void* (*pFip_t)(int32_t, void*);
 typedef void* (*pFpi_t)(void*, int32_t);
 typedef void* (*pFpp_t)(void*, void*);
+typedef void* (*SFpp_t)(void*, void*);
 typedef void (*vFipV_t)(int32_t, void*, ...);
 typedef void (*vFipA_t)(int32_t, void*, va_list);
 typedef void (*vFpii_t)(void*, int32_t, int32_t);
@@ -51,7 +51,9 @@ typedef int32_t (*iFppi_t)(void*, void*, int32_t);
 typedef int32_t (*iFppp_t)(void*, void*, void*);
 typedef int32_t (*iFppV_t)(void*, void*, ...);
 typedef int32_t (*iFppA_t)(void*, void*, va_list);
-typedef int32_t (*iFpOu_t)(void*, int32_t, uint32_t);
+typedef int32_t (*iFpON_t)(void*, int32_t, ...);
+typedef int32_t (*iFSpV_t)(void*, void*, ...);
+typedef int32_t (*iFSpA_t)(void*, void*, va_list);
 typedef intptr_t (*lFipV_t)(int32_t, void*, ...);
 typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
 typedef uintptr_t (*LFppL_t)(void*, void*, uintptr_t);
@@ -61,6 +63,7 @@ typedef void* (*pFppV_t)(void*, void*, ...);
 typedef void (*vFiipV_t)(int32_t, int32_t, void*, ...);
 typedef void (*vFiipA_t)(int32_t, int32_t, void*, va_list);
 typedef void (*vFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
+typedef void (*vFppiV_t)(void*, void*, int32_t, ...);
 typedef void (*vFpppp_t)(void*, void*, void*, void*);
 typedef int32_t (*iFiiip_t)(int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFiiiN_t)(int32_t, int32_t, int32_t, ...);
@@ -69,15 +72,14 @@ typedef int32_t (*iFiipA_t)(int32_t, int32_t, void*, va_list);
 typedef int32_t (*iFipii_t)(int32_t, void*, int32_t, int32_t);
 typedef int32_t (*iFipup_t)(int32_t, void*, uint32_t, void*);
 typedef int32_t (*iFippi_t)(int32_t, void*, void*, int32_t);
-typedef int32_t (*iFippL_t)(int32_t, void*, void*, uintptr_t);
 typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
 typedef int32_t (*iFpipV_t)(void*, int32_t, void*, ...);
 typedef int32_t (*iFpipA_t)(void*, int32_t, void*, va_list);
 typedef int32_t (*iFpLpV_t)(void*, uintptr_t, void*, ...);
 typedef int32_t (*iFpLpA_t)(void*, uintptr_t, void*, va_list);
 typedef int32_t (*iFppii_t)(void*, void*, int32_t, int32_t);
-typedef int32_t (*iFppiV_t)(void*, void*, int32_t, ...);
 typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef intptr_t (*lFippL_t)(int32_t, void*, void*, uintptr_t);
 typedef intptr_t (*lFuipp_t)(uint32_t, int32_t, void*, void*);
 typedef void (*vFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*);
 typedef int32_t (*iFiipup_t)(int32_t, int32_t, void*, uint32_t, void*);
@@ -85,15 +87,16 @@ typedef int32_t (*iFiippi_t)(int32_t, int32_t, void*, void*, int32_t);
 typedef int32_t (*iFiLLLL_t)(int32_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFipiip_t)(int32_t, void*, int32_t, int32_t, void*);
 typedef int32_t (*iFipppp_t)(int32_t, void*, void*, void*, void*);
+typedef int32_t (*iFpiipp_t)(void*, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFpilpV_t)(void*, int32_t, intptr_t, void*, ...);
 typedef int32_t (*iFpuppp_t)(void*, uint32_t, void*, void*, void*);
-typedef int32_t (*iFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*);
 typedef void* (*pFpLLiN_t)(void*, uintptr_t, uintptr_t, int32_t, ...);
 typedef void* (*pFppLLp_t)(void*, void*, uintptr_t, uintptr_t, void*);
 typedef void* (*pFpppLp_t)(void*, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFpLiLpp_t)(void*, uintptr_t, int32_t, uintptr_t, void*, void*);
 typedef int32_t (*iFpLiLpV_t)(void*, uintptr_t, int32_t, uintptr_t, void*, ...);
 typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+typedef void* (*pFpLiiiI_t)(void*, uintptr_t, int32_t, int32_t, int32_t, int64_t);
 typedef void* (*pFpLiiil_t)(void*, uintptr_t, int32_t, int32_t, int32_t, intptr_t);
 typedef int32_t (*iFpippppp_t)(void*, int32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
@@ -116,9 +119,9 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(setjmp, iFp_t) \
 	GO(stime, iFp_t) \
 	GO(uname, iFp_t) \
-	GO(sysconf, IFi_t) \
 	GO(syscall, lFv_t) \
 	GO(__sysconf, lFi_t) \
+	GO(sysconf, lFi_t) \
 	GO(getauxval, LFL_t) \
 	GO(__deregister_frame_info, pFp_t) \
 	GO(mallinfo, pFp_t) \
@@ -170,9 +173,9 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(sysv_signal, pFip_t) \
 	GO(backtrace_symbols, pFpi_t) \
 	GO(__realpath_chk, pFpp_t) \
-	GO(fopen, pFpp_t) \
-	GO(fopen64, pFpp_t) \
 	GO(realpath, pFpp_t) \
+	GO(fopen, SFpp_t) \
+	GO(fopen64, SFpp_t) \
 	GO(err, vFipV_t) \
 	GO(errx, vFipV_t) \
 	GO(syslog, vFipV_t) \
@@ -210,9 +213,6 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(__isoc99_sscanf, iFppV_t) \
 	GO(__isoc99_swscanf, iFppV_t) \
 	GO(asprintf, iFppV_t) \
-	GO(fprintf, iFppV_t) \
-	GO(fscanf, iFppV_t) \
-	GO(fwprintf, iFppV_t) \
 	GO(sprintf, iFppV_t) \
 	GO(sscanf, iFppV_t) \
 	GO(swscanf, iFppV_t) \
@@ -221,15 +221,18 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(__isoc99_vswscanf, iFppA_t) \
 	GO(obstack_vprintf, iFppA_t) \
 	GO(vasprintf, iFppA_t) \
-	GO(vfprintf, iFppA_t) \
-	GO(vfscanf, iFppA_t) \
-	GO(vfwprintf, iFppA_t) \
 	GO(vsprintf, iFppA_t) \
 	GO(vsscanf, iFppA_t) \
 	GO(vswscanf, iFppA_t) \
-	GO(__open, iFpOu_t) \
-	GO(open, iFpOu_t) \
-	GO(open64, iFpOu_t) \
+	GO(__open, iFpON_t) \
+	GO(open, iFpON_t) \
+	GO(open64, iFpON_t) \
+	GO(fprintf, iFSpV_t) \
+	GO(fscanf, iFSpV_t) \
+	GO(fwprintf, iFSpV_t) \
+	GO(vfprintf, iFSpA_t) \
+	GO(vfscanf, iFSpA_t) \
+	GO(vfwprintf, iFSpA_t) \
 	GO(__wprintf_chk, lFipV_t) \
 	GO(readlink, lFppL_t) \
 	GO(strlcat, LFppL_t) \
@@ -243,6 +246,7 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(__syslog_chk, vFiipV_t) \
 	GO(__vsyslog_chk, vFiipA_t) \
 	GO(qsort, vFpLLp_t) \
+	GO(makecontext, vFppiV_t) \
 	GO(__libc_init, vFpppp_t) \
 	GO(epoll_ctl, iFiiip_t) \
 	GO(semctl, iFiiiN_t) \
@@ -252,7 +256,6 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(__xmknod, iFipup_t) \
 	GO(fstatat, iFippi_t) \
 	GO(fstatat64, iFippi_t) \
-	GO(readlinkat, iFippL_t) \
 	GO(__vasprintf_chk, iFpipp_t) \
 	GO(glob, iFpipp_t) \
 	GO(glob64, iFpipp_t) \
@@ -267,11 +270,11 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(vsnprintf, iFpLpA_t) \
 	GO(vswprintf, iFpLpA_t) \
 	GO(nftw64, iFppii_t) \
-	GO(makecontext, iFppiV_t) \
 	GO(__register_atfork, iFpppp_t) \
 	GO(__vsprintf_chk, iFpppp_t) \
 	GO(scandir, iFpppp_t) \
 	GO(scandir64, iFpppp_t) \
+	GO(readlinkat, lFippL_t) \
 	GO(ptrace, lFuipp_t) \
 	GO(qsort_r, vFpLLpp_t) \
 	GO(__xmknodat, iFiipup_t) \
@@ -282,9 +285,9 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(getopt_long, iFipppp_t) \
 	GO(getopt_long_only, iFipppp_t) \
 	GO(scandirat, iFipppp_t) \
+	GO(_obstack_begin, iFpiipp_t) \
 	GO(__sprintf_chk, iFpilpV_t) \
 	GO(__vswprintf_chk, iFpuppp_t) \
-	GO(_obstack_begin, iFpLLpp_t) \
 	GO(mremap, pFpLLiN_t) \
 	GO(bsearch, pFppLLp_t) \
 	GO(lfind, pFpppLp_t) \
@@ -294,8 +297,8 @@ typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*
 	GO(__swprintf_chk, iFpLiLpV_t) \
 	GO(posix_spawn, iFpppppp_t) \
 	GO(posix_spawnp, iFpppppp_t) \
+	GO(mmap64, pFpLiiiI_t) \
 	GO(mmap, pFpLiiil_t) \
-	GO(mmap64, pFpLiiil_t) \
 	GO(__libc_start_main, iFpippppp_t) \
 	GO(clone, iFppipppp_t)
 
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index b5755a6c..3ce1c4d2 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -30,6 +30,19 @@ static void* io_convert(void* v)
 	return v;
 }
 
+static void* io_convert_back(void* v)
+{
+	if(!v)
+		return v;
+	if(v == stdin)
+		return my__IO_2_1_stdin_;
+	if(v == stdout)
+		return my__IO_2_1_stdout_;
+	if(v == stderr)
+		return my__IO_2_1_stderr_;
+	return v;
+}
+
 #define ST0val ST0.d
 
 int of_convert(int);
@@ -82,6 +95,7 @@ typedef int64_t (*IFI_t)(int64_t);
 typedef int64_t (*IFf_t)(float);
 typedef int64_t (*IFd_t)(double);
 typedef int64_t (*IFp_t)(void*);
+typedef int64_t (*IFS_t)(void*);
 typedef uint8_t (*CFv_t)(void);
 typedef uint8_t (*CFi_t)(int32_t);
 typedef uint8_t (*CFC_t)(uint8_t);
@@ -97,10 +111,12 @@ typedef uint16_t (*WFp_t)(void*);
 typedef uint32_t (*uFv_t)(void);
 typedef uint32_t (*uFi_t)(int32_t);
 typedef uint32_t (*uFu_t)(uint32_t);
+typedef uint32_t (*uFU_t)(uint64_t);
 typedef uint32_t (*uFd_t)(double);
 typedef uint32_t (*uFl_t)(intptr_t);
 typedef uint32_t (*uFL_t)(uintptr_t);
 typedef uint32_t (*uFp_t)(void*);
+typedef uint32_t (*uFS_t)(void*);
 typedef uint32_t (*uFb_t)(void*);
 typedef uint64_t (*UFv_t)(void);
 typedef uint64_t (*UFu_t)(uint32_t);
@@ -120,6 +136,7 @@ typedef intptr_t (*lFi_t)(int32_t);
 typedef intptr_t (*lFu_t)(uint32_t);
 typedef intptr_t (*lFl_t)(intptr_t);
 typedef intptr_t (*lFp_t)(void*);
+typedef intptr_t (*lFS_t)(void*);
 typedef uintptr_t (*LFv_t)(void);
 typedef uintptr_t (*LFi_t)(int32_t);
 typedef uintptr_t (*LFu_t)(uint32_t);
@@ -139,8 +156,10 @@ typedef void* (*pFl_t)(intptr_t);
 typedef void* (*pFL_t)(uintptr_t);
 typedef void* (*pFp_t)(void*);
 typedef void* (*pFV_t)(void*);
+typedef void* (*pFS_t)(void*);
 typedef void* (*pFA_t)(void*);
 typedef void* (*pFb_t)(void*);
+typedef void* (*SFv_t)(void);
 typedef unsigned __int128 (*HFi_t)(int32_t);
 typedef unsigned __int128 (*HFp_t)(void*);
 typedef complexf_t (*xFx_t)(complexf_t);
@@ -201,7 +220,9 @@ typedef void (*vFpL_t)(void*, uintptr_t);
 typedef void (*vFpp_t)(void*, void*);
 typedef void (*vFpV_t)(void*, void*);
 typedef void (*vFpS_t)(void*, void*);
+typedef void (*vFpA_t)(void*, void*);
 typedef void (*vFSi_t)(void*, int32_t);
+typedef void (*vFSp_t)(void*, void*);
 typedef void (*vFbi_t)(void*, int32_t);
 typedef void (*vFbu_t)(void*, uint32_t);
 typedef void (*vFbU_t)(void*, uint64_t);
@@ -219,8 +240,8 @@ typedef int32_t (*iFii_t)(int32_t, int32_t);
 typedef int32_t (*iFiI_t)(int32_t, int64_t);
 typedef int32_t (*iFiC_t)(int32_t, uint8_t);
 typedef int32_t (*iFiu_t)(int32_t, uint32_t);
+typedef int32_t (*iFiU_t)(int32_t, uint64_t);
 typedef int32_t (*iFil_t)(int32_t, intptr_t);
-typedef int32_t (*iFiL_t)(int32_t, uintptr_t);
 typedef int32_t (*iFip_t)(int32_t, void*);
 typedef int32_t (*iFiS_t)(int32_t, void*);
 typedef int32_t (*iFui_t)(uint32_t, int32_t);
@@ -246,14 +267,16 @@ typedef int32_t (*iFpd_t)(void*, double);
 typedef int32_t (*iFpl_t)(void*, intptr_t);
 typedef int32_t (*iFpL_t)(void*, uintptr_t);
 typedef int32_t (*iFpp_t)(void*, void*);
+typedef int32_t (*iFpV_t)(void*, void*);
 typedef int32_t (*iFpO_t)(void*, int32_t);
+typedef int32_t (*iFpS_t)(void*, void*);
+typedef int32_t (*iFpA_t)(void*, void*);
 typedef int32_t (*iFSi_t)(void*, int32_t);
-typedef int64_t (*IFEi_t)(x64emu_t*, int32_t);
+typedef int32_t (*iFSp_t)(void*, void*);
 typedef int64_t (*IFEf_t)(x64emu_t*, float);
 typedef int64_t (*IFEd_t)(x64emu_t*, double);
 typedef int64_t (*IFEp_t)(x64emu_t*, void*);
 typedef int64_t (*IFip_t)(int32_t, void*);
-typedef int64_t (*IFII_t)(int64_t, int64_t);
 typedef int64_t (*IFpi_t)(void*, int32_t);
 typedef int64_t (*IFpu_t)(void*, uint32_t);
 typedef int64_t (*IFpd_t)(void*, double);
@@ -273,10 +296,11 @@ typedef uint16_t (*WFpp_t)(void*, void*);
 typedef uint32_t (*uFEp_t)(x64emu_t*, void*);
 typedef uint32_t (*uFii_t)(int32_t, int32_t);
 typedef uint32_t (*uFiu_t)(int32_t, uint32_t);
-typedef uint32_t (*uFip_t)(int32_t, void*);
+typedef uint32_t (*uFiS_t)(int32_t, void*);
 typedef uint32_t (*uFui_t)(uint32_t, int32_t);
 typedef uint32_t (*uFuu_t)(uint32_t, uint32_t);
 typedef uint32_t (*uFup_t)(uint32_t, void*);
+typedef uint32_t (*uFuS_t)(uint32_t, void*);
 typedef uint32_t (*uFuM_t)(uint32_t, ...);
 typedef uint32_t (*uFpw_t)(void*, int16_t);
 typedef uint32_t (*uFpi_t)(void*, int32_t);
@@ -289,6 +313,7 @@ typedef uint32_t (*uFpL_t)(void*, uintptr_t);
 typedef uint32_t (*uFpp_t)(void*, void*);
 typedef uint32_t (*uFbu_t)(void*, uint32_t);
 typedef uint64_t (*UFEp_t)(x64emu_t*, void*);
+typedef uint64_t (*UFii_t)(int32_t, int32_t);
 typedef uint64_t (*UFuu_t)(uint32_t, uint32_t);
 typedef uint64_t (*UFUp_t)(uint64_t, void*);
 typedef uint64_t (*UFpi_t)(void*, int32_t);
@@ -324,7 +349,6 @@ typedef intptr_t (*lFpl_t)(void*, intptr_t);
 typedef intptr_t (*lFpp_t)(void*, void*);
 typedef uintptr_t (*LFEL_t)(x64emu_t*, uintptr_t);
 typedef uintptr_t (*LFEp_t)(x64emu_t*, void*);
-typedef uintptr_t (*LFii_t)(int32_t, int32_t);
 typedef uintptr_t (*LFuu_t)(uint32_t, uint32_t);
 typedef uintptr_t (*LFUp_t)(uint64_t, void*);
 typedef uintptr_t (*LFLi_t)(uintptr_t, int32_t);
@@ -369,6 +393,8 @@ typedef void* (*pFSi_t)(void*, int32_t);
 typedef void* (*pFbC_t)(void*, uint8_t);
 typedef void* (*pFbu_t)(void*, uint32_t);
 typedef void* (*pFbp_t)(void*, void*);
+typedef void* (*SFip_t)(int32_t, void*);
+typedef void* (*SFpp_t)(void*, void*);
 typedef unsigned __int128 (*HFII_t)(int64_t, int64_t);
 typedef unsigned __int128 (*HFll_t)(intptr_t, intptr_t);
 typedef unsigned __int128 (*HFpi_t)(void*, int32_t);
@@ -406,6 +432,7 @@ typedef void (*vFipi_t)(int32_t, void*, int32_t);
 typedef void (*vFipu_t)(int32_t, void*, uint32_t);
 typedef void (*vFipL_t)(int32_t, void*, uintptr_t);
 typedef void (*vFipp_t)(int32_t, void*, void*);
+typedef void (*vFipA_t)(int32_t, void*, void*);
 typedef void (*vFCCC_t)(uint8_t, uint8_t, uint8_t);
 typedef void (*vFWWW_t)(uint16_t, uint16_t, uint16_t);
 typedef void (*vFucc_t)(uint32_t, int8_t, int8_t);
@@ -490,6 +517,7 @@ typedef void (*vFppl_t)(void*, void*, intptr_t);
 typedef void (*vFppL_t)(void*, void*, uintptr_t);
 typedef void (*vFppp_t)(void*, void*, void*);
 typedef void (*vFppV_t)(void*, void*, void*);
+typedef void (*vFSpL_t)(void*, void*, uintptr_t);
 typedef int8_t (*cFpdp_t)(void*, double, void*);
 typedef int16_t (*wFppp_t)(void*, void*, void*);
 typedef int32_t (*iFEiw_t)(x64emu_t*, int32_t, int16_t);
@@ -514,6 +542,7 @@ typedef int32_t (*iFiiu_t)(int32_t, int32_t, uint32_t);
 typedef int32_t (*iFiil_t)(int32_t, int32_t, intptr_t);
 typedef int32_t (*iFiip_t)(int32_t, int32_t, void*);
 typedef int32_t (*iFiiO_t)(int32_t, int32_t, int32_t);
+typedef int32_t (*iFiII_t)(int32_t, int64_t, int64_t);
 typedef int32_t (*iFiCC_t)(int32_t, uint8_t, uint8_t);
 typedef int32_t (*iFiui_t)(int32_t, uint32_t, int32_t);
 typedef int32_t (*iFiuu_t)(int32_t, uint32_t, uint32_t);
@@ -593,7 +622,11 @@ typedef int32_t (*iFppL_t)(void*, void*, uintptr_t);
 typedef int32_t (*iFppp_t)(void*, void*, void*);
 typedef int32_t (*iFpOu_t)(void*, int32_t, uint32_t);
 typedef int32_t (*iFpOM_t)(void*, int32_t, ...);
+typedef int32_t (*iFSIi_t)(void*, int64_t, int32_t);
+typedef int32_t (*iFSli_t)(void*, intptr_t, int32_t);
 typedef int32_t (*iFSpL_t)(void*, void*, uintptr_t);
+typedef int32_t (*iFSpp_t)(void*, void*, void*);
+typedef int32_t (*iFSpA_t)(void*, void*, void*);
 typedef int32_t (*iFbpp_t)(void*, void*, void*);
 typedef int64_t (*IFiIi_t)(int32_t, int64_t, int32_t);
 typedef int64_t (*IFpIi_t)(void*, int64_t, int32_t);
@@ -668,8 +701,8 @@ typedef double (*dFppi_t)(void*, void*, int32_t);
 typedef double (*dFppu_t)(void*, void*, uint32_t);
 typedef double (*dFppd_t)(void*, void*, double);
 typedef double (*dFppp_t)(void*, void*, void*);
+typedef intptr_t (*lFiIL_t)(int32_t, int64_t, uintptr_t);
 typedef intptr_t (*lFili_t)(int32_t, intptr_t, int32_t);
-typedef intptr_t (*lFilL_t)(int32_t, intptr_t, uintptr_t);
 typedef intptr_t (*lFipi_t)(int32_t, void*, int32_t);
 typedef intptr_t (*lFipL_t)(int32_t, void*, uintptr_t);
 typedef intptr_t (*lFlll_t)(intptr_t, intptr_t, intptr_t);
@@ -680,6 +713,7 @@ typedef intptr_t (*lFppi_t)(void*, void*, int32_t);
 typedef intptr_t (*lFppu_t)(void*, void*, uint32_t);
 typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
 typedef intptr_t (*lFppp_t)(void*, void*, void*);
+typedef intptr_t (*lFppS_t)(void*, void*, void*);
 typedef intptr_t (*lFSpl_t)(void*, void*, intptr_t);
 typedef uintptr_t (*LFEpA_t)(x64emu_t*, void*, void*);
 typedef uintptr_t (*LFipL_t)(int32_t, void*, uintptr_t);
@@ -690,7 +724,9 @@ typedef uintptr_t (*LFLLL_t)(uintptr_t, uintptr_t, uintptr_t);
 typedef uintptr_t (*LFLpu_t)(uintptr_t, void*, uint32_t);
 typedef uintptr_t (*LFLpL_t)(uintptr_t, void*, uintptr_t);
 typedef uintptr_t (*LFpii_t)(void*, int32_t, int32_t);
+typedef uintptr_t (*LFpip_t)(void*, int32_t, void*);
 typedef uintptr_t (*LFpCi_t)(void*, uint8_t, int32_t);
+typedef uintptr_t (*LFpWp_t)(void*, uint16_t, void*);
 typedef uintptr_t (*LFpuL_t)(void*, uint32_t, uintptr_t);
 typedef uintptr_t (*LFpup_t)(void*, uint32_t, void*);
 typedef uintptr_t (*LFpLi_t)(void*, uintptr_t, int32_t);
@@ -746,6 +782,7 @@ typedef void* (*pFpid_t)(void*, int32_t, double);
 typedef void* (*pFpil_t)(void*, int32_t, intptr_t);
 typedef void* (*pFpiL_t)(void*, int32_t, uintptr_t);
 typedef void* (*pFpip_t)(void*, int32_t, void*);
+typedef void* (*pFpiS_t)(void*, int32_t, void*);
 typedef void* (*pFpCi_t)(void*, uint8_t, int32_t);
 typedef void* (*pFpCu_t)(void*, uint8_t, uint32_t);
 typedef void* (*pFpWi_t)(void*, uint16_t, int32_t);
@@ -753,7 +790,6 @@ typedef void* (*pFpWW_t)(void*, uint16_t, uint16_t);
 typedef void* (*pFpWp_t)(void*, uint16_t, void*);
 typedef void* (*pFpui_t)(void*, uint32_t, int32_t);
 typedef void* (*pFpuu_t)(void*, uint32_t, uint32_t);
-typedef void* (*pFpuL_t)(void*, uint32_t, uintptr_t);
 typedef void* (*pFpup_t)(void*, uint32_t, void*);
 typedef void* (*pFpUi_t)(void*, uint64_t, int32_t);
 typedef void* (*pFpUu_t)(void*, uint64_t, uint32_t);
@@ -787,6 +823,9 @@ typedef void* (*pFbUp_t)(void*, uint64_t, void*);
 typedef void* (*pFbpi_t)(void*, void*, int32_t);
 typedef void* (*pFbpu_t)(void*, void*, uint32_t);
 typedef void* (*pFbpp_t)(void*, void*, void*);
+typedef void* (*SFEpp_t)(x64emu_t*, void*, void*);
+typedef void* (*SFpLp_t)(void*, uintptr_t, void*);
+typedef void* (*SFppS_t)(void*, void*, void*);
 typedef void (*vWpup_t)(void*, uint32_t, void*);
 typedef int32_t (*iWEip_t)(x64emu_t*, int32_t, void*);
 typedef int32_t (*iWEpp_t)(x64emu_t*, void*, void*);
@@ -985,29 +1024,33 @@ typedef int32_t (*iFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
 typedef int32_t (*iFEppp_t)(x64emu_t*, void*, void*, void*);
 typedef int32_t (*iFEppV_t)(x64emu_t*, void*, void*, void*);
 typedef int32_t (*iFEppA_t)(x64emu_t*, void*, void*, void*);
-typedef int32_t (*iFEpOu_t)(x64emu_t*, void*, int32_t, uint32_t);
+typedef int32_t (*iFEpON_t)(x64emu_t*, void*, int32_t, ...);
+typedef int32_t (*iFESpV_t)(x64emu_t*, void*, void*, void*);
+typedef int32_t (*iFESpA_t)(x64emu_t*, void*, void*, void*);
 typedef int32_t (*iFwwww_t)(int16_t, int16_t, int16_t, int16_t);
 typedef int32_t (*iFwppp_t)(int16_t, void*, void*, void*);
 typedef int32_t (*iFiiii_t)(int32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFiiiu_t)(int32_t, int32_t, int32_t, uint32_t);
 typedef int32_t (*iFiiip_t)(int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFiiiN_t)(int32_t, int32_t, int32_t, ...);
+typedef int32_t (*iFiiII_t)(int32_t, int32_t, int64_t, int64_t);
 typedef int32_t (*iFiiui_t)(int32_t, int32_t, uint32_t, int32_t);
 typedef int32_t (*iFiill_t)(int32_t, int32_t, intptr_t, intptr_t);
 typedef int32_t (*iFiipi_t)(int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFiipp_t)(int32_t, int32_t, void*, void*);
+typedef int32_t (*iFiIIi_t)(int32_t, int64_t, int64_t, int32_t);
+typedef int32_t (*iFiIIu_t)(int32_t, int64_t, int64_t, uint32_t);
 typedef int32_t (*iFiWii_t)(int32_t, uint16_t, int32_t, int32_t);
 typedef int32_t (*iFiuwp_t)(int32_t, uint32_t, int16_t, void*);
 typedef int32_t (*iFiuup_t)(int32_t, uint32_t, uint32_t, void*);
 typedef int32_t (*iFiupp_t)(int32_t, uint32_t, void*, void*);
 typedef int32_t (*iFilli_t)(int32_t, intptr_t, intptr_t, int32_t);
-typedef int32_t (*iFillu_t)(int32_t, intptr_t, intptr_t, uint32_t);
 typedef int32_t (*iFiLpL_t)(int32_t, uintptr_t, void*, uintptr_t);
 typedef int32_t (*iFipii_t)(int32_t, void*, int32_t, int32_t);
 typedef int32_t (*iFipip_t)(int32_t, void*, int32_t, void*);
 typedef int32_t (*iFipWp_t)(int32_t, void*, uint16_t, void*);
 typedef int32_t (*iFipui_t)(int32_t, void*, uint32_t, int32_t);
-typedef int32_t (*iFipuL_t)(int32_t, void*, uint32_t, uintptr_t);
+typedef int32_t (*iFipuU_t)(int32_t, void*, uint32_t, uint64_t);
 typedef int32_t (*iFipLi_t)(int32_t, void*, uintptr_t, int32_t);
 typedef int32_t (*iFipLu_t)(int32_t, void*, uintptr_t, uint32_t);
 typedef int32_t (*iFipLp_t)(int32_t, void*, uintptr_t, void*);
@@ -1100,7 +1143,6 @@ typedef int32_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef int32_t (*iFppii_t)(void*, void*, int32_t, int32_t);
 typedef int32_t (*iFppiu_t)(void*, void*, int32_t, uint32_t);
 typedef int32_t (*iFppiU_t)(void*, void*, int32_t, uint64_t);
-typedef int32_t (*iFppiL_t)(void*, void*, int32_t, uintptr_t);
 typedef int32_t (*iFppip_t)(void*, void*, int32_t, void*);
 typedef int32_t (*iFppIL_t)(void*, void*, int64_t, uintptr_t);
 typedef int32_t (*iFppCC_t)(void*, void*, uint8_t, uint8_t);
@@ -1123,10 +1165,9 @@ typedef int32_t (*iFpppC_t)(void*, void*, void*, uint8_t);
 typedef int32_t (*iFpppu_t)(void*, void*, void*, uint32_t);
 typedef int32_t (*iFpppL_t)(void*, void*, void*, uintptr_t);
 typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef int32_t (*iFSpiL_t)(void*, void*, int32_t, uintptr_t);
 typedef int32_t (*iFbupp_t)(void*, uint32_t, void*, void*);
 typedef int64_t (*IFEpIi_t)(x64emu_t*, void*, int64_t, int32_t);
-typedef int64_t (*IFipUI_t)(int32_t, void*, uint64_t, int64_t);
-typedef int64_t (*IFipUp_t)(int32_t, void*, uint64_t, void*);
 typedef int64_t (*IFpIip_t)(void*, int64_t, int32_t, void*);
 typedef int64_t (*IFppii_t)(void*, void*, int32_t, int32_t);
 typedef int64_t (*IFppip_t)(void*, void*, int32_t, void*);
@@ -1181,6 +1222,7 @@ typedef intptr_t (*lFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
 typedef intptr_t (*lFEppp_t)(x64emu_t*, void*, void*, void*);
 typedef intptr_t (*lFiiLu_t)(int32_t, int32_t, uintptr_t, uint32_t);
 typedef intptr_t (*lFiipL_t)(int32_t, int32_t, void*, uintptr_t);
+typedef intptr_t (*lFipiI_t)(int32_t, void*, int32_t, int64_t);
 typedef intptr_t (*lFipil_t)(int32_t, void*, int32_t, intptr_t);
 typedef intptr_t (*lFipLi_t)(int32_t, void*, uintptr_t, int32_t);
 typedef intptr_t (*lFipLI_t)(int32_t, void*, uintptr_t, int64_t);
@@ -1197,6 +1239,7 @@ typedef intptr_t (*lFplpp_t)(void*, intptr_t, void*, void*);
 typedef intptr_t (*lFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef intptr_t (*lFppii_t)(void*, void*, int32_t, int32_t);
 typedef intptr_t (*lFppip_t)(void*, void*, int32_t, void*);
+typedef intptr_t (*lFppiS_t)(void*, void*, int32_t, void*);
 typedef intptr_t (*lFpppL_t)(void*, void*, void*, uintptr_t);
 typedef intptr_t (*lFpppp_t)(void*, void*, void*, void*);
 typedef uintptr_t (*LFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
@@ -1209,6 +1252,7 @@ typedef uintptr_t (*LFpCii_t)(void*, uint8_t, int32_t, int32_t);
 typedef uintptr_t (*LFpupL_t)(void*, uint32_t, void*, uintptr_t);
 typedef uintptr_t (*LFpLCL_t)(void*, uintptr_t, uint8_t, uintptr_t);
 typedef uintptr_t (*LFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
+typedef uintptr_t (*LFpLLS_t)(void*, uintptr_t, uintptr_t, void*);
 typedef uintptr_t (*LFpLpL_t)(void*, uintptr_t, void*, uintptr_t);
 typedef uintptr_t (*LFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef uintptr_t (*LFppii_t)(void*, void*, int32_t, int32_t);
@@ -1531,7 +1575,6 @@ typedef int32_t (*iFEiipV_t)(x64emu_t*, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFEiipA_t)(x64emu_t*, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFEipip_t)(x64emu_t*, int32_t, void*, int32_t, void*);
 typedef int32_t (*iFEippi_t)(x64emu_t*, int32_t, void*, void*, int32_t);
-typedef int32_t (*iFEippL_t)(x64emu_t*, int32_t, void*, void*, uintptr_t);
 typedef int32_t (*iFEippp_t)(x64emu_t*, int32_t, void*, void*, void*);
 typedef int32_t (*iFEpiii_t)(x64emu_t*, void*, int32_t, int32_t, int32_t);
 typedef int32_t (*iFEpipi_t)(x64emu_t*, void*, int32_t, void*, int32_t);
@@ -1544,7 +1587,6 @@ typedef int32_t (*iFEpLpV_t)(x64emu_t*, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFEpLpA_t)(x64emu_t*, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFEppii_t)(x64emu_t*, void*, void*, int32_t, int32_t);
 typedef int32_t (*iFEppip_t)(x64emu_t*, void*, void*, int32_t, void*);
-typedef int32_t (*iFEppiV_t)(x64emu_t*, void*, void*, int32_t, void*);
 typedef int32_t (*iFEppiA_t)(x64emu_t*, void*, void*, int32_t, void*);
 typedef int32_t (*iFEpplp_t)(x64emu_t*, void*, void*, intptr_t, void*);
 typedef int32_t (*iFEpppi_t)(x64emu_t*, void*, void*, void*, int32_t);
@@ -1558,7 +1600,7 @@ typedef int32_t (*iFiiupp_t)(int32_t, int32_t, uint32_t, void*, void*);
 typedef int32_t (*iFiippp_t)(int32_t, int32_t, void*, void*, void*);
 typedef int32_t (*iFiuuuu_t)(int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFiuuup_t)(int32_t, uint32_t, uint32_t, uint32_t, void*);
-typedef int32_t (*iFiuLip_t)(int32_t, uint32_t, uintptr_t, int32_t, void*);
+typedef int32_t (*iFiuUip_t)(int32_t, uint32_t, uint64_t, int32_t, void*);
 typedef int32_t (*iFillLL_t)(int32_t, intptr_t, intptr_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFipiii_t)(int32_t, void*, int32_t, int32_t, int32_t);
 typedef int32_t (*iFipiup_t)(int32_t, void*, int32_t, uint32_t, void*);
@@ -1630,7 +1672,6 @@ typedef int32_t (*iFpLiLi_t)(void*, uintptr_t, int32_t, uintptr_t, int32_t);
 typedef int32_t (*iFpLlpp_t)(void*, uintptr_t, intptr_t, void*, void*);
 typedef int32_t (*iFpLLii_t)(void*, uintptr_t, uintptr_t, int32_t, int32_t);
 typedef int32_t (*iFpLLup_t)(void*, uintptr_t, uintptr_t, uint32_t, void*);
-typedef int32_t (*iFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*);
 typedef int32_t (*iFpLpii_t)(void*, uintptr_t, void*, int32_t, int32_t);
 typedef int32_t (*iFpLpiL_t)(void*, uintptr_t, void*, int32_t, uintptr_t);
 typedef int32_t (*iFpLpuL_t)(void*, uintptr_t, void*, uint32_t, uintptr_t);
@@ -1678,6 +1719,7 @@ typedef int32_t (*iFppppu_t)(void*, void*, void*, void*, uint32_t);
 typedef int32_t (*iFppppl_t)(void*, void*, void*, void*, intptr_t);
 typedef int32_t (*iFppppL_t)(void*, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*);
+typedef int32_t (*iFSppLp_t)(void*, void*, void*, uintptr_t, void*);
 typedef int64_t (*IFppIII_t)(void*, void*, int64_t, int64_t, int64_t);
 typedef uint32_t (*uFEippp_t)(x64emu_t*, int32_t, void*, void*, void*);
 typedef uint32_t (*uFEpipp_t)(x64emu_t*, void*, int32_t, void*, void*);
@@ -1709,7 +1751,9 @@ typedef uint32_t (*uFbCuup_t)(void*, uint8_t, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFbuuWW_t)(void*, uint32_t, uint32_t, uint16_t, uint16_t);
 typedef uint32_t (*uFbuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
 typedef uint64_t (*UFuiiii_t)(uint32_t, int32_t, int32_t, int32_t, int32_t);
+typedef intptr_t (*lFEippL_t)(x64emu_t*, int32_t, void*, void*, uintptr_t);
 typedef intptr_t (*lFEuipp_t)(x64emu_t*, uint32_t, int32_t, void*, void*);
+typedef intptr_t (*lFipiIi_t)(int32_t, void*, int32_t, int64_t, int32_t);
 typedef intptr_t (*lFipili_t)(int32_t, void*, int32_t, intptr_t, int32_t);
 typedef intptr_t (*lFipLli_t)(int32_t, void*, uintptr_t, intptr_t, int32_t);
 typedef intptr_t (*lFipLlL_t)(int32_t, void*, uintptr_t, intptr_t, uintptr_t);
@@ -1718,7 +1762,6 @@ typedef intptr_t (*lFipLpp_t)(int32_t, void*, uintptr_t, void*, void*);
 typedef intptr_t (*lFpuipC_t)(void*, uint32_t, int32_t, void*, uint8_t);
 typedef intptr_t (*lFpuuLL_t)(void*, uint32_t, uint32_t, uintptr_t, uintptr_t);
 typedef intptr_t (*lFppupp_t)(void*, void*, uint32_t, void*, void*);
-typedef intptr_t (*lFppllp_t)(void*, void*, intptr_t, intptr_t, void*);
 typedef intptr_t (*lFppLpL_t)(void*, void*, uintptr_t, void*, uintptr_t);
 typedef intptr_t (*lFppLpp_t)(void*, void*, uintptr_t, void*, void*);
 typedef uintptr_t (*LFELppi_t)(x64emu_t*, uintptr_t, void*, void*, int32_t);
@@ -2020,6 +2063,8 @@ typedef int32_t (*iFiiiiip_t)(int32_t, int32_t, int32_t, int32_t, int32_t, void*
 typedef int32_t (*iFiiiipp_t)(int32_t, int32_t, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFiiiuwp_t)(int32_t, int32_t, int32_t, uint32_t, int16_t, void*);
 typedef int32_t (*iFiWiipi_t)(int32_t, uint16_t, int32_t, int32_t, void*, int32_t);
+typedef int32_t (*iFiuuuup_t)(int32_t, uint32_t, uint32_t, uint32_t, uint32_t, void*);
+typedef int32_t (*iFiuuppp_t)(int32_t, uint32_t, uint32_t, void*, void*, void*);
 typedef int32_t (*iFiuUuUu_t)(int32_t, uint32_t, uint64_t, uint32_t, uint64_t, uint32_t);
 typedef int32_t (*iFilpppp_t)(int32_t, intptr_t, void*, void*, void*, void*);
 typedef int32_t (*iFiLpppi_t)(int32_t, uintptr_t, void*, void*, void*, int32_t);
@@ -2172,7 +2217,6 @@ typedef intptr_t (*lFipLipp_t)(int32_t, void*, uintptr_t, int32_t, void*, void*)
 typedef intptr_t (*lFipLpLL_t)(int32_t, void*, uintptr_t, void*, uintptr_t, uintptr_t);
 typedef intptr_t (*lFpipill_t)(void*, int32_t, void*, int32_t, intptr_t, intptr_t);
 typedef intptr_t (*lFpuuLLp_t)(void*, uint32_t, uint32_t, uintptr_t, uintptr_t, void*);
-typedef intptr_t (*lFpplllp_t)(void*, void*, intptr_t, intptr_t, intptr_t, void*);
 typedef intptr_t (*lFppLipp_t)(void*, void*, uintptr_t, int32_t, void*, void*);
 typedef intptr_t (*lFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
 typedef uintptr_t (*LFEupppp_t)(x64emu_t*, uint32_t, void*, void*, void*, void*);
@@ -2393,9 +2437,12 @@ typedef int32_t (*iFEpppLpp_t)(x64emu_t*, void*, void*, void*, uintptr_t, void*,
 typedef int32_t (*iFEpppppL_t)(x64emu_t*, void*, void*, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFEpppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFiiiiiip_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*);
+typedef int32_t (*iFiupuuup_t)(int32_t, uint32_t, void*, uint32_t, uint32_t, uint32_t, void*);
+typedef int32_t (*iFiupuppp_t)(int32_t, uint32_t, void*, uint32_t, void*, void*, void*);
 typedef int32_t (*iFipupupi_t)(int32_t, void*, uint32_t, void*, uint32_t, void*, int32_t);
 typedef int32_t (*iFippuIup_t)(int32_t, void*, void*, uint32_t, int64_t, uint32_t, void*);
 typedef int32_t (*iFipppppp_t)(int32_t, void*, void*, void*, void*, void*, void*);
+typedef int32_t (*iFuippLpp_t)(uint32_t, int32_t, void*, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFpiiiiii_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFpiiiuwp_t)(void*, int32_t, int32_t, int32_t, uint32_t, int16_t, void*);
 typedef int32_t (*iFpiiiuup_t)(void*, int32_t, int32_t, int32_t, uint32_t, uint32_t, void*);
@@ -2492,6 +2539,7 @@ typedef uintptr_t (*LFEpppppu_t)(x64emu_t*, void*, void*, void*, void*, void*, u
 typedef uintptr_t (*LFpLLuupp_t)(void*, uintptr_t, uintptr_t, uint32_t, uint32_t, void*, void*);
 typedef uintptr_t (*LFpLLppuu_t)(void*, uintptr_t, uintptr_t, void*, void*, uint32_t, uint32_t);
 typedef void* (*pFEpupppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*);
+typedef void* (*pFEpLiiiI_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, int32_t, int64_t);
 typedef void* (*pFEpLiiil_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, int32_t, intptr_t);
 typedef void* (*pFEppuipp_t)(x64emu_t*, void*, void*, uint32_t, int32_t, void*, void*);
 typedef void* (*pFEppppip_t)(x64emu_t*, void*, void*, void*, void*, int32_t, void*);
@@ -2677,6 +2725,7 @@ typedef int32_t (*iFpLpppupu_t)(void*, uintptr_t, void*, void*, void*, uint32_t,
 typedef int32_t (*iFpLpppppp_t)(void*, uintptr_t, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFppiiipip_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*);
 typedef int32_t (*iFppillppp_t)(void*, void*, int32_t, intptr_t, intptr_t, void*, void*, void*);
+typedef int32_t (*iFppipiipi_t)(void*, void*, int32_t, void*, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFppippppp_t)(void*, void*, int32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFppIIIppp_t)(void*, void*, int64_t, int64_t, int64_t, void*, void*, void*);
 typedef int32_t (*iFppuiiuuu_t)(void*, void*, uint32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t);
@@ -2838,6 +2887,7 @@ typedef int32_t (*iFpLpLpLLpp_t)(void*, uintptr_t, void*, uintptr_t, void*, uint
 typedef int32_t (*iFpLpppupup_t)(void*, uintptr_t, void*, void*, void*, uint32_t, void*, uint32_t, void*);
 typedef int32_t (*iFpLppppppp_t)(void*, uintptr_t, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFppiiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef int32_t (*iFppipiiipi_t)(void*, void*, int32_t, void*, int32_t, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFppippippp_t)(void*, void*, int32_t, void*, void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFppuLLpupp_t)(void*, void*, uint32_t, uintptr_t, uintptr_t, void*, uint32_t, void*, void*);
 typedef int32_t (*iFppuppuuuu_t)(void*, void*, uint32_t, void*, void*, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -3194,9 +3244,12 @@ typedef int32_t (*iFEipiip_t)(x64emu_t*, int32_t, void*, int32_t, int32_t, void*
 #endif
 
 #if !defined(STATICBUILD)
+typedef intptr_t (*lFiV_t)(int32_t, void*);
 typedef int32_t (*iFlip_t)(intptr_t, int32_t, void*);
 typedef int32_t (*iFLLi_t)(uintptr_t, uintptr_t, int32_t);
-typedef int32_t (*iFLLiW_t)(uintptr_t, uintptr_t, int32_t, uint16_t);
+typedef int32_t (*iFLLii_t)(uintptr_t, uintptr_t, int32_t, int32_t);
+typedef uint16_t (*WFpLLu_t)(void*, uintptr_t, uintptr_t, uint32_t);
+typedef intptr_t (*lFpLpV_t)(void*, uintptr_t, void*, void*);
 typedef int32_t (*iFEipup_t)(x64emu_t*, int32_t, void*, uint32_t, void*);
 typedef int32_t (*iFEiipup_t)(x64emu_t*, int32_t, int32_t, void*, uint32_t, void*);
 typedef int32_t (*iFpipppL_t)(void*, int32_t, void*, void*, void*, uintptr_t);
@@ -3248,6 +3301,7 @@ void IFI(x64emu_t *emu, uintptr_t fcn) { IFI_t fn = (IFI_t)fcn; R_RAX=(int64_t)f
 void IFf(x64emu_t *emu, uintptr_t fcn) { IFf_t fn = (IFf_t)fcn; R_RAX=(int64_t)fn(emu->xmm[0].f[0]); }
 void IFd(x64emu_t *emu, uintptr_t fcn) { IFd_t fn = (IFd_t)fcn; R_RAX=(int64_t)fn(emu->xmm[0].d[0]); }
 void IFp(x64emu_t *emu, uintptr_t fcn) { IFp_t fn = (IFp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI); }
+void IFS(x64emu_t *emu, uintptr_t fcn) { IFS_t fn = (IFS_t)fcn; R_RAX=(int64_t)fn(io_convert((void*)R_RDI)); }
 void CFv(x64emu_t *emu, uintptr_t fcn) { CFv_t fn = (CFv_t)fcn; R_RAX=(unsigned char)fn(); }
 void CFi(x64emu_t *emu, uintptr_t fcn) { CFi_t fn = (CFi_t)fcn; R_RAX=(unsigned char)fn((int32_t)R_RDI); }
 void CFC(x64emu_t *emu, uintptr_t fcn) { CFC_t fn = (CFC_t)fcn; R_RAX=(unsigned char)fn((uint8_t)R_RDI); }
@@ -3263,10 +3317,12 @@ void WFp(x64emu_t *emu, uintptr_t fcn) { WFp_t fn = (WFp_t)fcn; R_RAX=(unsigned
 void uFv(x64emu_t *emu, uintptr_t fcn) { uFv_t fn = (uFv_t)fcn; R_RAX=(uint32_t)fn(); }
 void uFi(x64emu_t *emu, uintptr_t fcn) { uFi_t fn = (uFi_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI); }
 void uFu(x64emu_t *emu, uintptr_t fcn) { uFu_t fn = (uFu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI); }
+void uFU(x64emu_t *emu, uintptr_t fcn) { uFU_t fn = (uFU_t)fcn; R_RAX=(uint32_t)fn((uint64_t)R_RDI); }
 void uFd(x64emu_t *emu, uintptr_t fcn) { uFd_t fn = (uFd_t)fcn; R_RAX=(uint32_t)fn(emu->xmm[0].d[0]); }
 void uFl(x64emu_t *emu, uintptr_t fcn) { uFl_t fn = (uFl_t)fcn; R_RAX=(uint32_t)fn((intptr_t)R_RDI); }
 void uFL(x64emu_t *emu, uintptr_t fcn) { uFL_t fn = (uFL_t)fcn; R_RAX=(uint32_t)fn((uintptr_t)R_RDI); }
 void uFp(x64emu_t *emu, uintptr_t fcn) { uFp_t fn = (uFp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI); }
+void uFS(x64emu_t *emu, uintptr_t fcn) { uFS_t fn = (uFS_t)fcn; R_RAX=(uint32_t)fn(io_convert((void*)R_RDI)); }
 void uFb(x64emu_t *emu, uintptr_t fcn) { uFb_t fn = (uFb_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void UFv(x64emu_t *emu, uintptr_t fcn) { UFv_t fn = (UFv_t)fcn; R_RAX=fn(); }
 void UFu(x64emu_t *emu, uintptr_t fcn) { UFu_t fn = (UFu_t)fcn; R_RAX=fn((uint32_t)R_RDI); }
@@ -3286,6 +3342,7 @@ void lFi(x64emu_t *emu, uintptr_t fcn) { lFi_t fn = (lFi_t)fcn; R_RAX=(intptr_t)
 void lFu(x64emu_t *emu, uintptr_t fcn) { lFu_t fn = (lFu_t)fcn; R_RAX=(intptr_t)fn((uint32_t)R_RDI); }
 void lFl(x64emu_t *emu, uintptr_t fcn) { lFl_t fn = (lFl_t)fcn; R_RAX=(intptr_t)fn((intptr_t)R_RDI); }
 void lFp(x64emu_t *emu, uintptr_t fcn) { lFp_t fn = (lFp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI); }
+void lFS(x64emu_t *emu, uintptr_t fcn) { lFS_t fn = (lFS_t)fcn; R_RAX=(intptr_t)fn(io_convert((void*)R_RDI)); }
 void LFv(x64emu_t *emu, uintptr_t fcn) { LFv_t fn = (LFv_t)fcn; R_RAX=(uintptr_t)fn(); }
 void LFi(x64emu_t *emu, uintptr_t fcn) { LFi_t fn = (LFi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI); }
 void LFu(x64emu_t *emu, uintptr_t fcn) { LFu_t fn = (LFu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI); }
@@ -3305,8 +3362,10 @@ void pFl(x64emu_t *emu, uintptr_t fcn) { pFl_t fn = (pFl_t)fcn; R_RAX=(uintptr_t
 void pFL(x64emu_t *emu, uintptr_t fcn) { pFL_t fn = (pFL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI); }
 void pFp(x64emu_t *emu, uintptr_t fcn) { pFp_t fn = (pFp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI); }
 void pFV(x64emu_t *emu, uintptr_t fcn) { pFV_t fn = (pFV_t)fcn; R_RAX=(uintptr_t)fn((void*)(R_RSP + 8)); }
+void pFS(x64emu_t *emu, uintptr_t fcn) { pFS_t fn = (pFS_t)fcn; R_RAX=(uintptr_t)fn(io_convert((void*)R_RDI)); }
 void pFA(x64emu_t *emu, uintptr_t fcn) { pFA_t fn = (pFA_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI); }
 void pFb(x64emu_t *emu, uintptr_t fcn) { pFb_t fn = (pFb_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
+void SFv(x64emu_t *emu, uintptr_t fcn) { SFv_t fn = (SFv_t)fcn; R_RAX=(uintptr_t)io_convert_back(fn()); }
 void HFi(x64emu_t *emu, uintptr_t fcn) { HFi_t fn = (HFi_t)fcn; unsigned __int128 u128 = fn((int32_t)R_RDI); R_RAX=(u128&0xFFFFFFFFFFFFFFFFL); R_RDX=(u128>>64)&0xFFFFFFFFFFFFFFFFL; }
 void HFp(x64emu_t *emu, uintptr_t fcn) { HFp_t fn = (HFp_t)fcn; unsigned __int128 u128 = fn((void*)R_RDI); R_RAX=(u128&0xFFFFFFFFFFFFFFFFL); R_RDX=(u128>>64)&0xFFFFFFFFFFFFFFFFL; }
 void xFx(x64emu_t *emu, uintptr_t fcn) { xFx_t fn = (xFx_t)fcn; from_complexf(emu, fn(to_complexf(emu, 0))); }
@@ -3367,7 +3426,9 @@ void vFpL(x64emu_t *emu, uintptr_t fcn) { vFpL_t fn = (vFpL_t)fcn; fn((void*)R_R
 void vFpp(x64emu_t *emu, uintptr_t fcn) { vFpp_t fn = (vFpp_t)fcn; fn((void*)R_RDI, (void*)R_RSI); }
 void vFpV(x64emu_t *emu, uintptr_t fcn) { vFpV_t fn = (vFpV_t)fcn; fn((void*)R_RDI, (void*)(R_RSP + 8)); }
 void vFpS(x64emu_t *emu, uintptr_t fcn) { vFpS_t fn = (vFpS_t)fcn; fn((void*)R_RDI, io_convert((void*)R_RSI)); }
+void vFpA(x64emu_t *emu, uintptr_t fcn) { vFpA_t fn = (vFpA_t)fcn; fn((void*)R_RDI, (void*)R_RSI); }
 void vFSi(x64emu_t *emu, uintptr_t fcn) { vFSi_t fn = (vFSi_t)fcn; fn(io_convert((void*)R_RDI), (int32_t)R_RSI); }
+void vFSp(x64emu_t *emu, uintptr_t fcn) { vFSp_t fn = (vFSp_t)fcn; fn(io_convert((void*)R_RDI), (void*)R_RSI); }
 void vFbi(x64emu_t *emu, uintptr_t fcn) { vFbi_t fn = (vFbi_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); fn(aligned_xcb, (int32_t)R_RSI); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void vFbu(x64emu_t *emu, uintptr_t fcn) { vFbu_t fn = (vFbu_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); fn(aligned_xcb, (uint32_t)R_RSI); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void vFbU(x64emu_t *emu, uintptr_t fcn) { vFbU_t fn = (vFbU_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); fn(aligned_xcb, (uint64_t)R_RSI); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
@@ -3385,8 +3446,8 @@ void iFii(x64emu_t *emu, uintptr_t fcn) { iFii_t fn = (iFii_t)fcn; R_RAX=(int32_
 void iFiI(x64emu_t *emu, uintptr_t fcn) { iFiI_t fn = (iFiI_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int64_t)R_RSI); }
 void iFiC(x64emu_t *emu, uintptr_t fcn) { iFiC_t fn = (iFiC_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint8_t)R_RSI); }
 void iFiu(x64emu_t *emu, uintptr_t fcn) { iFiu_t fn = (iFiu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI); }
+void iFiU(x64emu_t *emu, uintptr_t fcn) { iFiU_t fn = (iFiU_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint64_t)R_RSI); }
 void iFil(x64emu_t *emu, uintptr_t fcn) { iFil_t fn = (iFil_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (intptr_t)R_RSI); }
-void iFiL(x64emu_t *emu, uintptr_t fcn) { iFiL_t fn = (iFiL_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI); }
 void iFip(x64emu_t *emu, uintptr_t fcn) { iFip_t fn = (iFip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI); }
 void iFiS(x64emu_t *emu, uintptr_t fcn) { iFiS_t fn = (iFiS_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, io_convert((void*)R_RSI)); }
 void iFui(x64emu_t *emu, uintptr_t fcn) { iFui_t fn = (iFui_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
@@ -3412,14 +3473,16 @@ void iFpd(x64emu_t *emu, uintptr_t fcn) { iFpd_t fn = (iFpd_t)fcn; R_RAX=(int32_
 void iFpl(x64emu_t *emu, uintptr_t fcn) { iFpl_t fn = (iFpl_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (intptr_t)R_RSI); }
 void iFpL(x64emu_t *emu, uintptr_t fcn) { iFpL_t fn = (iFpL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI); }
 void iFpp(x64emu_t *emu, uintptr_t fcn) { iFpp_t fn = (iFpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI); }
+void iFpV(x64emu_t *emu, uintptr_t fcn) { iFpV_t fn = (iFpV_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)(R_RSP + 8)); }
 void iFpO(x64emu_t *emu, uintptr_t fcn) { iFpO_t fn = (iFpO_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI)); }
+void iFpS(x64emu_t *emu, uintptr_t fcn) { iFpS_t fn = (iFpS_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, io_convert((void*)R_RSI)); }
+void iFpA(x64emu_t *emu, uintptr_t fcn) { iFpA_t fn = (iFpA_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI); }
 void iFSi(x64emu_t *emu, uintptr_t fcn) { iFSi_t fn = (iFSi_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (int32_t)R_RSI); }
-void IFEi(x64emu_t *emu, uintptr_t fcn) { IFEi_t fn = (IFEi_t)fcn; R_RAX=(int64_t)fn(emu, (int32_t)R_RDI); }
+void iFSp(x64emu_t *emu, uintptr_t fcn) { iFSp_t fn = (iFSp_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI); }
 void IFEf(x64emu_t *emu, uintptr_t fcn) { IFEf_t fn = (IFEf_t)fcn; R_RAX=(int64_t)fn(emu, emu->xmm[0].f[0]); }
 void IFEd(x64emu_t *emu, uintptr_t fcn) { IFEd_t fn = (IFEd_t)fcn; R_RAX=(int64_t)fn(emu, emu->xmm[0].d[0]); }
 void IFEp(x64emu_t *emu, uintptr_t fcn) { IFEp_t fn = (IFEp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI); }
 void IFip(x64emu_t *emu, uintptr_t fcn) { IFip_t fn = (IFip_t)fcn; R_RAX=(int64_t)fn((int32_t)R_RDI, (void*)R_RSI); }
-void IFII(x64emu_t *emu, uintptr_t fcn) { IFII_t fn = (IFII_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI); }
 void IFpi(x64emu_t *emu, uintptr_t fcn) { IFpi_t fn = (IFpi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int32_t)R_RSI); }
 void IFpu(x64emu_t *emu, uintptr_t fcn) { IFpu_t fn = (IFpu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint32_t)R_RSI); }
 void IFpd(x64emu_t *emu, uintptr_t fcn) { IFpd_t fn = (IFpd_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, emu->xmm[0].d[0]); }
@@ -3439,10 +3502,11 @@ void WFpp(x64emu_t *emu, uintptr_t fcn) { WFpp_t fn = (WFpp_t)fcn; R_RAX=(unsign
 void uFEp(x64emu_t *emu, uintptr_t fcn) { uFEp_t fn = (uFEp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI); }
 void uFii(x64emu_t *emu, uintptr_t fcn) { uFii_t fn = (uFii_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (int32_t)R_RSI); }
 void uFiu(x64emu_t *emu, uintptr_t fcn) { uFiu_t fn = (uFiu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI); }
-void uFip(x64emu_t *emu, uintptr_t fcn) { uFip_t fn = (uFip_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI); }
+void uFiS(x64emu_t *emu, uintptr_t fcn) { uFiS_t fn = (uFiS_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, io_convert((void*)R_RSI)); }
 void uFui(x64emu_t *emu, uintptr_t fcn) { uFui_t fn = (uFui_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
 void uFuu(x64emu_t *emu, uintptr_t fcn) { uFuu_t fn = (uFuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
 void uFup(x64emu_t *emu, uintptr_t fcn) { uFup_t fn = (uFup_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI); }
+void uFuS(x64emu_t *emu, uintptr_t fcn) { uFuS_t fn = (uFuS_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, io_convert((void*)R_RSI)); }
 void uFuM(x64emu_t *emu, uintptr_t fcn) { uFuM_t fn = (uFuM_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void uFpw(x64emu_t *emu, uintptr_t fcn) { uFpw_t fn = (uFpw_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int16_t)R_RSI); }
 void uFpi(x64emu_t *emu, uintptr_t fcn) { uFpi_t fn = (uFpi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI); }
@@ -3455,6 +3519,7 @@ void uFpL(x64emu_t *emu, uintptr_t fcn) { uFpL_t fn = (uFpL_t)fcn; R_RAX=(uint32
 void uFpp(x64emu_t *emu, uintptr_t fcn) { uFpp_t fn = (uFpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI); }
 void uFbu(x64emu_t *emu, uintptr_t fcn) { uFbu_t fn = (uFbu_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint32_t)R_RSI); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void UFEp(x64emu_t *emu, uintptr_t fcn) { UFEp_t fn = (UFEp_t)fcn; R_RAX=fn(emu, (void*)R_RDI); }
+void UFii(x64emu_t *emu, uintptr_t fcn) { UFii_t fn = (UFii_t)fcn; R_RAX=fn((int32_t)R_RDI, (int32_t)R_RSI); }
 void UFuu(x64emu_t *emu, uintptr_t fcn) { UFuu_t fn = (UFuu_t)fcn; R_RAX=fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
 void UFUp(x64emu_t *emu, uintptr_t fcn) { UFUp_t fn = (UFUp_t)fcn; R_RAX=fn((uint64_t)R_RDI, (void*)R_RSI); }
 void UFpi(x64emu_t *emu, uintptr_t fcn) { UFpi_t fn = (UFpi_t)fcn; R_RAX=fn((void*)R_RDI, (int32_t)R_RSI); }
@@ -3490,7 +3555,6 @@ void lFpl(x64emu_t *emu, uintptr_t fcn) { lFpl_t fn = (lFpl_t)fcn; R_RAX=(intptr
 void lFpp(x64emu_t *emu, uintptr_t fcn) { lFpp_t fn = (lFpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI); }
 void LFEL(x64emu_t *emu, uintptr_t fcn) { LFEL_t fn = (LFEL_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI); }
 void LFEp(x64emu_t *emu, uintptr_t fcn) { LFEp_t fn = (LFEp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI); }
-void LFii(x64emu_t *emu, uintptr_t fcn) { LFii_t fn = (LFii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI); }
 void LFuu(x64emu_t *emu, uintptr_t fcn) { LFuu_t fn = (LFuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
 void LFUp(x64emu_t *emu, uintptr_t fcn) { LFUp_t fn = (LFUp_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (void*)R_RSI); }
 void LFLi(x64emu_t *emu, uintptr_t fcn) { LFLi_t fn = (LFLi_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (int32_t)R_RSI); }
@@ -3535,6 +3599,8 @@ void pFSi(x64emu_t *emu, uintptr_t fcn) { pFSi_t fn = (pFSi_t)fcn; R_RAX=(uintpt
 void pFbC(x64emu_t *emu, uintptr_t fcn) { pFbC_t fn = (pFbC_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (uint8_t)R_RSI); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void pFbu(x64emu_t *emu, uintptr_t fcn) { pFbu_t fn = (pFbu_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (uint32_t)R_RSI); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void pFbp(x64emu_t *emu, uintptr_t fcn) { pFbp_t fn = (pFbp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (void*)R_RSI); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
+void SFip(x64emu_t *emu, uintptr_t fcn) { SFip_t fn = (SFip_t)fcn; R_RAX=(uintptr_t)io_convert_back(fn((int32_t)R_RDI, (void*)R_RSI)); }
+void SFpp(x64emu_t *emu, uintptr_t fcn) { SFpp_t fn = (SFpp_t)fcn; R_RAX=(uintptr_t)io_convert_back(fn((void*)R_RDI, (void*)R_RSI)); }
 void HFII(x64emu_t *emu, uintptr_t fcn) { HFII_t fn = (HFII_t)fcn; unsigned __int128 u128 = fn((int64_t)R_RDI, (int64_t)R_RSI); R_RAX=(u128&0xFFFFFFFFFFFFFFFFL); R_RDX=(u128>>64)&0xFFFFFFFFFFFFFFFFL; }
 void HFll(x64emu_t *emu, uintptr_t fcn) { HFll_t fn = (HFll_t)fcn; unsigned __int128 u128 = fn((intptr_t)R_RDI, (intptr_t)R_RSI); R_RAX=(u128&0xFFFFFFFFFFFFFFFFL); R_RDX=(u128>>64)&0xFFFFFFFFFFFFFFFFL; }
 void HFpi(x64emu_t *emu, uintptr_t fcn) { HFpi_t fn = (HFpi_t)fcn; unsigned __int128 u128 = fn((void*)R_RDI, (int32_t)R_RSI); R_RAX=(u128&0xFFFFFFFFFFFFFFFFL); R_RDX=(u128>>64)&0xFFFFFFFFFFFFFFFFL; }
@@ -3572,6 +3638,7 @@ void vFipi(x64emu_t *emu, uintptr_t fcn) { vFipi_t fn = (vFipi_t)fcn; fn((int32_
 void vFipu(x64emu_t *emu, uintptr_t fcn) { vFipu_t fn = (vFipu_t)fcn; fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void vFipL(x64emu_t *emu, uintptr_t fcn) { vFipL_t fn = (vFipL_t)fcn; fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void vFipp(x64emu_t *emu, uintptr_t fcn) { vFipp_t fn = (vFipp_t)fcn; fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void vFipA(x64emu_t *emu, uintptr_t fcn) { vFipA_t fn = (vFipA_t)fcn; fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFCCC(x64emu_t *emu, uintptr_t fcn) { vFCCC_t fn = (vFCCC_t)fcn; fn((uint8_t)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX); }
 void vFWWW(x64emu_t *emu, uintptr_t fcn) { vFWWW_t fn = (vFWWW_t)fcn; fn((uint16_t)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX); }
 void vFucc(x64emu_t *emu, uintptr_t fcn) { vFucc_t fn = (vFucc_t)fcn; fn((uint32_t)R_RDI, (int8_t)R_RSI, (int8_t)R_RDX); }
@@ -3656,6 +3723,7 @@ void vFppl(x64emu_t *emu, uintptr_t fcn) { vFppl_t fn = (vFppl_t)fcn; fn((void*)
 void vFppL(x64emu_t *emu, uintptr_t fcn) { vFppL_t fn = (vFppL_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void vFppp(x64emu_t *emu, uintptr_t fcn) { vFppp_t fn = (vFppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFppV(x64emu_t *emu, uintptr_t fcn) { vFppV_t fn = (vFppV_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); }
+void vFSpL(x64emu_t *emu, uintptr_t fcn) { vFSpL_t fn = (vFSpL_t)fcn; fn(io_convert((void*)R_RDI), (void*)R_RSI, (uintptr_t)R_RDX); }
 void cFpdp(x64emu_t *emu, uintptr_t fcn) { cFpdp_t fn = (cFpdp_t)fcn; R_RAX=fn((void*)R_RDI, emu->xmm[0].d[0], (void*)R_RSI); }
 void wFppp(x64emu_t *emu, uintptr_t fcn) { wFppp_t fn = (wFppp_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFEiw(x64emu_t *emu, uintptr_t fcn) { iFEiw_t fn = (iFEiw_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (int16_t)R_RSI); }
@@ -3680,6 +3748,7 @@ void iFiiu(x64emu_t *emu, uintptr_t fcn) { iFiiu_t fn = (iFiiu_t)fcn; R_RAX=(int
 void iFiil(x64emu_t *emu, uintptr_t fcn) { iFiil_t fn = (iFiil_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX); }
 void iFiip(x64emu_t *emu, uintptr_t fcn) { iFiip_t fn = (iFiip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void iFiiO(x64emu_t *emu, uintptr_t fcn) { iFiiO_t fn = (iFiiO_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, of_convert((int32_t)R_RDX)); }
+void iFiII(x64emu_t *emu, uintptr_t fcn) { iFiII_t fn = (iFiII_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void iFiCC(x64emu_t *emu, uintptr_t fcn) { iFiCC_t fn = (iFiCC_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX); }
 void iFiui(x64emu_t *emu, uintptr_t fcn) { iFiui_t fn = (iFiui_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void iFiuu(x64emu_t *emu, uintptr_t fcn) { iFiuu_t fn = (iFiuu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
@@ -3759,7 +3828,11 @@ void iFppL(x64emu_t *emu, uintptr_t fcn) { iFppL_t fn = (iFppL_t)fcn; R_RAX=(int
 void iFppp(x64emu_t *emu, uintptr_t fcn) { iFppp_t fn = (iFppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFpOu(x64emu_t *emu, uintptr_t fcn) { iFpOu_t fn = (iFpOu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (uint32_t)R_RDX); }
 void iFpOM(x64emu_t *emu, uintptr_t fcn) { iFpOM_t fn = (iFpOM_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (void*)R_RDX, (void*)R_RCX); }
+void iFSIi(x64emu_t *emu, uintptr_t fcn) { iFSIi_t fn = (iFSIi_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (int64_t)R_RSI, (int32_t)R_RDX); }
+void iFSli(x64emu_t *emu, uintptr_t fcn) { iFSli_t fn = (iFSli_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (intptr_t)R_RSI, (int32_t)R_RDX); }
 void iFSpL(x64emu_t *emu, uintptr_t fcn) { iFSpL_t fn = (iFSpL_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (uintptr_t)R_RDX); }
+void iFSpp(x64emu_t *emu, uintptr_t fcn) { iFSpp_t fn = (iFSpp_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (void*)R_RDX); }
+void iFSpA(x64emu_t *emu, uintptr_t fcn) { iFSpA_t fn = (iFSpA_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (void*)R_RDX); }
 void iFbpp(x64emu_t *emu, uintptr_t fcn) { iFbpp_t fn = (iFbpp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(int32_t)fn(aligned_xcb, (void*)R_RSI, (void*)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void IFiIi(x64emu_t *emu, uintptr_t fcn) { IFiIi_t fn = (IFiIi_t)fcn; R_RAX=(int64_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
 void IFpIi(x64emu_t *emu, uintptr_t fcn) { IFpIi_t fn = (IFpIi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
@@ -3834,8 +3907,8 @@ void dFppi(x64emu_t *emu, uintptr_t fcn) { dFppi_t fn = (dFppi_t)fcn; emu->xmm[0
 void dFppu(x64emu_t *emu, uintptr_t fcn) { dFppu_t fn = (dFppu_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void dFppd(x64emu_t *emu, uintptr_t fcn) { dFppd_t fn = (dFppd_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0]); }
 void dFppp(x64emu_t *emu, uintptr_t fcn) { dFppp_t fn = (dFppp_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void lFiIL(x64emu_t *emu, uintptr_t fcn) { lFiIL_t fn = (lFiIL_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (uintptr_t)R_RDX); }
 void lFili(x64emu_t *emu, uintptr_t fcn) { lFili_t fn = (lFili_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX); }
-void lFilL(x64emu_t *emu, uintptr_t fcn) { lFilL_t fn = (lFilL_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (uintptr_t)R_RDX); }
 void lFipi(x64emu_t *emu, uintptr_t fcn) { lFipi_t fn = (lFipi_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void lFipL(x64emu_t *emu, uintptr_t fcn) { lFipL_t fn = (lFipL_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void lFlll(x64emu_t *emu, uintptr_t fcn) { lFlll_t fn = (lFlll_t)fcn; R_RAX=(intptr_t)fn((intptr_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
@@ -3846,6 +3919,7 @@ void lFppi(x64emu_t *emu, uintptr_t fcn) { lFppi_t fn = (lFppi_t)fcn; R_RAX=(int
 void lFppu(x64emu_t *emu, uintptr_t fcn) { lFppu_t fn = (lFppu_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void lFppL(x64emu_t *emu, uintptr_t fcn) { lFppL_t fn = (lFppL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void lFppp(x64emu_t *emu, uintptr_t fcn) { lFppp_t fn = (lFppp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void lFppS(x64emu_t *emu, uintptr_t fcn) { lFppS_t fn = (lFppS_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, io_convert((void*)R_RDX)); }
 void lFSpl(x64emu_t *emu, uintptr_t fcn) { lFSpl_t fn = (lFSpl_t)fcn; R_RAX=(intptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (intptr_t)R_RDX); }
 void LFEpA(x64emu_t *emu, uintptr_t fcn) { LFEpA_t fn = (LFEpA_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
 void LFipL(x64emu_t *emu, uintptr_t fcn) { LFipL_t fn = (LFipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
@@ -3856,7 +3930,9 @@ void LFLLL(x64emu_t *emu, uintptr_t fcn) { LFLLL_t fn = (LFLLL_t)fcn; R_RAX=(uin
 void LFLpu(x64emu_t *emu, uintptr_t fcn) { LFLpu_t fn = (LFLpu_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void LFLpL(x64emu_t *emu, uintptr_t fcn) { LFLpL_t fn = (LFLpL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void LFpii(x64emu_t *emu, uintptr_t fcn) { LFpii_t fn = (LFpii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
+void LFpip(x64emu_t *emu, uintptr_t fcn) { LFpip_t fn = (LFpip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void LFpCi(x64emu_t *emu, uintptr_t fcn) { LFpCi_t fn = (LFpCi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX); }
+void LFpWp(x64emu_t *emu, uintptr_t fcn) { LFpWp_t fn = (LFpWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
 void LFpuL(x64emu_t *emu, uintptr_t fcn) { LFpuL_t fn = (LFpuL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX); }
 void LFpup(x64emu_t *emu, uintptr_t fcn) { LFpup_t fn = (LFpup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void LFpLi(x64emu_t *emu, uintptr_t fcn) { LFpLi_t fn = (LFpLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX); }
@@ -3912,6 +3988,7 @@ void pFpid(x64emu_t *emu, uintptr_t fcn) { pFpid_t fn = (pFpid_t)fcn; R_RAX=(uin
 void pFpil(x64emu_t *emu, uintptr_t fcn) { pFpil_t fn = (pFpil_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX); }
 void pFpiL(x64emu_t *emu, uintptr_t fcn) { pFpiL_t fn = (pFpiL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX); }
 void pFpip(x64emu_t *emu, uintptr_t fcn) { pFpip_t fn = (pFpip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
+void pFpiS(x64emu_t *emu, uintptr_t fcn) { pFpiS_t fn = (pFpiS_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, io_convert((void*)R_RDX)); }
 void pFpCi(x64emu_t *emu, uintptr_t fcn) { pFpCi_t fn = (pFpCi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX); }
 void pFpCu(x64emu_t *emu, uintptr_t fcn) { pFpCu_t fn = (pFpCu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX); }
 void pFpWi(x64emu_t *emu, uintptr_t fcn) { pFpWi_t fn = (pFpWi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX); }
@@ -3919,7 +3996,6 @@ void pFpWW(x64emu_t *emu, uintptr_t fcn) { pFpWW_t fn = (pFpWW_t)fcn; R_RAX=(uin
 void pFpWp(x64emu_t *emu, uintptr_t fcn) { pFpWp_t fn = (pFpWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
 void pFpui(x64emu_t *emu, uintptr_t fcn) { pFpui_t fn = (pFpui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void pFpuu(x64emu_t *emu, uintptr_t fcn) { pFpuu_t fn = (pFpuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
-void pFpuL(x64emu_t *emu, uintptr_t fcn) { pFpuL_t fn = (pFpuL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX); }
 void pFpup(x64emu_t *emu, uintptr_t fcn) { pFpup_t fn = (pFpup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void pFpUi(x64emu_t *emu, uintptr_t fcn) { pFpUi_t fn = (pFpUi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX); }
 void pFpUu(x64emu_t *emu, uintptr_t fcn) { pFpUu_t fn = (pFpUu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX); }
@@ -3953,6 +4029,9 @@ void pFbUp(x64emu_t *emu, uintptr_t fcn) { pFbUp_t fn = (pFbUp_t)fcn; void *alig
 void pFbpi(x64emu_t *emu, uintptr_t fcn) { pFbpi_t fn = (pFbpi_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (void*)R_RSI, (int32_t)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void pFbpu(x64emu_t *emu, uintptr_t fcn) { pFbpu_t fn = (pFbpu_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (void*)R_RSI, (uint32_t)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void pFbpp(x64emu_t *emu, uintptr_t fcn) { pFbpp_t fn = (pFbpp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (void*)R_RSI, (void*)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
+void SFEpp(x64emu_t *emu, uintptr_t fcn) { SFEpp_t fn = (SFEpp_t)fcn; R_RAX=(uintptr_t)io_convert_back(fn(emu, (void*)R_RDI, (void*)R_RSI)); }
+void SFpLp(x64emu_t *emu, uintptr_t fcn) { SFpLp_t fn = (SFpLp_t)fcn; R_RAX=(uintptr_t)io_convert_back(fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX)); }
+void SFppS(x64emu_t *emu, uintptr_t fcn) { SFppS_t fn = (SFppS_t)fcn; R_RAX=(uintptr_t)io_convert_back(fn((void*)R_RDI, (void*)R_RSI, io_convert((void*)R_RDX))); }
 void vWpup(x64emu_t *emu, uintptr_t fcn) { vWpup_t fn = (vWpup_t)fcn; fn((void*)R_RCX, (uint32_t)R_RDX, (void*)R_R8); }
 void iWEip(x64emu_t *emu, uintptr_t fcn) { iWEip_t fn = (iWEip_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RCX, (void*)R_RDX); }
 void iWEpp(x64emu_t *emu, uintptr_t fcn) { iWEpp_t fn = (iWEpp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RCX, (void*)R_RDX); }
@@ -4151,29 +4230,33 @@ void iFEppL(x64emu_t *emu, uintptr_t fcn) { iFEppL_t fn = (iFEppL_t)fcn; R_RAX=(
 void iFEppp(x64emu_t *emu, uintptr_t fcn) { iFEppp_t fn = (iFEppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFEppV(x64emu_t *emu, uintptr_t fcn) { iFEppV_t fn = (iFEppV_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); }
 void iFEppA(x64emu_t *emu, uintptr_t fcn) { iFEppA_t fn = (iFEppA_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
-void iFEpOu(x64emu_t *emu, uintptr_t fcn) { iFEpOu_t fn = (iFEpOu_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, of_convert((int32_t)R_RSI), (uint32_t)R_RDX); }
+void iFEpON(x64emu_t *emu, uintptr_t fcn) { iFEpON_t fn = (iFEpON_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, of_convert((int32_t)R_RSI), (void*)R_RDX); }
+void iFESpV(x64emu_t *emu, uintptr_t fcn) { iFESpV_t fn = (iFESpV_t)fcn; R_RAX=(int32_t)fn(emu, io_convert((void*)R_RDI), (void*)R_RSI, (void*)(R_RSP + 8)); }
+void iFESpA(x64emu_t *emu, uintptr_t fcn) { iFESpA_t fn = (iFESpA_t)fcn; R_RAX=(int32_t)fn(emu, io_convert((void*)R_RDI), (void*)R_RSI, (void*)R_RDX); }
 void iFwwww(x64emu_t *emu, uintptr_t fcn) { iFwwww_t fn = (iFwwww_t)fcn; R_RAX=(int32_t)fn((int16_t)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX, (int16_t)R_RCX); }
 void iFwppp(x64emu_t *emu, uintptr_t fcn) { iFwppp_t fn = (iFwppp_t)fcn; R_RAX=(int32_t)fn((int16_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFiiii(x64emu_t *emu, uintptr_t fcn) { iFiiii_t fn = (iFiiii_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFiiiu(x64emu_t *emu, uintptr_t fcn) { iFiiiu_t fn = (iFiiiu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void iFiiip(x64emu_t *emu, uintptr_t fcn) { iFiiip_t fn = (iFiiip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFiiiN(x64emu_t *emu, uintptr_t fcn) { iFiiiN_t fn = (iFiiiN_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void iFiiII(x64emu_t *emu, uintptr_t fcn) { iFiiII_t fn = (iFiiII_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void iFiiui(x64emu_t *emu, uintptr_t fcn) { iFiiui_t fn = (iFiiui_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void iFiill(x64emu_t *emu, uintptr_t fcn) { iFiill_t fn = (iFiill_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
 void iFiipi(x64emu_t *emu, uintptr_t fcn) { iFiipi_t fn = (iFiipi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void iFiipp(x64emu_t *emu, uintptr_t fcn) { iFiipp_t fn = (iFiipp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void iFiIIi(x64emu_t *emu, uintptr_t fcn) { iFiIIi_t fn = (iFiIIi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX); }
+void iFiIIu(x64emu_t *emu, uintptr_t fcn) { iFiIIu_t fn = (iFiIIu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint32_t)R_RCX); }
 void iFiWii(x64emu_t *emu, uintptr_t fcn) { iFiWii_t fn = (iFiWii_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFiuwp(x64emu_t *emu, uintptr_t fcn) { iFiuwp_t fn = (iFiuwp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (int16_t)R_RDX, (void*)R_RCX); }
 void iFiuup(x64emu_t *emu, uintptr_t fcn) { iFiuup_t fn = (iFiuup_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void iFiupp(x64emu_t *emu, uintptr_t fcn) { iFiupp_t fn = (iFiupp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFilli(x64emu_t *emu, uintptr_t fcn) { iFilli_t fn = (iFilli_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX); }
-void iFillu(x64emu_t *emu, uintptr_t fcn) { iFillu_t fn = (iFillu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX); }
 void iFiLpL(x64emu_t *emu, uintptr_t fcn) { iFiLpL_t fn = (iFiLpL_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFipii(x64emu_t *emu, uintptr_t fcn) { iFipii_t fn = (iFipii_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFipip(x64emu_t *emu, uintptr_t fcn) { iFipip_t fn = (iFipip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFipWp(x64emu_t *emu, uintptr_t fcn) { iFipWp_t fn = (iFipWp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
 void iFipui(x64emu_t *emu, uintptr_t fcn) { iFipui_t fn = (iFipui_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
-void iFipuL(x64emu_t *emu, uintptr_t fcn) { iFipuL_t fn = (iFipuL_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
+void iFipuU(x64emu_t *emu, uintptr_t fcn) { iFipuU_t fn = (iFipuU_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint64_t)R_RCX); }
 void iFipLi(x64emu_t *emu, uintptr_t fcn) { iFipLi_t fn = (iFipLi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
 void iFipLu(x64emu_t *emu, uintptr_t fcn) { iFipLu_t fn = (iFipLu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX); }
 void iFipLp(x64emu_t *emu, uintptr_t fcn) { iFipLp_t fn = (iFipLp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
@@ -4266,7 +4349,6 @@ void iFpLpp(x64emu_t *emu, uintptr_t fcn) { iFpLpp_t fn = (iFpLpp_t)fcn; R_RAX=(
 void iFppii(x64emu_t *emu, uintptr_t fcn) { iFppii_t fn = (iFppii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFppiu(x64emu_t *emu, uintptr_t fcn) { iFppiu_t fn = (iFppiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void iFppiU(x64emu_t *emu, uintptr_t fcn) { iFppiU_t fn = (iFppiU_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX); }
-void iFppiL(x64emu_t *emu, uintptr_t fcn) { iFppiL_t fn = (iFppiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFppip(x64emu_t *emu, uintptr_t fcn) { iFppip_t fn = (iFppip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFppIL(x64emu_t *emu, uintptr_t fcn) { iFppIL_t fn = (iFppIL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX); }
 void iFppCC(x64emu_t *emu, uintptr_t fcn) { iFppCC_t fn = (iFppCC_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX); }
@@ -4289,10 +4371,9 @@ void iFpppC(x64emu_t *emu, uintptr_t fcn) { iFpppC_t fn = (iFpppC_t)fcn; R_RAX=(
 void iFpppu(x64emu_t *emu, uintptr_t fcn) { iFpppu_t fn = (iFpppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void iFpppL(x64emu_t *emu, uintptr_t fcn) { iFpppL_t fn = (iFpppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFpppp(x64emu_t *emu, uintptr_t fcn) { iFpppp_t fn = (iFpppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void iFSpiL(x64emu_t *emu, uintptr_t fcn) { iFSpiL_t fn = (iFSpiL_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFbupp(x64emu_t *emu, uintptr_t fcn) { iFbupp_t fn = (iFbupp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(int32_t)fn(aligned_xcb, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void IFEpIi(x64emu_t *emu, uintptr_t fcn) { IFEpIi_t fn = (IFEpIi_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
-void IFipUI(x64emu_t *emu, uintptr_t fcn) { IFipUI_t fn = (IFipUI_t)fcn; R_RAX=(int64_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX); }
-void IFipUp(x64emu_t *emu, uintptr_t fcn) { IFipUp_t fn = (IFipUp_t)fcn; R_RAX=(int64_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX); }
 void IFpIip(x64emu_t *emu, uintptr_t fcn) { IFpIip_t fn = (IFpIip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void IFppii(x64emu_t *emu, uintptr_t fcn) { IFppii_t fn = (IFppii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void IFppip(x64emu_t *emu, uintptr_t fcn) { IFppip_t fn = (IFppip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
@@ -4347,6 +4428,7 @@ void lFEppL(x64emu_t *emu, uintptr_t fcn) { lFEppL_t fn = (lFEppL_t)fcn; R_RAX=(
 void lFEppp(x64emu_t *emu, uintptr_t fcn) { lFEppp_t fn = (lFEppp_t)fcn; R_RAX=(intptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void lFiiLu(x64emu_t *emu, uintptr_t fcn) { lFiiLu_t fn = (lFiiLu_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX); }
 void lFiipL(x64emu_t *emu, uintptr_t fcn) { lFiipL_t fn = (lFiipL_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
+void lFipiI(x64emu_t *emu, uintptr_t fcn) { lFipiI_t fn = (lFipiI_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int64_t)R_RCX); }
 void lFipil(x64emu_t *emu, uintptr_t fcn) { lFipil_t fn = (lFipil_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX); }
 void lFipLi(x64emu_t *emu, uintptr_t fcn) { lFipLi_t fn = (lFipLi_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
 void lFipLI(x64emu_t *emu, uintptr_t fcn) { lFipLI_t fn = (lFipLI_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX); }
@@ -4363,6 +4445,7 @@ void lFplpp(x64emu_t *emu, uintptr_t fcn) { lFplpp_t fn = (lFplpp_t)fcn; R_RAX=(
 void lFpLpp(x64emu_t *emu, uintptr_t fcn) { lFpLpp_t fn = (lFpLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void lFppii(x64emu_t *emu, uintptr_t fcn) { lFppii_t fn = (lFppii_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void lFppip(x64emu_t *emu, uintptr_t fcn) { lFppip_t fn = (lFppip_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void lFppiS(x64emu_t *emu, uintptr_t fcn) { lFppiS_t fn = (lFppiS_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, io_convert((void*)R_RCX)); }
 void lFpppL(x64emu_t *emu, uintptr_t fcn) { lFpppL_t fn = (lFpppL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void lFpppp(x64emu_t *emu, uintptr_t fcn) { lFpppp_t fn = (lFpppp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void LFEppL(x64emu_t *emu, uintptr_t fcn) { LFEppL_t fn = (LFEppL_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
@@ -4375,6 +4458,7 @@ void LFpCii(x64emu_t *emu, uintptr_t fcn) { LFpCii_t fn = (LFpCii_t)fcn; R_RAX=(
 void LFpupL(x64emu_t *emu, uintptr_t fcn) { LFpupL_t fn = (LFpupL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void LFpLCL(x64emu_t *emu, uintptr_t fcn) { LFpLCL_t fn = (LFpLCL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint8_t)R_RDX, (uintptr_t)R_RCX); }
 void LFpLLp(x64emu_t *emu, uintptr_t fcn) { LFpLLp_t fn = (LFpLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
+void LFpLLS(x64emu_t *emu, uintptr_t fcn) { LFpLLS_t fn = (LFpLLS_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, io_convert((void*)R_RCX)); }
 void LFpLpL(x64emu_t *emu, uintptr_t fcn) { LFpLpL_t fn = (LFpLpL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void LFpLpp(x64emu_t *emu, uintptr_t fcn) { LFpLpp_t fn = (LFpLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void LFppii(x64emu_t *emu, uintptr_t fcn) { LFppii_t fn = (LFppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
@@ -4697,7 +4781,6 @@ void iFEiipV(x64emu_t *emu, uintptr_t fcn) { iFEiipV_t fn = (iFEiipV_t)fcn; R_RA
 void iFEiipA(x64emu_t *emu, uintptr_t fcn) { iFEiipA_t fn = (iFEiipA_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFEipip(x64emu_t *emu, uintptr_t fcn) { iFEipip_t fn = (iFEipip_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFEippi(x64emu_t *emu, uintptr_t fcn) { iFEippi_t fn = (iFEippi_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
-void iFEippL(x64emu_t *emu, uintptr_t fcn) { iFEippL_t fn = (iFEippL_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFEippp(x64emu_t *emu, uintptr_t fcn) { iFEippp_t fn = (iFEippp_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFEpiii(x64emu_t *emu, uintptr_t fcn) { iFEpiii_t fn = (iFEpiii_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFEpipi(x64emu_t *emu, uintptr_t fcn) { iFEpipi_t fn = (iFEpipi_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
@@ -4710,7 +4793,6 @@ void iFEpLpV(x64emu_t *emu, uintptr_t fcn) { iFEpLpV_t fn = (iFEpLpV_t)fcn; R_RA
 void iFEpLpA(x64emu_t *emu, uintptr_t fcn) { iFEpLpA_t fn = (iFEpLpA_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFEppii(x64emu_t *emu, uintptr_t fcn) { iFEppii_t fn = (iFEppii_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFEppip(x64emu_t *emu, uintptr_t fcn) { iFEppip_t fn = (iFEppip_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
-void iFEppiV(x64emu_t *emu, uintptr_t fcn) { iFEppiV_t fn = (iFEppiV_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)(R_RSP + 8)); }
 void iFEppiA(x64emu_t *emu, uintptr_t fcn) { iFEppiA_t fn = (iFEppiA_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFEpplp(x64emu_t *emu, uintptr_t fcn) { iFEpplp_t fn = (iFEpplp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
 void iFEpppi(x64emu_t *emu, uintptr_t fcn) { iFEpppi_t fn = (iFEpppi_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
@@ -4724,7 +4806,7 @@ void iFiiupp(x64emu_t *emu, uintptr_t fcn) { iFiiupp_t fn = (iFiiupp_t)fcn; R_RA
 void iFiippp(x64emu_t *emu, uintptr_t fcn) { iFiippp_t fn = (iFiippp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFiuuuu(x64emu_t *emu, uintptr_t fcn) { iFiuuuu_t fn = (iFiuuuu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void iFiuuup(x64emu_t *emu, uintptr_t fcn) { iFiuuup_t fn = (iFiuuup_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
-void iFiuLip(x64emu_t *emu, uintptr_t fcn) { iFiuLip_t fn = (iFiuLip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
+void iFiuUip(x64emu_t *emu, uintptr_t fcn) { iFiuUip_t fn = (iFiuUip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFillLL(x64emu_t *emu, uintptr_t fcn) { iFillLL_t fn = (iFillLL_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
 void iFipiii(x64emu_t *emu, uintptr_t fcn) { iFipiii_t fn = (iFipiii_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void iFipiup(x64emu_t *emu, uintptr_t fcn) { iFipiup_t fn = (iFipiup_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
@@ -4796,7 +4878,6 @@ void iFpLiLi(x64emu_t *emu, uintptr_t fcn) { iFpLiLi_t fn = (iFpLiLi_t)fcn; R_RA
 void iFpLlpp(x64emu_t *emu, uintptr_t fcn) { iFpLlpp_t fn = (iFpLlpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpLLii(x64emu_t *emu, uintptr_t fcn) { iFpLLii_t fn = (iFpLLii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void iFpLLup(x64emu_t *emu, uintptr_t fcn) { iFpLLup_t fn = (iFpLLup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
-void iFpLLpp(x64emu_t *emu, uintptr_t fcn) { iFpLLpp_t fn = (iFpLLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpLpii(x64emu_t *emu, uintptr_t fcn) { iFpLpii_t fn = (iFpLpii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void iFpLpiL(x64emu_t *emu, uintptr_t fcn) { iFpLpiL_t fn = (iFpLpiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); }
 void iFpLpuL(x64emu_t *emu, uintptr_t fcn) { iFpLpuL_t fn = (iFpLpuL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8); }
@@ -4844,6 +4925,7 @@ void iFppppu(x64emu_t *emu, uintptr_t fcn) { iFppppu_t fn = (iFppppu_t)fcn; R_RA
 void iFppppl(x64emu_t *emu, uintptr_t fcn) { iFppppl_t fn = (iFppppl_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (intptr_t)R_R8); }
 void iFppppL(x64emu_t *emu, uintptr_t fcn) { iFppppL_t fn = (iFppppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void iFppppp(x64emu_t *emu, uintptr_t fcn) { iFppppp_t fn = (iFppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFSppLp(x64emu_t *emu, uintptr_t fcn) { iFSppLp_t fn = (iFSppLp_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void IFppIII(x64emu_t *emu, uintptr_t fcn) { IFppIII_t fn = (IFppIII_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void uFEippp(x64emu_t *emu, uintptr_t fcn) { uFEippp_t fn = (uFEippp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFEpipp(x64emu_t *emu, uintptr_t fcn) { uFEpipp_t fn = (uFEpipp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -4875,7 +4957,9 @@ void uFbCuup(x64emu_t *emu, uintptr_t fcn) { uFbCuup_t fn = (uFbCuup_t)fcn; void
 void uFbuuWW(x64emu_t *emu, uintptr_t fcn) { uFbuuWW_t fn = (uFbuuWW_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void uFbuuup(x64emu_t *emu, uintptr_t fcn) { uFbuuup_t fn = (uFbuuup_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void UFuiiii(x64emu_t *emu, uintptr_t fcn) { UFuiiii_t fn = (UFuiiii_t)fcn; R_RAX=fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
+void lFEippL(x64emu_t *emu, uintptr_t fcn) { lFEippL_t fn = (lFEippL_t)fcn; R_RAX=(intptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void lFEuipp(x64emu_t *emu, uintptr_t fcn) { lFEuipp_t fn = (lFEuipp_t)fcn; R_RAX=(intptr_t)fn(emu, (uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void lFipiIi(x64emu_t *emu, uintptr_t fcn) { lFipiIi_t fn = (lFipiIi_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int64_t)R_RCX, (int32_t)R_R8); }
 void lFipili(x64emu_t *emu, uintptr_t fcn) { lFipili_t fn = (lFipili_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (int32_t)R_R8); }
 void lFipLli(x64emu_t *emu, uintptr_t fcn) { lFipLli_t fn = (lFipLli_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX, (int32_t)R_R8); }
 void lFipLlL(x64emu_t *emu, uintptr_t fcn) { lFipLlL_t fn = (lFipLlL_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX, (uintptr_t)R_R8); }
@@ -4884,7 +4968,6 @@ void lFipLpp(x64emu_t *emu, uintptr_t fcn) { lFipLpp_t fn = (lFipLpp_t)fcn; R_RA
 void lFpuipC(x64emu_t *emu, uintptr_t fcn) { lFpuipC_t fn = (lFpuipC_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint8_t)R_R8); }
 void lFpuuLL(x64emu_t *emu, uintptr_t fcn) { lFpuuLL_t fn = (lFpuuLL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
 void lFppupp(x64emu_t *emu, uintptr_t fcn) { lFppupp_t fn = (lFppupp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void lFppllp(x64emu_t *emu, uintptr_t fcn) { lFppllp_t fn = (lFppllp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8); }
 void lFppLpL(x64emu_t *emu, uintptr_t fcn) { lFppLpL_t fn = (lFppLpL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void lFppLpp(x64emu_t *emu, uintptr_t fcn) { lFppLpp_t fn = (lFppLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void LFELppi(x64emu_t *emu, uintptr_t fcn) { LFELppi_t fn = (LFELppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
@@ -5186,6 +5269,8 @@ void iFiiiiip(x64emu_t *emu, uintptr_t fcn) { iFiiiiip_t fn = (iFiiiiip_t)fcn; R
 void iFiiiipp(x64emu_t *emu, uintptr_t fcn) { iFiiiipp_t fn = (iFiiiipp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFiiiuwp(x64emu_t *emu, uintptr_t fcn) { iFiiiuwp_t fn = (iFiiiuwp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (void*)R_R9); }
 void iFiWiipi(x64emu_t *emu, uintptr_t fcn) { iFiWiipi_t fn = (iFiWiipi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
+void iFiuuuup(x64emu_t *emu, uintptr_t fcn) { iFiuuuup_t fn = (iFiuuuup_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
+void iFiuuppp(x64emu_t *emu, uintptr_t fcn) { iFiuuppp_t fn = (iFiuuppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFiuUuUu(x64emu_t *emu, uintptr_t fcn) { iFiuUuUu_t fn = (iFiuUuUu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX, (uint64_t)R_R8, (uint32_t)R_R9); }
 void iFilpppp(x64emu_t *emu, uintptr_t fcn) { iFilpppp_t fn = (iFilpppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFiLpppi(x64emu_t *emu, uintptr_t fcn) { iFiLpppi_t fn = (iFiLpppi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
@@ -5338,7 +5423,6 @@ void lFipLipp(x64emu_t *emu, uintptr_t fcn) { lFipLipp_t fn = (lFipLipp_t)fcn; R
 void lFipLpLL(x64emu_t *emu, uintptr_t fcn) { lFipLpLL_t fn = (lFipLpLL_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); }
 void lFpipill(x64emu_t *emu, uintptr_t fcn) { lFpipill_t fn = (lFpipill_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9); }
 void lFpuuLLp(x64emu_t *emu, uintptr_t fcn) { lFpuuLLp_t fn = (lFpuuLLp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
-void lFpplllp(x64emu_t *emu, uintptr_t fcn) { lFpplllp_t fn = (lFpplllp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (void*)R_R9); }
 void lFppLipp(x64emu_t *emu, uintptr_t fcn) { lFppLipp_t fn = (lFppLipp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void lFpppLpp(x64emu_t *emu, uintptr_t fcn) { lFpppLpp_t fn = (lFpppLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void LFEupppp(x64emu_t *emu, uintptr_t fcn) { LFEupppp_t fn = (LFEupppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5559,9 +5643,12 @@ void iFEpppLpp(x64emu_t *emu, uintptr_t fcn) { iFEpppLpp_t fn = (iFEpppLpp_t)fcn
 void iFEpppppL(x64emu_t *emu, uintptr_t fcn) { iFEpppppL_t fn = (iFEpppppL_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void iFEpppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppppp_t fn = (iFEpppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFiiiiiip(x64emu_t *emu, uintptr_t fcn) { iFiiiiiip_t fn = (iFiiiiiip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
+void iFiupuuup(x64emu_t *emu, uintptr_t fcn) { iFiupuuup_t fn = (iFiupuuup_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
+void iFiupuppp(x64emu_t *emu, uintptr_t fcn) { iFiupuppp_t fn = (iFiupuppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFipupupi(x64emu_t *emu, uintptr_t fcn) { iFipupupi_t fn = (iFipupupi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFippuIup(x64emu_t *emu, uintptr_t fcn) { iFippuIup_t fn = (iFippuIup_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int64_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFipppppp(x64emu_t *emu, uintptr_t fcn) { iFipppppp_t fn = (iFipppppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void iFuippLpp(x64emu_t *emu, uintptr_t fcn) { iFuippLpp_t fn = (iFuippLpp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiiiiii(x64emu_t *emu, uintptr_t fcn) { iFpiiiiii_t fn = (iFpiiiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpiiiuwp(x64emu_t *emu, uintptr_t fcn) { iFpiiiuwp_t fn = (iFpiiiuwp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int16_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiiiuup(x64emu_t *emu, uintptr_t fcn) { iFpiiiuup_t fn = (iFpiiiuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -5658,6 +5745,7 @@ void LFEpppppu(x64emu_t *emu, uintptr_t fcn) { LFEpppppu_t fn = (LFEpppppu_t)fcn
 void LFpLLuupp(x64emu_t *emu, uintptr_t fcn) { LFpLLuupp_t fn = (LFpLLuupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void LFpLLppuu(x64emu_t *emu, uintptr_t fcn) { LFpLLppuu_t fn = (LFpLLppuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void pFEpupppp(x64emu_t *emu, uintptr_t fcn) { pFEpupppp_t fn = (pFEpupppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void pFEpLiiiI(x64emu_t *emu, uintptr_t fcn) { pFEpLiiiI_t fn = (pFEpLiiiI_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int64_t)R_R9); }
 void pFEpLiiil(x64emu_t *emu, uintptr_t fcn) { pFEpLiiil_t fn = (pFEpLiiil_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (intptr_t)R_R9); }
 void pFEppuipp(x64emu_t *emu, uintptr_t fcn) { pFEppuipp_t fn = (pFEppuipp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFEppppip(x64emu_t *emu, uintptr_t fcn) { pFEppppip_t fn = (pFEppppip_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
@@ -5843,6 +5931,7 @@ void iFpLpppupu(x64emu_t *emu, uintptr_t fcn) { iFpLpppupu_t fn = (iFpLpppupu_t)
 void iFpLpppppp(x64emu_t *emu, uintptr_t fcn) { iFpLpppppp_t fn = (iFpLpppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppiiipip(x64emu_t *emu, uintptr_t fcn) { iFppiiipip_t fn = (iFppiiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppillppp(x64emu_t *emu, uintptr_t fcn) { iFppillppp_t fn = (iFppillppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void iFppipiipi(x64emu_t *emu, uintptr_t fcn) { iFppipiipi_t fn = (iFppipiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void iFppippppp(x64emu_t *emu, uintptr_t fcn) { iFppippppp_t fn = (iFppippppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppIIIppp(x64emu_t *emu, uintptr_t fcn) { iFppIIIppp_t fn = (iFppIIIppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppuiiuuu(x64emu_t *emu, uintptr_t fcn) { iFppuiiuuu_t fn = (iFppuiiuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
@@ -6004,6 +6093,7 @@ void iFpLpLpLLpp(x64emu_t *emu, uintptr_t fcn) { iFpLpLpLLpp_t fn = (iFpLpLpLLpp
 void iFpLpppupup(x64emu_t *emu, uintptr_t fcn) { iFpLpppupup_t fn = (iFpLpppupup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFpLppppppp(x64emu_t *emu, uintptr_t fcn) { iFpLppppppp_t fn = (iFpLppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFppiiiiiii(x64emu_t *emu, uintptr_t fcn) { iFppiiiiiii_t fn = (iFppiiiiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
+void iFppipiiipi(x64emu_t *emu, uintptr_t fcn) { iFppipiiipi_t fn = (iFppipiiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void iFppippippp(x64emu_t *emu, uintptr_t fcn) { iFppippippp_t fn = (iFppippippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFppuLLpupp(x64emu_t *emu, uintptr_t fcn) { iFppuLLpupp_t fn = (iFppuLLpupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFppuppuuuu(x64emu_t *emu, uintptr_t fcn) { iFppuppuuuu_t fn = (iFppuppuuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
@@ -6360,9 +6450,12 @@ void iFEipiip(x64emu_t *emu, uintptr_t fcn) { iFEipiip_t fn = (iFEipiip_t)fcn; R
 #endif
 
 #if !defined(STATICBUILD)
+void lFiV(x64emu_t *emu, uintptr_t fcn) { lFiV_t fn = (lFiV_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)(R_RSP + 8)); }
 void iFlip(x64emu_t *emu, uintptr_t fcn) { iFlip_t fn = (iFlip_t)fcn; R_RAX=(int32_t)fn((intptr_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void iFLLi(x64emu_t *emu, uintptr_t fcn) { iFLLi_t fn = (iFLLi_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX); }
-void iFLLiW(x64emu_t *emu, uintptr_t fcn) { iFLLiW_t fn = (iFLLiW_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (uint16_t)R_RCX); }
+void iFLLii(x64emu_t *emu, uintptr_t fcn) { iFLLii_t fn = (iFLLii_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
+void WFpLLu(x64emu_t *emu, uintptr_t fcn) { WFpLLu_t fn = (WFpLLu_t)fcn; R_RAX=(unsigned short)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX); }
+void lFpLpV(x64emu_t *emu, uintptr_t fcn) { lFpLpV_t fn = (lFpLpV_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
 void iFEipup(x64emu_t *emu, uintptr_t fcn) { iFEipup_t fn = (iFEipup_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void iFEiipup(x64emu_t *emu, uintptr_t fcn) { iFEiipup_t fn = (iFEiipup_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpipppL(x64emu_t *emu, uintptr_t fcn) { iFpipppL_t fn = (iFpipppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
@@ -6434,6 +6527,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFv) return 1;
 	if (fun == &uFi) return 1;
 	if (fun == &uFu) return 1;
+	if (fun == &uFU) return 1;
 	if (fun == &uFd) return 2;
 	if (fun == &uFl) return 1;
 	if (fun == &uFL) return 1;
@@ -6528,8 +6622,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiI) return 1;
 	if (fun == &iFiC) return 1;
 	if (fun == &iFiu) return 1;
+	if (fun == &iFiU) return 1;
 	if (fun == &iFil) return 1;
-	if (fun == &iFiL) return 1;
 	if (fun == &iFip) return 1;
 	if (fun == &iFui) return 1;
 	if (fun == &iFuu) return 1;
@@ -6555,7 +6649,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpL) return 1;
 	if (fun == &iFpp) return 1;
 	if (fun == &IFip) return 1;
-	if (fun == &IFII) return 1;
 	if (fun == &IFpi) return 1;
 	if (fun == &IFpu) return 1;
 	if (fun == &IFpd) return 2;
@@ -6574,7 +6667,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &WFpp) return 1;
 	if (fun == &uFii) return 1;
 	if (fun == &uFiu) return 1;
-	if (fun == &uFip) return 1;
 	if (fun == &uFui) return 1;
 	if (fun == &uFuu) return 1;
 	if (fun == &uFup) return 1;
@@ -6587,6 +6679,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpl) return 1;
 	if (fun == &uFpL) return 1;
 	if (fun == &uFpp) return 1;
+	if (fun == &UFii) return 1;
 	if (fun == &UFuu) return 1;
 	if (fun == &UFUp) return 1;
 	if (fun == &UFpi) return 1;
@@ -6615,7 +6708,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFpd) return 2;
 	if (fun == &lFpl) return 1;
 	if (fun == &lFpp) return 1;
-	if (fun == &LFii) return 1;
 	if (fun == &LFuu) return 1;
 	if (fun == &LFUp) return 1;
 	if (fun == &LFLi) return 1;
@@ -6764,6 +6856,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiiu) return 1;
 	if (fun == &iFiil) return 1;
 	if (fun == &iFiip) return 1;
+	if (fun == &iFiII) return 1;
 	if (fun == &iFiCC) return 1;
 	if (fun == &iFiui) return 1;
 	if (fun == &iFiuu) return 1;
@@ -6899,8 +6992,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &dFppu) return -1;
 	if (fun == &dFppd) return -2;
 	if (fun == &dFppp) return -1;
+	if (fun == &lFiIL) return 1;
 	if (fun == &lFili) return 1;
-	if (fun == &lFilL) return 1;
 	if (fun == &lFipi) return 1;
 	if (fun == &lFipL) return 1;
 	if (fun == &lFlll) return 1;
@@ -6919,7 +7012,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFLpu) return 1;
 	if (fun == &LFLpL) return 1;
 	if (fun == &LFpii) return 1;
+	if (fun == &LFpip) return 1;
 	if (fun == &LFpCi) return 1;
+	if (fun == &LFpWp) return 1;
 	if (fun == &LFpuL) return 1;
 	if (fun == &LFpup) return 1;
 	if (fun == &LFpLi) return 1;
@@ -6972,7 +7067,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpWp) return 1;
 	if (fun == &pFpui) return 1;
 	if (fun == &pFpuu) return 1;
-	if (fun == &pFpuL) return 1;
 	if (fun == &pFpup) return 1;
 	if (fun == &pFpUi) return 1;
 	if (fun == &pFpUu) return 1;
@@ -7148,22 +7242,24 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiiii) return 1;
 	if (fun == &iFiiiu) return 1;
 	if (fun == &iFiiip) return 1;
+	if (fun == &iFiiII) return 1;
 	if (fun == &iFiiui) return 1;
 	if (fun == &iFiill) return 1;
 	if (fun == &iFiipi) return 1;
 	if (fun == &iFiipp) return 1;
+	if (fun == &iFiIIi) return 1;
+	if (fun == &iFiIIu) return 1;
 	if (fun == &iFiWii) return 1;
 	if (fun == &iFiuwp) return 1;
 	if (fun == &iFiuup) return 1;
 	if (fun == &iFiupp) return 1;
 	if (fun == &iFilli) return 1;
-	if (fun == &iFillu) return 1;
 	if (fun == &iFiLpL) return 1;
 	if (fun == &iFipii) return 1;
 	if (fun == &iFipip) return 1;
 	if (fun == &iFipWp) return 1;
 	if (fun == &iFipui) return 1;
-	if (fun == &iFipuL) return 1;
+	if (fun == &iFipuU) return 1;
 	if (fun == &iFipLi) return 1;
 	if (fun == &iFipLu) return 1;
 	if (fun == &iFipLp) return 1;
@@ -7253,7 +7349,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppii) return 1;
 	if (fun == &iFppiu) return 1;
 	if (fun == &iFppiU) return 1;
-	if (fun == &iFppiL) return 1;
 	if (fun == &iFppip) return 1;
 	if (fun == &iFppIL) return 1;
 	if (fun == &iFppCC) return 1;
@@ -7276,8 +7371,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppu) return 1;
 	if (fun == &iFpppL) return 1;
 	if (fun == &iFpppp) return 1;
-	if (fun == &IFipUI) return 1;
-	if (fun == &IFipUp) return 1;
 	if (fun == &IFpIip) return 1;
 	if (fun == &IFppii) return 1;
 	if (fun == &IFppip) return 1;
@@ -7314,6 +7407,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &dFpppp) return -1;
 	if (fun == &lFiiLu) return 1;
 	if (fun == &lFiipL) return 1;
+	if (fun == &lFipiI) return 1;
 	if (fun == &lFipil) return 1;
 	if (fun == &lFipLi) return 1;
 	if (fun == &lFipLI) return 1;
@@ -7608,7 +7702,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiippp) return 1;
 	if (fun == &iFiuuuu) return 1;
 	if (fun == &iFiuuup) return 1;
-	if (fun == &iFiuLip) return 1;
+	if (fun == &iFiuUip) return 1;
 	if (fun == &iFillLL) return 1;
 	if (fun == &iFipiii) return 1;
 	if (fun == &iFipiup) return 1;
@@ -7680,7 +7774,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpLlpp) return 1;
 	if (fun == &iFpLLii) return 1;
 	if (fun == &iFpLLup) return 1;
-	if (fun == &iFpLLpp) return 1;
 	if (fun == &iFpLpii) return 1;
 	if (fun == &iFpLpiL) return 1;
 	if (fun == &iFpLpuL) return 1;
@@ -7750,6 +7843,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFppppL) return 1;
 	if (fun == &uFppppp) return 1;
 	if (fun == &UFuiiii) return 1;
+	if (fun == &lFipiIi) return 1;
 	if (fun == &lFipili) return 1;
 	if (fun == &lFipLli) return 1;
 	if (fun == &lFipLlL) return 1;
@@ -7758,7 +7852,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFpuipC) return 1;
 	if (fun == &lFpuuLL) return 1;
 	if (fun == &lFppupp) return 1;
-	if (fun == &lFppllp) return 1;
 	if (fun == &lFppLpL) return 1;
 	if (fun == &lFppLpp) return 1;
 	if (fun == &LFuiCiu) return 1;
@@ -7992,6 +8085,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiiiipp) return 1;
 	if (fun == &iFiiiuwp) return 1;
 	if (fun == &iFiWiipi) return 1;
+	if (fun == &iFiuuuup) return 1;
+	if (fun == &iFiuuppp) return 1;
 	if (fun == &iFiuUuUu) return 1;
 	if (fun == &iFilpppp) return 1;
 	if (fun == &iFiLpppi) return 1;
@@ -8134,7 +8229,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFipLpLL) return 1;
 	if (fun == &lFpipill) return 1;
 	if (fun == &lFpuuLLp) return 1;
-	if (fun == &lFpplllp) return 1;
 	if (fun == &lFppLipp) return 1;
 	if (fun == &lFpppLpp) return 1;
 	if (fun == &LFpipipi) return 1;
@@ -8238,7 +8332,8 @@ int isSimpleWrapper(wrapper_t fun) {
 #if !defined(STATICBUILD)
 	if (fun == &iFlip) return 1;
 	if (fun == &iFLLi) return 1;
-	if (fun == &iFLLiW) return 1;
+	if (fun == &iFLLii) return 1;
+	if (fun == &WFpLLu) return 1;
 	if (fun == &iFpipppL) return 1;
 #endif
 	return 0;
@@ -8273,6 +8368,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &WFp) return 1;
 	if (fun == &uFv) return 1;
 	if (fun == &uFu) return 1;
+	if (fun == &uFU) return 1;
 	if (fun == &uFd) return 3;
 	if (fun == &uFl) return 1;
 	if (fun == &uFL) return 1;
@@ -8335,7 +8431,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpl) return 1;
 	if (fun == &vFpL) return 1;
 	if (fun == &vFpp) return 1;
-	if (fun == &IFII) return 1;
 	if (fun == &IFpu) return 1;
 	if (fun == &IFpd) return 3;
 	if (fun == &IFpp) return 1;
@@ -8499,6 +8594,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFLLL) return 1;
 	if (fun == &LFLpu) return 1;
 	if (fun == &LFLpL) return 1;
+	if (fun == &LFpWp) return 1;
 	if (fun == &LFpuL) return 1;
 	if (fun == &LFpup) return 1;
 	if (fun == &LFpLL) return 1;
@@ -8525,7 +8621,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpWW) return 1;
 	if (fun == &pFpWp) return 1;
 	if (fun == &pFpuu) return 1;
-	if (fun == &pFpuL) return 1;
 	if (fun == &pFpup) return 1;
 	if (fun == &pFpUu) return 1;
 	if (fun == &pFpdu) return 3;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 1777a02c..01e974b3 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -83,6 +83,7 @@ void IFI(x64emu_t *emu, uintptr_t fnc);
 void IFf(x64emu_t *emu, uintptr_t fnc);
 void IFd(x64emu_t *emu, uintptr_t fnc);
 void IFp(x64emu_t *emu, uintptr_t fnc);
+void IFS(x64emu_t *emu, uintptr_t fnc);
 void CFv(x64emu_t *emu, uintptr_t fnc);
 void CFi(x64emu_t *emu, uintptr_t fnc);
 void CFC(x64emu_t *emu, uintptr_t fnc);
@@ -98,10 +99,12 @@ void WFp(x64emu_t *emu, uintptr_t fnc);
 void uFv(x64emu_t *emu, uintptr_t fnc);
 void uFi(x64emu_t *emu, uintptr_t fnc);
 void uFu(x64emu_t *emu, uintptr_t fnc);
+void uFU(x64emu_t *emu, uintptr_t fnc);
 void uFd(x64emu_t *emu, uintptr_t fnc);
 void uFl(x64emu_t *emu, uintptr_t fnc);
 void uFL(x64emu_t *emu, uintptr_t fnc);
 void uFp(x64emu_t *emu, uintptr_t fnc);
+void uFS(x64emu_t *emu, uintptr_t fnc);
 void uFb(x64emu_t *emu, uintptr_t fnc);
 void UFv(x64emu_t *emu, uintptr_t fnc);
 void UFu(x64emu_t *emu, uintptr_t fnc);
@@ -124,6 +127,7 @@ void lFu(x64emu_t *emu, uintptr_t fnc);
 void lFD(x64emu_t *emu, uintptr_t fnc);
 void lFl(x64emu_t *emu, uintptr_t fnc);
 void lFp(x64emu_t *emu, uintptr_t fnc);
+void lFS(x64emu_t *emu, uintptr_t fnc);
 void LFv(x64emu_t *emu, uintptr_t fnc);
 void LFi(x64emu_t *emu, uintptr_t fnc);
 void LFu(x64emu_t *emu, uintptr_t fnc);
@@ -143,8 +147,10 @@ void pFl(x64emu_t *emu, uintptr_t fnc);
 void pFL(x64emu_t *emu, uintptr_t fnc);
 void pFp(x64emu_t *emu, uintptr_t fnc);
 void pFV(x64emu_t *emu, uintptr_t fnc);
+void pFS(x64emu_t *emu, uintptr_t fnc);
 void pFA(x64emu_t *emu, uintptr_t fnc);
 void pFb(x64emu_t *emu, uintptr_t fnc);
+void SFv(x64emu_t *emu, uintptr_t fnc);
 void HFi(x64emu_t *emu, uintptr_t fnc);
 void HFp(x64emu_t *emu, uintptr_t fnc);
 void xFx(x64emu_t *emu, uintptr_t fnc);
@@ -206,7 +212,9 @@ void vFpL(x64emu_t *emu, uintptr_t fnc);
 void vFpp(x64emu_t *emu, uintptr_t fnc);
 void vFpV(x64emu_t *emu, uintptr_t fnc);
 void vFpS(x64emu_t *emu, uintptr_t fnc);
+void vFpA(x64emu_t *emu, uintptr_t fnc);
 void vFSi(x64emu_t *emu, uintptr_t fnc);
+void vFSp(x64emu_t *emu, uintptr_t fnc);
 void vFbi(x64emu_t *emu, uintptr_t fnc);
 void vFbu(x64emu_t *emu, uintptr_t fnc);
 void vFbU(x64emu_t *emu, uintptr_t fnc);
@@ -224,8 +232,8 @@ void iFii(x64emu_t *emu, uintptr_t fnc);
 void iFiI(x64emu_t *emu, uintptr_t fnc);
 void iFiC(x64emu_t *emu, uintptr_t fnc);
 void iFiu(x64emu_t *emu, uintptr_t fnc);
+void iFiU(x64emu_t *emu, uintptr_t fnc);
 void iFil(x64emu_t *emu, uintptr_t fnc);
-void iFiL(x64emu_t *emu, uintptr_t fnc);
 void iFip(x64emu_t *emu, uintptr_t fnc);
 void iFiS(x64emu_t *emu, uintptr_t fnc);
 void iFui(x64emu_t *emu, uintptr_t fnc);
@@ -251,15 +259,17 @@ void iFpd(x64emu_t *emu, uintptr_t fnc);
 void iFpl(x64emu_t *emu, uintptr_t fnc);
 void iFpL(x64emu_t *emu, uintptr_t fnc);
 void iFpp(x64emu_t *emu, uintptr_t fnc);
+void iFpV(x64emu_t *emu, uintptr_t fnc);
 void iFpO(x64emu_t *emu, uintptr_t fnc);
+void iFpS(x64emu_t *emu, uintptr_t fnc);
+void iFpA(x64emu_t *emu, uintptr_t fnc);
 void iFSi(x64emu_t *emu, uintptr_t fnc);
-void IFEi(x64emu_t *emu, uintptr_t fnc);
+void iFSp(x64emu_t *emu, uintptr_t fnc);
 void IFEf(x64emu_t *emu, uintptr_t fnc);
 void IFEd(x64emu_t *emu, uintptr_t fnc);
 void IFED(x64emu_t *emu, uintptr_t fnc);
 void IFEp(x64emu_t *emu, uintptr_t fnc);
 void IFip(x64emu_t *emu, uintptr_t fnc);
-void IFII(x64emu_t *emu, uintptr_t fnc);
 void IFpi(x64emu_t *emu, uintptr_t fnc);
 void IFpu(x64emu_t *emu, uintptr_t fnc);
 void IFpd(x64emu_t *emu, uintptr_t fnc);
@@ -279,10 +289,11 @@ void WFpp(x64emu_t *emu, uintptr_t fnc);
 void uFEp(x64emu_t *emu, uintptr_t fnc);
 void uFii(x64emu_t *emu, uintptr_t fnc);
 void uFiu(x64emu_t *emu, uintptr_t fnc);
-void uFip(x64emu_t *emu, uintptr_t fnc);
+void uFiS(x64emu_t *emu, uintptr_t fnc);
 void uFui(x64emu_t *emu, uintptr_t fnc);
 void uFuu(x64emu_t *emu, uintptr_t fnc);
 void uFup(x64emu_t *emu, uintptr_t fnc);
+void uFuS(x64emu_t *emu, uintptr_t fnc);
 void uFuM(x64emu_t *emu, uintptr_t fnc);
 void uFpw(x64emu_t *emu, uintptr_t fnc);
 void uFpi(x64emu_t *emu, uintptr_t fnc);
@@ -295,6 +306,7 @@ void uFpL(x64emu_t *emu, uintptr_t fnc);
 void uFpp(x64emu_t *emu, uintptr_t fnc);
 void uFbu(x64emu_t *emu, uintptr_t fnc);
 void UFEp(x64emu_t *emu, uintptr_t fnc);
+void UFii(x64emu_t *emu, uintptr_t fnc);
 void UFuu(x64emu_t *emu, uintptr_t fnc);
 void UFUp(x64emu_t *emu, uintptr_t fnc);
 void UFpi(x64emu_t *emu, uintptr_t fnc);
@@ -338,7 +350,6 @@ void lFpl(x64emu_t *emu, uintptr_t fnc);
 void lFpp(x64emu_t *emu, uintptr_t fnc);
 void LFEL(x64emu_t *emu, uintptr_t fnc);
 void LFEp(x64emu_t *emu, uintptr_t fnc);
-void LFii(x64emu_t *emu, uintptr_t fnc);
 void LFuu(x64emu_t *emu, uintptr_t fnc);
 void LFUp(x64emu_t *emu, uintptr_t fnc);
 void LFLi(x64emu_t *emu, uintptr_t fnc);
@@ -383,6 +394,8 @@ void pFSi(x64emu_t *emu, uintptr_t fnc);
 void pFbC(x64emu_t *emu, uintptr_t fnc);
 void pFbu(x64emu_t *emu, uintptr_t fnc);
 void pFbp(x64emu_t *emu, uintptr_t fnc);
+void SFip(x64emu_t *emu, uintptr_t fnc);
+void SFpp(x64emu_t *emu, uintptr_t fnc);
 void HFII(x64emu_t *emu, uintptr_t fnc);
 void HFll(x64emu_t *emu, uintptr_t fnc);
 void HFpi(x64emu_t *emu, uintptr_t fnc);
@@ -421,6 +434,7 @@ void vFipi(x64emu_t *emu, uintptr_t fnc);
 void vFipu(x64emu_t *emu, uintptr_t fnc);
 void vFipL(x64emu_t *emu, uintptr_t fnc);
 void vFipp(x64emu_t *emu, uintptr_t fnc);
+void vFipA(x64emu_t *emu, uintptr_t fnc);
 void vFCCC(x64emu_t *emu, uintptr_t fnc);
 void vFWWW(x64emu_t *emu, uintptr_t fnc);
 void vFucc(x64emu_t *emu, uintptr_t fnc);
@@ -506,6 +520,7 @@ void vFppl(x64emu_t *emu, uintptr_t fnc);
 void vFppL(x64emu_t *emu, uintptr_t fnc);
 void vFppp(x64emu_t *emu, uintptr_t fnc);
 void vFppV(x64emu_t *emu, uintptr_t fnc);
+void vFSpL(x64emu_t *emu, uintptr_t fnc);
 void cFpdp(x64emu_t *emu, uintptr_t fnc);
 void wFppp(x64emu_t *emu, uintptr_t fnc);
 void iFEiw(x64emu_t *emu, uintptr_t fnc);
@@ -530,6 +545,7 @@ void iFiiu(x64emu_t *emu, uintptr_t fnc);
 void iFiil(x64emu_t *emu, uintptr_t fnc);
 void iFiip(x64emu_t *emu, uintptr_t fnc);
 void iFiiO(x64emu_t *emu, uintptr_t fnc);
+void iFiII(x64emu_t *emu, uintptr_t fnc);
 void iFiCC(x64emu_t *emu, uintptr_t fnc);
 void iFiui(x64emu_t *emu, uintptr_t fnc);
 void iFiuu(x64emu_t *emu, uintptr_t fnc);
@@ -609,7 +625,11 @@ void iFppL(x64emu_t *emu, uintptr_t fnc);
 void iFppp(x64emu_t *emu, uintptr_t fnc);
 void iFpOu(x64emu_t *emu, uintptr_t fnc);
 void iFpOM(x64emu_t *emu, uintptr_t fnc);
+void iFSIi(x64emu_t *emu, uintptr_t fnc);
+void iFSli(x64emu_t *emu, uintptr_t fnc);
 void iFSpL(x64emu_t *emu, uintptr_t fnc);
+void iFSpp(x64emu_t *emu, uintptr_t fnc);
+void iFSpA(x64emu_t *emu, uintptr_t fnc);
 void iFbpp(x64emu_t *emu, uintptr_t fnc);
 void IFiIi(x64emu_t *emu, uintptr_t fnc);
 void IFpIi(x64emu_t *emu, uintptr_t fnc);
@@ -687,8 +707,8 @@ void dFppp(x64emu_t *emu, uintptr_t fnc);
 void DFDDD(x64emu_t *emu, uintptr_t fnc);
 void DFppi(x64emu_t *emu, uintptr_t fnc);
 void DFppp(x64emu_t *emu, uintptr_t fnc);
+void lFiIL(x64emu_t *emu, uintptr_t fnc);
 void lFili(x64emu_t *emu, uintptr_t fnc);
-void lFilL(x64emu_t *emu, uintptr_t fnc);
 void lFipi(x64emu_t *emu, uintptr_t fnc);
 void lFipL(x64emu_t *emu, uintptr_t fnc);
 void lFlll(x64emu_t *emu, uintptr_t fnc);
@@ -699,6 +719,7 @@ void lFppi(x64emu_t *emu, uintptr_t fnc);
 void lFppu(x64emu_t *emu, uintptr_t fnc);
 void lFppL(x64emu_t *emu, uintptr_t fnc);
 void lFppp(x64emu_t *emu, uintptr_t fnc);
+void lFppS(x64emu_t *emu, uintptr_t fnc);
 void lFSpl(x64emu_t *emu, uintptr_t fnc);
 void LFEpA(x64emu_t *emu, uintptr_t fnc);
 void LFipL(x64emu_t *emu, uintptr_t fnc);
@@ -709,7 +730,9 @@ void LFLLL(x64emu_t *emu, uintptr_t fnc);
 void LFLpu(x64emu_t *emu, uintptr_t fnc);
 void LFLpL(x64emu_t *emu, uintptr_t fnc);
 void LFpii(x64emu_t *emu, uintptr_t fnc);
+void LFpip(x64emu_t *emu, uintptr_t fnc);
 void LFpCi(x64emu_t *emu, uintptr_t fnc);
+void LFpWp(x64emu_t *emu, uintptr_t fnc);
 void LFpuL(x64emu_t *emu, uintptr_t fnc);
 void LFpup(x64emu_t *emu, uintptr_t fnc);
 void LFpLi(x64emu_t *emu, uintptr_t fnc);
@@ -766,6 +789,7 @@ void pFpid(x64emu_t *emu, uintptr_t fnc);
 void pFpil(x64emu_t *emu, uintptr_t fnc);
 void pFpiL(x64emu_t *emu, uintptr_t fnc);
 void pFpip(x64emu_t *emu, uintptr_t fnc);
+void pFpiS(x64emu_t *emu, uintptr_t fnc);
 void pFpCi(x64emu_t *emu, uintptr_t fnc);
 void pFpCu(x64emu_t *emu, uintptr_t fnc);
 void pFpWi(x64emu_t *emu, uintptr_t fnc);
@@ -773,7 +797,6 @@ void pFpWW(x64emu_t *emu, uintptr_t fnc);
 void pFpWp(x64emu_t *emu, uintptr_t fnc);
 void pFpui(x64emu_t *emu, uintptr_t fnc);
 void pFpuu(x64emu_t *emu, uintptr_t fnc);
-void pFpuL(x64emu_t *emu, uintptr_t fnc);
 void pFpup(x64emu_t *emu, uintptr_t fnc);
 void pFpUi(x64emu_t *emu, uintptr_t fnc);
 void pFpUu(x64emu_t *emu, uintptr_t fnc);
@@ -807,6 +830,9 @@ void pFbUp(x64emu_t *emu, uintptr_t fnc);
 void pFbpi(x64emu_t *emu, uintptr_t fnc);
 void pFbpu(x64emu_t *emu, uintptr_t fnc);
 void pFbpp(x64emu_t *emu, uintptr_t fnc);
+void SFEpp(x64emu_t *emu, uintptr_t fnc);
+void SFpLp(x64emu_t *emu, uintptr_t fnc);
+void SFppS(x64emu_t *emu, uintptr_t fnc);
 void vWpup(x64emu_t *emu, uintptr_t fnc);
 void iWEip(x64emu_t *emu, uintptr_t fnc);
 void iWEpp(x64emu_t *emu, uintptr_t fnc);
@@ -1005,29 +1031,33 @@ void iFEppL(x64emu_t *emu, uintptr_t fnc);
 void iFEppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppV(x64emu_t *emu, uintptr_t fnc);
 void iFEppA(x64emu_t *emu, uintptr_t fnc);
-void iFEpOu(x64emu_t *emu, uintptr_t fnc);
+void iFEpON(x64emu_t *emu, uintptr_t fnc);
+void iFESpV(x64emu_t *emu, uintptr_t fnc);
+void iFESpA(x64emu_t *emu, uintptr_t fnc);
 void iFwwww(x64emu_t *emu, uintptr_t fnc);
 void iFwppp(x64emu_t *emu, uintptr_t fnc);
 void iFiiii(x64emu_t *emu, uintptr_t fnc);
 void iFiiiu(x64emu_t *emu, uintptr_t fnc);
 void iFiiip(x64emu_t *emu, uintptr_t fnc);
 void iFiiiN(x64emu_t *emu, uintptr_t fnc);
+void iFiiII(x64emu_t *emu, uintptr_t fnc);
 void iFiiui(x64emu_t *emu, uintptr_t fnc);
 void iFiill(x64emu_t *emu, uintptr_t fnc);
 void iFiipi(x64emu_t *emu, uintptr_t fnc);
 void iFiipp(x64emu_t *emu, uintptr_t fnc);
+void iFiIIi(x64emu_t *emu, uintptr_t fnc);
+void iFiIIu(x64emu_t *emu, uintptr_t fnc);
 void iFiWii(x64emu_t *emu, uintptr_t fnc);
 void iFiuwp(x64emu_t *emu, uintptr_t fnc);
 void iFiuup(x64emu_t *emu, uintptr_t fnc);
 void iFiupp(x64emu_t *emu, uintptr_t fnc);
 void iFilli(x64emu_t *emu, uintptr_t fnc);
-void iFillu(x64emu_t *emu, uintptr_t fnc);
 void iFiLpL(x64emu_t *emu, uintptr_t fnc);
 void iFipii(x64emu_t *emu, uintptr_t fnc);
 void iFipip(x64emu_t *emu, uintptr_t fnc);
 void iFipWp(x64emu_t *emu, uintptr_t fnc);
 void iFipui(x64emu_t *emu, uintptr_t fnc);
-void iFipuL(x64emu_t *emu, uintptr_t fnc);
+void iFipuU(x64emu_t *emu, uintptr_t fnc);
 void iFipLi(x64emu_t *emu, uintptr_t fnc);
 void iFipLu(x64emu_t *emu, uintptr_t fnc);
 void iFipLp(x64emu_t *emu, uintptr_t fnc);
@@ -1121,7 +1151,6 @@ void iFpLpp(x64emu_t *emu, uintptr_t fnc);
 void iFppii(x64emu_t *emu, uintptr_t fnc);
 void iFppiu(x64emu_t *emu, uintptr_t fnc);
 void iFppiU(x64emu_t *emu, uintptr_t fnc);
-void iFppiL(x64emu_t *emu, uintptr_t fnc);
 void iFppip(x64emu_t *emu, uintptr_t fnc);
 void iFppIL(x64emu_t *emu, uintptr_t fnc);
 void iFppCC(x64emu_t *emu, uintptr_t fnc);
@@ -1144,10 +1173,9 @@ void iFpppC(x64emu_t *emu, uintptr_t fnc);
 void iFpppu(x64emu_t *emu, uintptr_t fnc);
 void iFpppL(x64emu_t *emu, uintptr_t fnc);
 void iFpppp(x64emu_t *emu, uintptr_t fnc);
+void iFSpiL(x64emu_t *emu, uintptr_t fnc);
 void iFbupp(x64emu_t *emu, uintptr_t fnc);
 void IFEpIi(x64emu_t *emu, uintptr_t fnc);
-void IFipUI(x64emu_t *emu, uintptr_t fnc);
-void IFipUp(x64emu_t *emu, uintptr_t fnc);
 void IFpIip(x64emu_t *emu, uintptr_t fnc);
 void IFppii(x64emu_t *emu, uintptr_t fnc);
 void IFppip(x64emu_t *emu, uintptr_t fnc);
@@ -1202,6 +1230,7 @@ void lFEppL(x64emu_t *emu, uintptr_t fnc);
 void lFEppp(x64emu_t *emu, uintptr_t fnc);
 void lFiiLu(x64emu_t *emu, uintptr_t fnc);
 void lFiipL(x64emu_t *emu, uintptr_t fnc);
+void lFipiI(x64emu_t *emu, uintptr_t fnc);
 void lFipil(x64emu_t *emu, uintptr_t fnc);
 void lFipLi(x64emu_t *emu, uintptr_t fnc);
 void lFipLI(x64emu_t *emu, uintptr_t fnc);
@@ -1218,6 +1247,7 @@ void lFplpp(x64emu_t *emu, uintptr_t fnc);
 void lFpLpp(x64emu_t *emu, uintptr_t fnc);
 void lFppii(x64emu_t *emu, uintptr_t fnc);
 void lFppip(x64emu_t *emu, uintptr_t fnc);
+void lFppiS(x64emu_t *emu, uintptr_t fnc);
 void lFpppL(x64emu_t *emu, uintptr_t fnc);
 void lFpppp(x64emu_t *emu, uintptr_t fnc);
 void LFEppL(x64emu_t *emu, uintptr_t fnc);
@@ -1230,6 +1260,7 @@ void LFpCii(x64emu_t *emu, uintptr_t fnc);
 void LFpupL(x64emu_t *emu, uintptr_t fnc);
 void LFpLCL(x64emu_t *emu, uintptr_t fnc);
 void LFpLLp(x64emu_t *emu, uintptr_t fnc);
+void LFpLLS(x64emu_t *emu, uintptr_t fnc);
 void LFpLpL(x64emu_t *emu, uintptr_t fnc);
 void LFpLpp(x64emu_t *emu, uintptr_t fnc);
 void LFppii(x64emu_t *emu, uintptr_t fnc);
@@ -1553,7 +1584,6 @@ void iFEiipV(x64emu_t *emu, uintptr_t fnc);
 void iFEiipA(x64emu_t *emu, uintptr_t fnc);
 void iFEipip(x64emu_t *emu, uintptr_t fnc);
 void iFEippi(x64emu_t *emu, uintptr_t fnc);
-void iFEippL(x64emu_t *emu, uintptr_t fnc);
 void iFEippp(x64emu_t *emu, uintptr_t fnc);
 void iFEpiii(x64emu_t *emu, uintptr_t fnc);
 void iFEpipi(x64emu_t *emu, uintptr_t fnc);
@@ -1566,7 +1596,6 @@ void iFEpLpV(x64emu_t *emu, uintptr_t fnc);
 void iFEpLpA(x64emu_t *emu, uintptr_t fnc);
 void iFEppii(x64emu_t *emu, uintptr_t fnc);
 void iFEppip(x64emu_t *emu, uintptr_t fnc);
-void iFEppiV(x64emu_t *emu, uintptr_t fnc);
 void iFEppiA(x64emu_t *emu, uintptr_t fnc);
 void iFEpplp(x64emu_t *emu, uintptr_t fnc);
 void iFEpppi(x64emu_t *emu, uintptr_t fnc);
@@ -1580,7 +1609,7 @@ void iFiiupp(x64emu_t *emu, uintptr_t fnc);
 void iFiippp(x64emu_t *emu, uintptr_t fnc);
 void iFiuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFiuuup(x64emu_t *emu, uintptr_t fnc);
-void iFiuLip(x64emu_t *emu, uintptr_t fnc);
+void iFiuUip(x64emu_t *emu, uintptr_t fnc);
 void iFillLL(x64emu_t *emu, uintptr_t fnc);
 void iFipiii(x64emu_t *emu, uintptr_t fnc);
 void iFipiup(x64emu_t *emu, uintptr_t fnc);
@@ -1652,7 +1681,6 @@ void iFpLiLi(x64emu_t *emu, uintptr_t fnc);
 void iFpLlpp(x64emu_t *emu, uintptr_t fnc);
 void iFpLLii(x64emu_t *emu, uintptr_t fnc);
 void iFpLLup(x64emu_t *emu, uintptr_t fnc);
-void iFpLLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpLpii(x64emu_t *emu, uintptr_t fnc);
 void iFpLpiL(x64emu_t *emu, uintptr_t fnc);
 void iFpLpuL(x64emu_t *emu, uintptr_t fnc);
@@ -1700,6 +1728,7 @@ void iFppppu(x64emu_t *emu, uintptr_t fnc);
 void iFppppl(x64emu_t *emu, uintptr_t fnc);
 void iFppppL(x64emu_t *emu, uintptr_t fnc);
 void iFppppp(x64emu_t *emu, uintptr_t fnc);
+void iFSppLp(x64emu_t *emu, uintptr_t fnc);
 void IFppIII(x64emu_t *emu, uintptr_t fnc);
 void uFEippp(x64emu_t *emu, uintptr_t fnc);
 void uFEpipp(x64emu_t *emu, uintptr_t fnc);
@@ -1731,7 +1760,9 @@ void uFbCuup(x64emu_t *emu, uintptr_t fnc);
 void uFbuuWW(x64emu_t *emu, uintptr_t fnc);
 void uFbuuup(x64emu_t *emu, uintptr_t fnc);
 void UFuiiii(x64emu_t *emu, uintptr_t fnc);
+void lFEippL(x64emu_t *emu, uintptr_t fnc);
 void lFEuipp(x64emu_t *emu, uintptr_t fnc);
+void lFipiIi(x64emu_t *emu, uintptr_t fnc);
 void lFipili(x64emu_t *emu, uintptr_t fnc);
 void lFipLli(x64emu_t *emu, uintptr_t fnc);
 void lFipLlL(x64emu_t *emu, uintptr_t fnc);
@@ -1740,7 +1771,6 @@ void lFipLpp(x64emu_t *emu, uintptr_t fnc);
 void lFpuipC(x64emu_t *emu, uintptr_t fnc);
 void lFpuuLL(x64emu_t *emu, uintptr_t fnc);
 void lFppupp(x64emu_t *emu, uintptr_t fnc);
-void lFppllp(x64emu_t *emu, uintptr_t fnc);
 void lFppLpL(x64emu_t *emu, uintptr_t fnc);
 void lFppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFELppi(x64emu_t *emu, uintptr_t fnc);
@@ -2042,6 +2072,8 @@ void iFiiiiip(x64emu_t *emu, uintptr_t fnc);
 void iFiiiipp(x64emu_t *emu, uintptr_t fnc);
 void iFiiiuwp(x64emu_t *emu, uintptr_t fnc);
 void iFiWiipi(x64emu_t *emu, uintptr_t fnc);
+void iFiuuuup(x64emu_t *emu, uintptr_t fnc);
+void iFiuuppp(x64emu_t *emu, uintptr_t fnc);
 void iFiuUuUu(x64emu_t *emu, uintptr_t fnc);
 void iFilpppp(x64emu_t *emu, uintptr_t fnc);
 void iFiLpppi(x64emu_t *emu, uintptr_t fnc);
@@ -2195,7 +2227,6 @@ void lFipLipp(x64emu_t *emu, uintptr_t fnc);
 void lFipLpLL(x64emu_t *emu, uintptr_t fnc);
 void lFpipill(x64emu_t *emu, uintptr_t fnc);
 void lFpuuLLp(x64emu_t *emu, uintptr_t fnc);
-void lFpplllp(x64emu_t *emu, uintptr_t fnc);
 void lFppLipp(x64emu_t *emu, uintptr_t fnc);
 void lFpppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFEupppp(x64emu_t *emu, uintptr_t fnc);
@@ -2416,9 +2447,12 @@ void iFEpppLpp(x64emu_t *emu, uintptr_t fnc);
 void iFEpppppL(x64emu_t *emu, uintptr_t fnc);
 void iFEpppppp(x64emu_t *emu, uintptr_t fnc);
 void iFiiiiiip(x64emu_t *emu, uintptr_t fnc);
+void iFiupuuup(x64emu_t *emu, uintptr_t fnc);
+void iFiupuppp(x64emu_t *emu, uintptr_t fnc);
 void iFipupupi(x64emu_t *emu, uintptr_t fnc);
 void iFippuIup(x64emu_t *emu, uintptr_t fnc);
 void iFipppppp(x64emu_t *emu, uintptr_t fnc);
+void iFuippLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiuwp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiuup(x64emu_t *emu, uintptr_t fnc);
@@ -2515,6 +2549,7 @@ void LFEpppppu(x64emu_t *emu, uintptr_t fnc);
 void LFpLLuupp(x64emu_t *emu, uintptr_t fnc);
 void LFpLLppuu(x64emu_t *emu, uintptr_t fnc);
 void pFEpupppp(x64emu_t *emu, uintptr_t fnc);
+void pFEpLiiiI(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiil(x64emu_t *emu, uintptr_t fnc);
 void pFEppuipp(x64emu_t *emu, uintptr_t fnc);
 void pFEppppip(x64emu_t *emu, uintptr_t fnc);
@@ -2700,6 +2735,7 @@ void iFpLpppupu(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppppp(x64emu_t *emu, uintptr_t fnc);
 void iFppiiipip(x64emu_t *emu, uintptr_t fnc);
 void iFppillppp(x64emu_t *emu, uintptr_t fnc);
+void iFppipiipi(x64emu_t *emu, uintptr_t fnc);
 void iFppippppp(x64emu_t *emu, uintptr_t fnc);
 void iFppIIIppp(x64emu_t *emu, uintptr_t fnc);
 void iFppuiiuuu(x64emu_t *emu, uintptr_t fnc);
@@ -2862,6 +2898,7 @@ void iFpLpLpLLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppupup(x64emu_t *emu, uintptr_t fnc);
 void iFpLppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiiiii(x64emu_t *emu, uintptr_t fnc);
+void iFppipiiipi(x64emu_t *emu, uintptr_t fnc);
 void iFppippippp(x64emu_t *emu, uintptr_t fnc);
 void iFppuLLpupp(x64emu_t *emu, uintptr_t fnc);
 void iFppuppuuuu(x64emu_t *emu, uintptr_t fnc);
@@ -3166,9 +3203,12 @@ void iFEipiip(x64emu_t *emu, uintptr_t fnc);
 #endif
 
 #if !defined(STATICBUILD)
+void lFiV(x64emu_t *emu, uintptr_t fnc);
 void iFlip(x64emu_t *emu, uintptr_t fnc);
 void iFLLi(x64emu_t *emu, uintptr_t fnc);
-void iFLLiW(x64emu_t *emu, uintptr_t fnc);
+void iFLLii(x64emu_t *emu, uintptr_t fnc);
+void WFpLLu(x64emu_t *emu, uintptr_t fnc);
+void lFpLpV(x64emu_t *emu, uintptr_t fnc);
 void iFEipup(x64emu_t *emu, uintptr_t fnc);
 void iFEiipup(x64emu_t *emu, uintptr_t fnc);
 void iFpipppL(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index d862a2c0..3e2d6062 100644
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -2337,7 +2337,7 @@ EXPORT int32_t my_execl(x64emu_t* emu, const char* path)
     int x64 = FileIsX64ELF(path);
     int x86 = my_context->box86path?FileIsX86ELF(path):0;
     int script = (my_context->bashpath && FileIsShell(path))?1:0;
-    printf_log(LOG_DEBUG, "execle(\"%s\", ...), IsX86=%d, self=%d\n", path, x64, self);
+    printf_log(LOG_DEBUG, "execl(\"%s\", ...), IsX86=%d, self=%d\n", path, x64, self);
     // count argv...
     int i=0;
     while(getVargN(emu, i+1)) ++i;
@@ -2350,7 +2350,7 @@ EXPORT int32_t my_execl(x64emu_t* emu, const char* path)
     for (int k=0; k<i; ++k)
         newargv[j++] = getVargN(emu, k+1);
     if(self) newargv[1] = emu->context->fullpath;
-    printf_log(LOG_DEBUG, " => execle(\"%s\", %p [\"%s\", \"%s\"...:%d])\n", newargv[0], newargv, newargv[1], i?newargv[2]:"", i);
+    printf_log(LOG_DEBUG, " => execl(\"%s\", %p [\"%s\", \"%s\"...:%d])\n", newargv[0], newargv, newargv[1], i?newargv[2]:"", i);
     int ret = 0;
     if (!(x64 || x86 || script || self)) {
         ret = execv(path, newargv);
@@ -2367,7 +2367,7 @@ EXPORT int32_t my_execle(x64emu_t* emu, const char* path)
     int x64 = FileIsX64ELF(path);
     int x86 = my_context->box86path?FileIsX86ELF(path):0;
     int script = (my_context->bashpath && FileIsShell(path))?1:0;
-    printf_log(LOG_DEBUG, "execl(\"%s\", ...), IsX86=%d, self=%d\n", path, x64, self);
+    printf_log(LOG_DEBUG, "execle(\"%s\", ...), IsX86=%d, self=%d\n", path, x64, self);
     // hack to update the environ var if needed
     // count argv...
     int i=0;
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index ceaef297..dc7fbc40 100644
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -2,13 +2,6 @@
 #error Meh...
 #endif
 
-//socklen_t is u32
-// typedef unsigned long int nfds_t;
-// pid_t is S32
-// key_t is S32
-// uid_t is u32
-// gid_t is u32
-
 GO(a64l, lFp)
 GO(abort, vFv)
 //DATAB(__abort_msg, 
@@ -17,28 +10,28 @@ GO(accept, iFipp)
 GO(accept4, iFippi)
 GOW(access, iFpi)
 GO(acct, iFp)
-GOW(addmntent, iFpp)
+GOW(addmntent, iFSp)
 GOW(addseverity, iFip)
 GOW(adjtime, iFpp)
 GO(__adjtimex, iFp)
 GOW(adjtimex, iFp)
 //GOW(advance, 
 GO(alarm, uFu)
-GO(aligned_alloc, pFUU)
+GO(aligned_alloc, pFLL)
 GOW(alphasort, iFpp)
 GOW(alphasort64, iFpp)
 //GO(__arch_prctl, 
 //GOW(arch_prctl, 
-//DATA(argp_err_exit_status, 
-//GOW(argp_error, vF!pV)
-//GOW(argp_failure, vF!iipV)
-//GOW(argp_help, vF!pup)
-//GOW(argp_parse, iF!ipupp)
-//DATAB(argp_program_bug_address, 
-//DATAB(argp_program_version, 
-//DATAB(argp_program_version_hook, 
-//GOW(argp_state_help, vF!pu)
-//GOW(argp_usage, vF!)
+//DATA(argp_err_exit_status, 4)
+//GOWM(argp_error, vFppV)
+//GOWM(argp_failure, vFpiipV)
+//GOWM(argp_help, vFpSup)
+//GOWM(argp_parse, iFpipupp)
+//DATAB(argp_program_bug_address, 8)
+//DATAB(argp_program_version, 8)
+//DATAM(argp_program_version_hook, 8)
+//GOWM(argp_state_help, vFpSu)
+//GOWM(argp_usage, vFp)
 GOW(argz_add, iFppp)
 GOW(argz_add_sep, iFpppi)
 GOW(argz_append, iFpppL)
@@ -67,13 +60,13 @@ GO(atof, dFp)
 GO(atoi, iFp)
 GO(atol, lFp)
 GO(atoll, IFp)
-//GO(authdes_create, !Fpup!)
-//GO(authdes_getucred, iF!pppp)
-//GO(authdes_pk_create, !Fp!up!)
-//GO(_authenticate, uF!!)
-//GO(authnone_create, !Fv)
-//GO(authunix_create, !Fpuuip)
-//GO(authunix_create_default, !Fv)
+//GOM(authdes_create, pFpupp)
+//GO(authdes_getucred, "iF!pppp")
+//GOM(authdes_pk_create, pFppupp)
+//GOM(_authenticate, uFpp)
+//GOM(authnone_create, pFv)
+//GOM(authunix_create, pFpuuip)
+//GOM(authunix_create_default, pFv)
 //GO(__backtrace, 
 GOWM(backtrace, iFEpi)
 //GO(__backtrace_symbols, 
@@ -83,9 +76,9 @@ GOWM(backtrace_symbols_fd, vFEpii)
 GOW(basename, pFp)
 GO(bcmp, iFppL)
 GO(bcopy, vFppL)
-//GO(bdflush, // Deprecated
+//GO(bdflush, 
 GOW(bind, iFipu)
-//GO(bindresvport, iFi!)
+GO(bindresvport, iFip)
 GOW(bindtextdomain, pFpp)
 GOW(bind_textdomain_codeset, pFpp)
 GOW(brk, iFp)
@@ -95,10 +88,10 @@ GOM(bsearch, pFEppLLp)
 GOW(btowc, uFi)
 GO(__bzero, vFpL)
 GO(bzero, vFpL)
-//GO(c16rtomb, LFpW!)
+GO(c16rtomb, LFpWp)
 GOW(c32rtomb, LFpup)
 GOW(calloc, pFLL)
-//GO(callrpc, iFpLLL@p@p)
+//GOM(callrpc, iFpiiipppp)
 //GO(__call_tls_dtors, vFv)
 GOW(canonicalize_file_name, pFp)
 GO(capget, iFpp)
@@ -106,7 +99,11 @@ GO(capset, iFpp)
 GO(catclose, iFp)
 GO(catgets, pFpiip)
 GO(catopen, pFpi)
-//GO(cbc_crypt, // Deprecated
+#ifdef STATICBUILD
+//GO(cbc_crypt, iFppuup)
+#else
+GO(cbc_crypt, iFppuup)
+#endif
 GO(cfgetispeed, uFp)
 GO(cfgetospeed, uFp)
 GO(cfmakeraw, vFp)
@@ -115,43 +112,43 @@ GO(cfsetispeed, iFpu)
 GO(cfsetospeed, iFpu)
 GO(cfsetspeed, iFpu)
 GOW(chdir, iFp)
-DATA(__check_rhosts_file, sizeof(void*))
+DATA(__check_rhosts_file, 8)
 //GO(chflags, 
 //GO(__chk_fail, 
 GOW(chmod, iFpu)
 GOW(chown, iFpuu)
 GO(chroot, iFp)
 GOW(clearenv, iFv)
-GO(clearerr, vFp)
-GO(clearerr_unlocked, vFp)
+GO(clearerr, vFS)
+GO(clearerr_unlocked, vFS)
 #ifdef STATICBUILD
 //GO(clnt_broadcast, 
-//GO(clnt_create, !FpLLp)
+//GO(clnt_create, "!FpLLp")
 //GO(clnt_pcreateerror, vFp)
 //GO(clnt_perrno, vFu)
-//GO(clnt_perror, vF!p)
-//GO(clntraw_create, !FLL)
+//GO(clnt_perror, "vF!p")
+//GO(clntraw_create, "!FLL")
 //GO(clnt_spcreateerror, pFp)
 //GO(clnt_sperrno, pFu)
-//GO(clnt_sperror, pF!p)
-//GO(clnttcp_create, !F!LLpuu)
-//GO(clntudp_bufcreate, !F!LL?puu)
-//GO(clntudp_create, !F!LL?p)
-//GO(clntunix_create, !F!LLpuu)
+//GO(clnt_sperror, "pF!p")
+//GO(clnttcp_create, "!F!LLpuu")
+//GO(clntudp_bufcreate, "!F!LL?puu")
+//GO(clntudp_create, "!F!LL?p")
+//GO(clntunix_create, "!F!LLpuu")
 #else
-//GO(clnt_broadcast, 
-//GO(clnt_create, !FpLLp)
+//GOM(clnt_broadcast, uFLLLppppp)
+//GOM(clnt_create, pFpuup)
 GO(clnt_pcreateerror, vFp)
 GO(clnt_perrno, vFu)
-//GO(clnt_perror, vF!p)
-//GO(clntraw_create, !FLL)
+//GOM(clnt_perror, vFpp)
+//GOM(clntraw_create, pFLL)
 GO(clnt_spcreateerror, pFp)
 GO(clnt_sperrno, pFu)
-//GO(clnt_sperror, pF!p)
-//GO(clnttcp_create, !F!LLpuu)
-//GO(clntudp_bufcreate, !F!LL?puu)
-//GO(clntudp_create, !F!LL?p)
-//GO(clntunix_create, !F!LLpuu)
+//GOM(clnt_sperror, pFpp)
+//GOM(clnttcp_create, pFpLLpuu)
+//GO(clntudp_bufcreate, "!F!LL?puu")
+//GO(clntudp_create, "!F!LL?p")
+//GOM(clntunix_create, pFpLLpuu)
 #endif
 GO(clock, lFv)
 GO(clock_adjtime, iFip)
@@ -172,7 +169,7 @@ GOW(close, iFi)
 GOW(closedir, iFp)
 GO(closelog, vFv)
 //GO(__close_nocancel, 
-GO(close_range, iFuuu)
+GO(close_range, iFuui)
 GO(__cmsg_nxthdr, pFpp)
 GO(confstr, LFipL)
 GO(__confstr_chk, LFipLL)
@@ -193,21 +190,21 @@ GO(ctime_r, pFpp)
 //DATA(__ctype32_tolower, 
 //DATA(__ctype32_toupper, 
 #ifdef STATICBUILD
-//DATA(__ctype_b, sizeof(void*))
+//DATA(__ctype_b, 8)
 #else
-DATA(__ctype_b, sizeof(void*))
+DATA(__ctype_b, 8)
 #endif
 GO(__ctype_b_loc, pFv)
 GO(__ctype_get_mb_cur_max, LFv)
 //GO(__ctype_init, 
-DATAM(__ctype_tolower, sizeof(void*))
+DATAM(__ctype_tolower, 8)
 GO(__ctype_tolower_loc, pFv)
-DATAM(__ctype_toupper, sizeof(void*))
+DATAM(__ctype_toupper, 8)
 GO(__ctype_toupper_loc, pFv)
 //DATAB(__curbrk, 
 GO(cuserid, pFp)
 GOM(__cxa_atexit, iFEppp)
-//GO(__cxa_at_quick_exit, /* at_quick_exit has signature iF@ -> */ iF@pp)
+//GO(__cxa_at_quick_exit, "/* at_quick_exit has signature iF@ -> */ iF@pp")
 GOM(__cxa_finalize, vFEp)
 GOM(__cxa_thread_atexit_impl, iFEppp)
 //GO(__cyg_profile_func_enter, 
@@ -219,20 +216,25 @@ GO(__dcgettext, pFppi)
 GOW(dcgettext, pFppi)
 GOW(dcngettext, pFpppLi)
 //GO(__default_morecore, 
-//GO(delete_module, // Deprecated
-//GO(des_setparity, // Deprecated
+#ifdef STATICBUILD
+//GO(delete_module, 
+//GO(des_setparity, 
+#else
+//GO(delete_module, 
+GO(des_setparity, vFp)
+#endif
 GO(__dgettext, pFpp)
 GOW(dgettext, pFpp)
 GO(difftime, dFll)
 GO(dirfd, iFp)
 GO(dirname, pFp)
-GO(div, LFii)
+GO(div, UFii)
 //GO(_dl_addr, 
 //GO(_dl_catch_error, 
 //GO(_dl_catch_exception, 
 GOWM(dl_iterate_phdr, iFEpp)
 //GO(_dl_mcount_wrapper, 
-//GO(_dl_mcount_wrapper_check, 
+GO(_dl_mcount_wrapper_check, vFp)
 //DATAB(_dl_open_hook, 
 //DATAB(_dl_open_hook2, 
 //GO(_dl_signal_error, 
@@ -252,7 +254,11 @@ GO(__duplocale, pFp)
 GOW(duplocale, pFp)
 GO(dysize, iFi)
 GOW(eaccess, iFpi)
+#ifdef STATICBUILD
 //GO(ecb_crypt, 
+#else
+GO(ecb_crypt, iFppuu)
+#endif
 GO(ecvt, pFdipp)
 GOW(ecvt_r, iFdipppL)
 GO(endaliasent, vFv)
@@ -260,21 +266,25 @@ GO(endfsent, vFv)
 GO(endgrent, vFv)
 GO(endhostent, vFv)
 GO(__endmntent, iFp)
-GOW(endmntent, iFp)
+GOW(endmntent, iFS)
 GO(endnetent, vFv)
 GO(endnetgrent, vFv)
 GO(endprotoent, vFv)
 GO(endpwent, vFv)
 GO(endrpcent, vFv)
 GO(endservent, vFv)
+#ifdef STATICBUILD
 //GO(endsgent, 
+#else
+GO(endsgent, vFv)
+#endif
 GO(endspent, vFv)
 GOW(endttyent, iFv)
 GO(endusershell, vFv)
 GOW(endutent, vFv)
 GO(endutxent, vFv)
-DATAM(environ, sizeof(void*))
-DATAM(__environ, sizeof(void*))
+DATAM(environ, 8)
+DATAM(__environ, 8)
 GO(envz_add, iFpppp)
 GO(envz_entry, pFpLp)
 GO(envz_get, pFpLp)
@@ -288,7 +298,7 @@ GO(epoll_ctl, iFiiip)
 GO(epoll_pwait, iFipiip)
 GO(epoll_wait, iFipii)
 #else
-GOM(epoll_ctl, iFEiiip)   // struct epoll_event is 12byte on x86_64 and 16bytes (8bytes aligned) on arm64
+GOM(epoll_ctl, iFEiiip)
 GOM(epoll_pwait, iFEipiip)
 GOM(epoll_wait, iFEipii)
 #endif
@@ -298,22 +308,32 @@ GOM(err, vFEipV)
 //DATAB(errno, 
 GO(__errno_location, pFv)
 GOW(error, vFiipV)
-//GOW(error_at_line, vFiipupV)
-//DATAB(error_message_count, 
-//DATAB(error_one_per_line, 
-//DATAB(error_print_progname, 
+//GOWM(error_at_line, vFiipupV)
+//DATAB(error_message_count, 4)
+//DATAB(error_one_per_line, 4)
+//DATAM(error_print_progname, 8)
 GOM(errx, vFEipV)
-//GO(ether_aton, !Fp)
-//GO(ether_aton_r, !Fp!)
-//GO(ether_hostton, iFp!)
-//GO(ether_line, iFp!p)
-//GO(ether_ntoa, pF!)
-//GO(ether_ntoa_r, pF!p)
-//GO(ether_ntohost, iFp!)
+#ifdef STATICBUILD
+//GO(ether_aton, pFp)
+//GO(ether_aton_r, pFpp)
+//GO(ether_hostton, iFpp)
+//GO(ether_line, iFppp)
+//GO(ether_ntoa, pFp)
+//GO(ether_ntoa_r, pFpp)
+//GO(ether_ntohost, iFpp)
+#else
+GO(ether_aton, pFp)
+GO(ether_aton_r, pFpp)
+GO(ether_hostton, iFpp)
+GO(ether_line, iFppp)
+GO(ether_ntoa, pFp)
+GO(ether_ntoa_r, pFpp)
+GO(ether_ntohost, iFpp)
+#endif
 GOW(euidaccess, iFpi)
 GO(eventfd, iFui)
 GO(eventfd_read, iFip)
-GO(eventfd_write, iFiL)
+GO(eventfd_write, iFiU)
 GOM(execl, iFEpV) // First argument is also part of the variadic
 GOM(execle, iFEpV) // First argument is also part of the variadic
 GOM(execlp, iFEpV) // First argument is also part of the variadic
@@ -321,16 +341,16 @@ GOM(execv, iFEpp)
 GOM(execve, iFEppp)
 GOM(execvp, iFEpp)
 GOW(execvpe, iFppp)
-GO(_exit, vFi)  // immediate exit
+GO(_exit, vFi)
 GOM(exit, vFEi)
 GOW(_Exit, vFi)
 GO(explicit_bzero, vFpL)
 GO(__explicit_bzero_chk, vFpLL)
 GO(faccessat, iFipii)
 GOW(fallocate, iFiill)
-GO(fallocate64, iFiill)
+GO(fallocate64, iFiiII)
 GO(fanotify_init, iFuu)
-GO(fanotify_mark, iFiuLip)
+GO(fanotify_mark, iFiuUip)
 //GO(fattach, 
 GO(__fbufsize, LFp)
 GOW(fchdir, iFi)
@@ -339,7 +359,7 @@ GOW(fchmod, iFiu)
 GO(fchmodat, iFipui)
 GOW(fchown, iFiuu)
 GO(fchownat, iFipuui)
-GO(fclose, iFp)
+GO(fclose, iFS)
 GOW(fcloseall, iFv)
 GOWM(__fcntl, iFEiiN)
 GOWM(fcntl, iFEiiN)
@@ -350,41 +370,46 @@ GO(fdatasync, iFi)
 GO(__fdelt_chk, LFL)
 //GO(__fdelt_warn, 
 //GO(fdetach, 
-GO(fdopen, pFip)
+GO(fdopen, SFip)
 GOW(fdopendir, pFi)
 //GO(__fentry__, 
-GOW(feof, iFp)
-GOW(feof_unlocked, iFp)
-GOW(ferror, iFp)
-GOW(ferror_unlocked, iFp)
+GOW(feof, iFS)
+GOW(feof_unlocked, iFS)
+GOW(ferror, iFS)
+GOW(ferror_unlocked, iFS)
 GO(fexecve, iFipp)
 GOW(fflush, iFS)
 GO(fflush_unlocked, iFS)
 //GO(__ffs, 
 GO(ffs, iFi)
-GO(ffsl, iFI)
+GO(ffsl, iFl)
 GO(ffsll, iFI)
-GOW(fgetc, iFp)
-GOW(fgetc_unlocked, iFp)
-GO(fgetgrent, pFp)
-GOW(fgetgrent_r, iFpppLp)
-GO(fgetpos, iFpp)
-GO(fgetpos64, iFpp)
-GO(fgetpwent, pFp)
-GOW(fgetpwent_r, iFpppLp)
-GOW(fgets, pFpip)
+GOW(fgetc, iFS)
+GOW(fgetc_unlocked, iFS)
+GO(fgetgrent, pFS)
+GOW(fgetgrent_r, iFSppLp)
+GO(fgetpos, iFSp)
+GO(fgetpos64, iFSp)
+GO(fgetpwent, pFS)
+GOW(fgetpwent_r, iFSppLp)
+GOW(fgets, pFpiS)
 GO(__fgets_chk, pFpLip)
+#ifdef STATICBUILD
 //GO(fgetsgent, 
 //GOW(fgetsgent_r, 
-GO(fgetspent, pFp)
-GOW(fgetspent_r, iFpppLp)
-GOW(fgets_unlocked, pFpip)
+#else
+GO(fgetsgent, pFS)
+GOW(fgetsgent_r, iFSppLp)
+#endif
+GO(fgetspent, pFS)
+GOW(fgetspent_r, iFSppLp)
+GOW(fgets_unlocked, pFpiS)
 //GO(__fgets_unlocked_chk, 
-GOW(fgetwc, uFp)
-GOW(fgetwc_unlocked, uFp)
-GO(fgetws, pFpip)
+GOW(fgetwc, uFS)
+GOW(fgetwc_unlocked, uFS)
+GO(fgetws, pFpiS)
 //GO(__fgetws_chk, 
-GO(fgetws_unlocked, pFpip)
+GO(fgetws_unlocked, pFpiS)
 //GO(__fgetws_unlocked_chk, 
 GO(fgetxattr, lFippL)
 GOW(fileno, iFS)
@@ -398,36 +423,36 @@ GOWD(finitel, iFD, finite)
 GO(__flbf, iFp)
 GO(flistxattr, lFipL)
 GOW(flock, iFii)
-GOW(flockfile, vFp)
+GOW(flockfile, vFS)
 GOW(_flushlbf, vFv)
-GO(fmemopen, pFpLp)
+GO(fmemopen, SFpLp)
 GO(fmtmsg, iFlpippp)
 GO(fnmatch, iFppi)
-GOM(fopen, pFEpp)
-GOWM(fopen64, pFEpp)
+GOM(fopen, SFEpp)
+GOWM(fopen64, SFEpp)
 GOM(fopencookie, pFEppV)
 //GO(__fork, 
 GOWM(fork, iFEv)
 //GO(__fortify_fail, 
 GO(fpathconf, lFii)
 GO(__fpending, LFp)
-GOM(fprintf, iFEppV)
+GOM(fprintf, iFESpV)
 GOM(__fprintf_chk, iFEpipV)
 //DATA(__fpu_control, 
 GO(__fpurge, vFp)
-GO(fputc, iFip)
-GO(fputc_unlocked, iFip)
-GOW(fputs, iFpp)
-GOW(fputs_unlocked, iFpp)
-GO(fputwc, uFip)
-GO(fputwc_unlocked, uFip)
-GO(fputws, iFpp)
-GO(fputws_unlocked, iFpp)
-GO(fread, LFpLLp)
+GO(fputc, iFiS)
+GO(fputc_unlocked, iFiS)
+GOW(fputs, iFpS)
+GOW(fputs_unlocked, iFpS)
+GO(fputwc, uFiS)
+GO(fputwc_unlocked, uFiS)
+GO(fputws, iFpS)
+GO(fputws_unlocked, iFpS)
+GO(fread, LFpLLS)
 GO(__freadable, iFp)
 GO(__fread_chk, LFpLLLp)
 GO(__freading, iFp)
-GO(fread_unlocked, LFpLLp)
+GO(fread_unlocked, LFpLLS)
 GO(__fread_unlocked_chk, LFpLLLp)
 GO(free, vFp)
 GO(freeaddrinfo, vFp)
@@ -435,19 +460,19 @@ GOW(freeifaddrs, vFp)
 GO(__freelocale, vFp)
 GOW(freelocale, vFp)
 GO(fremovexattr, iFip)
-GO(freopen, pFppp)
-GO(freopen64, pFppp)
+GO(freopen, SFppS)
+GO(freopen64, SFppS)
 GOW(frexp, dFdp)
 GOW(frexpf, fFfp)
 GOWD(frexpl, DFDp, frexp)
-GOM(fscanf, iFEppV)
-GO(fseek, iFpli)
-GO(fseeko, iFpIi)
+GOM(fscanf, iFESpV)
+GO(fseek, iFSli)
+GO(fseeko, iFSli)
 GO(__fseeko64, iFpli)
-GO(fseeko64, iFpli)
+GO(fseeko64, iFSIi)
 GO(__fsetlocking, iFpi)
-GO(fsetpos, iFpp)
-GO(fsetpos64, iFpp)
+GO(fsetpos, iFSp)
+GO(fsetpos64, iFSp)
 GO(fsetxattr, iFippLi)
 GOM(fstat, iFEip)
 GOM(fstat64, iFEip)
@@ -458,15 +483,15 @@ GOW(fstatfs64, iFip)
 GOW(fstatvfs, iFip)
 GOW(fstatvfs64, iFip)
 GO(fsync, iFi)
-GO(ftell, lFp)
-GO(ftello, IFp)
+GO(ftell, lFS)
+GO(ftello, lFS)
 GO(__ftello64, lFp)
-GO(ftello64, lFp)
+GO(ftello64, IFS)
 GO(ftime, iFp)
 GO(ftok, iFpi)
-GO(ftruncate, iFiI)
-GO(ftruncate64, iFil)
-GOW(ftrylockfile, iFp)
+GO(ftruncate, iFil)
+GO(ftruncate64, iFiI)
+GOW(ftrylockfile, iFS)
 GOW(fts64_children, pFpi)
 GOW(fts64_close, iFp)
 GOWM(fts64_open, pFEpip)
@@ -479,18 +504,18 @@ GO(fts_read, pFp)
 GO(fts_set, iFppi)
 GOM(ftw, iFEppi)
 GOM(ftw64, iFEppi)
-GOW(funlockfile, vFp)
+GOW(funlockfile, vFS)
 GO(futimens, iFip)
 GOW(futimes, iFip)
 GO(futimesat, iFipp)
-GO(fwide, iFpi)
-GOWM(fwprintf, iFEppV)
+GO(fwide, iFSi)
+GOWM(fwprintf, iFESpV)
 GOM(__fwprintf_chk, iFEpipV)
 GO(__fwritable, iFp)
-GO(fwrite, LFpLLp)
-GO(fwrite_unlocked, LFpLLp)
+GO(fwrite, LFpLLS)
+GO(fwrite_unlocked, LFpLLS)
 GO(__fwriting, iFp)
-//GO(fwscanf, iFppV)
+//GOM(fwscanf, iFSpV)
 GOM(__fxstat, iFEiip)
 GOM(__fxstat64, iFEiip)
 GOM(__fxstatat, iFEiippi)
@@ -506,7 +531,7 @@ GO(gai_suspend, iFpip)
 //GO(__gconv_transliterate, 
 GO(gcvt, pFdip)
 GO(getaddrinfo, iFpppp)
-GO(getaddrinfo_a, iFipip)
+//GOM(getaddrinfo_a, iFipip)
 GO(getaliasbyname, pFp)
 GO(getaliasbyname_r, iFpppLp)
 GO(getaliasent, pFv)
@@ -514,22 +539,22 @@ GO(getaliasent_r, iFppLp)
 //GO(__getauxval, 
 GOWM(getauxval, LFEL)
 GOW(get_avphys_pages, lFv)
-GOW(getc, iFp)
+GOW(getc, iFS)
 GO(getchar, iFv)
 GO(getchar_unlocked, iFv)
 GOWM(getcontext, iFEp)
 GOW(getcpu, iFpp)
-GOW(getc_unlocked, iFp)
+GOW(getc_unlocked, iFS)
 GO(get_current_dir_name, pFv)
 GO(getcwd, pFpL)
 GO(__getcwd_chk, pFpLL)
 GO(getdate, pFp)
-//DATAB(getdate_err, 
+//DATAB(getdate_err, 4)
 GOW(getdate_r, iFpp)
-GOW(__getdelim, lFppip)
-GO(getdelim, lFppip)
+GOW(__getdelim, lFppiS)
+GO(getdelim, lFppiS)
 GO(getdents64, lFipL)
-GO(getdirentries, IFipUp)
+GO(getdirentries, lFipLp)
 GO(getdirentries64, lFipLp)
 GO(getdomainname, iFpL)
 //GO(__getdomainname_chk, 
@@ -563,26 +588,35 @@ GO(gethostid, lFv)
 GOW(gethostname, iFpL)
 //GO(__gethostname_chk, 
 GOW(getifaddrs, iFp)
-//GO(getipv4sourcefilter, iFi??pp!)
+GO(getipv4sourcefilter, iFiuuppp)
 GOW(getitimer, iFup)
-//GO(get_kernel_syms, // Deprecated
-GO(getline, lFppp)
+#ifdef STATICBUILD
+//GO(get_kernel_syms, 
+#else
+//GO(get_kernel_syms, 
+#endif
+GO(getline, lFppS)
 GO(getloadavg, iFpi)
 GO(getlogin, pFv)
 GOW(getlogin_r, iFpL)
 //GO(__getlogin_r_chk, 
-GO(getmntent, pFp)
+GO(getmntent, pFS)
 GO(__getmntent_r, pFpppi)
-GOW(getmntent_r, pFpppi)
-//GO(getmsg, // Deprecated
-//GO(get_myaddress, vF!)
+GOW(getmntent_r, pFSppi)
+#ifdef STATICBUILD
+//GO(getmsg, 
+//GO(get_myaddress, iFp)
+#else
+//GO(getmsg, 
+GO(get_myaddress, iFp)
+#endif
 GO(getnameinfo, iFpupupui)
-//GO(getnetbyaddr, !Fui)
-//GO(getnetbyaddr_r, iFui!pL!p)
-//GO(getnetbyname, !Fp)
-//GO(getnetbyname_r, iFp!pL!p)
-//GO(getnetent, !Fv)
-//GO(getnetent_r, iF!pL!p)
+GO(getnetbyaddr, pFui)
+GO(getnetbyaddr_r, iFuippLpp)
+GO(getnetbyname, pFp)
+GO(getnetbyname_r, iFpppLpp)
+GO(getnetent, pFv)
+GO(getnetent_r, iFppLpp)
 GO(getnetgrent, iFppp)
 GOW(getnetgrent_r, iFppppL)
 #ifdef STATICBUILD
@@ -605,7 +639,7 @@ GO(getpgrp, iFv)
 GOW(get_phys_pages, lFv)
 GO(__getpid, iFv)
 GO(getpid, iFv)
-//GO(getpmsg, // Deprecated
+//GO(getpmsg, 
 GOW(getppid, iFv)
 GOW(getpriority, iFuu)
 GO(getprotobyname, pFp)
@@ -642,10 +676,10 @@ GO(getrpcent_r, iFppLp)
 #ifdef STATICBUILD
 //GO(getrpcport, 
 #else
-GO(getrpcport, iFpLLu)
+GO(getrpcport, iFpiii)
 #endif
 GOW(getrusage, iFip)
-//GOW(gets, // Deprecated
+//GOW(gets, 
 //GO(__gets_chk, 
 #ifdef STATICBUILD
 //GO(getsecretkey, 
@@ -657,15 +691,22 @@ GO(getservbyname_r, iFppppLp)
 GO(getservbyport, pFip)
 GO(getservbyport_r, iFipppLp)
 GO(getservent, pFv)
-//GO(getservent_r, iF!pL!)
+GO(getservent_r, iFppLp)
+#ifdef STATICBUILD
 //GO(getsgent, 
 //GO(getsgent_r, 
 //GO(getsgnam, 
 //GO(getsgnam_r, 
+#else
+GO(getsgent, pFv)
+GO(getsgent_r, iFppLp)
+GO(getsgnam, pFp)
+GO(getsgnam_r, iFpppLp)
+#endif
 GO(getsid, iFi)
 GOW(getsockname, iFipp)
 GOW(getsockopt, iFiiipp)
-//GO(getsourcefilter, iFiupupp!)
+GO(getsourcefilter, iFiupuppp)
 GO(getspent, pFv)
 GO(getspent_r, iFppLp)
 GO(getspnam, pFp)
@@ -690,11 +731,11 @@ GO(getutmpx, vFpp)
 GO(getutxent, pFv)
 GO(getutxid, pFp)
 GO(getutxline, pFp)
-GO(getw, iFp)
-GOW(getwc, uFp)
+GO(getw, iFS)
+GOW(getwc, uFS)
 GO(getwchar, uFv)
 GO(getwchar_unlocked, uFv)
-GOW(getwc_unlocked, uFp)
+GOW(getwc_unlocked, uFS)
 GO(getwd, pFp)
 //GO(__getwd_chk, 
 GO(getxattr, lFpppL)
@@ -706,20 +747,20 @@ GOW(glob_pattern_p, iFpi)
 GO(gmtime, pFp)
 GO(__gmtime_r, pFpp)
 GOW(gmtime_r, pFpp)
-GOW(gnu_dev_major, uFL)
-GOW(gnu_dev_makedev, LFuu)
-GOW(gnu_dev_minor, uFL)
+GOW(gnu_dev_major, uFU)
+GOW(gnu_dev_makedev, UFuu)
+GOW(gnu_dev_minor, uFU)
 GOW(gnu_get_libc_release, pFv)
 GOW(gnu_get_libc_version, pFv)
 GO(grantpt, iFi)
 GOW(group_member, iFu)
 GOW(gsignal, iFi)
-//GO(gtty, // Deprecated
+//GO(gtty, 
 GOW(hasmntopt, pFpp)
-GO(hcreate, iFU)
-//GOW(hcreate_r, iFL!)
+GO(hcreate, iFL)
+GOW(hcreate_r, iFLp)
 GOW(hdestroy, vFv)
-//GOW(hdestroy_r, vF!)
+GOW(hdestroy_r, vFp)
 //DATA(h_errlist, 
 //DATAB(__h_errno, 
 GO(__h_errno_location, pFv)
@@ -729,8 +770,8 @@ GO(herror, vFp)
 #else
 GO(host2netname, iFppp)
 #endif
-//GO(hsearch, pF?u)
-//GOW(hsearch_r, iF?up!)
+//GO(hsearch, "pF?u")
+//GOW(hsearch_r, "iF?up!")
 GO(hstrerror, pFi)
 GO(htonl, uFu)
 GO(htons, WFW)
@@ -743,10 +784,10 @@ GOW(if_freenameindex, vFp)
 GOW(if_indextoname, pFup)
 GOW(if_nameindex, pFv)
 GOW(if_nametoindex, uFp)
-GOW(imaxabs, lFl)
-GOW(imaxdiv, IFII)
-DATA(in6addr_any, 16)  // type V
-DATA(in6addr_loopback, 16)  //type V
+GOW(imaxabs, IFI)
+GOW(imaxdiv, HFII)
+DATAV(in6addr_any, 16)
+DATAV(in6addr_loopback, 16)
 GO(index, pFpi)
 GO(inet6_opt_append, iFpuiCuCp)
 GO(inet6_opt_find, iFpuiCpp)
@@ -761,8 +802,8 @@ GO(inet6_option_next, iFpp)
 GO(inet6_option_space, iFi)
 GO(inet6_opt_next, iFpuippp)
 GO(inet6_opt_set_val, iFpipu)
-//GO(inet6_rth_add, iFp!)
-//GO(inet6_rth_getaddr, !Fpi)
+GO(inet6_rth_add, iFpp)
+GO(inet6_rth_getaddr, pFpi)
 GO(inet6_rth_init, pFpuii)
 GO(inet6_rth_reverse, iFpp)
 GO(inet6_rth_segments, iFp)
@@ -771,18 +812,18 @@ GO(inet6_rth_space, uFii)
 GOW(inet_addr, uFp)
 GOW(inet_aton, iFpp)
 //GO(__inet_aton_exact, 
-//GO(inet_lnaof, uF?)
-//GOW(inet_makeaddr, ?Fuu)
-//GO(inet_netof, uF?)
+GO(inet_lnaof, uFu)
+GOW(inet_makeaddr, UFuu)
+GO(inet_netof, uFu)
 GO(inet_network, uFp)
 GO(inet_nsap_addr, uFppi)
 GO(inet_nsap_ntoa, pFipp)
-GO(inet_ntoa, pFu) // Really?
+GO(inet_ntoa, pFu)
 GO(inet_ntop, pFippu)
 GOW(inet_pton, iFipp)
 //GO(__inet_pton_length, 
 GO(initgroups, iFpu)
-//GO(init_module, // Deprecated
+//GO(init_module, 
 GO(initstate, pFupL)
 GO(initstate_r, iFupLp)
 GO(innetgr, iFpppp)
@@ -824,7 +865,7 @@ GO(_IO_file_doallocate, iFS)
 //GO(_IO_file_finish, 
 GO(_IO_file_fopen, pFSppi)
 GO(_IO_file_init, vFS)
-DATA(_IO_file_jumps, sizeof(void*))
+DATA(_IO_file_jumps, 8)
 GO(_IO_file_open, pFSpiiii)
 GO(_IO_file_overflow, iFSi)
 GO(_IO_file_read, lFSpl)
@@ -864,7 +905,7 @@ GO(_IO_init_marker, vFpS)
 //GO(_IO_iter_next, 
 //GO(_IO_least_wmarker, 
 GO(_IO_link_in, vFp)
-DATA(_IO_list_all, sizeof(void*))
+DATA(_IO_list_all, 8)
 //GO(_IO_list_lock, 
 //GO(_IO_list_resetlock, 
 //GO(_IO_list_unlock, 
@@ -936,29 +977,29 @@ GO(iruserok, iFuipp)
 GO(iruserok_af, iFpippW)
 GO(isalnum, iFi)
 //GO(__isalnum_l, 
-//GOW(isalnum_l, iFi!)
+GOW(isalnum_l, iFip)
 GO(isalpha, iFi)
 //GO(__isalpha_l, 
 GOW(isalpha_l, iFip)
 GO(isascii, iFi)
 //GOW(__isascii_l, 
-//GO(isastream, // Deprecated
+//GO(isastream, 
 GOW(isatty, iFi)
 GO(isblank, iFi)
 //GO(__isblank_l, 
-//GOW(isblank_l, iFi!)
+GOW(isblank_l, iFip)
 GO(iscntrl, iFi)
 //GO(__iscntrl_l, 
-//GOW(iscntrl_l, iFi!)
+GOW(iscntrl_l, iFip)
 //GO(__isctype, 
 GOW(isctype, iFii)
 GO(isdigit, iFi)
 //GO(__isdigit_l, 
-//GOW(isdigit_l, iFi!)
+GOW(isdigit_l, iFip)
 GO(isfdtype, iFii)
 GO(isgraph, iFi)
 //GO(__isgraph_l, 
-//GOW(isgraph_l, iFi!)
+GOW(isgraph_l, iFip)
 GO(__isinf, iFd)
 GOW(isinf, iFd)
 GO(__isinff, iFf)
@@ -967,7 +1008,7 @@ GOD(__isinfl, iFD, __isinf)
 GOWD(isinfl, iFD, isinf)
 GO(islower, iFi)
 //GO(__islower_l, 
-//GOW(islower_l, iFi!)
+GOW(islower_l, iFip)
 GO(__isnan, iFd)
 GOW(isnan, iFd)
 GO(__isnanf, iFf)
@@ -980,7 +1021,7 @@ GO2(__isoc23_strtol, lFppi, strtol)
 GO2(__isoc23_strtoll, IFppi, strtoll)
 GO2(__isoc23_strtoul, LFppi, strtoul)
 GO2(__isoc23_strtoull, UFppi, strtoull)
-GO2(__isoc23_wcstol, LFppi, wcstol)
+GO2(__isoc23_wcstol, lFppi, wcstol)
 GOM(__isoc99_fscanf, iFEppV)
 //GO(__isoc99_fwscanf, iFppV)
 GOM(__isoc99_scanf, iFEpV)
@@ -995,16 +1036,16 @@ GOM(__isoc99_vswscanf, iFEppA)
 //GO(__isoc99_wscanf, iFpV)
 GO(isprint, iFi)
 //GO(__isprint_l, 
-//GOW(isprint_l, iFi!)
+GOW(isprint_l, iFip)
 GO(ispunct, iFi)
 //GO(__ispunct_l, 
-//GOW(ispunct_l, iFi!)
+GOW(ispunct_l, iFip)
 GO(isspace, iFi)
 //GO(__isspace_l, 
-//GOW(isspace_l, iFi!)
+GOW(isspace_l, iFip)
 GO(isupper, iFi)
 //GO(__isupper_l, 
-//GOW(isupper_l, iFi!)
+GOW(isupper_l, iFip)
 GOW(iswalnum, iFu)
 //GO(__iswalnum_l, 
 GOW(iswalnum_l, iFup)
@@ -1051,15 +1092,29 @@ GOW(isxdigit_l, iFip)
 //GO(__ivaliduser, 
 GO(jrand48, lFp)
 GOW(jrand48_r, iFppp)
-//GO(key_decryptsession, iFp!)
-//GO(key_decryptsession_pk, iFp!!)
+#ifdef STATICBUILD
+//GO(key_decryptsession, iFpp)
+//GO(key_decryptsession_pk, "iFp!!")
+#else
+GO(key_decryptsession, iFpp)
+//GO(key_decryptsession_pk, "iFp!!")
+#endif
 //DATAB(__key_decryptsession_pk_LOCAL, 
-//GO(key_encryptsession, iFp!)
-//GO(key_encryptsession_pk, iFp!!)
+#ifdef STATICBUILD
+//GO(key_encryptsession, iFpp)
+//GO(key_encryptsession_pk, "iFp!!")
+#else
+GO(key_encryptsession, iFpp)
+//GO(key_encryptsession_pk, "iFp!!")
+#endif
 //DATAB(__key_encryptsession_pk_LOCAL, 
-//GO(key_gendes, iF!)
+#ifdef STATICBUILD
+//GO(key_gendes, iFp)
+#else
+GO(key_gendes, iFp)
+#endif
 //DATAB(__key_gendes_LOCAL, 
-//GO(key_get_conv, iFp!)
+//GO(key_get_conv, "iFp!")
 #ifdef STATICBUILD
 //GO(key_secretkey_is_set, 
 //GO(key_setnet, 
@@ -1149,16 +1204,16 @@ GO(listxattr, lFppL)
 GO(llabs, IFI)
 GO(lldiv, HFII)
 GO(llistxattr, lFppL)
-//GO(llseek, // Deprecated
+//GO(llseek, 
 //DATAB(loc1, 
 //DATAB(loc2, 
 GO(localeconv, pFv)
 GO(localtime, pFp)
 GO2(localtime64, pFp, localtime)
 GOW(localtime_r, pFpp)
-GO2(localtime64_r, pFpp, localtime_r)   //Weak
-GO(lockf, iFiiI)
-GO(lockf64, iFiil)
+GOW2(localtime64_r, pFpp, localtime_r)
+GO(lockf, iFiil)
+GO(lockf64, iFiiI)
 //DATAB(locs, 
 GOWM(_longjmp, vFEpi)
 GOWM(longjmp, vFEpi)
@@ -1168,8 +1223,8 @@ GO(lrand48_r, iFpp)
 GO(lremovexattr, iFpp)
 GOM(lsearch, pFEpppLp)
 GO(__lseek, IFiIi)
-GO(lseek, IFiIi)
-GO(lseek64, lFili)
+GO(lseek, lFili)
+GO(lseek64, IFiIi)
 GO(lsetxattr, iFpppLi)
 GOM(lstat, iFEpp)
 GOM(lstat64, iFEpp)
@@ -1178,21 +1233,21 @@ GOM(__lxstat, iFEipp)
 GOM(__lxstat64, iFEipp)
 GO(__madvise, iFpLi)
 GOW(madvise, iFpLi)
-GOWM(makecontext, iFEppiV)
+GOWM(makecontext, vFEppiV)
 GOWM(mallinfo, pFEp)
 GO(malloc, pFL)
-//GO(malloc_get_state, // Obsolete
-GOW(malloc_info, iFip)
-//GO(malloc_set_state, // Obsolete
+//GO(malloc_get_state, 
+GOW(malloc_info, iFiS)
+//GO(malloc_set_state, 
 GOW(malloc_stats, vFv)
 GO(malloc_trim, iFL)
 GO(malloc_usable_size, LFp)
 GOW(mallopt, iFii)
 //DATAB(mallwatch, 
-GO(mblen, iFpU)
+GO(mblen, iFpL)
 GO(__mbrlen, LFpLp)
 GO(mbrlen, LFpLp)
-//GO(mbrtoc16, LFppL!)
+GO(mbrtoc16, LFppLp)
 GOW(mbrtoc32, LFppLp)
 GO(__mbrtowc, LFppLp)
 GO(mbrtowc, LFppLp)
@@ -1204,9 +1259,9 @@ GO(__mbsrtowcs_chk, LFppLpL)
 GO(mbstowcs, LFppL)
 GO(__mbstowcs_chk, LFppLL)
 GO(mbtowc, iFppL)
-//GO(mcheck, iF@)
+//GOM(mcheck, iFp)
 GO(mcheck_check_all, vFv)
-//GO(mcheck_pedantic, iF@)
+//GOM(mcheck_pedantic, iFp)
 //GO(_mcleanup, 
 GO(_mcount, vFpp)
 GO2(mcount, vFpp, _mcount)
@@ -1220,7 +1275,7 @@ GO(__memcpy_chk, pFppLL)
 GO(memfd_create, iFpu)
 GO(memfrob, pFpL)
 GO(memmem, pFpLpL)
-GO(memmove, pFppU)
+GO(memmove, pFppL)
 GO(__memmove_chk, pFppLL)
 GO(__mempcpy, pFppL)
 GO(mempcpy, pFppL)
@@ -1236,8 +1291,8 @@ GO(mkdirat, iFipu)
 GO(mkdtemp, pFp)
 GO(mkfifo, iFpu)
 GO(mkfifoat, iFipu)
-GO(mknod, iFpuL)
-GO(mknodat, iFipuL)
+GO(mknod, iFpuU)
+GO(mknodat, iFipuU)
 GO(mkostemp, iFpi)
 GOW(mkostemp64, iFpi)
 GO(mkostemps, iFpii)
@@ -1254,22 +1309,22 @@ GO(mlock2, iFpLu)
 GO(mlockall, iFi)
 //GO(__mmap, 
 GOWM(mmap, pFEpLiiil)
-GOWM(mmap64, pFEpLiiil)
+GOWM(mmap64, pFEpLiiiI)
 GOW(modf, dFdp)
 GOW(modff, fFfp)
 GOWD(modfl, DFDp, modf)
-//GOW(modify_ldt, // Deprecated
+//GOW(modify_ldt, 
 //GOW(moncontrol, 
 //GO(__monstartup, 
 //GOW(monstartup, 
-//DATA(__morecore, // Compat-only
+//DATA(__morecore, 
 GOW(mount, iFpppLp)
 GO(mprobe, iFp)
 //GO(__mprotect, 
 GOWM(mprotect, iFEpLi)
-GO(mrand48, IFv)
+GO(mrand48, lFv)
 GO(mrand48_r, iFpp)
-GOM(mremap, pFEpLLiN) //weal
+GOWM(mremap, pFEpLLiN)
 GO(msgctl, iFiip)
 GO(msgget, iFii)
 GOW(msgrcv, lFipLli)
@@ -1295,8 +1350,8 @@ GO(netname2user, iFppppp)
 #endif
 GO(__newlocale, pFipp)
 GOW(newlocale, pFipp)
-//GO(nfsservctl, // Deprecated
-//GO(nftw, iFp@ii)
+//GO(nfsservctl, 
+//GOM(nftw, iFppii)
 GOM(nftw64, iFEppii)
 GOW(ngettext, pFppL)
 GO(nice, iFi)
@@ -1330,29 +1385,29 @@ GOW(nrand48_r, iFppp)
 GOW(ntohl, uFu)
 GOW(ntohs, WFW)
 GOW(ntp_adjtime, iFp)
-//GO(ntp_gettime, iF!)
-//GO(ntp_gettimex, iF!)
-//DATAB(_null_auth, 
+//GO(ntp_gettime, "iF!")
+GO(ntp_gettimex, iFp)
+//DATAB(_null_auth, 24)
 //DATAB(_obstack, 
 //GO(_obstack_allocated_p, 
-//DATA(obstack_alloc_failed_handler, 
-GOM(_obstack_begin, iFpLLpp)
-//GO(_obstack_begin_1, 
-//DATA(obstack_exit_failure, 
+//DATAM(obstack_alloc_failed_handler, 8)
+GOM(_obstack_begin, iFpiipp)
+//GOM(_obstack_begin_1, iFpiippp)
+//DATA(obstack_exit_failure, 4)
 GOM(_obstack_free, vFpp)
 GOM(obstack_free, vFpp)
-//GO(_obstack_memory_used, 
+//GOM(_obstack_memory_used, iFp)
 GOM(_obstack_newchunk, vFEpi)
-//GOW(obstack_printf, iFppV)
+//GOWM(obstack_printf, iFppV)
 //GO(__obstack_printf_chk, 
 GOWM(obstack_vprintf, iFEppA)
 //GO(__obstack_vprintf_chk, 
-//GOW(on_exit, iF@p)
-GOWM(__open, iFEpOu)
-GOWM(open, iFEpOu)
+//GOWM(on_exit, iFpp)
+GOWM(__open, iFEpON)
+GOWM(open, iFEpON)
 GO(__open_2, iFpO)
 //GOW(__open64, 
-GOWM(open64, iFEpOu)
+GOWM(open64, iFEpON)
 GO(__open64_2, iFpO)
 //GO(__open64_nocancel, 
 GOW(openat, iFipON)
@@ -1363,49 +1418,56 @@ GO(open_by_handle_at, iFipi)
 //GO(__open_catalog, 
 GOW(opendir, pFp)
 GO(openlog, vFpii)
-GOW(open_memstream, pFpp)
+GOW(open_memstream, SFpp)
 //GO(__open_nocancel, 
-GO(open_wmemstream, pFpp)
-DATA(optarg, sizeof(void*))
-DATA(opterr, sizeof(int))
-DATA(optind, sizeof(int))
-DATA(optopt, sizeof(int))
-GO(__overflow, iFpi)
+GO(open_wmemstream, SFpp)
+DATA(optarg, 8)
+DATA(opterr, 4)
+DATA(optind, 4)
+DATA(optopt, 4)
+GO(__overflow, iFSi)
 GO(parse_printf_format, LFpLp)
-//GO(passwd2des, // Deprecated
+#ifdef STATICBUILD
+//GO(passwd2des, 
+#else
+GO(passwd2des, vFpp)
+#endif
 GO(pathconf, lFpi)
 GOW(pause, iFv)
 //GO(__pause_nocancel, 
-GO(pclose, iFp)
+GO(pclose, iFS)
 GO(perror, vFp)
 GOW(personality, iFL)
 GO(__pipe, iFp)
 GOW(pipe, iFp)
 GO(pipe2, iFpO)
-//GO(pivot_root, // Deprecated
+//GO(pivot_root, 
 GO(pkey_alloc, iFuu)
 GO(pkey_free, iFi)
 GO(pkey_get, iFi)
 GO(pkey_mprotect, iFpLii)
 GO(pkey_set, iFiu)
-//GO(pmap_getmaps, pF!)
-//GO(pmap_getport, WF!LLu)
-//GO(pmap_rmtcall, uF!LLL@p@p?p)
 #ifdef STATICBUILD
-//GO(pmap_set, iFLLiW)
+//GO(pmap_getmaps, pFp)
+//GO(pmap_getport, WFpLLu)
+//GO(pmap_rmtcall, "uF!LLL@p@p?p")
+//GO(pmap_set, iFLLii)
 //GO(pmap_unset, iFLL)
 #else
-GO(pmap_set, iFLLiW)
+GO(pmap_getmaps, pFp)
+GO(pmap_getport, WFpLLu)
+//GO(pmap_rmtcall, "uF!LLL@p@p?p")
+GO(pmap_set, iFLLii)
 GO(pmap_unset, iFLL)
 #endif
 GO(__poll, iFpLi)
 GO(poll, iFpLi)
 GO(__poll_chk, iFpuiL)
-GO(popen, pFpp)
+GO(popen, SFpp)
 GO(posix_fadvise, iFilli)
-GO(posix_fadvise64, iFilli)
+GO(posix_fadvise64, iFiIIi)
 GO(posix_fallocate, iFill)
-GO(posix_fallocate64, iFill)
+GO(posix_fallocate64, iFiII)
 //GO(__posix_getopt, 
 GO(posix_madvise, iFpLi)
 GO(posix_memalign, iFpLL)
@@ -1436,28 +1498,28 @@ GOM(posix_spawnp, iFEpppppp)
 GO(ppoll, iFpLpp)
 GO(__ppoll_chk, iFpuppL)
 GOWM(prctl, iFEiLLLL)
-GO(pread, IFipUI)
+GO(pread, lFipLl)
 GOW(__pread64, lFipLI)
-GO(pread64, lFipLl)
+GO(pread64, lFipLI)
 //GO(__pread64_chk, 
 GO(__pread_chk, lFipLlL)
 GO(preadv, lFipil)
 GO(preadv2, lFipili)
-GO(preadv64, lFipil)
-GO(preadv64v2, lFipili)
+GO(preadv64, lFipiI)
+GO(preadv64v2, lFipiIi)
 GOM(printf, iFEpV)
 GOM(__printf_chk, iFEipV)
 //GO(__printf_fp, 
-//GO(printf_size, 
-//GO(printf_size_info, 
+GO(printf_size, iFSpp)
+GO(printf_size_info, iFpLp)
 GO(prlimit, iFiupp)
 GOW(prlimit64, iFiupp)
 GO(process_vm_readv, lFipLpLL)
 GO(process_vm_writev, lFipLpLL)
 GO(profil, iFpLLu)
 //GO(__profile_frequency, 
-DATA(__progname, sizeof(void*))
-DATA(__progname_full, sizeof(void))
+DATA(__progname, 8)
+DATA(__progname_full, 1)
 GOW(pselect, iFippppp)
 GO(psiginfo, vFpp)
 GO(psignal, vFip)
@@ -1473,33 +1535,37 @@ GOM(ptrace, lFEuipp)
 GO(ptsname, pFi)
 GOW(ptsname_r, iFipL)
 //GO(__ptsname_r_chk, 
-GOW(putc, iFip)
+GOW(putc, iFiS)
 GO(putchar, iFi)
 GO(putchar_unlocked, iFi)
-GOW(putc_unlocked, iFip)
+GOW(putc_unlocked, iFiS)
 GO(putenv, iFp)
-GO(putgrent, iFpp)
-//GO(putmsg, // Deprecated
-//GO(putpmsg, // Deprecated
-GO(putpwent, iFpp)
+GO(putgrent, iFpS)
+//GO(putmsg, 
+//GO(putpmsg, 
+GO(putpwent, iFpS)
 GOW(puts, iFp)
+#ifdef STATICBUILD
 //GO(putsgent, 
-GO(putspent, iFpp)
+#else
+GO(putsgent, iFpS)
+#endif
+GO(putspent, iFpS)
 GOW(pututline, pFp)
 GO(pututxline, pFp)
-GO(putw, iFip)
-GO(putwc, uFup)
-GO(putwchar, uFu)
-GO(putwchar_unlocked, uFu)
-GO(putwc_unlocked, uFup)
+GO(putw, iFiS)
+GO(putwc, uFiS)
+GO(putwchar, uFi)
+GO(putwchar_unlocked, uFi)
+GO(putwc_unlocked, uFiS)
 GO(pvalloc, pFL)
-GO(pwrite, IFipUI)
+GO(pwrite, lFipLl)
 //GOW(__pwrite64, 
-GO(pwrite64, lFipLl)
+GO(pwrite64, lFipLI)
 GO(pwritev, lFipil)
 GO(pwritev2, lFipili)
-GO(pwritev64, lFipil)
-GO(pwritev64v2, lFipili)
+GO(pwritev64, lFipiI)
+GO(pwritev64v2, lFipiIi)
 GOD(qecvt, pFDipp, ecvt)
 GOWD(qecvt_r, iFDipppL, ecvt_r)
 GOD(qfcvt, pFDipp, fcvt)
@@ -1507,7 +1573,7 @@ GOD(qfcvt_r, iFDipppL, fcvt_r)
 GOD(qgcvt, pFDip, gcvt)
 GOM(qsort, vFEpLLp)
 GOWM(qsort_r, vFEpLLpp)
-//GO(query_module, // Deprecated
+//GO(query_module, 
 GO(quick_exit, vFi)
 GO(quotactl, iFipip)
 GO(raise, iFi)
@@ -1522,14 +1588,14 @@ GO(rcmd_af, iFpWppppW)
 //DATAB(__rcmd_errstr, 
 GOW(__read, lFipL)
 GO(read, lFipL)
-GO(readahead, lFilL)
+GO(readahead, lFiIL)
 GO(__read_chk, lFipLL)
-GOW(readdir, pFp) // struct dirent is 280 bytes on x86_64 and ARM64
+GOW(readdir, pFp)
 GOW(readdir64, pFp)
 GOW(readdir64_r, iFppp)
 GOW(readdir_r, iFppp)
 GOWM(readlink, lFEppL)
-GOM(readlinkat, iFEippL)
+GOM(readlinkat, lFEippL)
 //GO(__readlinkat_chk, 
 //GO(__readlink_chk, 
 //GO(__read_nocancel, 
@@ -1539,7 +1605,7 @@ GO(reallocarray, pFpLL)
 GOM(realpath, pFEpp)
 GO2(__realpath_chk, pFEppv, my_realpath)
 GO(reboot, iFi)
-//GOW(re_comp, // Deprecated
+//GOW(re_comp, 
 GOW(re_compile_fastmap, iFp)
 GOW(re_compile_pattern, pFpLp)
 GOW(__recv, lFipLi)
@@ -1549,20 +1615,20 @@ GOW(recvfrom, lFipLipp)
 //GO(__recvfrom_chk, 
 GO(recvmmsg, iFipuip)
 GO(recvmsg, lFipi)
-//GOW(re_exec, // Deprecated
+//GOW(re_exec, 
 GOW(regcomp, iFppi)
 GOW(regerror, LFippL)
 GO(regexec, iFppLpi)
 GOW(regfree, vFp)
 GOM(__register_atfork, iFEpppp)
-//GOW(register_printf_function, 
+//GOWM(register_printf_function, iFipp)
 GOW(register_printf_modifier, iFp)
 GOWM(register_printf_specifier, iFEipp)
 GOWM(register_printf_type, iFEp)
-//GO(registerrpc, // Deprecated?
+//GOM(registerrpc, iFiiippp)
 GO(remap_file_pages, iFpLiLi)
-GOW(re_match, lFppllp)
-//GOW(re_match_2, iFppipii!i)
+GOW(re_match, iFppiip)
+GOW(re_match_2, iFppipiipi)
 //DATA(re_max_failures, 
 GO(remove, iFp)
 GO(removexattr, iFpp)
@@ -1571,9 +1637,9 @@ GO(rename, iFpp)
 GOW(renameat, iFipip)
 GOW(renameat2, iFipipu)
 //DATAB(_res, 
-GOW(re_search, lFpplllp)
-//GOW(re_search_2, iFppipiii!i)
-//GOW(re_set_registers, vFp!upp)
+GOW(re_search, iFppiiip)
+GOW(re_search_2, iFppipiiipi)
+GOW(re_set_registers, vFppupp)
 GOW(re_set_syntax, LFL)
 //DATAB(_res_hconf, 
 GO(__res_iclose, vFpi)
@@ -1586,11 +1652,15 @@ GO(res_nsearch, iFppiipi)
 //GO(__resolv_context_get_preinit, 
 //GO(__resolv_context_put, 
 //DATA(__resp, 
+#ifdef STATICBUILD
 //GO(__res_randomid, 
+#else
+GO(__res_randomid, uFv)
+#endif
 GO(__res_state, pFv)
-//DATAB(re_syntax_options, 
+//DATAB(re_syntax_options, 8)
 GOW(revoke, iFp)
-GO(rewind, vFp)
+GO(rewind, vFS)
 GOW(rewinddir, vFp)
 GO(rexec, iFpipppp)
 GO(rexec_af, iFpippppW)
@@ -1600,22 +1670,26 @@ GOW(rmdir, iFp)
 #ifdef STATICBUILD
 //DATAB(rpc_createerr, 
 //GO(_rpc_dtablesize, iFv)
-//GO(__rpc_thread_createerr, !Fv)
-//GO(__rpc_thread_svc_fdset, !Fv)
+//GO(__rpc_thread_createerr, "!Fv")
+//GO(__rpc_thread_svc_fdset, "!Fv")
 //GO(__rpc_thread_svc_max_pollfd, pFv)
 //GO(__rpc_thread_svc_pollfd, pFv)
 #else
 //DATAB(rpc_createerr, 
 GO(_rpc_dtablesize, iFv)
-//GO(__rpc_thread_createerr, !Fv)
-//GO(__rpc_thread_svc_fdset, !Fv)
+//GO(__rpc_thread_createerr, "!Fv")
+//GO(__rpc_thread_svc_fdset, "!Fv")
 GO(__rpc_thread_svc_max_pollfd, pFv)
 GO(__rpc_thread_svc_pollfd, pFv)
 #endif
 GO(rpmatch, iFp)
 GO(rresvport, iFp)
 GO(rresvport_af, iFpW)
-//GO(rtime, iF!!!)
+#ifdef STATICBUILD
+//GO(rtime, 
+#else
+GO(rtime, iFppp)
+#endif
 GO(ruserok, iFpipp)
 GO(ruserok_af, iFpippW)
 //GO(ruserpass, 
@@ -1627,8 +1701,8 @@ GOWD(scalbnl, DFDi, scalbn)
 GOWM(scandir, iFEpppp)
 GOWM(scandir64, iFEpppp)
 GOWM(scandirat, iFipppp)
-//GO(scandirat64, iFipp@@)
-//GO(scanf, iFpV)
+//GOM(scandirat64, iFipppp)
+GO(scanf, iFpV)
 GO(__sched_cpualloc, pFL)
 GO(__sched_cpucount, iFLp)
 GO(__sched_cpufree, vFp)
@@ -1669,13 +1743,13 @@ GOW(sendmmsg, iFipui)
 GO(sendmsg, lFipi)
 GOW(sendto, lFipLipu)
 GO(setaliasent, vFv)
-GO(setbuf, vFpp)
-GO(setbuffer, vFppL)
+GO(setbuf, vFSp)
+GO(setbuffer, vFSpL)
 GOWM(setcontext, iFEp)
 GO(setdomainname, iFpL)
 GO(setegid, iFu)
 GOW(setenv, iFppi)
-//GO(_seterr_reply, vF!!)
+//GOM(_seterr_reply, vFpp)
 GO(seteuid, iFu)
 GO(setfsent, iFv)
 GO(setfsgid, iFu)
@@ -1686,16 +1760,16 @@ GO(setgroups, iFLp)
 GO(sethostent, vFi)
 GO(sethostid, iFl)
 GO(sethostname, iFpL)
-//GO(setipv4sourcefilter, iFi??uu!)
+GO(setipv4sourcefilter, iFiuuuup)
 GOW(setitimer, iFupp)
 GOM(_setjmp, iFEp)
 GOM(setjmp, iFEp)
-GO(setlinebuf, vFp)
+GO(setlinebuf, vFS)
 GO(setlocale, pFip)
 GO(setlogin, iFp)
 GO(setlogmask, iFi)
 GO(__setmntent, pFpp)
-GOW(setmntent, pFpp)
+GOW(setmntent, SFpp)
 GO(setnetent, vFi)
 GO(setnetgrent, iFp)
 GO(setns, iFii)
@@ -1713,10 +1787,14 @@ GOWM(setrlimit, iFEup)
 GOW(setrlimit64, iFup)
 GO(setrpcent, vFi)
 GO(setservent, vFi)
+#ifdef STATICBUILD
 //GO(setsgent, 
+#else
+GO(setsgent, vFv)
+#endif
 GOW(setsid, iFv)
 GOW(setsockopt, iFiiipu)
-//GO(setsourcefilter, iFiupuuu!)
+GO(setsourcefilter, iFiupuuup)
 GO(setspent, vFv)
 GOW(setstate, pFp)
 GOW(setstate_r, iFpp)
@@ -1726,10 +1804,15 @@ GOW(setuid, iFu)
 GO(setusershell, vFv)
 GOW(setutent, vFv)
 GO(setutxent, vFv)
-GO(setvbuf, iFppiL)
+GO(setvbuf, iFSpiL)
 GO(setxattr, iFpppLi)
-//GO(sgetsgent, 
-//GOW(sgetsgent_r, 
+#ifdef STATICBUILD
+//GO(sgetsgent, pFp)
+//GOW(sgetsgent_r, iFpppLp)
+#else
+GO(sgetsgent, pFp)
+GOW(sgetsgent_r, iFpppLp)
+#endif
 GO(sgetspent, pFp)
 GOW(sgetspent_r, iFpppLp)
 GO(shmat, pFipi)
@@ -1742,7 +1825,7 @@ GOWM(sigaction, iFEipp)
 GO(__sigaddset, iFpi)
 GO(sigaddset, iFpi)
 GOWM(sigaltstack, iFEpp)
-//GO(sigandset, 
+GO(sigandset, iFppp)
 GOW(sigblock, iFi)
 //GO(__sigdelset, 
 GO(sigdelset, iFpi)
@@ -1762,13 +1845,18 @@ GO(__signbit, iFd)
 GO(__signbitf, iFf)
 GOD(__signbitl, iFD, __signbit)
 GO(sigorset, iFppp)
+#ifdef STATICBUILD
 //GO(__sigpause, 
-//GOW(sigpause, // Deprecated
+//GOW(sigpause, 
+#else
+GO(__sigpause, iFii)
+//GOW(sigpause, 
+#endif
 GO(sigpending, iFp)
 GOW(sigprocmask, iFipp)
-//GOW(sigqueue, iFii?)
+//GOW(sigqueue, "iFii?")
 GO(sigrelse, iFi)
-//GOW(sigreturn, iF!)
+GOW(sigreturn, iFp)
 GOM(sigset, pFEip)
 GOM(__sigsetjmp, iFEpi)
 GOM(sigsetjmp, iFEpi)
@@ -1778,7 +1866,7 @@ GO(__sigsuspend, iFp)
 GOW(sigsuspend, iFp)
 GO(__sigtimedwait, iFppp)
 GOW(sigtimedwait, iFppp)
-//GO(sigvec, // Deprecated
+//GO(sigvec, 
 GOW(sigwait, iFpp)
 GOW(sigwaitinfo, iFpp)
 GOW(sleep, uFu)
@@ -1792,14 +1880,18 @@ GOW(socketpair, iFiiip)
 GO(splice, lFipipLu)
 GOM(sprintf, iFEppV)
 GOM(__sprintf_chk, iFEpilpV)
+#ifdef STATICBUILD
 //GOW(sprofil, 
+#else
+GOW(sprofil, iFpipu)
+#endif
 GOW(srand, vFu)
 GO(srand48, vFl)
 GO(srand48_r, iFlp)
 GOW(srandom, vFu)
 GOW(srandom_r, iFup)
 GOM(sscanf, iFEppV)
-//GOW(ssignal, @Fi@)
+//GOWM(ssignal, pFip)
 //GO(sstk, 
 GOM(__stack_chk_fail, vFEv)
 GOM(stat, iFEpp)
@@ -1810,9 +1902,9 @@ GOW(statfs64, iFpp)
 GOW(statvfs, iFpp)
 GOW(statvfs64, iFpp)
 GO(statx, iFipiup)
-DATA(stderr, sizeof(void*))
-DATA(stdin, sizeof(void*))
-DATA(stdout, sizeof(void*))
+DATA(stderr, 8)
+DATA(stdin, 8)
+DATA(stdout, 8)
 //GOW(step, 
 GOM(stime, iFEp)
 GO(__stpcpy, pFpp)
@@ -1849,8 +1941,13 @@ GO(strerror, pFi)
 GO(strerror_l, pFip)
 GO(__strerror_r, pFipL)
 GO(strerror_r, pFipL)
+#ifdef STATICBUILD
 //GO(strfmon, lFpLpV)
 //GO(__strfmon_l, 
+#else
+GO(strfmon, lFpLpV)
+//GO(__strfmon_l, 
+#endif
 GOW(strfmon_l, lFpLppdddddd)    // should be V, but only double are allowed...
 GO(strfromd, iFpLpd)
 GO(strfromf, iFpLpf)
@@ -1858,7 +1955,7 @@ GOD(strfromf128, iFpLpD, strfromf64)
 GO(strfromf32, iFpLpf)
 GO(strfromf32x, iFpLpd)
 GO(strfromf64, iFpLpd)
-GOD(strfromf64x, iFpLpD, strfromf64)
+GOD(strfromf64x, iFpLpD, strfromf32x)
 GOD(strfroml, iFpLpD, strfromd)
 GO(strfry, pFp)
 GO(strftime, LFpLpp)
@@ -1880,7 +1977,7 @@ GO(strpbrk, pFpp)
 //GO(__strpbrk_c2, 
 //GO(__strpbrk_c3, 
 GO(strptime, pFppp)
-//GOW(strptime_l, pFppp!)
+GOW(strptime_l, pFpppp)
 GO(strrchr, pFpi)
 GOW(strsep, pFpp)
 //GO(__strsep_1c, 
@@ -1904,19 +2001,19 @@ GOD(strtof128, DFpp, strtof64)
 //GOW(strtof128_l, 
 //GO(__strtof128_nan, 
 GOW(strtof32, fFpp)
-//GOW(strtof32_l, fFpp!)
+GOW(strtof32_l, fFppp)
 GOW(strtof32x, dFpp)
-//GOW(strtof32x_l, dFpp!)
+GOW(strtof32x_l, dFppp)
 GOW(strtof64, dFpp)
-//GOW(strtof64_l, dFpp!)
-GOWD(strtof64x, DFpp, strtof64)
-//GOW(strtof64x_l, DFpp!)
+GOW(strtof64_l, dFppp)
+GOWD(strtof64x, DFpp, strtof32x)
+GOWD(strtof64x_l, DFppp, strtof32x_l)
 GO(__strtof_internal, fFppi)
 GO(__strtof_l, fFppL)
 GOW(strtof_l, fFppp)
 //GO(__strtof_nan, 
-GO(strtoimax, lFppi)
-GO2(__isoc23_strtoimax, lFppi, strtoimax)
+GO(strtoimax, IFppi)
+GO2(__isoc23_strtoimax, IFppi, strtoimax)
 GO(strtok, pFpp)
 GO(__strtok_r, pFppp)
 GOW(strtok_r, pFppp)
@@ -1943,102 +2040,104 @@ GOW(strtoull, UFppi)
 GO(__strtoull_internal, UFppii)
 GOW(__strtoull_l, LFppip)
 GOW(strtoull_l, UFppip)
-GO(strtoumax, LFppi)
-GO2(__isoc23_strtoumax, LFppi, strtoumax)
+GO(strtoumax, UFppi)
+GO2(__isoc23_strtoumax, UFppi, strtoumax)
 GOW(strtouq, UFppi)
 //GO(__strverscmp, 
 GOW(strverscmp, iFpp)
 GO(strxfrm, LFppL)
 GO(__strxfrm_l, LFppLL)
 GO(strxfrm_l, LFppLp)
-//GO(stty, // Deprecated
+//GO(stty, 
 #ifdef STATICBUILD
 //DATAB(svcauthdes_stats, 
-//GO(svcerr_auth, vF!u)
-//GO(svcerr_decode, vF!)
-//GO(svcerr_noproc, vF!)
-//GO(svcerr_noprog, vF!)
-//GO(svcerr_progvers, vF!LL)
-//GO(svcerr_systemerr, vF!)
-//GO(svcerr_weakauth, vF!)
+//GO(svcerr_auth, "vF!u")
+//GO(svcerr_decode, "vF!")
+//GO(svcerr_noproc, "vF!")
+//GO(svcerr_noprog, "vF!")
+//GO(svcerr_progvers, "vF!uu")
+//GO(svcerr_systemerr, "vF!")
+//GO(svcerr_weakauth, "vF!")
 //GO(svc_exit, vFv)
-//GO(svcfd_create, !Fiuu)
+//GO(svcfd_create, "!Fiuu")
 //DATAB(svc_fdset, 
 //GO(svc_getreq, vFi)
 //GO(svc_getreq_common, vFi)
 //GO(svc_getreq_poll, vFpi)
-//GO(svc_getreqset, vF!)
+//GO(svc_getreqset, "vF!")
 //DATAB(svc_max_pollfd, 
 //DATAB(svc_pollfd, 
-//GO(svcraw_create, !Fv)
-//GO(svc_register, iF!LL@L)
+//GO(svcraw_create, "!Fv")
+//GO(svc_register, "iF!LL@i")
 //GO(svc_run, vFv)
-//GO(svc_sendreply, iF!@p)
-//GO(svctcp_create, !Fiuu)
-//GO(svcudp_bufcreate, !Fiuu)
-//GO(svcudp_create, !Fi)
+//GO(svc_sendreply, "iF!@p")
+//GO(svctcp_create, "!Fiuu")
+//GO(svcudp_bufcreate, "!Fiuu")
+//GO(svcudp_create, "!Fi")
 //GO(svcudp_enablecache, 
-//GO(svcunix_create, !Fiuup)
+//GO(svcunix_create, "!Fiuup")
 //GO(svcunixfd_create, 
 //GO(svc_unregister, vFLL)
 #else
 //DATAB(svcauthdes_stats, 
-//GO(svcerr_auth, vF!u)
-//GO(svcerr_decode, vF!)
-//GO(svcerr_noproc, vF!)
-//GO(svcerr_noprog, vF!)
-//GO(svcerr_progvers, vF!LL)
-//GO(svcerr_systemerr, vF!)
-//GO(svcerr_weakauth, vF!)
+//GOM(svcerr_auth, vFpu)
+//GOM(svcerr_decode, vFp)
+//GOM(svcerr_noproc, vFp)
+//GOM(svcerr_noprog, vFp)
+//GOM(svcerr_progvers, vFpuu)
+//GOM(svcerr_systemerr, vFp)
+//GOM(svcerr_weakauth, vFp)
 GO(svc_exit, vFv)
-//GO(svcfd_create, !Fiuu)
-//DATAB(svc_fdset, 
+//GOM(svcfd_create, pFiuu)
+//DATAB(svc_fdset, 128)
 GO(svc_getreq, vFi)
 GO(svc_getreq_common, vFi)
 GO(svc_getreq_poll, vFpi)
-//GO(svc_getreqset, vF!)
-//DATAB(svc_max_pollfd, 
-//DATAB(svc_pollfd, 
-//GO(svcraw_create, !Fv)
-//GO(svc_register, iF!LL@L)
+GO(svc_getreqset, vFp)
+//DATAB(svc_max_pollfd, 4)
+//DATAB(svc_pollfd, 8)
+//GOM(svcraw_create, pFv)
+//GOM(svc_register, iFpLLpi)
 GO(svc_run, vFv)
-//GO(svc_sendreply, iF!@p)
-//GO(svctcp_create, !Fiuu)
-//GO(svcudp_bufcreate, !Fiuu)
-//GO(svcudp_create, !Fi)
-//GO(svcudp_enablecache, 
-//GO(svcunix_create, !Fiuup)
-//GO(svcunixfd_create, 
+//GOM(svc_sendreply, iFppp)
+//GOM(svctcp_create, pFiuu)
+//GOM(svcudp_bufcreate, pFiuu)
+//GOM(svcudp_create, pFi)
+//GOM(svcudp_enablecache, iFpL)
+//GOM(svcunix_create, pFiuup)
+//GOM(svcunixfd_create, pFiuu)
 GO(svc_unregister, vFLL)
 #endif
 GO(swab, vFppl)
 GOWM(swapcontext, iFEpp)
+#ifdef STATICBUILD
 //GOW(swapoff, 
 //GOW(swapon, 
+#else
+GOW(swapoff, iFp)
+GOW(swapon, iFpi)
+#endif
 GOM(swprintf, iFEpLpV)
 GOM(__swprintf_chk, iFEpLiLpV)
 GOM(swscanf, iFEppV)
 GOW(symlink, iFpp)
 GO(symlinkat, iFpip)
 GO(sync, vFv)
-GO(sync_file_range, iFillu)
+GO(sync_file_range, iFiIIu)
 GO(syncfs, iFi)
 GOM(syscall, lFEv)
 GOM(__sysconf, lFEi)
-GOM(sysconf, IFEi)
+GOM(sysconf, lFEi)
 #ifdef STATICBUILD
 //GO(__sysctl, 
-//GO(sysctl, 
+//GOW(sysctl, 
+//DATA(_sys_errlist, 8)
+//DATA(sys_errlist, 8)
 #else
 GO(__sysctl, iFpipppL)
-GOW(sysctl, iFpipppL) // Deprecated
-#endif
-#ifdef STATICBUILD
-//DATA(_sys_errlist, sizeof(void*))
-//DATA(sys_errlist, sizeof(void*))
-#else
-DATA(_sys_errlist, sizeof(void*))
-DATA(sys_errlist, sizeof(void*))
+GOW(sysctl, iFpipppL)
+DATA(_sys_errlist, 8)
+DATA(sys_errlist, 8)
 #endif
 GOW(sysinfo, iFp)
 GOM(syslog, vFEipV)
@@ -2068,11 +2167,21 @@ GOW(textdomain, pFp)
 //GO(__tfind, 
 GOWM(tfind, pFEppp)
 GOW(tgkill, iFiii)
+#ifdef STATICBUILD
 //GO(thrd_current, 
-GO(thrd_exit, vFp)
+#else
+GO(thrd_current, LFv)
+#endif
+GO(thrd_exit, vFi)
+#ifdef STATICBUILD
 //GO(thrd_equal, 
 //GO(thrd_sleep, 
 //GO(thrd_yield, 
+#else
+GO(thrd_equal, iFLL)
+GO(thrd_sleep, iFpp)
+GO(thrd_yield, vFv)
+#endif
 GO(time, lFp)
 GO(timegm, lFp)
 GOW(timelocal, lFp)
@@ -2081,21 +2190,21 @@ GO(timerfd_gettime, iFip)
 GO(timerfd_settime, iFiipp)
 GOW(times, lFp)
 GO(timespec_get, iFpi)
-DATAB(__timezone, sizeof(void*))
-DATAV(timezone, sizeof(void*))
-GO(tmpfile, pFv)
-GOW(tmpfile64, pFv)
+DATAB(__timezone, 8)
+DATAV(timezone, 8)
+GO(tmpfile, SFv)
+GOW(tmpfile64, SFv)
 GO(tmpnam, pFp)
 GO(tmpnam_r, pFp)
 GO(toascii, iFi)
 //GOW(__toascii_l, 
 GO(_tolower, iFi)
 GO(tolower, iFi)
-//GO(__tolower_l, iFi!)
+GO(__tolower_l, iFip)
 GOW(tolower_l, iFip)
 GO(_toupper, iFi)
 GO(toupper, iFi)
-//GO(__toupper_l, iFi!)
+GO(__toupper_l, iFip)
 GOW(toupper_l, iFip)
 //GO(__towctrans, 
 GOW(towctrans, uFup)
@@ -2108,8 +2217,8 @@ GOW(towupper, uFu)
 GO(__towupper_l, iFip)
 GOW(towupper_l, uFup)
 //GO(tr_break, 
-GO(truncate, iFpI)
-GO(truncate64, iFpl)
+GO(truncate, iFpl)
+GO(truncate64, iFpI)
 //GO(__tsearch, 
 GOWM(tsearch, pFEppp)
 GO(ttyname, pFi)
@@ -2118,21 +2227,25 @@ GO(ttyname_r, iFipL)
 GO(ttyslot, iFv)
 //GO(__twalk, 
 GOWM(twalk, vFEpp)
-//GOW(twalk_r, vFp@p)
-DATA(__tzname, sizeof(void*))
-DATA(tzname, sizeof(void*)) //type V
+//GOWM(twalk_r, vFppp)
+DATA(__tzname, 16)
+DATAV(tzname, 16)
 GOW(tzset, vFv)
 GO(ualarm, uFuu)
-GO(__uflow, iFp)
+GO(__uflow, iFS)
 GOW(ulckpwdf, iFv)
-//GOW(ulimit, lFiV) // Deprecated
+#ifdef STATICBUILD
+//GOW(ulimit, lFiV)
+#else
+GOW(ulimit, lFiV)
+#endif
 GOW(umask, uFu)
 GOW(umount, iFp)
 GOW(umount2, iFpi)
 GOWM(uname, iFp)
 GO(__underflow, iFp)
-GOW(ungetc, iFip)
-GO(ungetwc, uFup)
+GOW(ungetc, iFiS)
+GO(ungetwc, uFuS)
 GOW(unlink, iFp)
 GO(unlinkat, iFipi)
 GO(unlockpt, iFi)
@@ -2140,7 +2253,7 @@ GOW(unsetenv, iFp)
 GO(unshare, iFi)
 GOW(updwtmp, vFpp)
 GO(updwtmpx, vFpp)
-//GO(uselib, // Deprecated
+//GO(uselib, 
 GO(__uselocale, pFp)
 GOW(uselocale, pFp)
 #ifdef STATICBUILD
@@ -2149,7 +2262,7 @@ GOW(uselocale, pFp)
 GO(user2netname, iFpup)
 #endif
 GO(usleep, iFu)
-//GO(ustat, // Deprecated
+//GO(ustat, 
 GO(utime, iFpp)
 GO(utimensat, iFippi)
 GOW(utimes, iFpp)
@@ -2160,21 +2273,21 @@ GOWM(vasprintf, iFEppA)
 GOM(__vasprintf_chk, iFEpipp)
 GOM(vdprintf, iFEipA)
 GOM(__vdprintf_chk, iFEiipA)
-//GO(verr, vFipA)
-//GO(verrx, vFipA)
+GO(verr, vFipA)
+GO(verrx, vFipA)
 GOW(versionsort, iFpp)
 GOW(versionsort64, iFpp)
 //GO(__vfork, 
 GOWM(vfork, iFEv)
-GOM(vfprintf, iFEppA)
+GOM(vfprintf, iFESpA)
 GOM(__vfprintf_chk, iFEpvpp)
 //GO(__vfscanf, 
-GOWM(vfscanf, iFEppA)
-GOWM(vfwprintf, iFEppA)
+GOWM(vfscanf, iFESpA)
+GOWM(vfwprintf, iFESpA)
 GOM(__vfwprintf_chk, iFEpipA)
-//GOW(vfwscanf, iFppA)
+GOW(vfwscanf, iFSpA)
 GO(vhangup, iFv)
-//GO(vlimit, // Deprecated
+//GO(vlimit, 
 GO(vmsplice, lFipLu)
 GOM(vprintf, iFEpA)
 GOM(__vprintf_chk, iFEvpp)
@@ -2191,12 +2304,12 @@ GOWM(__vswprintf_chk, iFEpuvvppp)
 GOM(vswscanf, iFEppA)
 GOM(vsyslog, vFEipA)
 GOM(__vsyslog_chk, vFEiipA)
-//GO(vtimes, // Deprecated
-//GO(vwarn, vFpA)
-//GO(vwarnx, vFpA)
+//GO(vtimes, 
+GO(vwarn, vFpA)
+GO(vwarnx, vFpA)
 GOM(vwprintf, iFEpA)
 //GO(__vwprintf_chk, 
-//GO(vwscanf, iFpA)
+GO(vwscanf, iFpA)
 GOW(__wait, iFp)
 GOW(wait, iFp)
 GOW(wait3, iFpip)
@@ -2210,15 +2323,15 @@ GOW(wcpcpy, pFpp)
 //GO(__wcpcpy_chk, 
 GO(wcpncpy, pFppL)
 //GO(__wcpncpy_chk, 
-GO(wcrtomb, LFpup)
+GO(wcrtomb, LFpip)
 GO(__wcrtomb_chk, LFpupL)
 GOW(wcscasecmp, iFpp)
 GO(__wcscasecmp_l, iFppp)
 GOW(wcscasecmp_l, iFppp)
 GOW(wcscat, pFpp)
 GO(__wcscat_chk, pFppL)
-GO(wcschr, pFpu)
-GO(wcschrnul, pFpu)
+GO(wcschr, pFpi)
+GO(wcschrnul, pFpi)
 GO(wcscmp, iFpp)
 GOW(wcscoll, iFpp)
 GO(__wcscoll_l, iFppp)
@@ -2233,7 +2346,7 @@ GO(wcsftime_l, LFpLppp)
 GO(wcslen, LFp)
 GO(wcsncasecmp, iFppL)
 //GO(__wcsncasecmp_l, 
-//GOW(wcsncasecmp_l, iFppL!)
+GOW(wcsncasecmp_l, iFppLp)
 GO(wcsncat, pFppL)
 GO(__wcsncat_chk, pFppLL)
 GO(wcsncmp, iFppL)
@@ -2243,7 +2356,7 @@ GO(wcsnlen, LFpL)
 GO(wcsnrtombs, LFppLLp)
 //GO(__wcsnrtombs_chk, 
 GO(wcspbrk, pFpp)
-GO(wcsrchr, pFpu)
+GO(wcsrchr, pFpi)
 GO(wcsrtombs, LFppLp)
 GO(__wcsrtombs_chk, LFppLpL)
 GO(wcsspn, LFpp)
@@ -2257,30 +2370,30 @@ GOD(wcstof128, DFpp, wcstof64)
 //GO(__wcstof128_internal, 
 //GOW(wcstof128_l, 
 GOW(wcstof32, fFpp)
-//GOW(wcstof32_l, fFpp!)
+GOW(wcstof32_l, fFppp)
 GOW(wcstof32x, dFpp)
-//GOW(wcstof32x_l, dFpp!)
+GOW(wcstof32x_l, dFppp)
 GOW(wcstof64, dFpp)
-//GOW(wcstof64_l, dFpp!)
-GOWD(wcstof64x, DFpp, wcstof64)
-//GOW(wcstof64x_l, DFpp!)
+GOW(wcstof64_l, dFppp)
+GOWD(wcstof64x, DFpp, wcstof32x)
+GOWD(wcstof64x_l, DFppp, wcstof32x_l)
 //GO(__wcstof_internal, 
 //GO(__wcstof_l, 
-//GOW(wcstof_l, fFpp!)
-GO(wcstoimax, lFppi)
+GOW(wcstof_l, fFppp)
+GO(wcstoimax, IFppi)
 GO(wcstok, pFppp)
 GO(wcstol, lFppi)
 GOD(wcstold, DFpp, wcstod)
 //GO(__wcstold_internal, 
 //GO(__wcstold_l, 
-//GOW(wcstold_l, DFpp!)
+GOWD(wcstold_l, DFppp, wcstod_l)
 //GO(__wcstol_internal, 
 //GO(__wcstol_l, 
 GOW(wcstol_l, lFppip)
 GOW(wcstoll, IFppi)
 //GO(__wcstoll_internal, 
 //GOW(__wcstoll_l, 
-//GOW(wcstoll_l, IFppi!)
+GOW(wcstoll_l, IFppip)
 GO(wcstombs, LFppL)
 //GO(__wcstombs_chk, 
 GOW(wcstoq, IFppi)
@@ -2291,8 +2404,8 @@ GOW(wcstoul_l, LFppip)
 GOW(wcstoull, UFppi)
 //GO(__wcstoull_internal, 
 //GOW(__wcstoull_l, 
-//GOW(wcstoull_l, UFppi!)
-GO(wcstoumax, LFppi)
+GOW(wcstoull_l, UFppip)
+GO(wcstoumax, UFppi)
 GOW(wcstouq, UFppi)
 GOW(wcswcs, pFpp)
 GO(wcswidth, iFpL)
@@ -2300,7 +2413,7 @@ GO(wcsxfrm, LFppL)
 GO(__wcsxfrm_l, LFppLL)
 GO(wcsxfrm_l, LFppLp)
 GO(wctob, iFu)
-GO(wctomb, iFpu)
+GO(wctomb, iFpi)
 GO(__wctomb_chk, iFpuL)
 GOW(wctrans, pFp)
 //GO(__wctrans_l, 
@@ -2308,8 +2421,8 @@ GOW(wctrans_l, pFpp)
 GOW(wctype, LFp)
 GOW(wctype_l, LFpp)
 GO(__wctype_l, LFpp)
-GO(wcwidth, iFu)
-GO(wmemchr, pFpuL)
+GO(wcwidth, iFi)
+GO(wmemchr, pFpiL)
 GO(wmemcmp, iFppL)
 GOW(wmemcpy, pFppL)
 GO(__wmemcpy_chk, pFppLL)
@@ -2317,7 +2430,7 @@ GO(wmemmove, pFppL)
 GO(__wmemmove_chk, pFppLL)
 GOW(wmempcpy, pFppL)
 //GO(__wmempcpy_chk, 
-GO(wmemset, pFpuL)
+GO(wmemset, pFpiL)
 GO(__wmemset_chk, pFpuLL)
 GO(wordexp, iFppi)
 GO(wordfree, vFp)
@@ -2328,83 +2441,150 @@ GOW(__write, lFipL)
 GO(write, lFipL)
 //GO(__write_nocancel, 
 GOW(writev, lFipi)
-//GO(wscanf, iFpV)
+GO(wscanf, iFpV)
 //GO(__wuflow, 
 //GO(__wunderflow, 
-//GO(xdecrypt, // Deprecated
-//GO(xdr_accepted_reply, 
-//GO(xdr_array, iF!ppuu@)
+//GO(xdecrypt, 
+#ifdef STATICBUILD
+//GOM(xdr_accepted_reply, iFpp)
+//GOM(xdr_array, iFpppuup)
 //GO(xdr_authdes_cred, 
 //GO(xdr_authdes_verf, 
-//GO(xdr_authunix_parms, iF!!)
-//GO(xdr_bool, iF!p)
-//GO(xdr_bytes, iF!ppu)
-//GO(xdr_callhdr, iF!!)
-//GO(xdr_callmsg, iF!!)
-//GO(xdr_char, iF!p)
+//GOM(xdr_authunix_parms, iFpp)
+//GOM(xdr_bool, iFpp)
+//GOM(xdr_bytes, iFpppu)
+//GOM(xdr_callhdr, iFpp)
+//GOM(xdr_callmsg, iFpp)
+//GOM(xdr_char, iFpp)
 //GO(xdr_cryptkeyarg, 
 //GO(xdr_cryptkeyarg2, 
 //GO(xdr_cryptkeyres, 
-//GO(xdr_des_block, iF!!)
-//GO(xdr_double, iF!p)
-//GO(xdr_enum, iF!p)
-//GO(xdr_float, iF!p)
-//GO(xdr_free, vF@p)
+//GOM(xdr_des_block, iFpp)
+//GOM(xdr_double, iFpp)
+//GOM(xdr_enum, iFpp)
+//GOM(xdr_float, iFpp)
+//GOM(xdr_free, vFpp)
 //GO(xdr_getcredres, 
-//GO(xdr_hyper, iF!p)
-//GO(xdr_int, iF!p)
-//GO(xdr_int16_t, iF!p)
-//GO(xdr_int32_t, iF!p)
-//GO(xdr_int64_t, iF!p)
-//GO(xdr_int8_t, iF!p)
+//GOM(xdr_hyper, iFpp)
+//GOM(xdr_int, iFpp)
+//GOM(xdr_int16_t, iFpp)
+//GOM(xdr_int32_t, iFpp)
+//GOM(xdr_int64_t, iFpp)
+//GOM(xdr_int8_t, iFpp)
 //GO(xdr_keybuf, 
 //GO(xdr_key_netstarg, 
 //GO(xdr_key_netstres, 
 //GO(xdr_keystatus, 
-//GO(xdr_long, iF!p)
-//GO(xdr_longlong_t, iF!p)
-//GO(xdrmem_create, vF!puu)
+//GOM(xdr_long, iFpp)
+//GOM(xdr_longlong_t, iFpp)
+//GOM(xdrmem_create, vFppuu)
 //GO(xdr_netnamestr, 
-//GO(xdr_netobj, iF!!)
-//GO(xdr_opaque, iF!pu)
-//GO(xdr_opaque_auth, iF!!)
-//GO(xdr_pmap, 
-//GO(xdr_pmaplist, 
-//GO(xdr_pointer, iF!pu@)
-//GO(xdr_quad_t, iF!p)
-//GO(xdrrec_create, vF!uup@@)
-//GO(xdrrec_endofrecord, iF!i)
-//GO(xdrrec_eof, iF!)
-//GO(xdrrec_skiprecord, iF!)
-//GO(xdr_reference, iF!pu@)
-//GO(xdr_rejected_reply, 
-//GO(xdr_replymsg, iF!!)
+//GOM(xdr_netobj, iFpp)
+//GOM(xdr_opaque, iFppu)
+//GOM(xdr_opaque_auth, iFpp)
+//GOM(xdr_pmap, iFpp)
+//GOM(xdr_pmaplist, iFpp)
+//GOM(xdr_pointer, iFppup)
+//GOM(xdr_quad_t, iFpp)
+//GOM(xdrrec_create, vFpuuppp)
+//GOM(xdrrec_endofrecord, iFpi)
+//GOM(xdrrec_eof, iFp)
+//GOM(xdrrec_skiprecord, iFp)
+//GOM(xdr_reference, iFppup)
+//GOM(xdr_rejected_reply, iFpp)
+//GOM(xdr_replymsg, iFpp)
 //GO(xdr_rmtcall_args, 
 //GO(xdr_rmtcallres, 
-//GO(xdr_short, iF!p)
-//GO(xdr_sizeof, LF@p)
-//GO(xdrstdio_create, vF!pu)
-//GO(xdr_string, iF!pu)
-//GO(xdr_u_char, iF!p)
-//GO(xdr_u_hyper, iF!p)
-//GO(xdr_u_int, iF!p)
-//GO(xdr_uint16_t, iF!p)
-//GO(xdr_uint32_t, iF!p)
-//GO(xdr_uint64_t, iF!p)
-//GO(xdr_uint8_t, iF!p)
-//GO(xdr_u_long, iF!p)
-//GO(xdr_u_longlong_t, iF!p)
-//GO(xdr_union, iF!pp!@)
+//GOM(xdr_short, iFpp)
+//GOM(xdr_sizeof, LFpp)
+//GOM(xdrstdio_create, vFpSu)
+//GOM(xdr_string, iFppu)
+//GOM(xdr_u_char, iFpp)
+//GOM(xdr_u_hyper, iFpp)
+//GOM(xdr_u_int, iFpp)
+//GOM(xdr_uint16_t, iFpp)
+//GOM(xdr_uint32_t, iFpp)
+//GOM(xdr_uint64_t, iFpp)
+//GOM(xdr_uint8_t, iFpp)
+//GOM(xdr_u_long, iFpp)
+//GOM(xdr_u_longlong_t, iFpp)
+//GOM(xdr_union, iFppppp)
 //GO(xdr_unixcred, 
-//GO(xdr_u_quad_t, iF!p)
-//GO(xdr_u_short, iF!p)
-//GO(xdr_vector, iF!puu@)
-#ifdef STATICBUILD
+//GOM(xdr_u_quad_t, iFpp)
+//GOM(xdr_u_short, iFpp)
+//GOM(xdr_vector, iFppuup)
 //GO(xdr_void, 
-//GO(xdr_wrapstring, iF!p)
+//GO(xdr_wrapstring, "iF!p")
 #else
+//GOM(xdr_accepted_reply, iFpp)
+//GOM(xdr_array, iFpppuup)
+//GO(xdr_authdes_cred, 
+//GO(xdr_authdes_verf, 
+//GOM(xdr_authunix_parms, iFpp)
+//GOM(xdr_bool, iFpp)
+//GOM(xdr_bytes, iFpppu)
+//GOM(xdr_callhdr, iFpp)
+//GOM(xdr_callmsg, iFpp)
+//GOM(xdr_char, iFpp)
+GO(xdr_cryptkeyarg, iFv)
+GO(xdr_cryptkeyarg2, iFv)
+GO(xdr_cryptkeyres, iFv)
+//GOM(xdr_des_block, iFpp)
+//GOM(xdr_double, iFpp)
+//GOM(xdr_enum, iFpp)
+//GOM(xdr_float, iFpp)
+//GOM(xdr_free, vFpp)
+GO(xdr_getcredres, iFv)
+//GOM(xdr_hyper, iFpp)
+//GOM(xdr_int, iFpp)
+//GOM(xdr_int16_t, iFpp)
+//GOM(xdr_int32_t, iFpp)
+//GOM(xdr_int64_t, iFpp)
+//GOM(xdr_int8_t, iFpp)
+GO(xdr_keybuf, iFv)
+GO(xdr_key_netstarg, iFv)
+GO(xdr_key_netstres, iFv)
+GO(xdr_keystatus, iFv)
+//GOM(xdr_long, iFpp)
+//GOM(xdr_longlong_t, iFpp)
+//GOM(xdrmem_create, vFppuu)
+GO(xdr_netnamestr, iFv)
+//GOM(xdr_netobj, iFpp)
+//GOM(xdr_opaque, iFppu)
+//GOM(xdr_opaque_auth, iFpp)
+//GOM(xdr_pmap, iFpp)
+//GOM(xdr_pmaplist, iFpp)
+//GOM(xdr_pointer, iFppup)
+//GOM(xdr_quad_t, iFpp)
+//GOM(xdrrec_create, vFpuuppp)
+//GOM(xdrrec_endofrecord, iFpi)
+//GOM(xdrrec_eof, iFp)
+//GOM(xdrrec_skiprecord, iFp)
+//GOM(xdr_reference, iFppup)
+//GOM(xdr_rejected_reply, iFpp)
+//GOM(xdr_replymsg, iFpp)
+//GO(xdr_rmtcall_args, 
+//GO(xdr_rmtcallres, 
+//GOM(xdr_short, iFpp)
+//GOM(xdr_sizeof, LFpp)
+//GOM(xdrstdio_create, vFpSu)
+//GOM(xdr_string, iFppu)
+//GOM(xdr_u_char, iFpp)
+//GOM(xdr_u_hyper, iFpp)
+//GOM(xdr_u_int, iFpp)
+//GOM(xdr_uint16_t, iFpp)
+//GOM(xdr_uint32_t, iFpp)
+//GOM(xdr_uint64_t, iFpp)
+//GOM(xdr_uint8_t, iFpp)
+//GOM(xdr_u_long, iFpp)
+//GOM(xdr_u_longlong_t, iFpp)
+//GOM(xdr_union, iFppppp)
+GO(xdr_unixcred, iFv)
+//GOM(xdr_u_quad_t, iFpp)
+//GOM(xdr_u_short, iFpp)
+//GOM(xdr_vector, iFppuup)
 GO(xdr_void, iFv)
-//GO(xdr_wrapstring, iF!p)
+//GOM(xdr_wrapstring, iFpp)
 #endif
 //GO(xencrypt, 
 #ifdef STATICBUILD
@@ -2417,8 +2597,8 @@ GOM(__xmknodat, iFEiipup)
 GO(__xpg_basename, pFp)
 GOW(__xpg_sigpause, iFi)
 GO(__xpg_strerror_r, pFipL)
-//GO(xprt_register, vF!)
-//GO(xprt_unregister, vF!)
+//GOM(xprt_register, vFp)
+//GOM(xprt_unregister, vFp)
 GOM(__xstat, iFEipp)
 GOM(__xstat64, iFEipp)
 
@@ -2436,8 +2616,8 @@ GOM(strlcat, LFEppL)
 
 GOWM(__cxa_pure_virtual, vFEv)     // create a function to trap pure virtual call
 
-DATAM(program_invocation_name, sizeof(void*))
-DATAM(program_invocation_short_name, sizeof(void*))
+DATAM(program_invocation_name, 8)
+DATAM(program_invocation_short_name, 8)
 
 DATAM(__libc_single_threaded, 1)