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.txt304
-rw-r--r--src/wrapped/generated/wrappedbz2types.h2
-rw-r--r--src/wrapped/generated/wrappedcryptotypes.h4
-rw-r--r--src/wrapped/generated/wrappedcurltypes.h2
-rw-r--r--src/wrapped/generated/wrappeddbustypes.h2
-rw-r--r--src/wrapped/generated/wrappedexpattypes.h2
-rw-r--r--src/wrapped/generated/wrappedflactypes.h2
-rw-r--r--src/wrapped/generated/wrappedfreetypetypes.h2
-rw-r--r--src/wrapped/generated/wrappedgnutlstypes.h2
-rw-r--r--src/wrapped/generated/wrappedkrb5types.h2
-rw-r--r--src/wrapped/generated/wrappedldlinuxtypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibasoundtypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibctypes.h76
-rw-r--r--src/wrapped/generated/wrappedlibdltypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibgltypes.h4
-rw-r--r--src/wrapped/generated/wrappedlibglutypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibmtypes.h56
-rw-r--r--src/wrapped/generated/wrappedlibncurses6types.h14
-rw-r--r--src/wrapped/generated/wrappedlibncursestypes.h14
-rw-r--r--src/wrapped/generated/wrappedlibncurseswtypes.h14
-rw-r--r--src/wrapped/generated/wrappedlibpthreadtypes.h13
-rw-r--r--src/wrapped/generated/wrappedlibrttypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibsmtypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibssltypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibtinfo6types.h2
-rw-r--r--src/wrapped/generated/wrappedlibtinfotypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibx11types.h2
-rw-r--r--src/wrapped/generated/wrappedlibxexttypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibxtsttypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibxttypes.h2
-rw-r--r--src/wrapped/generated/wrappedlibztypes.h5
-rw-r--r--src/wrapped/generated/wrappedlzmatypes.h2
-rw-r--r--src/wrapped/generated/wrappedmpg123types.h2
-rw-r--r--src/wrapped/generated/wrappedopenaltypes.h2
-rw-r--r--src/wrapped/generated/wrappedpangotypes.h2
-rw-r--r--src/wrapped/generated/wrappedpng16types.h2
-rw-r--r--src/wrapped/generated/wrappedpulsetypes.h4
-rw-r--r--src/wrapped/generated/wrappedsdl1imagetypes.h2
-rw-r--r--src/wrapped/generated/wrappedsdl1mixertypes.h2
-rw-r--r--src/wrapped/generated/wrappedsdl1soundtypes.h2
-rw-r--r--src/wrapped/generated/wrappedsdl1ttftypes.h2
-rw-r--r--src/wrapped/generated/wrappedsdl1types.h11
-rw-r--r--src/wrapped/generated/wrappedsdl2imagetypes.h2
-rw-r--r--src/wrapped/generated/wrappedsdl2mixertypes.h2
-rw-r--r--src/wrapped/generated/wrappedsdl2ttftypes.h2
-rw-r--r--src/wrapped/generated/wrappedsdl2types.h28
-rw-r--r--src/wrapped/generated/wrappedsmpeg2types.h2
-rw-r--r--src/wrapped/generated/wrappedsmpegtypes.h2
-rw-r--r--src/wrapped/generated/wrappedtcmallocminimaltypes.h2
-rw-r--r--src/wrapped/generated/wrappedudev0types.h2
-rw-r--r--src/wrapped/generated/wrappedudev1types.h2
-rw-r--r--src/wrapped/generated/wrappedutiltypes.h2
-rw-r--r--src/wrapped/generated/wrappedvorbisfiletypes.h2
-rw-r--r--src/wrapped/generated/wrappedxml2types.h2
-rw-r--r--src/wrapped/generated/wrapper.c434
-rw-r--r--src/wrapped/generated/wrapper.h180
-rwxr-xr-xsrc/wrapped/wrappedbz2.c8
-rwxr-xr-xsrc/wrapped/wrappedcrypto.c3
-rwxr-xr-xsrc/wrapped/wrappedfreetype_private.h15
-rwxr-xr-xsrc/wrapped/wrappedlibc_private.h1793
-rwxr-xr-xsrc/wrapped/wrappedlibgl_private.h52
-rwxr-xr-xsrc/wrapped/wrappedlibm_private.h2
-rwxr-xr-xsrc/wrapped/wrappedlibncurses.c13
-rwxr-xr-xsrc/wrapped/wrappedlibncurses6.c26
-rwxr-xr-xsrc/wrapped/wrappedlibncurses6_private.h563
-rwxr-xr-xsrc/wrapped/wrappedlibncurses_private.h556
-rwxr-xr-xsrc/wrapped/wrappedlibncursesw.c26
-rwxr-xr-xsrc/wrapped/wrappedlibncursesw_private.h558
-rwxr-xr-xsrc/wrapped/wrappedlibpthread_private.h1
-rwxr-xr-xsrc/wrapped/wrappedlibssl_private.h5
-rwxr-xr-xsrc/wrapped/wrappedlibxt_private.h6
-rwxr-xr-xsrc/wrapped/wrappedlibz.c26
-rw-r--r--src/wrapped/wrappedlibz_private.h152
-rwxr-xr-xsrc/wrapped/wrappedsdl2mixer_private.h2
-rwxr-xr-xsrc/wrapped/wrappedtcmallocminimal_private.h2
-rwxr-xr-xsrc/wrapped/wrappedxml2_private.h7
76 files changed, 2794 insertions, 2265 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index e69111ba..7510dcee 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -6,7 +6,6 @@
 #() vFf
 #() vFd
 #() vFl
-#() vFL
 #() vFp
 #() vFS
 #() cFv
@@ -15,17 +14,22 @@
 #() cFf
 #() cFp
 #() wFp
+#() iFE
 #() iFv
 #() iFw
 #() iFi
+#() iFI
 #() iFu
 #() iFU
 #() iFf
 #() iFd
+#() iFD
+#() iFl
 #() iFL
 #() iFp
 #() iFO
 #() iFS
+#() IFI
 #() IFf
 #() IFd
 #() IFp
@@ -36,9 +40,9 @@
 #() uFv
 #() uFi
 #() uFu
-#() uFU
 #() uFd
 #() uFl
+#() uFL
 #() uFp
 #() UFv
 #() UFu
@@ -57,7 +61,6 @@
 #() lFi
 #() lFl
 #() lFp
-#() LFE
 #() LFv
 #() LFL
 #() LFp
@@ -96,6 +99,7 @@
 #() vFfp
 #() vFdd
 #() vFlp
+#() vFLL
 #() vFLp
 #() vFpi
 #() vFpu
@@ -110,23 +114,23 @@
 #() iFEp
 #() iFwp
 #() iFii
-#() iFiI
 #() iFiu
-#() iFiU
 #() iFil
+#() iFiL
 #() iFip
 #() iFIi
 #() iFui
 #() iFuu
+#() iFuL
 #() iFup
-#() iFli
-#() iFLi
+#() iFlp
 #() iFLL
 #() iFLp
 #() iFpw
 #() iFpi
 #() iFpI
 #() iFpC
+#() iFpW
 #() iFpu
 #() iFpU
 #() iFpf
@@ -145,7 +149,9 @@
 #() CFpu
 #() CFpp
 #() uFEp
+#() uFii
 #() uFiu
+#() uFip
 #() uFui
 #() uFuu
 #() uFup
@@ -156,7 +162,6 @@
 #() uFpL
 #() uFpp
 #() UFEp
-#() UFii
 #() UFuu
 #() UFUp
 #() UFpp
@@ -171,24 +176,27 @@
 #() dFdd
 #() dFdD
 #() dFdp
-#() dFLL
+#() dFll
 #() dFpi
 #() dFpp
+#() DFDi
+#() DFDD
+#() DFDp
 #() DFpp
+#() lFii
 #() lFll
 #() lFpi
 #() lFpp
 #() LFEL
 #() LFii
+#() LFuu
 #() LFLi
-#() LFLp
 #() LFpi
 #() LFpL
 #() LFpp
 #() pFEp
 #() pFii
 #() pFiu
-#() pFiL
 #() pFip
 #() pFui
 #() pFuu
@@ -259,9 +267,11 @@
 #() vFpll
 #() vFpLi
 #() vFpLL
+#() vFpLp
 #() vFppi
 #() vFppu
 #() vFppd
+#() vFppl
 #() vFppL
 #() vFppp
 #() iFEiw
@@ -273,40 +283,44 @@
 #() iFEpL
 #() iFEpp
 #() iFEpV
+#() iFEpA
 #() iFESp
 #() iFwww
 #() iFwpp
 #() iFiwC
 #() iFiii
 #() iFiiu
-#() iFiiL
+#() iFiil
 #() iFiip
 #() iFiiO
 #() iFiuu
+#() iFill
 #() iFiLi
+#() iFiLp
 #() iFiLN
 #() iFipi
 #() iFipu
 #() iFipL
 #() iFipp
 #() iFipO
+#() iFuwp
+#() iFuui
 #() iFuuu
 #() iFuup
 #() iFuff
 #() iFuLL
+#() iFuLp
 #() iFupL
+#() iFupp
 #() iFfff
-#() iFlll
-#() iFLwp
 #() iFLip
-#() iFLLp
+#() iFLLi
 #() iFLpp
 #() iFpwp
 #() iFpii
 #() iFpiu
 #() iFpiL
 #() iFpip
-#() iFpIi
 #() iFpui
 #() iFpuu
 #() iFpuU
@@ -321,6 +335,7 @@
 #() iFpll
 #() iFplp
 #() iFpLi
+#() iFpLu
 #() iFpLL
 #() iFpLp
 #() iFppi
@@ -342,45 +357,49 @@
 #() uFEpU
 #() uFipu
 #() uFuip
-#() uFuui
 #() uFuuu
 #() uFuup
 #() uFupu
 #() uFupp
+#() uFpii
 #() uFpip
 #() uFpCi
 #() uFpui
 #() uFpuu
+#() uFpup
 #() uFpLp
 #() uFppi
 #() uFppu
 #() uFppp
 #() UFppi
-#() fFuii
 #() fFull
 #() fFfff
 #() fFffp
 #() fFppL
+#() fFppp
 #() dFddd
 #() dFddp
 #() dFppi
 #() dFppp
+#() DFppp
+#() lFili
+#() lFilL
 #() lFipi
 #() lFipL
 #() lFlll
 #() lFlpi
-#() lFpip
+#() lFpli
 #() lFpLu
 #() lFppi
 #() lFppL
+#() lFppp
 #() lFSpl
 #() LFipL
-#() LFLLi
-#() LFLLI
+#() LFLLl
 #() LFLpu
 #() LFLpL
 #() LFpii
-#() LFpup
+#() LFpip
 #() LFpLi
 #() LFpLp
 #() LFppi
@@ -400,7 +419,9 @@
 #() pFupi
 #() pFupL
 #() pFUpi
+#() pFdip
 #() pFddd
+#() pFDip
 #() pFpii
 #() pFpiu
 #() pFpil
@@ -427,6 +448,7 @@
 #() pFSpl
 #() vFEipp
 #() vFEipV
+#() vFEipA
 #() vFEpii
 #() vFEpip
 #() vFEpup
@@ -527,6 +549,7 @@
 #() iFEppL
 #() iFEppp
 #() iFEppV
+#() iFEppA
 #() iFEpOu
 #() iFwwww
 #() iFwppp
@@ -534,14 +557,15 @@
 #() iFiiiu
 #() iFiiip
 #() iFiiiN
+#() iFiiui
 #() iFiill
-#() iFiiLi
 #() iFiipi
 #() iFiipp
+#() iFiuwp
 #() iFiuii
-#() iFiupi
+#() iFiupp
 #() iFilli
-#() iFiLwp
+#() iFillu
 #() iFipii
 #() iFipip
 #() iFipui
@@ -549,14 +573,18 @@
 #() iFipLi
 #() iFipLp
 #() iFippi
-#() iFippu
 #() iFippL
 #() iFippp
 #() iFipON
 #() iFuipp
 #() iFuuff
+#() iFuupi
+#() iFupLp
 #() iFuppi
 #() iFuppp
+#() iFLLiW
+#() iFpwww
+#() iFpwpp
 #() iFpiii
 #() iFpiiu
 #() iFpiid
@@ -567,10 +595,12 @@
 #() iFpild
 #() iFpipi
 #() iFpipC
+#() iFpipu
 #() iFpipp
 #() iFpipV
 #() iFpCCC
 #() iFpWWu
+#() iFpuwp
 #() iFpuiL
 #() iFpuip
 #() iFpuui
@@ -584,8 +614,12 @@
 #() iFpupV
 #() iFplii
 #() iFplip
-#() iFpLwp
+#() iFpLii
+#() iFpLLu
 #() iFpLpi
+#() iFpLpf
+#() iFpLpd
+#() iFpLpD
 #() iFpLpL
 #() iFpLpp
 #() iFppii
@@ -623,21 +657,24 @@
 #() uFpppi
 #() uFpppp
 #() UFpipp
-#() DFppiL
+#() UFppip
 #() lFEpip
 #() lFEppL
+#() lFiiLu
 #() lFiipL
-#() lFilpp
-#() lFipiI
+#() lFipil
 #() lFipLi
 #() lFipLI
+#() lFipLu
 #() lFipLl
 #() lFipLL
+#() lFipLp
 #() lFippL
-#() lFlpip
+#() lFuipp
 #() lFpili
 #() lFpilp
 #() lFppii
+#() lFppip
 #() lFpppL
 #() LFippL
 #() LFpuuu
@@ -658,11 +695,13 @@
 #() pFiiiu
 #() pFiiup
 #() pFippi
-#() pFippL
+#() pFippu
 #() pFuiii
 #() pFulli
 #() pFullu
+#() pFdipp
 #() pFdddd
+#() pFDipp
 #() pFlfff
 #() pFpiii
 #() pFpiip
@@ -721,7 +760,6 @@
 #() vFuiiii
 #() vFuiiiu
 #() vFuiiip
-#() vFuiiup
 #() vFuiifi
 #() vFuiIII
 #() vFuiuii
@@ -793,6 +831,7 @@
 #() iFEpipV
 #() iFEpLpp
 #() iFEpLpV
+#() iFEpLpA
 #() iFEppii
 #() iFEppip
 #() iFEppiV
@@ -803,29 +842,33 @@
 #() iFiiipu
 #() iFiiipp
 #() iFiiupp
+#() iFiipup
+#() iFiuLip
 #() iFiLLLL
 #() iFipiii
 #() iFipipi
 #() iFipipu
 #() iFipuip
+#() iFipuui
 #() iFippLi
 #() iFippLp
 #() iFipppi
 #() iFipppp
 #() iFuppLp
-#() iFlppLp
+#() iFpwwww
+#() iFpwppp
 #() iFpiiii
 #() iFpiiiu
 #() iFpiiiL
 #() iFpiiip
+#() iFpiiui
 #() iFpiiuu
-#() iFpiiLi
 #() iFpiipi
 #() iFpiipp
-#() iFpiLwp
+#() iFpiuwp
 #() iFpipii
 #() iFpipiL
-#() iFpippi
+#() iFpippW
 #() iFpippp
 #() iFpCCCC
 #() iFpuuip
@@ -834,17 +877,18 @@
 #() iFpuuLL
 #() iFpuupp
 #() iFplluu
+#() iFpLiLi
 #() iFpLlpp
 #() iFppiip
 #() iFppiup
 #() iFppiLi
 #() iFppipi
 #() iFppipp
+#() iFppuwp
 #() iFppuip
 #() iFppupi
 #() iFppupp
 #() iFppllp
-#() iFppLwp
 #() iFppLpi
 #() iFppLpL
 #() iFppLpp
@@ -869,9 +913,9 @@
 #() uFppppu
 #() uFppppp
 #() UFuiiii
+#() lFipili
 #() lFipLli
 #() lFipLLi
-#() LFLpppp
 #() LFpLLLp
 #() LFpLppL
 #() LFpLppp
@@ -950,7 +994,6 @@
 #() vFuiUUUU
 #() vFuiffff
 #() vFuidddd
-#() vFuipiup
 #() vFuuiiii
 #() vFuuiiiu
 #() vFuuiuii
@@ -1006,7 +1049,6 @@
 #() vFpppppp
 #() cFppLppi
 #() iFEiippi
-#() iFEipppp
 #() iFElpppp
 #() iFEpiipp
 #() iFEpiipV
@@ -1016,13 +1058,16 @@
 #() iFEppppp
 #() iFiiiiii
 #() iFiiiiip
-#() iFiiiLwp
+#() iFiiiuwp
 #() iFiuiipi
 #() iFipiipi
 #() iFipuufp
 #() iFipupup
 #() iFipuppp
 #() iFuppppp
+#() iFdipppL
+#() iFDipppL
+#() iFlpippp
 #() iFLppipp
 #() iFpiiiii
 #() iFpiiipp
@@ -1032,6 +1077,9 @@
 #() iFpippip
 #() iFpipppL
 #() iFpipppp
+#() iFpWpppp
+#() iFpuiCpp
+#() iFpuippp
 #() iFpupuui
 #() iFppiiuu
 #() iFppiipi
@@ -1066,6 +1114,7 @@
 #() lFipipLu
 #() lFipLipu
 #() lFipLipp
+#() lFipLpLL
 #() LFpipipi
 #() LFSpLiip
 #() pFEpippp
@@ -1099,10 +1148,8 @@
 #() vFEpppppp
 #() vFiiiiiip
 #() vFiiiiuup
-#() vFiiupuip
 #() vFiiffffp
 #() vFiipllli
-#() vFiupuuup
 #() vFuiiiiii
 #() vFuiiiuip
 #() vFuiiiuup
@@ -1166,18 +1213,21 @@
 #() iFEpppppp
 #() iFiiiiiip
 #() iFpiiiiii
-#() iFpiiiLwp
+#() iFpiiiuwp
 #() iFpiiuuiu
 #() iFpiipppp
 #() iFpiuiipp
 #() iFpiupiii
 #() iFpippLpp
+#() iFpippppW
 #() iFpippppp
 #() iFpIIpppp
+#() iFpWppppW
+#() iFpuiCuCp
 #() iFpuuiuui
 #() iFpuupppp
 #() iFpupuuui
-#() iFpupLpLi
+#() iFpupupui
 #() iFpuppppp
 #() iFpLipipi
 #() iFppiiiip
@@ -1207,6 +1257,7 @@
 #() uFppiuppp
 #() pFEpLiiii
 #() pFEpLiiiI
+#() pFEpLiiil
 #() pFEppppip
 #() pFEpppppi
 #() pFifffppp
@@ -1225,13 +1276,10 @@
 #() pFpppppuu
 #() pFppppppp
 #() vFiiiiuuip
-#() vFiupuiuup
-#() vFiupuuuup
 #() vFilipufip
 #() vFuiiiiiii
 #() vFuiiiiill
 #() vFuiiiiuup
-#() vFuiiipiup
 #() vFuiuiiiii
 #() vFuiuiiiip
 #() vFuiulplpp
@@ -1263,11 +1311,9 @@
 #() iFEppppipp
 #() iFiiiiiiip
 #() iFiiupiupi
-#() iFuiifpppp
 #() iFuipuuluf
+#() iFuuuuuuuu
 #() iFullfpppp
-#() iFLLLLLLLL
-#() iFpiiiiipi
 #() iFpWCuWCuu
 #() iFpWWipppp
 #() iFpuippLpp
@@ -1306,14 +1352,12 @@
 #() vFuiiilliip
 #() vFuiiillilp
 #() vFuiuiiiiip
-#() vFuiupuffup
 #() vFuuiiiiiii
 #() vFuuiuiiiii
 #() vFuuiuiiiip
 #() vFuuiuiiuup
 #() vFuuuiiiiip
 #() vFuuuuuuuuu
-#() vFuupiuiuuf
 #() vFuffffffff
 #() vFffuuuufff
 #() vFddddddddd
@@ -1334,7 +1378,7 @@
 #() iFuilpluluf
 #() iFdddpppppp
 #() iFpipLpiiip
-#() iFpLLLLLLLL
+#() iFpuuuuuuuu
 #() iFppiiiiiii
 #() iFppiuiippL
 #() iFpppiiipip
@@ -1367,7 +1411,6 @@
 #() vFuuiuiiiuup
 #() vFuuuuuuuiii
 #() vFuuuuuuuuuu
-#() vFuupiiupuuf
 #() vFuffiiffiip
 #() vFuddiiddiip
 #() vFffffffffff
@@ -1454,8 +1497,6 @@
 #() pFpippppppppppppppppp
 #() pFipppppppppppppppppppppp
 #defined(HAVE_LD80BITS) DFD
-#defined(HAVE_LD80BITS) DFDD
-#defined(HAVE_LD80BITS) DFDp
 #!defined(HAVE_LD80BITS) KFK
 #!defined(HAVE_LD80BITS) KFKK
 #!defined(HAVE_LD80BITS) KFKp
@@ -1465,8 +1506,8 @@
 #!defined(NOALIGN) iFEipii
 #!defined(NOALIGN) iFEipiip
 #() vFEv -> vFE
+#() iFEv -> iFE
 #() lFEv -> lFE
-#() LFEv -> LFE
 #() pFEv -> pFE
 #() iFEvpp -> iFEpp
 #() pFEppv -> pFEpp
@@ -1502,6 +1543,8 @@ wrappedcrypto:
   - PEM_read_bio_RSA_PUBKEY
 - iFpiipp:
   - ENGINE_ctrl
+- iFpplppi:
+  - ENGINE_ctrl_cmd
 - iFppppipp:
   - PEM_write_bio_DSAPrivateKey
   - PEM_write_bio_ECPrivateKey
@@ -1575,20 +1618,26 @@ wrappedlibasound:
   - snd_dlopen
 wrappedlibc:
 - vFv:
+  - _Jv_RegisterClasses
   - __stack_chk_fail
 - vFp:
   - _ITM_deregisterTMCloneTable
   - __cxa_finalize
+- iFv:
+  - fork
 - iFp:
   - _setjmp
   - getcontext
   - setjmp
+  - uname
 - lFv:
-  - fork
-- LFv:
   - syscall
 - LFL:
   - getauxval
+- pFL:
+  - malloc
+- pFp:
+  - __deregister_frame_info
 - vFpi:
   - __longjmp_chk
   - _longjmp
@@ -1596,6 +1645,8 @@ wrappedlibc:
   - siglongjmp
 - vFpu:
   - _ITM_registerTMCloneTable
+- vFpp:
+  - __register_frame_info
 - vFpV:
   - warn
   - warnx
@@ -1611,11 +1662,12 @@ wrappedlibc:
   - execvp
   - sigaltstack
   - swapcontext
-  - vprintf
 - iFpV:
   - execl
   - execlp
   - printf
+- iFpA:
+  - vprintf
 - iFSp:
   - _IO_file_stat
 - pFip:
@@ -1630,11 +1682,12 @@ wrappedlibc:
   - fopen
   - fopen64
   - realpath
-- vFipp:
-  - vsyslog
 - vFipV:
   - err
+  - errx
   - syslog
+- vFipA:
+  - vsyslog
 - vFpii:
   - backtrace_symbols_fd
 - vFpup:
@@ -1652,10 +1705,10 @@ wrappedlibc:
   - __sigaction
   - __xstat
   - __xstat64
+  - getopt
   - sigaction
 - iFipV:
   - __printf_chk
-  - errx
 - iFpLi:
   - mprotect
 - iFppi:
@@ -1669,10 +1722,6 @@ wrappedlibc:
   - __vfprintf_chk
   - __vsscanf
   - execve
-  - vasprintf
-  - vfprintf
-  - vfscanf
-  - vsscanf
 - iFppV:
   - __asprintf
   - __isoc99_fscanf
@@ -1684,6 +1733,12 @@ wrappedlibc:
   - sprintf
   - sscanf
   - swscanf
+- iFppA:
+  - vasprintf
+  - vfprintf
+  - vfscanf
+  - vsprintf
+  - vsscanf
 - iFpOu:
   - __open
   - open
@@ -1698,6 +1753,8 @@ wrappedlibc:
   - qsort
 - iFiiip:
   - epoll_ctl
+- iFiiiN:
+  - semctl
 - iFipii:
   - epoll_wait
 - iFpipp:
@@ -1708,13 +1765,15 @@ wrappedlibc:
   - __asprintf_chk
   - __fprintf_chk
 - iFpLpp:
-  - __vsnprintf
   - __vsnprintf_chk
-  - vsnprintf
 - iFpLpV:
   - __snprintf
   - snprintf
   - swprintf
+- iFpLpA:
+  - __vsnprintf
+  - vsnprintf
+  - vswprintf
 - iFppii:
   - nftw64
 - iFppiV:
@@ -1724,7 +1783,6 @@ wrappedlibc:
   - __vsprintf_chk
   - scandir
   - scandir64
-  - vsprintf
 - vFpLLpp:
   - qsort_r
 - iFiippi:
@@ -1733,12 +1791,13 @@ wrappedlibc:
 - iFipiip:
   - epoll_pwait
 - iFipppp:
+  - getopt_long
+  - getopt_long_only
   - scandirat
 - iFpilpV:
   - __sprintf_chk
 - iFpuppp:
   - __vswprintf_chk
-  - vswprintf
 - pFpLLiN:
   - mremap
 - pFppLLp:
@@ -1749,7 +1808,7 @@ wrappedlibc:
 - iFpLiLpV:
   - __snprintf_chk
   - __swprintf_chk
-- pFpLiiiI:
+- pFpLiiil:
   - mmap
   - mmap64
 - iFpippppp:
@@ -1772,6 +1831,8 @@ wrappedlibdl:
 - pFppp:
   - dlvsym
 wrappedlibgl:
+- iFi:
+  - glXSwapIntervalMESA
 - pFp:
   - glXGetProcAddress
   - glXGetProcAddressARB
@@ -1786,27 +1847,77 @@ wrappedlibglu:
   - gluNurbsCallback
   - gluQuadricCallback
   - gluTessCallback
+wrappedlibm:
+- UFV:
+  - cacosf
+  - cacoshf
+  - casinf
+  - casinhf
+  - catanf
+  - catanhf
+- fFf:
+  - __acosf_finite
+  - __acoshf_finite
+  - __asinf_finite
+  - __coshf_finite
+  - __exp2f_finite
+  - __expf_finite
+  - __log10f_finite
+  - __log2f_finite
+  - __logf_finite
+  - __sinhf_finite
+  - __sqrtf_finite
+- dFd:
+  - __acos_finite
+  - __acosh_finite
+  - __asin_finite
+  - __cosh_finite
+  - __exp2_finite
+  - __exp_finite
+  - __log10_finite
+  - __log2_finite
+  - __log_finite
+  - __sinh_finite
+  - __sqrt_finite
+- fFff:
+  - __atan2f_finite
+  - __hypotf_finite
+  - __powf_finite
+- dFdd:
+  - __atan2_finite
+  - __hypot_finite
+  - __pow_finite
 wrappedlibncurses:
+- pFv:
+  - initscr
 - iFpV:
   - printw
-- iFppp:
+- iFppA:
   - vwprintw
 - iFiipV:
   - mvprintw
 - iFpiipV:
   - mvwprintw
 wrappedlibncurses6:
+- pFv:
+  - initscr
 - iFpV:
   - printw
-- iFppp:
+- iFppA:
   - vwprintw
+- iFiipV:
+  - mvprintw
 - iFpiipV:
   - mvwprintw
 wrappedlibncursesw:
+- pFv:
+  - initscr
 - iFpV:
   - printw
-- iFppp:
+- iFppA:
   - vwprintw
+- iFiipV:
+  - mvprintw
 - iFpiipV:
   - mvwprintw
 wrappedlibpthread:
@@ -1815,6 +1926,10 @@ wrappedlibpthread:
   - __pthread_unregister_cancel
   - __pthread_unwind_next
 - iFp:
+  - __pthread_mutex_destroy
+  - __pthread_mutex_lock
+  - __pthread_mutex_trylock
+  - __pthread_mutex_unlock
   - __pthread_mutexattr_destroy
   - __pthread_mutexattr_init
   - pthread_attr_destroy
@@ -1823,6 +1938,10 @@ wrappedlibpthread:
   - pthread_barrierattr_init
   - pthread_condattr_destroy
   - pthread_condattr_init
+  - pthread_mutex_destroy
+  - pthread_mutex_lock
+  - pthread_mutex_trylock
+  - pthread_mutex_unlock
   - pthread_mutexattr_destroy
   - pthread_mutexattr_init
 - vFpi:
@@ -1847,6 +1966,7 @@ wrappedlibpthread:
   - pthread_attr_setstacksize
 - iFpp:
   - __pthread_key_create
+  - __pthread_mutex_init
   - __pthread_once
   - pthread_attr_getdetachstate
   - pthread_attr_getguardsize
@@ -1864,6 +1984,8 @@ wrappedlibpthread:
   - pthread_condattr_getclock
   - pthread_condattr_getpshared
   - pthread_key_create
+  - pthread_mutex_init
+  - pthread_mutex_timedlock
   - pthread_mutexattr_getkind_np
   - pthread_mutexattr_getprotocol
   - pthread_mutexattr_gettype
@@ -1976,12 +2098,13 @@ wrappedlibz:
 - iFp:
   - deflateEnd
   - inflateEnd
-  - inflateInit
 - iFppi:
   - inflateInit_
 - iFpipi:
   - deflateInit_
   - inflateInit2_
+- iFpippi:
+  - inflateBackInit_
 - iFpiiiiipi:
   - deflateInit2_
 wrappedlzma:
@@ -2114,6 +2237,15 @@ wrappedsdl1:
   - SDL_KillThread
   - SDL_SetEventFilter
   - SDL_UnloadObject
+- iFv:
+  - SDL_Has3DNow
+  - SDL_Has3DNowExt
+  - SDL_HasAltiVec
+  - SDL_HasMMX
+  - SDL_HasMMXExt
+  - SDL_HasRDTSC
+  - SDL_HasSSE
+  - SDL_HasSSE2
 - iFp:
   - SDL_GetWMInfo
   - SDL_RemoveTimer
@@ -2207,6 +2339,20 @@ wrappedsdl1ttf:
 wrappedsdl2:
 - vFp:
   - SDL_UnloadObject
+- iFv:
+  - SDL_Has3DNow
+  - SDL_HasAVX
+  - SDL_HasAVX2
+  - SDL_HasAVX512F
+  - SDL_HasAltiVec
+  - SDL_HasMMX
+  - SDL_HasNEON
+  - SDL_HasRDTSC
+  - SDL_HasSSE
+  - SDL_HasSSE2
+  - SDL_HasSSE3
+  - SDL_HasSSE41
+  - SDL_HasSSE42
 - iFp:
   - SDL_RWclose
   - SDL_RemoveTimer
@@ -2300,6 +2446,8 @@ wrappedsdl2:
 - uFppuu:
   - SDL_RWread
   - SDL_RWwrite
+- vFppppp:
+  - SDL_GetJoystickGUIDInfo
 - iFpippi:
   - SDL_OpenAudioDevice
 - pFpippp:
diff --git a/src/wrapped/generated/wrappedbz2types.h b/src/wrapped/generated/wrappedbz2types.h
index c2494d06..a8bdcad9 100644
--- a/src/wrapped/generated/wrappedbz2types.h
+++ b/src/wrapped/generated/wrappedbz2types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedbz2TYPES_H_
 #define __wrappedbz2TYPES_H_
diff --git a/src/wrapped/generated/wrappedcryptotypes.h b/src/wrapped/generated/wrappedcryptotypes.h
index 15add64f..8bb6dff2 100644
--- a/src/wrapped/generated/wrappedcryptotypes.h
+++ b/src/wrapped/generated/wrappedcryptotypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedcryptoTYPES_H_
 #define __wrappedcryptoTYPES_H_
@@ -16,6 +16,7 @@ typedef void* (*pFp_t)(void*);
 typedef void (*vFpp_t)(void*, void*);
 typedef void* (*pFpppp_t)(void*, void*, void*, void*);
 typedef int64_t (*iFpiipp_t)(void*, int64_t, int64_t, void*, void*);
+typedef int64_t (*iFpplppi_t)(void*, void*, intptr_t, void*, void*, int64_t);
 typedef int64_t (*iFppppipp_t)(void*, void*, void*, void*, int64_t, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
@@ -30,6 +31,7 @@ typedef int64_t (*iFppppipp_t)(void*, void*, void*, void*, int64_t, void*, void*
 	GO(PEM_read_bio_RSAPrivateKey, pFpppp_t) \
 	GO(PEM_read_bio_RSA_PUBKEY, pFpppp_t) \
 	GO(ENGINE_ctrl, iFpiipp_t) \
+	GO(ENGINE_ctrl_cmd, iFpplppi_t) \
 	GO(PEM_write_bio_DSAPrivateKey, iFppppipp_t) \
 	GO(PEM_write_bio_ECPrivateKey, iFppppipp_t) \
 	GO(PEM_write_bio_RSAPrivateKey, iFppppipp_t)
diff --git a/src/wrapped/generated/wrappedcurltypes.h b/src/wrapped/generated/wrappedcurltypes.h
index 5afb7115..f7559c8e 100644
--- a/src/wrapped/generated/wrappedcurltypes.h
+++ b/src/wrapped/generated/wrappedcurltypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedcurlTYPES_H_
 #define __wrappedcurlTYPES_H_
diff --git a/src/wrapped/generated/wrappeddbustypes.h b/src/wrapped/generated/wrappeddbustypes.h
index a4e785b0..2078b977 100644
--- a/src/wrapped/generated/wrappeddbustypes.h
+++ b/src/wrapped/generated/wrappeddbustypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappeddbusTYPES_H_
 #define __wrappeddbusTYPES_H_
diff --git a/src/wrapped/generated/wrappedexpattypes.h b/src/wrapped/generated/wrappedexpattypes.h
index 3c46f1bc..223ce3ac 100644
--- a/src/wrapped/generated/wrappedexpattypes.h
+++ b/src/wrapped/generated/wrappedexpattypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedexpatTYPES_H_
 #define __wrappedexpatTYPES_H_
diff --git a/src/wrapped/generated/wrappedflactypes.h b/src/wrapped/generated/wrappedflactypes.h
index fbb112fa..47f69a8d 100644
--- a/src/wrapped/generated/wrappedflactypes.h
+++ b/src/wrapped/generated/wrappedflactypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedflacTYPES_H_
 #define __wrappedflacTYPES_H_
diff --git a/src/wrapped/generated/wrappedfreetypetypes.h b/src/wrapped/generated/wrappedfreetypetypes.h
index 901bb072..a34afc21 100644
--- a/src/wrapped/generated/wrappedfreetypetypes.h
+++ b/src/wrapped/generated/wrappedfreetypetypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedfreetypeTYPES_H_
 #define __wrappedfreetypeTYPES_H_
diff --git a/src/wrapped/generated/wrappedgnutlstypes.h b/src/wrapped/generated/wrappedgnutlstypes.h
index 8d809be6..f4ebd07b 100644
--- a/src/wrapped/generated/wrappedgnutlstypes.h
+++ b/src/wrapped/generated/wrappedgnutlstypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedgnutlsTYPES_H_
 #define __wrappedgnutlsTYPES_H_
diff --git a/src/wrapped/generated/wrappedkrb5types.h b/src/wrapped/generated/wrappedkrb5types.h
index 836c5476..d86ab782 100644
--- a/src/wrapped/generated/wrappedkrb5types.h
+++ b/src/wrapped/generated/wrappedkrb5types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedkrb5TYPES_H_
 #define __wrappedkrb5TYPES_H_
diff --git a/src/wrapped/generated/wrappedldlinuxtypes.h b/src/wrapped/generated/wrappedldlinuxtypes.h
index 36fbfebb..29a1730b 100644
--- a/src/wrapped/generated/wrappedldlinuxtypes.h
+++ b/src/wrapped/generated/wrappedldlinuxtypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedldlinuxTYPES_H_
 #define __wrappedldlinuxTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibasoundtypes.h b/src/wrapped/generated/wrappedlibasoundtypes.h
index 8be41bbd..aaff37ac 100644
--- a/src/wrapped/generated/wrappedlibasoundtypes.h
+++ b/src/wrapped/generated/wrappedlibasoundtypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibasoundTYPES_H_
 #define __wrappedlibasoundTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibctypes.h b/src/wrapped/generated/wrappedlibctypes.h
index 6fcfe37b..13ed3b1f 100644
--- a/src/wrapped/generated/wrappedlibctypes.h
+++ b/src/wrapped/generated/wrappedlibctypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibcTYPES_H_
 #define __wrappedlibcTYPES_H_
@@ -13,75 +13,87 @@
 
 typedef void (*vFv_t)(void);
 typedef void (*vFp_t)(void*);
+typedef int64_t (*iFv_t)(void);
 typedef int64_t (*iFp_t)(void*);
 typedef intptr_t (*lFv_t)(void);
-typedef uintptr_t (*LFv_t)(void);
 typedef uintptr_t (*LFL_t)(uintptr_t);
+typedef void* (*pFL_t)(uintptr_t);
+typedef void* (*pFp_t)(void*);
 typedef void (*vFpi_t)(void*, int64_t);
 typedef void (*vFpu_t)(void*, uint64_t);
-typedef void (*vFpV_t)(void*, void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void (*vFpV_t)(void*, ...);
 typedef int64_t (*iFpi_t)(void*, int64_t);
 typedef int64_t (*iFpL_t)(void*, uintptr_t);
 typedef int64_t (*iFpp_t)(void*, void*);
-typedef int64_t (*iFpV_t)(void*, void*);
+typedef int64_t (*iFpV_t)(void*, ...);
+typedef int64_t (*iFpA_t)(void*, va_list);
 typedef int64_t (*iFSp_t)(void*, void*);
 typedef void* (*pFip_t)(int64_t, void*);
 typedef void* (*pFpi_t)(void*, int64_t);
 typedef void* (*pFpp_t)(void*, void*);
-typedef void (*vFipp_t)(int64_t, void*, void*);
-typedef void (*vFipV_t)(int64_t, void*, void*);
+typedef void (*vFipV_t)(int64_t, void*, ...);
+typedef void (*vFipA_t)(int64_t, void*, va_list);
 typedef void (*vFpii_t)(void*, int64_t, int64_t);
 typedef void (*vFpup_t)(void*, uint64_t, void*);
 typedef int64_t (*iFiip_t)(int64_t, int64_t, void*);
 typedef int64_t (*iFiiN_t)(int64_t, int64_t, ...);
 typedef int64_t (*iFipp_t)(int64_t, void*, void*);
-typedef int64_t (*iFipV_t)(int64_t, void*, void*);
+typedef int64_t (*iFipV_t)(int64_t, void*, ...);
 typedef int64_t (*iFpLi_t)(void*, uintptr_t, int64_t);
 typedef int64_t (*iFppi_t)(void*, void*, int64_t);
 typedef int64_t (*iFppp_t)(void*, void*, void*);
-typedef int64_t (*iFppV_t)(void*, void*, void*);
+typedef int64_t (*iFppV_t)(void*, void*, ...);
+typedef int64_t (*iFppA_t)(void*, void*, va_list);
 typedef int64_t (*iFpOu_t)(void*, int32_t, uint64_t);
 typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
 typedef void* (*pFpip_t)(void*, int64_t, void*);
-typedef void (*vFiipV_t)(int64_t, int64_t, void*, void*);
+typedef void (*vFiipV_t)(int64_t, int64_t, void*, ...);
 typedef void (*vFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
 typedef int64_t (*iFiiip_t)(int64_t, int64_t, int64_t, void*);
+typedef int64_t (*iFiiiN_t)(int64_t, int64_t, int64_t, ...);
 typedef int64_t (*iFipii_t)(int64_t, void*, int64_t, int64_t);
 typedef int64_t (*iFpipp_t)(void*, int64_t, void*, void*);
-typedef int64_t (*iFpipV_t)(void*, int64_t, void*, void*);
+typedef int64_t (*iFpipV_t)(void*, int64_t, void*, ...);
 typedef int64_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
-typedef int64_t (*iFpLpV_t)(void*, uintptr_t, void*, void*);
+typedef int64_t (*iFpLpV_t)(void*, uintptr_t, void*, ...);
+typedef int64_t (*iFpLpA_t)(void*, uintptr_t, void*, va_list);
 typedef int64_t (*iFppii_t)(void*, void*, int64_t, int64_t);
-typedef int64_t (*iFppiV_t)(void*, void*, int64_t, void*);
+typedef int64_t (*iFppiV_t)(void*, void*, int64_t, ...);
 typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
 typedef void (*vFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*);
 typedef int64_t (*iFiippi_t)(int64_t, int64_t, void*, void*, int64_t);
 typedef int64_t (*iFipiip_t)(int64_t, void*, int64_t, int64_t, void*);
 typedef int64_t (*iFipppp_t)(int64_t, void*, void*, void*, void*);
-typedef int64_t (*iFpilpV_t)(void*, int64_t, intptr_t, void*, void*);
+typedef int64_t (*iFpilpV_t)(void*, int64_t, intptr_t, void*, ...);
 typedef int64_t (*iFpuppp_t)(void*, uint64_t, void*, void*, void*);
 typedef void* (*pFpLLiN_t)(void*, uintptr_t, uintptr_t, int64_t, ...);
 typedef void* (*pFppLLp_t)(void*, void*, uintptr_t, uintptr_t, void*);
 typedef void* (*pFpppLp_t)(void*, void*, void*, uintptr_t, void*);
-typedef int64_t (*iFpLiLpV_t)(void*, uintptr_t, int64_t, uintptr_t, void*, void*);
-typedef void* (*pFpLiiiI_t)(void*, uintptr_t, int64_t, int64_t, int64_t, int64_t);
+typedef int64_t (*iFpLiLpV_t)(void*, uintptr_t, int64_t, uintptr_t, void*, ...);
+typedef void* (*pFpLiiil_t)(void*, uintptr_t, int64_t, int64_t, int64_t, intptr_t);
 typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
+	GO(_Jv_RegisterClasses, vFv_t) \
 	GO(__stack_chk_fail, vFv_t) \
 	GO(_ITM_deregisterTMCloneTable, vFp_t) \
 	GO(__cxa_finalize, vFp_t) \
+	GO(fork, iFv_t) \
 	GO(_setjmp, iFp_t) \
 	GO(getcontext, iFp_t) \
 	GO(setjmp, iFp_t) \
-	GO(fork, lFv_t) \
-	GO(syscall, LFv_t) \
+	GO(uname, iFp_t) \
+	GO(syscall, lFv_t) \
 	GO(getauxval, LFL_t) \
+	GO(malloc, pFL_t) \
+	GO(__deregister_frame_info, pFp_t) \
 	GO(__longjmp_chk, vFpi_t) \
 	GO(_longjmp, vFpi_t) \
 	GO(longjmp, vFpi_t) \
 	GO(siglongjmp, vFpi_t) \
 	GO(_ITM_registerTMCloneTable, vFpu_t) \
+	GO(__register_frame_info, vFpp_t) \
 	GO(warn, vFpV_t) \
 	GO(warnx, vFpV_t) \
 	GO(__sigsetjmp, iFpi_t) \
@@ -93,10 +105,10 @@ typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*
 	GO(execvp, iFpp_t) \
 	GO(sigaltstack, iFpp_t) \
 	GO(swapcontext, iFpp_t) \
-	GO(vprintf, iFpp_t) \
 	GO(execl, iFpV_t) \
 	GO(execlp, iFpV_t) \
 	GO(printf, iFpV_t) \
+	GO(vprintf, iFpA_t) \
 	GO(_IO_file_stat, iFSp_t) \
 	GO(__sysv_signal, pFip_t) \
 	GO(signal, pFip_t) \
@@ -107,9 +119,10 @@ typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*
 	GO(fopen, pFpp_t) \
 	GO(fopen64, pFpp_t) \
 	GO(realpath, pFpp_t) \
-	GO(vsyslog, vFipp_t) \
 	GO(err, vFipV_t) \
+	GO(errx, vFipV_t) \
 	GO(syslog, vFipV_t) \
+	GO(vsyslog, vFipA_t) \
 	GO(backtrace_symbols_fd, vFpii_t) \
 	GO(_ITM_addUserCommitAction, vFpup_t) \
 	GO(__fxstat, iFiip_t) \
@@ -122,9 +135,9 @@ typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*
 	GO(__sigaction, iFipp_t) \
 	GO(__xstat, iFipp_t) \
 	GO(__xstat64, iFipp_t) \
+	GO(getopt, iFipp_t) \
 	GO(sigaction, iFipp_t) \
 	GO(__printf_chk, iFipV_t) \
-	GO(errx, iFipV_t) \
 	GO(mprotect, iFpLi_t) \
 	GO(ftw, iFppi_t) \
 	GO(ftw64, iFppi_t) \
@@ -135,10 +148,6 @@ typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*
 	GO(__vfprintf_chk, iFppp_t) \
 	GO(__vsscanf, iFppp_t) \
 	GO(execve, iFppp_t) \
-	GO(vasprintf, iFppp_t) \
-	GO(vfprintf, iFppp_t) \
-	GO(vfscanf, iFppp_t) \
-	GO(vsscanf, iFppp_t) \
 	GO(__asprintf, iFppV_t) \
 	GO(__isoc99_fscanf, iFppV_t) \
 	GO(__isoc99_sscanf, iFppV_t) \
@@ -149,6 +158,11 @@ typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*
 	GO(sprintf, iFppV_t) \
 	GO(sscanf, iFppV_t) \
 	GO(swscanf, iFppV_t) \
+	GO(vasprintf, iFppA_t) \
+	GO(vfprintf, iFppA_t) \
+	GO(vfscanf, iFppA_t) \
+	GO(vsprintf, iFppA_t) \
+	GO(vsscanf, iFppA_t) \
 	GO(__open, iFpOu_t) \
 	GO(open, iFpOu_t) \
 	GO(open64, iFpOu_t) \
@@ -157,41 +171,43 @@ typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*
 	GO(__syslog_chk, vFiipV_t) \
 	GO(qsort, vFpLLp_t) \
 	GO(epoll_ctl, iFiiip_t) \
+	GO(semctl, iFiiiN_t) \
 	GO(epoll_wait, iFipii_t) \
 	GO(__vasprintf_chk, iFpipp_t) \
 	GO(glob, iFpipp_t) \
 	GO(glob64, iFpipp_t) \
 	GO(__asprintf_chk, iFpipV_t) \
 	GO(__fprintf_chk, iFpipV_t) \
-	GO(__vsnprintf, iFpLpp_t) \
 	GO(__vsnprintf_chk, iFpLpp_t) \
-	GO(vsnprintf, iFpLpp_t) \
 	GO(__snprintf, iFpLpV_t) \
 	GO(snprintf, iFpLpV_t) \
 	GO(swprintf, iFpLpV_t) \
+	GO(__vsnprintf, iFpLpA_t) \
+	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(vsprintf, iFpppp_t) \
 	GO(qsort_r, vFpLLpp_t) \
 	GO(__fxstatat, iFiippi_t) \
 	GO(__fxstatat64, iFiippi_t) \
 	GO(epoll_pwait, iFipiip_t) \
+	GO(getopt_long, iFipppp_t) \
+	GO(getopt_long_only, iFipppp_t) \
 	GO(scandirat, iFipppp_t) \
 	GO(__sprintf_chk, iFpilpV_t) \
 	GO(__vswprintf_chk, iFpuppp_t) \
-	GO(vswprintf, iFpuppp_t) \
 	GO(mremap, pFpLLiN_t) \
 	GO(bsearch, pFppLLp_t) \
 	GO(lfind, pFpppLp_t) \
 	GO(lsearch, pFpppLp_t) \
 	GO(__snprintf_chk, iFpLiLpV_t) \
 	GO(__swprintf_chk, iFpLiLpV_t) \
-	GO(mmap, pFpLiiiI_t) \
-	GO(mmap64, pFpLiiiI_t) \
+	GO(mmap, pFpLiiil_t) \
+	GO(mmap64, pFpLiiil_t) \
 	GO(__libc_start_main, iFpippppp_t)
 
 #endif // __wrappedlibcTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibdltypes.h b/src/wrapped/generated/wrappedlibdltypes.h
index c2d5fac2..7cb93aac 100644
--- a/src/wrapped/generated/wrappedlibdltypes.h
+++ b/src/wrapped/generated/wrappedlibdltypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibdlTYPES_H_
 #define __wrappedlibdlTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibgltypes.h b/src/wrapped/generated/wrappedlibgltypes.h
index 2ac13804..d516e6da 100644
--- a/src/wrapped/generated/wrappedlibgltypes.h
+++ b/src/wrapped/generated/wrappedlibgltypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibglTYPES_H_
 #define __wrappedlibglTYPES_H_
@@ -11,11 +11,13 @@
 #define ADDED_FUNCTIONS() 
 #endif
 
+typedef int64_t (*iFi_t)(int64_t);
 typedef void* (*pFp_t)(void*);
 typedef void (*vFpp_t)(void*, void*);
 typedef void (*vFipp_t)(int64_t, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
+	GO(glXSwapIntervalMESA, iFi_t) \
 	GO(glXGetProcAddress, pFp_t) \
 	GO(glXGetProcAddressARB, pFp_t) \
 	GO(glDebugMessageCallback, vFpp_t) \
diff --git a/src/wrapped/generated/wrappedlibglutypes.h b/src/wrapped/generated/wrappedlibglutypes.h
index 6880a014..657d9811 100644
--- a/src/wrapped/generated/wrappedlibglutypes.h
+++ b/src/wrapped/generated/wrappedlibglutypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibgluTYPES_H_
 #define __wrappedlibgluTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibmtypes.h b/src/wrapped/generated/wrappedlibmtypes.h
new file mode 100644
index 00000000..5de93d7c
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibmtypes.h
@@ -0,0 +1,56 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
+ *******************************************************************/
+#ifndef __wrappedlibmTYPES_H_
+#define __wrappedlibmTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef uint64_t (*UFV_t)(...);
+typedef float (*fFf_t)(float);
+typedef double (*dFd_t)(double);
+typedef float (*fFff_t)(float, float);
+typedef double (*dFdd_t)(double, double);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(cacosf, UFV_t) \
+	GO(cacoshf, UFV_t) \
+	GO(casinf, UFV_t) \
+	GO(casinhf, UFV_t) \
+	GO(catanf, UFV_t) \
+	GO(catanhf, UFV_t) \
+	GO(__acosf_finite, fFf_t) \
+	GO(__acoshf_finite, fFf_t) \
+	GO(__asinf_finite, fFf_t) \
+	GO(__coshf_finite, fFf_t) \
+	GO(__exp2f_finite, fFf_t) \
+	GO(__expf_finite, fFf_t) \
+	GO(__log10f_finite, fFf_t) \
+	GO(__log2f_finite, fFf_t) \
+	GO(__logf_finite, fFf_t) \
+	GO(__sinhf_finite, fFf_t) \
+	GO(__sqrtf_finite, fFf_t) \
+	GO(__acos_finite, dFd_t) \
+	GO(__acosh_finite, dFd_t) \
+	GO(__asin_finite, dFd_t) \
+	GO(__cosh_finite, dFd_t) \
+	GO(__exp2_finite, dFd_t) \
+	GO(__exp_finite, dFd_t) \
+	GO(__log10_finite, dFd_t) \
+	GO(__log2_finite, dFd_t) \
+	GO(__log_finite, dFd_t) \
+	GO(__sinh_finite, dFd_t) \
+	GO(__sqrt_finite, dFd_t) \
+	GO(__atan2f_finite, fFff_t) \
+	GO(__hypotf_finite, fFff_t) \
+	GO(__powf_finite, fFff_t) \
+	GO(__atan2_finite, dFdd_t) \
+	GO(__hypot_finite, dFdd_t) \
+	GO(__pow_finite, dFdd_t)
+
+#endif // __wrappedlibmTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibncurses6types.h b/src/wrapped/generated/wrappedlibncurses6types.h
index 0904b0ae..5a327f0b 100644
--- a/src/wrapped/generated/wrappedlibncurses6types.h
+++ b/src/wrapped/generated/wrappedlibncurses6types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibncurses6TYPES_H_
 #define __wrappedlibncurses6TYPES_H_
@@ -11,13 +11,17 @@
 #define ADDED_FUNCTIONS() 
 #endif
 
-typedef int64_t (*iFpV_t)(void*, void*);
-typedef int64_t (*iFppp_t)(void*, void*, void*);
-typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, void*);
+typedef void* (*pFv_t)(void);
+typedef int64_t (*iFpV_t)(void*, ...);
+typedef int64_t (*iFppA_t)(void*, void*, va_list);
+typedef int64_t (*iFiipV_t)(int64_t, int64_t, void*, ...);
+typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, ...);
 
 #define SUPER() ADDED_FUNCTIONS() \
+	GO(initscr, pFv_t) \
 	GO(printw, iFpV_t) \
-	GO(vwprintw, iFppp_t) \
+	GO(vwprintw, iFppA_t) \
+	GO(mvprintw, iFiipV_t) \
 	GO(mvwprintw, iFpiipV_t)
 
 #endif // __wrappedlibncurses6TYPES_H_
diff --git a/src/wrapped/generated/wrappedlibncursestypes.h b/src/wrapped/generated/wrappedlibncursestypes.h
index 367dd61b..044fdfd5 100644
--- a/src/wrapped/generated/wrappedlibncursestypes.h
+++ b/src/wrapped/generated/wrappedlibncursestypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibncursesTYPES_H_
 #define __wrappedlibncursesTYPES_H_
@@ -11,14 +11,16 @@
 #define ADDED_FUNCTIONS() 
 #endif
 
-typedef int64_t (*iFpV_t)(void*, void*);
-typedef int64_t (*iFppp_t)(void*, void*, void*);
-typedef int64_t (*iFiipV_t)(int64_t, int64_t, void*, void*);
-typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, void*);
+typedef void* (*pFv_t)(void);
+typedef int64_t (*iFpV_t)(void*, ...);
+typedef int64_t (*iFppA_t)(void*, void*, va_list);
+typedef int64_t (*iFiipV_t)(int64_t, int64_t, void*, ...);
+typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, ...);
 
 #define SUPER() ADDED_FUNCTIONS() \
+	GO(initscr, pFv_t) \
 	GO(printw, iFpV_t) \
-	GO(vwprintw, iFppp_t) \
+	GO(vwprintw, iFppA_t) \
 	GO(mvprintw, iFiipV_t) \
 	GO(mvwprintw, iFpiipV_t)
 
diff --git a/src/wrapped/generated/wrappedlibncurseswtypes.h b/src/wrapped/generated/wrappedlibncurseswtypes.h
index ddad87e9..47c3ef9d 100644
--- a/src/wrapped/generated/wrappedlibncurseswtypes.h
+++ b/src/wrapped/generated/wrappedlibncurseswtypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibncurseswTYPES_H_
 #define __wrappedlibncurseswTYPES_H_
@@ -11,13 +11,17 @@
 #define ADDED_FUNCTIONS() 
 #endif
 
-typedef int64_t (*iFpV_t)(void*, void*);
-typedef int64_t (*iFppp_t)(void*, void*, void*);
-typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, void*);
+typedef void* (*pFv_t)(void);
+typedef int64_t (*iFpV_t)(void*, ...);
+typedef int64_t (*iFppA_t)(void*, void*, va_list);
+typedef int64_t (*iFiipV_t)(int64_t, int64_t, void*, ...);
+typedef int64_t (*iFpiipV_t)(void*, int64_t, int64_t, void*, ...);
 
 #define SUPER() ADDED_FUNCTIONS() \
+	GO(initscr, pFv_t) \
 	GO(printw, iFpV_t) \
-	GO(vwprintw, iFppp_t) \
+	GO(vwprintw, iFppA_t) \
+	GO(mvprintw, iFiipV_t) \
 	GO(mvwprintw, iFpiipV_t)
 
 #endif // __wrappedlibncurseswTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibpthreadtypes.h b/src/wrapped/generated/wrappedlibpthreadtypes.h
index d159b0e8..c6fbd83c 100644
--- a/src/wrapped/generated/wrappedlibpthreadtypes.h
+++ b/src/wrapped/generated/wrappedlibpthreadtypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibpthreadTYPES_H_
 #define __wrappedlibpthreadTYPES_H_
@@ -28,6 +28,10 @@ typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
 	GO(__pthread_register_cancel, vFp_t) \
 	GO(__pthread_unregister_cancel, vFp_t) \
 	GO(__pthread_unwind_next, vFp_t) \
+	GO(__pthread_mutex_destroy, iFp_t) \
+	GO(__pthread_mutex_lock, iFp_t) \
+	GO(__pthread_mutex_trylock, iFp_t) \
+	GO(__pthread_mutex_unlock, iFp_t) \
 	GO(__pthread_mutexattr_destroy, iFp_t) \
 	GO(__pthread_mutexattr_init, iFp_t) \
 	GO(pthread_attr_destroy, iFp_t) \
@@ -36,6 +40,10 @@ typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
 	GO(pthread_barrierattr_init, iFp_t) \
 	GO(pthread_condattr_destroy, iFp_t) \
 	GO(pthread_condattr_init, iFp_t) \
+	GO(pthread_mutex_destroy, iFp_t) \
+	GO(pthread_mutex_lock, iFp_t) \
+	GO(pthread_mutex_trylock, iFp_t) \
+	GO(pthread_mutex_unlock, iFp_t) \
 	GO(pthread_mutexattr_destroy, iFp_t) \
 	GO(pthread_mutexattr_init, iFp_t) \
 	GO(_pthread_cleanup_pop, vFpi_t) \
@@ -56,6 +64,7 @@ typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
 	GO(pthread_attr_setguardsize, iFpL_t) \
 	GO(pthread_attr_setstacksize, iFpL_t) \
 	GO(__pthread_key_create, iFpp_t) \
+	GO(__pthread_mutex_init, iFpp_t) \
 	GO(__pthread_once, iFpp_t) \
 	GO(pthread_attr_getdetachstate, iFpp_t) \
 	GO(pthread_attr_getguardsize, iFpp_t) \
@@ -73,6 +82,8 @@ typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
 	GO(pthread_condattr_getclock, iFpp_t) \
 	GO(pthread_condattr_getpshared, iFpp_t) \
 	GO(pthread_key_create, iFpp_t) \
+	GO(pthread_mutex_init, iFpp_t) \
+	GO(pthread_mutex_timedlock, iFpp_t) \
 	GO(pthread_mutexattr_getkind_np, iFpp_t) \
 	GO(pthread_mutexattr_getprotocol, iFpp_t) \
 	GO(pthread_mutexattr_gettype, iFpp_t) \
diff --git a/src/wrapped/generated/wrappedlibrttypes.h b/src/wrapped/generated/wrappedlibrttypes.h
index a07115bd..6f89cca4 100644
--- a/src/wrapped/generated/wrappedlibrttypes.h
+++ b/src/wrapped/generated/wrappedlibrttypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibrtTYPES_H_
 #define __wrappedlibrtTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibsmtypes.h b/src/wrapped/generated/wrappedlibsmtypes.h
index 8f20cffb..b41792e7 100644
--- a/src/wrapped/generated/wrappedlibsmtypes.h
+++ b/src/wrapped/generated/wrappedlibsmtypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibsmTYPES_H_
 #define __wrappedlibsmTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibssltypes.h b/src/wrapped/generated/wrappedlibssltypes.h
index efb1b707..38eeda5f 100644
--- a/src/wrapped/generated/wrappedlibssltypes.h
+++ b/src/wrapped/generated/wrappedlibssltypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibsslTYPES_H_
 #define __wrappedlibsslTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibtinfo6types.h b/src/wrapped/generated/wrappedlibtinfo6types.h
index cb8bcc0f..8ff414e6 100644
--- a/src/wrapped/generated/wrappedlibtinfo6types.h
+++ b/src/wrapped/generated/wrappedlibtinfo6types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibtinfo6TYPES_H_
 #define __wrappedlibtinfo6TYPES_H_
diff --git a/src/wrapped/generated/wrappedlibtinfotypes.h b/src/wrapped/generated/wrappedlibtinfotypes.h
index f6446e3b..ff23eb26 100644
--- a/src/wrapped/generated/wrappedlibtinfotypes.h
+++ b/src/wrapped/generated/wrappedlibtinfotypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibtinfoTYPES_H_
 #define __wrappedlibtinfoTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibx11types.h b/src/wrapped/generated/wrappedlibx11types.h
index 457993e8..eabcf3d9 100644
--- a/src/wrapped/generated/wrappedlibx11types.h
+++ b/src/wrapped/generated/wrappedlibx11types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibx11TYPES_H_
 #define __wrappedlibx11TYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxexttypes.h b/src/wrapped/generated/wrappedlibxexttypes.h
index 02d68618..209d1a95 100644
--- a/src/wrapped/generated/wrappedlibxexttypes.h
+++ b/src/wrapped/generated/wrappedlibxexttypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibxextTYPES_H_
 #define __wrappedlibxextTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxtsttypes.h b/src/wrapped/generated/wrappedlibxtsttypes.h
index 1762f8b9..883e076f 100644
--- a/src/wrapped/generated/wrappedlibxtsttypes.h
+++ b/src/wrapped/generated/wrappedlibxtsttypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibxtstTYPES_H_
 #define __wrappedlibxtstTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxttypes.h b/src/wrapped/generated/wrappedlibxttypes.h
index 29a2b126..158d6bcf 100644
--- a/src/wrapped/generated/wrappedlibxttypes.h
+++ b/src/wrapped/generated/wrappedlibxttypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibxtTYPES_H_
 #define __wrappedlibxtTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibztypes.h b/src/wrapped/generated/wrappedlibztypes.h
index 24dee671..ce8747c3 100644
--- a/src/wrapped/generated/wrappedlibztypes.h
+++ b/src/wrapped/generated/wrappedlibztypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlibzTYPES_H_
 #define __wrappedlibzTYPES_H_
@@ -14,15 +14,16 @@
 typedef int64_t (*iFp_t)(void*);
 typedef int64_t (*iFppi_t)(void*, void*, int64_t);
 typedef int64_t (*iFpipi_t)(void*, int64_t, void*, int64_t);
+typedef int64_t (*iFpippi_t)(void*, int64_t, void*, void*, int64_t);
 typedef int64_t (*iFpiiiiipi_t)(void*, int64_t, int64_t, int64_t, int64_t, int64_t, void*, int64_t);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(deflateEnd, iFp_t) \
 	GO(inflateEnd, iFp_t) \
-	GO(inflateInit, iFp_t) \
 	GO(inflateInit_, iFppi_t) \
 	GO(deflateInit_, iFpipi_t) \
 	GO(inflateInit2_, iFpipi_t) \
+	GO(inflateBackInit_, iFpippi_t) \
 	GO(deflateInit2_, iFpiiiiipi_t)
 
 #endif // __wrappedlibzTYPES_H_
diff --git a/src/wrapped/generated/wrappedlzmatypes.h b/src/wrapped/generated/wrappedlzmatypes.h
index 5cdd8d1d..9bbfbb83 100644
--- a/src/wrapped/generated/wrappedlzmatypes.h
+++ b/src/wrapped/generated/wrappedlzmatypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedlzmaTYPES_H_
 #define __wrappedlzmaTYPES_H_
diff --git a/src/wrapped/generated/wrappedmpg123types.h b/src/wrapped/generated/wrappedmpg123types.h
index 61830079..e3a1680c 100644
--- a/src/wrapped/generated/wrappedmpg123types.h
+++ b/src/wrapped/generated/wrappedmpg123types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedmpg123TYPES_H_
 #define __wrappedmpg123TYPES_H_
diff --git a/src/wrapped/generated/wrappedopenaltypes.h b/src/wrapped/generated/wrappedopenaltypes.h
index 02193222..c7b8c12c 100644
--- a/src/wrapped/generated/wrappedopenaltypes.h
+++ b/src/wrapped/generated/wrappedopenaltypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedopenalTYPES_H_
 #define __wrappedopenalTYPES_H_
diff --git a/src/wrapped/generated/wrappedpangotypes.h b/src/wrapped/generated/wrappedpangotypes.h
index c32d3800..9b90d8cd 100644
--- a/src/wrapped/generated/wrappedpangotypes.h
+++ b/src/wrapped/generated/wrappedpangotypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedpangoTYPES_H_
 #define __wrappedpangoTYPES_H_
diff --git a/src/wrapped/generated/wrappedpng16types.h b/src/wrapped/generated/wrappedpng16types.h
index d6c3a6c6..7af1a1ce 100644
--- a/src/wrapped/generated/wrappedpng16types.h
+++ b/src/wrapped/generated/wrappedpng16types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedpng16TYPES_H_
 #define __wrappedpng16TYPES_H_
diff --git a/src/wrapped/generated/wrappedpulsetypes.h b/src/wrapped/generated/wrappedpulsetypes.h
index bec7cd77..73f6afb3 100644
--- a/src/wrapped/generated/wrappedpulsetypes.h
+++ b/src/wrapped/generated/wrappedpulsetypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedpulseTYPES_H_
 #define __wrappedpulseTYPES_H_
@@ -20,7 +20,7 @@ typedef void (*vFppp_t)(void*, void*, void*);
 typedef void* (*pFipp_t)(int64_t, void*, void*);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef int64_t (*iFppip_t)(void*, void*, int64_t, void*);
-typedef int64_t (*iFpppV_t)(void*, void*, void*, void*);
+typedef int64_t (*iFpppV_t)(void*, void*, void*, ...);
 typedef void* (*pFpipp_t)(void*, int64_t, void*, void*);
 typedef void* (*pFpupp_t)(void*, uint64_t, void*, void*);
 typedef void* (*pFpppp_t)(void*, void*, void*, void*);
diff --git a/src/wrapped/generated/wrappedsdl1imagetypes.h b/src/wrapped/generated/wrappedsdl1imagetypes.h
index 801f1b8c..f0bbe77b 100644
--- a/src/wrapped/generated/wrappedsdl1imagetypes.h
+++ b/src/wrapped/generated/wrappedsdl1imagetypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl1imageTYPES_H_
 #define __wrappedsdl1imageTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1mixertypes.h b/src/wrapped/generated/wrappedsdl1mixertypes.h
index 5c101512..498f86df 100644
--- a/src/wrapped/generated/wrappedsdl1mixertypes.h
+++ b/src/wrapped/generated/wrappedsdl1mixertypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl1mixerTYPES_H_
 #define __wrappedsdl1mixerTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1soundtypes.h b/src/wrapped/generated/wrappedsdl1soundtypes.h
index 72cf99b5..c9744d84 100644
--- a/src/wrapped/generated/wrappedsdl1soundtypes.h
+++ b/src/wrapped/generated/wrappedsdl1soundtypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl1soundTYPES_H_
 #define __wrappedsdl1soundTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1ttftypes.h b/src/wrapped/generated/wrappedsdl1ttftypes.h
index f534a830..768dbcd9 100644
--- a/src/wrapped/generated/wrappedsdl1ttftypes.h
+++ b/src/wrapped/generated/wrappedsdl1ttftypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl1ttfTYPES_H_
 #define __wrappedsdl1ttfTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1types.h b/src/wrapped/generated/wrappedsdl1types.h
index 0dd02b2d..2e7240d5 100644
--- a/src/wrapped/generated/wrappedsdl1types.h
+++ b/src/wrapped/generated/wrappedsdl1types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl1TYPES_H_
 #define __wrappedsdl1TYPES_H_
@@ -12,6 +12,7 @@
 #endif
 
 typedef void (*vFp_t)(void*);
+typedef int64_t (*iFv_t)(void);
 typedef int64_t (*iFp_t)(void*);
 typedef uint64_t (*uFp_t)(void*);
 typedef uint64_t (*UFp_t)(void*);
@@ -32,6 +33,14 @@ typedef void* (*pFpippp_t)(void*, int64_t, void*, void*, void*);
 	GO(SDL_KillThread, vFp_t) \
 	GO(SDL_SetEventFilter, vFp_t) \
 	GO(SDL_UnloadObject, vFp_t) \
+	GO(SDL_Has3DNow, iFv_t) \
+	GO(SDL_Has3DNowExt, iFv_t) \
+	GO(SDL_HasAltiVec, iFv_t) \
+	GO(SDL_HasMMX, iFv_t) \
+	GO(SDL_HasMMXExt, iFv_t) \
+	GO(SDL_HasRDTSC, iFv_t) \
+	GO(SDL_HasSSE, iFv_t) \
+	GO(SDL_HasSSE2, iFv_t) \
 	GO(SDL_GetWMInfo, iFp_t) \
 	GO(SDL_RemoveTimer, iFp_t) \
 	GO(SDL_ReadBE16, uFp_t) \
diff --git a/src/wrapped/generated/wrappedsdl2imagetypes.h b/src/wrapped/generated/wrappedsdl2imagetypes.h
index caa292aa..8629eb80 100644
--- a/src/wrapped/generated/wrappedsdl2imagetypes.h
+++ b/src/wrapped/generated/wrappedsdl2imagetypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl2imageTYPES_H_
 #define __wrappedsdl2imageTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2mixertypes.h b/src/wrapped/generated/wrappedsdl2mixertypes.h
index 5950e0b6..f42bc8b9 100644
--- a/src/wrapped/generated/wrappedsdl2mixertypes.h
+++ b/src/wrapped/generated/wrappedsdl2mixertypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl2mixerTYPES_H_
 #define __wrappedsdl2mixerTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2ttftypes.h b/src/wrapped/generated/wrappedsdl2ttftypes.h
index 3802bc25..e11ccd62 100644
--- a/src/wrapped/generated/wrappedsdl2ttftypes.h
+++ b/src/wrapped/generated/wrappedsdl2ttftypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl2ttfTYPES_H_
 #define __wrappedsdl2ttfTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2types.h b/src/wrapped/generated/wrappedsdl2types.h
index dc3c54dd..ff9d318e 100644
--- a/src/wrapped/generated/wrappedsdl2types.h
+++ b/src/wrapped/generated/wrappedsdl2types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsdl2TYPES_H_
 #define __wrappedsdl2TYPES_H_
@@ -12,6 +12,7 @@
 #endif
 
 typedef void (*vFp_t)(void*);
+typedef int64_t (*iFv_t)(void);
 typedef int64_t (*iFp_t)(void*);
 typedef int64_t (*IFp_t)(void*);
 typedef uint64_t (*uFp_t)(void*);
@@ -19,7 +20,7 @@ typedef uint64_t (*UFp_t)(void*);
 typedef void* (*pFv_t)(void);
 typedef void* (*pFp_t)(void*);
 typedef void (*vFpp_t)(void*, void*);
-typedef void (*vFpV_t)(void*, void*);
+typedef void (*vFpV_t)(void*, ...);
 typedef int64_t (*iFip_t)(int64_t, void*);
 typedef int64_t (*iFWW_t)(uint16_t, uint16_t);
 typedef int64_t (*iFUU_t)(uint64_t, uint64_t);
@@ -30,23 +31,37 @@ typedef uint64_t (*uFpu_t)(void*, uint64_t);
 typedef uint64_t (*uFpU_t)(void*, uint64_t);
 typedef void* (*pFpi_t)(void*, int64_t);
 typedef void* (*pFpp_t)(void*, void*);
-typedef void (*vFipV_t)(int64_t, void*, void*);
+typedef void (*vFipV_t)(int64_t, void*, ...);
 typedef int64_t (*iFupp_t)(uint64_t, void*, void*);
 typedef int64_t (*iFppi_t)(void*, void*, int64_t);
-typedef int64_t (*iFppV_t)(void*, void*, void*);
+typedef int64_t (*iFppV_t)(void*, void*, ...);
 typedef int64_t (*IFpIi_t)(void*, int64_t, int64_t);
 typedef void* (*pFupp_t)(uint64_t, void*, void*);
 typedef void* (*pFppi_t)(void*, void*, int64_t);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef void (*vFpuup_t)(void*, uint64_t, uint64_t, void*);
 typedef int64_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
-typedef int64_t (*iFpLpV_t)(void*, uintptr_t, void*, void*);
+typedef int64_t (*iFpLpV_t)(void*, uintptr_t, void*, ...);
 typedef uint64_t (*uFppuu_t)(void*, void*, uint64_t, uint64_t);
+typedef void (*vFppppp_t)(void*, void*, void*, void*, void*);
 typedef int64_t (*iFpippi_t)(void*, int64_t, void*, void*, int64_t);
 typedef void* (*pFpippp_t)(void*, int64_t, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(SDL_UnloadObject, vFp_t) \
+	GO(SDL_Has3DNow, iFv_t) \
+	GO(SDL_HasAVX, iFv_t) \
+	GO(SDL_HasAVX2, iFv_t) \
+	GO(SDL_HasAVX512F, iFv_t) \
+	GO(SDL_HasAltiVec, iFv_t) \
+	GO(SDL_HasMMX, iFv_t) \
+	GO(SDL_HasNEON, iFv_t) \
+	GO(SDL_HasRDTSC, iFv_t) \
+	GO(SDL_HasSSE, iFv_t) \
+	GO(SDL_HasSSE2, iFv_t) \
+	GO(SDL_HasSSE3, iFv_t) \
+	GO(SDL_HasSSE41, iFv_t) \
+	GO(SDL_HasSSE42, iFv_t) \
 	GO(SDL_RWclose, iFp_t) \
 	GO(SDL_RemoveTimer, iFp_t) \
 	GO(SDL_SaveAllDollarTemplates, iFp_t) \
@@ -110,7 +125,10 @@ typedef void* (*pFpippp_t)(void*, int64_t, void*, void*, void*);
 	GO(SDL_snprintf, iFpLpV_t) \
 	GO(SDL_RWread, uFppuu_t) \
 	GO(SDL_RWwrite, uFppuu_t) \
+	/*GO(SDL_GetJoystickGUIDInfo, vFppppp_t)*/ \
 	GO(SDL_OpenAudioDevice, iFpippi_t) \
 	GO(SDL_LoadWAV_RW, pFpippp_t)
 
+// TODO: FIXME
+
 #endif // __wrappedsdl2TYPES_H_
diff --git a/src/wrapped/generated/wrappedsmpeg2types.h b/src/wrapped/generated/wrappedsmpeg2types.h
index f18c0852..2e2afa10 100644
--- a/src/wrapped/generated/wrappedsmpeg2types.h
+++ b/src/wrapped/generated/wrappedsmpeg2types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsmpeg2TYPES_H_
 #define __wrappedsmpeg2TYPES_H_
diff --git a/src/wrapped/generated/wrappedsmpegtypes.h b/src/wrapped/generated/wrappedsmpegtypes.h
index 8cd196f5..0c30e35a 100644
--- a/src/wrapped/generated/wrappedsmpegtypes.h
+++ b/src/wrapped/generated/wrappedsmpegtypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedsmpegTYPES_H_
 #define __wrappedsmpegTYPES_H_
diff --git a/src/wrapped/generated/wrappedtcmallocminimaltypes.h b/src/wrapped/generated/wrappedtcmallocminimaltypes.h
index ee95bcd7..bffd259c 100644
--- a/src/wrapped/generated/wrappedtcmallocminimaltypes.h
+++ b/src/wrapped/generated/wrappedtcmallocminimaltypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedtcmallocminimalTYPES_H_
 #define __wrappedtcmallocminimalTYPES_H_
diff --git a/src/wrapped/generated/wrappedudev0types.h b/src/wrapped/generated/wrappedudev0types.h
index 3a02323d..839b0dc8 100644
--- a/src/wrapped/generated/wrappedudev0types.h
+++ b/src/wrapped/generated/wrappedudev0types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedudev0TYPES_H_
 #define __wrappedudev0TYPES_H_
diff --git a/src/wrapped/generated/wrappedudev1types.h b/src/wrapped/generated/wrappedudev1types.h
index 72a014f3..7ace4f1a 100644
--- a/src/wrapped/generated/wrappedudev1types.h
+++ b/src/wrapped/generated/wrappedudev1types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedudev1TYPES_H_
 #define __wrappedudev1TYPES_H_
diff --git a/src/wrapped/generated/wrappedutiltypes.h b/src/wrapped/generated/wrappedutiltypes.h
index 2c4cd66a..a9383317 100644
--- a/src/wrapped/generated/wrappedutiltypes.h
+++ b/src/wrapped/generated/wrappedutiltypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedutilTYPES_H_
 #define __wrappedutilTYPES_H_
diff --git a/src/wrapped/generated/wrappedvorbisfiletypes.h b/src/wrapped/generated/wrappedvorbisfiletypes.h
index 2acf3593..ee95fa84 100644
--- a/src/wrapped/generated/wrappedvorbisfiletypes.h
+++ b/src/wrapped/generated/wrappedvorbisfiletypes.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedvorbisfileTYPES_H_
 #define __wrappedvorbisfileTYPES_H_
diff --git a/src/wrapped/generated/wrappedxml2types.h b/src/wrapped/generated/wrappedxml2types.h
index ddabd191..acdda975 100644
--- a/src/wrapped/generated/wrappedxml2types.h
+++ b/src/wrapped/generated/wrappedxml2types.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __wrappedxml2TYPES_H_
 #define __wrappedxml2TYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 96268d75..6b17d610 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,7 +40,6 @@ typedef void (*vFU_t)(uint64_t);
 typedef void (*vFf_t)(float);
 typedef void (*vFd_t)(double);
 typedef void (*vFl_t)(intptr_t);
-typedef void (*vFL_t)(uintptr_t);
 typedef void (*vFp_t)(void*);
 typedef void (*vFS_t)(void*);
 typedef int8_t (*cFv_t)(void);
@@ -49,17 +48,22 @@ typedef int8_t (*cFu_t)(uint64_t);
 typedef int8_t (*cFf_t)(float);
 typedef int8_t (*cFp_t)(void*);
 typedef int16_t (*wFp_t)(void*);
+typedef int64_t (*iFE_t)(x64emu_t*);
 typedef int64_t (*iFv_t)(void);
 typedef int64_t (*iFw_t)(int16_t);
 typedef int64_t (*iFi_t)(int64_t);
+typedef int64_t (*iFI_t)(int64_t);
 typedef int64_t (*iFu_t)(uint64_t);
 typedef int64_t (*iFU_t)(uint64_t);
 typedef int64_t (*iFf_t)(float);
 typedef int64_t (*iFd_t)(double);
+typedef int64_t (*iFD_t)(long double);
+typedef int64_t (*iFl_t)(intptr_t);
 typedef int64_t (*iFL_t)(uintptr_t);
 typedef int64_t (*iFp_t)(void*);
 typedef int64_t (*iFO_t)(int32_t);
 typedef int64_t (*iFS_t)(void*);
+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*);
@@ -70,9 +74,9 @@ typedef uint16_t (*WFp_t)(void*);
 typedef uint64_t (*uFv_t)(void);
 typedef uint64_t (*uFi_t)(int64_t);
 typedef uint64_t (*uFu_t)(uint64_t);
-typedef uint64_t (*uFU_t)(uint64_t);
 typedef uint64_t (*uFd_t)(double);
 typedef uint64_t (*uFl_t)(intptr_t);
+typedef uint64_t (*uFL_t)(uintptr_t);
 typedef uint64_t (*uFp_t)(void*);
 typedef uint64_t (*UFv_t)(void);
 typedef uint64_t (*UFu_t)(uint64_t);
@@ -91,7 +95,6 @@ typedef intptr_t (*lFv_t)(void);
 typedef intptr_t (*lFi_t)(int64_t);
 typedef intptr_t (*lFl_t)(intptr_t);
 typedef intptr_t (*lFp_t)(void*);
-typedef uintptr_t (*LFE_t)(x64emu_t*);
 typedef uintptr_t (*LFv_t)(void);
 typedef uintptr_t (*LFL_t)(uintptr_t);
 typedef uintptr_t (*LFp_t)(void*);
@@ -130,6 +133,7 @@ typedef void (*vFff_t)(float, float);
 typedef void (*vFfp_t)(float, void*);
 typedef void (*vFdd_t)(double, double);
 typedef void (*vFlp_t)(intptr_t, void*);
+typedef void (*vFLL_t)(uintptr_t, uintptr_t);
 typedef void (*vFLp_t)(uintptr_t, void*);
 typedef void (*vFpi_t)(void*, int64_t);
 typedef void (*vFpu_t)(void*, uint64_t);
@@ -144,23 +148,23 @@ typedef int8_t (*cFpp_t)(void*, void*);
 typedef int64_t (*iFEp_t)(x64emu_t*, void*);
 typedef int64_t (*iFwp_t)(int16_t, void*);
 typedef int64_t (*iFii_t)(int64_t, int64_t);
-typedef int64_t (*iFiI_t)(int64_t, int64_t);
 typedef int64_t (*iFiu_t)(int64_t, uint64_t);
-typedef int64_t (*iFiU_t)(int64_t, uint64_t);
 typedef int64_t (*iFil_t)(int64_t, intptr_t);
+typedef int64_t (*iFiL_t)(int64_t, uintptr_t);
 typedef int64_t (*iFip_t)(int64_t, void*);
 typedef int64_t (*iFIi_t)(int64_t, int64_t);
 typedef int64_t (*iFui_t)(uint64_t, int64_t);
 typedef int64_t (*iFuu_t)(uint64_t, uint64_t);
+typedef int64_t (*iFuL_t)(uint64_t, uintptr_t);
 typedef int64_t (*iFup_t)(uint64_t, void*);
-typedef int64_t (*iFli_t)(intptr_t, int64_t);
-typedef int64_t (*iFLi_t)(uintptr_t, int64_t);
+typedef int64_t (*iFlp_t)(intptr_t, void*);
 typedef int64_t (*iFLL_t)(uintptr_t, uintptr_t);
 typedef int64_t (*iFLp_t)(uintptr_t, void*);
 typedef int64_t (*iFpw_t)(void*, int16_t);
 typedef int64_t (*iFpi_t)(void*, int64_t);
 typedef int64_t (*iFpI_t)(void*, int64_t);
 typedef int64_t (*iFpC_t)(void*, uint8_t);
+typedef int64_t (*iFpW_t)(void*, uint16_t);
 typedef int64_t (*iFpu_t)(void*, uint64_t);
 typedef int64_t (*iFpU_t)(void*, uint64_t);
 typedef int64_t (*iFpf_t)(void*, float);
@@ -179,7 +183,9 @@ typedef uint8_t (*CFpi_t)(void*, int64_t);
 typedef uint8_t (*CFpu_t)(void*, uint64_t);
 typedef uint8_t (*CFpp_t)(void*, void*);
 typedef uint64_t (*uFEp_t)(x64emu_t*, void*);
+typedef uint64_t (*uFii_t)(int64_t, int64_t);
 typedef uint64_t (*uFiu_t)(int64_t, uint64_t);
+typedef uint64_t (*uFip_t)(int64_t, void*);
 typedef uint64_t (*uFui_t)(uint64_t, int64_t);
 typedef uint64_t (*uFuu_t)(uint64_t, uint64_t);
 typedef uint64_t (*uFup_t)(uint64_t, void*);
@@ -190,7 +196,6 @@ typedef uint64_t (*uFpU_t)(void*, uint64_t);
 typedef uint64_t (*uFpL_t)(void*, uintptr_t);
 typedef uint64_t (*uFpp_t)(void*, void*);
 typedef uint64_t (*UFEp_t)(x64emu_t*, void*);
-typedef uint64_t (*UFii_t)(int64_t, int64_t);
 typedef uint64_t (*UFuu_t)(uint64_t, uint64_t);
 typedef uint64_t (*UFUp_t)(uint64_t, void*);
 typedef uint64_t (*UFpp_t)(void*, void*);
@@ -205,24 +210,27 @@ typedef double (*dFdi_t)(double, int64_t);
 typedef double (*dFdd_t)(double, double);
 typedef double (*dFdD_t)(double, long double);
 typedef double (*dFdp_t)(double, void*);
-typedef double (*dFLL_t)(uintptr_t, uintptr_t);
+typedef double (*dFll_t)(intptr_t, intptr_t);
 typedef double (*dFpi_t)(void*, int64_t);
 typedef double (*dFpp_t)(void*, void*);
+typedef long double (*DFDi_t)(long double, int64_t);
+typedef long double (*DFDD_t)(long double, long double);
+typedef long double (*DFDp_t)(long double, void*);
 typedef long double (*DFpp_t)(void*, void*);
+typedef intptr_t (*lFii_t)(int64_t, int64_t);
 typedef intptr_t (*lFll_t)(intptr_t, intptr_t);
 typedef intptr_t (*lFpi_t)(void*, int64_t);
 typedef intptr_t (*lFpp_t)(void*, void*);
 typedef uintptr_t (*LFEL_t)(x64emu_t*, uintptr_t);
 typedef uintptr_t (*LFii_t)(int64_t, int64_t);
+typedef uintptr_t (*LFuu_t)(uint64_t, uint64_t);
 typedef uintptr_t (*LFLi_t)(uintptr_t, int64_t);
-typedef uintptr_t (*LFLp_t)(uintptr_t, void*);
 typedef uintptr_t (*LFpi_t)(void*, int64_t);
 typedef uintptr_t (*LFpL_t)(void*, uintptr_t);
 typedef uintptr_t (*LFpp_t)(void*, void*);
 typedef void* (*pFEp_t)(x64emu_t*, void*);
 typedef void* (*pFii_t)(int64_t, int64_t);
 typedef void* (*pFiu_t)(int64_t, uint64_t);
-typedef void* (*pFiL_t)(int64_t, uintptr_t);
 typedef void* (*pFip_t)(int64_t, void*);
 typedef void* (*pFui_t)(uint64_t, int64_t);
 typedef void* (*pFuu_t)(uint64_t, uint64_t);
@@ -293,9 +301,11 @@ typedef void (*vFpdd_t)(void*, double, double);
 typedef void (*vFpll_t)(void*, intptr_t, intptr_t);
 typedef void (*vFpLi_t)(void*, uintptr_t, int64_t);
 typedef void (*vFpLL_t)(void*, uintptr_t, uintptr_t);
+typedef void (*vFpLp_t)(void*, uintptr_t, void*);
 typedef void (*vFppi_t)(void*, void*, int64_t);
 typedef void (*vFppu_t)(void*, void*, uint64_t);
 typedef void (*vFppd_t)(void*, void*, double);
+typedef void (*vFppl_t)(void*, void*, intptr_t);
 typedef void (*vFppL_t)(void*, void*, uintptr_t);
 typedef void (*vFppp_t)(void*, void*, void*);
 typedef int64_t (*iFEiw_t)(x64emu_t*, int64_t, int16_t);
@@ -307,40 +317,44 @@ typedef int64_t (*iFEpi_t)(x64emu_t*, void*, int64_t);
 typedef int64_t (*iFEpL_t)(x64emu_t*, void*, uintptr_t);
 typedef int64_t (*iFEpp_t)(x64emu_t*, void*, void*);
 typedef int64_t (*iFEpV_t)(x64emu_t*, void*, void*);
+typedef int64_t (*iFEpA_t)(x64emu_t*, void*, void*);
 typedef int64_t (*iFESp_t)(x64emu_t*, void*, void*);
 typedef int64_t (*iFwww_t)(int16_t, int16_t, int16_t);
 typedef int64_t (*iFwpp_t)(int16_t, void*, void*);
 typedef int64_t (*iFiwC_t)(int64_t, int16_t, uint8_t);
 typedef int64_t (*iFiii_t)(int64_t, int64_t, int64_t);
 typedef int64_t (*iFiiu_t)(int64_t, int64_t, uint64_t);
-typedef int64_t (*iFiiL_t)(int64_t, int64_t, uintptr_t);
+typedef int64_t (*iFiil_t)(int64_t, int64_t, intptr_t);
 typedef int64_t (*iFiip_t)(int64_t, int64_t, void*);
 typedef int64_t (*iFiiO_t)(int64_t, int64_t, int32_t);
 typedef int64_t (*iFiuu_t)(int64_t, uint64_t, uint64_t);
+typedef int64_t (*iFill_t)(int64_t, intptr_t, intptr_t);
 typedef int64_t (*iFiLi_t)(int64_t, uintptr_t, int64_t);
+typedef int64_t (*iFiLp_t)(int64_t, uintptr_t, void*);
 typedef int64_t (*iFiLN_t)(int64_t, uintptr_t, ...);
 typedef int64_t (*iFipi_t)(int64_t, void*, int64_t);
 typedef int64_t (*iFipu_t)(int64_t, void*, uint64_t);
 typedef int64_t (*iFipL_t)(int64_t, void*, uintptr_t);
 typedef int64_t (*iFipp_t)(int64_t, void*, void*);
 typedef int64_t (*iFipO_t)(int64_t, void*, int32_t);
+typedef int64_t (*iFuwp_t)(uint64_t, int16_t, void*);
+typedef int64_t (*iFuui_t)(uint64_t, uint64_t, int64_t);
 typedef int64_t (*iFuuu_t)(uint64_t, uint64_t, uint64_t);
 typedef int64_t (*iFuup_t)(uint64_t, uint64_t, void*);
 typedef int64_t (*iFuff_t)(uint64_t, float, float);
 typedef int64_t (*iFuLL_t)(uint64_t, uintptr_t, uintptr_t);
+typedef int64_t (*iFuLp_t)(uint64_t, uintptr_t, void*);
 typedef int64_t (*iFupL_t)(uint64_t, void*, uintptr_t);
+typedef int64_t (*iFupp_t)(uint64_t, void*, void*);
 typedef int64_t (*iFfff_t)(float, float, float);
-typedef int64_t (*iFlll_t)(intptr_t, intptr_t, intptr_t);
-typedef int64_t (*iFLwp_t)(uintptr_t, int16_t, void*);
 typedef int64_t (*iFLip_t)(uintptr_t, int64_t, void*);
-typedef int64_t (*iFLLp_t)(uintptr_t, uintptr_t, void*);
+typedef int64_t (*iFLLi_t)(uintptr_t, uintptr_t, int64_t);
 typedef int64_t (*iFLpp_t)(uintptr_t, void*, void*);
 typedef int64_t (*iFpwp_t)(void*, int16_t, void*);
 typedef int64_t (*iFpii_t)(void*, int64_t, int64_t);
 typedef int64_t (*iFpiu_t)(void*, int64_t, uint64_t);
 typedef int64_t (*iFpiL_t)(void*, int64_t, uintptr_t);
 typedef int64_t (*iFpip_t)(void*, int64_t, void*);
-typedef int64_t (*iFpIi_t)(void*, int64_t, int64_t);
 typedef int64_t (*iFpui_t)(void*, uint64_t, int64_t);
 typedef int64_t (*iFpuu_t)(void*, uint64_t, uint64_t);
 typedef int64_t (*iFpuU_t)(void*, uint64_t, uint64_t);
@@ -355,6 +369,7 @@ typedef int64_t (*iFpli_t)(void*, intptr_t, int64_t);
 typedef int64_t (*iFpll_t)(void*, intptr_t, intptr_t);
 typedef int64_t (*iFplp_t)(void*, intptr_t, void*);
 typedef int64_t (*iFpLi_t)(void*, uintptr_t, int64_t);
+typedef int64_t (*iFpLu_t)(void*, uintptr_t, uint64_t);
 typedef int64_t (*iFpLL_t)(void*, uintptr_t, uintptr_t);
 typedef int64_t (*iFpLp_t)(void*, uintptr_t, void*);
 typedef int64_t (*iFppi_t)(void*, void*, int64_t);
@@ -376,45 +391,49 @@ typedef uint64_t (*uFEpu_t)(x64emu_t*, void*, uint64_t);
 typedef uint64_t (*uFEpU_t)(x64emu_t*, void*, uint64_t);
 typedef uint64_t (*uFipu_t)(int64_t, void*, uint64_t);
 typedef uint64_t (*uFuip_t)(uint64_t, int64_t, void*);
-typedef uint64_t (*uFuui_t)(uint64_t, uint64_t, int64_t);
 typedef uint64_t (*uFuuu_t)(uint64_t, uint64_t, uint64_t);
 typedef uint64_t (*uFuup_t)(uint64_t, uint64_t, void*);
 typedef uint64_t (*uFupu_t)(uint64_t, void*, uint64_t);
 typedef uint64_t (*uFupp_t)(uint64_t, void*, void*);
+typedef uint64_t (*uFpii_t)(void*, int64_t, int64_t);
 typedef uint64_t (*uFpip_t)(void*, int64_t, void*);
 typedef uint64_t (*uFpCi_t)(void*, uint8_t, int64_t);
 typedef uint64_t (*uFpui_t)(void*, uint64_t, int64_t);
 typedef uint64_t (*uFpuu_t)(void*, uint64_t, uint64_t);
+typedef uint64_t (*uFpup_t)(void*, uint64_t, void*);
 typedef uint64_t (*uFpLp_t)(void*, uintptr_t, void*);
 typedef uint64_t (*uFppi_t)(void*, void*, int64_t);
 typedef uint64_t (*uFppu_t)(void*, void*, uint64_t);
 typedef uint64_t (*uFppp_t)(void*, void*, void*);
 typedef uint64_t (*UFppi_t)(void*, void*, int64_t);
-typedef float (*fFuii_t)(uint64_t, int64_t, int64_t);
 typedef float (*fFull_t)(uint64_t, intptr_t, intptr_t);
 typedef float (*fFfff_t)(float, float, float);
 typedef float (*fFffp_t)(float, float, void*);
 typedef float (*fFppL_t)(void*, void*, uintptr_t);
+typedef float (*fFppp_t)(void*, void*, void*);
 typedef double (*dFddd_t)(double, double, double);
 typedef double (*dFddp_t)(double, double, void*);
 typedef double (*dFppi_t)(void*, void*, int64_t);
 typedef double (*dFppp_t)(void*, void*, void*);
+typedef long double (*DFppp_t)(void*, void*, void*);
+typedef intptr_t (*lFili_t)(int64_t, intptr_t, int64_t);
+typedef intptr_t (*lFilL_t)(int64_t, intptr_t, uintptr_t);
 typedef intptr_t (*lFipi_t)(int64_t, void*, int64_t);
 typedef intptr_t (*lFipL_t)(int64_t, void*, uintptr_t);
 typedef intptr_t (*lFlll_t)(intptr_t, intptr_t, intptr_t);
 typedef intptr_t (*lFlpi_t)(intptr_t, void*, int64_t);
-typedef intptr_t (*lFpip_t)(void*, int64_t, void*);
+typedef intptr_t (*lFpli_t)(void*, intptr_t, int64_t);
 typedef intptr_t (*lFpLu_t)(void*, uintptr_t, uint64_t);
 typedef intptr_t (*lFppi_t)(void*, void*, int64_t);
 typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
+typedef intptr_t (*lFppp_t)(void*, void*, void*);
 typedef intptr_t (*lFSpl_t)(void*, void*, intptr_t);
 typedef uintptr_t (*LFipL_t)(int64_t, void*, uintptr_t);
-typedef uintptr_t (*LFLLi_t)(uintptr_t, uintptr_t, int64_t);
-typedef uintptr_t (*LFLLI_t)(uintptr_t, uintptr_t, int64_t);
+typedef uintptr_t (*LFLLl_t)(uintptr_t, uintptr_t, intptr_t);
 typedef uintptr_t (*LFLpu_t)(uintptr_t, void*, uint64_t);
 typedef uintptr_t (*LFLpL_t)(uintptr_t, void*, uintptr_t);
 typedef uintptr_t (*LFpii_t)(void*, int64_t, int64_t);
-typedef uintptr_t (*LFpup_t)(void*, uint64_t, void*);
+typedef uintptr_t (*LFpip_t)(void*, int64_t, void*);
 typedef uintptr_t (*LFpLi_t)(void*, uintptr_t, int64_t);
 typedef uintptr_t (*LFpLp_t)(void*, uintptr_t, void*);
 typedef uintptr_t (*LFppi_t)(void*, void*, int64_t);
@@ -434,7 +453,9 @@ typedef void* (*pFuii_t)(uint64_t, int64_t, int64_t);
 typedef void* (*pFupi_t)(uint64_t, void*, int64_t);
 typedef void* (*pFupL_t)(uint64_t, void*, uintptr_t);
 typedef void* (*pFUpi_t)(uint64_t, void*, int64_t);
+typedef void* (*pFdip_t)(double, int64_t, void*);
 typedef void* (*pFddd_t)(double, double, double);
+typedef void* (*pFDip_t)(long double, int64_t, void*);
 typedef void* (*pFpii_t)(void*, int64_t, int64_t);
 typedef void* (*pFpiu_t)(void*, int64_t, uint64_t);
 typedef void* (*pFpil_t)(void*, int64_t, intptr_t);
@@ -461,6 +482,7 @@ typedef void* (*pFpOM_t)(void*, int32_t, ...);
 typedef void* (*pFSpl_t)(void*, void*, intptr_t);
 typedef void (*vFEipp_t)(x64emu_t*, int64_t, void*, void*);
 typedef void (*vFEipV_t)(x64emu_t*, int64_t, void*, void*);
+typedef void (*vFEipA_t)(x64emu_t*, int64_t, void*, void*);
 typedef void (*vFEpii_t)(x64emu_t*, void*, int64_t, int64_t);
 typedef void (*vFEpip_t)(x64emu_t*, void*, int64_t, void*);
 typedef void (*vFEpup_t)(x64emu_t*, void*, uint64_t, void*);
@@ -561,6 +583,7 @@ typedef int64_t (*iFEppi_t)(x64emu_t*, void*, void*, int64_t);
 typedef int64_t (*iFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
 typedef int64_t (*iFEppp_t)(x64emu_t*, void*, void*, void*);
 typedef int64_t (*iFEppV_t)(x64emu_t*, void*, void*, void*);
+typedef int64_t (*iFEppA_t)(x64emu_t*, void*, void*, void*);
 typedef int64_t (*iFEpOu_t)(x64emu_t*, void*, int32_t, uint64_t);
 typedef int64_t (*iFwwww_t)(int16_t, int16_t, int16_t, int16_t);
 typedef int64_t (*iFwppp_t)(int16_t, void*, void*, void*);
@@ -568,14 +591,15 @@ typedef int64_t (*iFiiii_t)(int64_t, int64_t, int64_t, int64_t);
 typedef int64_t (*iFiiiu_t)(int64_t, int64_t, int64_t, uint64_t);
 typedef int64_t (*iFiiip_t)(int64_t, int64_t, int64_t, void*);
 typedef int64_t (*iFiiiN_t)(int64_t, int64_t, int64_t, ...);
+typedef int64_t (*iFiiui_t)(int64_t, int64_t, uint64_t, int64_t);
 typedef int64_t (*iFiill_t)(int64_t, int64_t, intptr_t, intptr_t);
-typedef int64_t (*iFiiLi_t)(int64_t, int64_t, uintptr_t, int64_t);
 typedef int64_t (*iFiipi_t)(int64_t, int64_t, void*, int64_t);
 typedef int64_t (*iFiipp_t)(int64_t, int64_t, void*, void*);
+typedef int64_t (*iFiuwp_t)(int64_t, uint64_t, int16_t, void*);
 typedef int64_t (*iFiuii_t)(int64_t, uint64_t, int64_t, int64_t);
-typedef int64_t (*iFiupi_t)(int64_t, uint64_t, void*, int64_t);
+typedef int64_t (*iFiupp_t)(int64_t, uint64_t, void*, void*);
 typedef int64_t (*iFilli_t)(int64_t, intptr_t, intptr_t, int64_t);
-typedef int64_t (*iFiLwp_t)(int64_t, uintptr_t, int16_t, void*);
+typedef int64_t (*iFillu_t)(int64_t, intptr_t, intptr_t, uint64_t);
 typedef int64_t (*iFipii_t)(int64_t, void*, int64_t, int64_t);
 typedef int64_t (*iFipip_t)(int64_t, void*, int64_t, void*);
 typedef int64_t (*iFipui_t)(int64_t, void*, uint64_t, int64_t);
@@ -583,14 +607,18 @@ typedef int64_t (*iFipup_t)(int64_t, void*, uint64_t, void*);
 typedef int64_t (*iFipLi_t)(int64_t, void*, uintptr_t, int64_t);
 typedef int64_t (*iFipLp_t)(int64_t, void*, uintptr_t, void*);
 typedef int64_t (*iFippi_t)(int64_t, void*, void*, int64_t);
-typedef int64_t (*iFippu_t)(int64_t, void*, void*, uint64_t);
 typedef int64_t (*iFippL_t)(int64_t, void*, void*, uintptr_t);
 typedef int64_t (*iFippp_t)(int64_t, void*, void*, void*);
 typedef int64_t (*iFipON_t)(int64_t, void*, int32_t, ...);
 typedef int64_t (*iFuipp_t)(uint64_t, int64_t, void*, void*);
 typedef int64_t (*iFuuff_t)(uint64_t, uint64_t, float, float);
+typedef int64_t (*iFuupi_t)(uint64_t, uint64_t, void*, int64_t);
+typedef int64_t (*iFupLp_t)(uint64_t, void*, uintptr_t, void*);
 typedef int64_t (*iFuppi_t)(uint64_t, void*, void*, int64_t);
 typedef int64_t (*iFuppp_t)(uint64_t, void*, void*, void*);
+typedef int64_t (*iFLLiW_t)(uintptr_t, uintptr_t, int64_t, uint16_t);
+typedef int64_t (*iFpwww_t)(void*, int16_t, int16_t, int16_t);
+typedef int64_t (*iFpwpp_t)(void*, int16_t, void*, void*);
 typedef int64_t (*iFpiii_t)(void*, int64_t, int64_t, int64_t);
 typedef int64_t (*iFpiiu_t)(void*, int64_t, int64_t, uint64_t);
 typedef int64_t (*iFpiid_t)(void*, int64_t, int64_t, double);
@@ -601,10 +629,12 @@ typedef int64_t (*iFpiup_t)(void*, int64_t, uint64_t, void*);
 typedef int64_t (*iFpild_t)(void*, int64_t, intptr_t, double);
 typedef int64_t (*iFpipi_t)(void*, int64_t, void*, int64_t);
 typedef int64_t (*iFpipC_t)(void*, int64_t, void*, uint8_t);
+typedef int64_t (*iFpipu_t)(void*, int64_t, void*, uint64_t);
 typedef int64_t (*iFpipp_t)(void*, int64_t, void*, void*);
 typedef int64_t (*iFpipV_t)(void*, int64_t, void*, void*);
 typedef int64_t (*iFpCCC_t)(void*, uint8_t, uint8_t, uint8_t);
 typedef int64_t (*iFpWWu_t)(void*, uint16_t, uint16_t, uint64_t);
+typedef int64_t (*iFpuwp_t)(void*, uint64_t, int16_t, void*);
 typedef int64_t (*iFpuiL_t)(void*, uint64_t, int64_t, uintptr_t);
 typedef int64_t (*iFpuip_t)(void*, uint64_t, int64_t, void*);
 typedef int64_t (*iFpuui_t)(void*, uint64_t, uint64_t, int64_t);
@@ -618,8 +648,12 @@ typedef int64_t (*iFpupp_t)(void*, uint64_t, void*, void*);
 typedef int64_t (*iFpupV_t)(void*, uint64_t, void*, void*);
 typedef int64_t (*iFplii_t)(void*, intptr_t, int64_t, int64_t);
 typedef int64_t (*iFplip_t)(void*, intptr_t, int64_t, void*);
-typedef int64_t (*iFpLwp_t)(void*, uintptr_t, int16_t, void*);
+typedef int64_t (*iFpLii_t)(void*, uintptr_t, int64_t, int64_t);
+typedef int64_t (*iFpLLu_t)(void*, uintptr_t, uintptr_t, uint64_t);
 typedef int64_t (*iFpLpi_t)(void*, uintptr_t, void*, int64_t);
+typedef int64_t (*iFpLpf_t)(void*, uintptr_t, void*, float);
+typedef int64_t (*iFpLpd_t)(void*, uintptr_t, void*, double);
+typedef int64_t (*iFpLpD_t)(void*, uintptr_t, void*, long double);
 typedef int64_t (*iFpLpL_t)(void*, uintptr_t, void*, uintptr_t);
 typedef int64_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef int64_t (*iFppii_t)(void*, void*, int64_t, int64_t);
@@ -657,21 +691,24 @@ typedef uint64_t (*uFppiu_t)(void*, void*, int64_t, uint64_t);
 typedef uint64_t (*uFpppi_t)(void*, void*, void*, int64_t);
 typedef uint64_t (*uFpppp_t)(void*, void*, void*, void*);
 typedef uint64_t (*UFpipp_t)(void*, int64_t, void*, void*);
-typedef long double (*DFppiL_t)(void*, void*, int64_t, uintptr_t);
+typedef uint64_t (*UFppip_t)(void*, void*, int64_t, void*);
 typedef intptr_t (*lFEpip_t)(x64emu_t*, void*, int64_t, void*);
 typedef intptr_t (*lFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
+typedef intptr_t (*lFiiLu_t)(int64_t, int64_t, uintptr_t, uint64_t);
 typedef intptr_t (*lFiipL_t)(int64_t, int64_t, void*, uintptr_t);
-typedef intptr_t (*lFilpp_t)(int64_t, intptr_t, void*, void*);
-typedef intptr_t (*lFipiI_t)(int64_t, void*, int64_t, int64_t);
+typedef intptr_t (*lFipil_t)(int64_t, void*, int64_t, intptr_t);
 typedef intptr_t (*lFipLi_t)(int64_t, void*, uintptr_t, int64_t);
 typedef intptr_t (*lFipLI_t)(int64_t, void*, uintptr_t, int64_t);
+typedef intptr_t (*lFipLu_t)(int64_t, void*, uintptr_t, uint64_t);
 typedef intptr_t (*lFipLl_t)(int64_t, void*, uintptr_t, intptr_t);
 typedef intptr_t (*lFipLL_t)(int64_t, void*, uintptr_t, uintptr_t);
+typedef intptr_t (*lFipLp_t)(int64_t, void*, uintptr_t, void*);
 typedef intptr_t (*lFippL_t)(int64_t, void*, void*, uintptr_t);
-typedef intptr_t (*lFlpip_t)(intptr_t, void*, int64_t, void*);
+typedef intptr_t (*lFuipp_t)(uint64_t, int64_t, void*, void*);
 typedef intptr_t (*lFpili_t)(void*, int64_t, intptr_t, int64_t);
 typedef intptr_t (*lFpilp_t)(void*, int64_t, intptr_t, void*);
 typedef intptr_t (*lFppii_t)(void*, void*, int64_t, int64_t);
+typedef intptr_t (*lFppip_t)(void*, void*, int64_t, void*);
 typedef intptr_t (*lFpppL_t)(void*, void*, void*, uintptr_t);
 typedef uintptr_t (*LFippL_t)(int64_t, void*, void*, uintptr_t);
 typedef uintptr_t (*LFpuuu_t)(void*, uint64_t, uint64_t, uint64_t);
@@ -692,11 +729,13 @@ typedef void* (*pFiiii_t)(int64_t, int64_t, int64_t, int64_t);
 typedef void* (*pFiiiu_t)(int64_t, int64_t, int64_t, uint64_t);
 typedef void* (*pFiiup_t)(int64_t, int64_t, uint64_t, void*);
 typedef void* (*pFippi_t)(int64_t, void*, void*, int64_t);
-typedef void* (*pFippL_t)(int64_t, void*, void*, uintptr_t);
+typedef void* (*pFippu_t)(int64_t, void*, void*, uint64_t);
 typedef void* (*pFuiii_t)(uint64_t, int64_t, int64_t, int64_t);
 typedef void* (*pFulli_t)(uint64_t, intptr_t, intptr_t, int64_t);
 typedef void* (*pFullu_t)(uint64_t, intptr_t, intptr_t, uint64_t);
+typedef void* (*pFdipp_t)(double, int64_t, void*, void*);
 typedef void* (*pFdddd_t)(double, double, double, double);
+typedef void* (*pFDipp_t)(long double, int64_t, void*, void*);
 typedef void* (*pFlfff_t)(intptr_t, float, float, float);
 typedef void* (*pFpiii_t)(void*, int64_t, int64_t, int64_t);
 typedef void* (*pFpiip_t)(void*, int64_t, int64_t, void*);
@@ -755,7 +794,6 @@ typedef void (*vFiplll_t)(int64_t, void*, intptr_t, intptr_t, intptr_t);
 typedef void (*vFuiiii_t)(uint64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuiiiu_t)(uint64_t, int64_t, int64_t, int64_t, uint64_t);
 typedef void (*vFuiiip_t)(uint64_t, int64_t, int64_t, int64_t, void*);
-typedef void (*vFuiiup_t)(uint64_t, int64_t, int64_t, uint64_t, void*);
 typedef void (*vFuiifi_t)(uint64_t, int64_t, int64_t, float, int64_t);
 typedef void (*vFuiIII_t)(uint64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuiuii_t)(uint64_t, int64_t, uint64_t, int64_t, int64_t);
@@ -827,6 +865,7 @@ typedef int64_t (*iFEpipp_t)(x64emu_t*, void*, int64_t, void*, void*);
 typedef int64_t (*iFEpipV_t)(x64emu_t*, void*, int64_t, void*, void*);
 typedef int64_t (*iFEpLpp_t)(x64emu_t*, void*, uintptr_t, void*, void*);
 typedef int64_t (*iFEpLpV_t)(x64emu_t*, void*, uintptr_t, void*, void*);
+typedef int64_t (*iFEpLpA_t)(x64emu_t*, void*, uintptr_t, void*, void*);
 typedef int64_t (*iFEppii_t)(x64emu_t*, void*, void*, int64_t, int64_t);
 typedef int64_t (*iFEppip_t)(x64emu_t*, void*, void*, int64_t, void*);
 typedef int64_t (*iFEppiV_t)(x64emu_t*, void*, void*, int64_t, void*);
@@ -837,29 +876,33 @@ typedef int64_t (*iFEpppV_t)(x64emu_t*, void*, void*, void*, void*);
 typedef int64_t (*iFiiipu_t)(int64_t, int64_t, int64_t, void*, uint64_t);
 typedef int64_t (*iFiiipp_t)(int64_t, int64_t, int64_t, void*, void*);
 typedef int64_t (*iFiiupp_t)(int64_t, int64_t, uint64_t, void*, void*);
+typedef int64_t (*iFiipup_t)(int64_t, int64_t, void*, uint64_t, void*);
+typedef int64_t (*iFiuLip_t)(int64_t, uint64_t, uintptr_t, int64_t, void*);
 typedef int64_t (*iFiLLLL_t)(int64_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
 typedef int64_t (*iFipiii_t)(int64_t, void*, int64_t, int64_t, int64_t);
 typedef int64_t (*iFipipi_t)(int64_t, void*, int64_t, void*, int64_t);
 typedef int64_t (*iFipipu_t)(int64_t, void*, int64_t, void*, uint64_t);
 typedef int64_t (*iFipuip_t)(int64_t, void*, uint64_t, int64_t, void*);
+typedef int64_t (*iFipuui_t)(int64_t, void*, uint64_t, uint64_t, int64_t);
 typedef int64_t (*iFippLi_t)(int64_t, void*, void*, uintptr_t, int64_t);
 typedef int64_t (*iFippLp_t)(int64_t, void*, void*, uintptr_t, void*);
 typedef int64_t (*iFipppi_t)(int64_t, void*, void*, void*, int64_t);
 typedef int64_t (*iFipppp_t)(int64_t, void*, void*, void*, void*);
 typedef int64_t (*iFuppLp_t)(uint64_t, void*, void*, uintptr_t, void*);
-typedef int64_t (*iFlppLp_t)(intptr_t, void*, void*, uintptr_t, void*);
+typedef int64_t (*iFpwwww_t)(void*, int16_t, int16_t, int16_t, int16_t);
+typedef int64_t (*iFpwppp_t)(void*, int16_t, void*, void*, void*);
 typedef int64_t (*iFpiiii_t)(void*, int64_t, int64_t, int64_t, int64_t);
 typedef int64_t (*iFpiiiu_t)(void*, int64_t, int64_t, int64_t, uint64_t);
 typedef int64_t (*iFpiiiL_t)(void*, int64_t, int64_t, int64_t, uintptr_t);
 typedef int64_t (*iFpiiip_t)(void*, int64_t, int64_t, int64_t, void*);
+typedef int64_t (*iFpiiui_t)(void*, int64_t, int64_t, uint64_t, int64_t);
 typedef int64_t (*iFpiiuu_t)(void*, int64_t, int64_t, uint64_t, uint64_t);
-typedef int64_t (*iFpiiLi_t)(void*, int64_t, int64_t, uintptr_t, int64_t);
 typedef int64_t (*iFpiipi_t)(void*, int64_t, int64_t, void*, int64_t);
 typedef int64_t (*iFpiipp_t)(void*, int64_t, int64_t, void*, void*);
-typedef int64_t (*iFpiLwp_t)(void*, int64_t, uintptr_t, int16_t, void*);
+typedef int64_t (*iFpiuwp_t)(void*, int64_t, uint64_t, int16_t, void*);
 typedef int64_t (*iFpipii_t)(void*, int64_t, void*, int64_t, int64_t);
 typedef int64_t (*iFpipiL_t)(void*, int64_t, void*, int64_t, uintptr_t);
-typedef int64_t (*iFpippi_t)(void*, int64_t, void*, void*, int64_t);
+typedef int64_t (*iFpippW_t)(void*, int64_t, void*, void*, uint16_t);
 typedef int64_t (*iFpippp_t)(void*, int64_t, void*, void*, void*);
 typedef int64_t (*iFpCCCC_t)(void*, uint8_t, uint8_t, uint8_t, uint8_t);
 typedef int64_t (*iFpuuip_t)(void*, uint64_t, uint64_t, int64_t, void*);
@@ -868,17 +911,18 @@ typedef int64_t (*iFpuuup_t)(void*, uint64_t, uint64_t, uint64_t, void*);
 typedef int64_t (*iFpuuLL_t)(void*, uint64_t, uint64_t, uintptr_t, uintptr_t);
 typedef int64_t (*iFpuupp_t)(void*, uint64_t, uint64_t, void*, void*);
 typedef int64_t (*iFplluu_t)(void*, intptr_t, intptr_t, uint64_t, uint64_t);
+typedef int64_t (*iFpLiLi_t)(void*, uintptr_t, int64_t, uintptr_t, int64_t);
 typedef int64_t (*iFpLlpp_t)(void*, uintptr_t, intptr_t, void*, void*);
 typedef int64_t (*iFppiip_t)(void*, void*, int64_t, int64_t, void*);
 typedef int64_t (*iFppiup_t)(void*, void*, int64_t, uint64_t, void*);
 typedef int64_t (*iFppiLi_t)(void*, void*, int64_t, uintptr_t, int64_t);
 typedef int64_t (*iFppipi_t)(void*, void*, int64_t, void*, int64_t);
 typedef int64_t (*iFppipp_t)(void*, void*, int64_t, void*, void*);
+typedef int64_t (*iFppuwp_t)(void*, void*, uint64_t, int16_t, void*);
 typedef int64_t (*iFppuip_t)(void*, void*, uint64_t, int64_t, void*);
 typedef int64_t (*iFppupi_t)(void*, void*, uint64_t, void*, int64_t);
 typedef int64_t (*iFppupp_t)(void*, void*, uint64_t, void*, void*);
 typedef int64_t (*iFppllp_t)(void*, void*, intptr_t, intptr_t, void*);
-typedef int64_t (*iFppLwp_t)(void*, void*, uintptr_t, int16_t, void*);
 typedef int64_t (*iFppLpi_t)(void*, void*, uintptr_t, void*, int64_t);
 typedef int64_t (*iFppLpL_t)(void*, void*, uintptr_t, void*, uintptr_t);
 typedef int64_t (*iFppLpp_t)(void*, void*, uintptr_t, void*, void*);
@@ -903,9 +947,9 @@ typedef uint64_t (*uFpplip_t)(void*, void*, intptr_t, int64_t, void*);
 typedef uint64_t (*uFppppu_t)(void*, void*, void*, void*, uint64_t);
 typedef uint64_t (*uFppppp_t)(void*, void*, void*, void*, void*);
 typedef uint64_t (*UFuiiii_t)(uint64_t, int64_t, int64_t, int64_t, int64_t);
+typedef intptr_t (*lFipili_t)(int64_t, void*, int64_t, intptr_t, int64_t);
 typedef intptr_t (*lFipLli_t)(int64_t, void*, uintptr_t, intptr_t, int64_t);
 typedef intptr_t (*lFipLLi_t)(int64_t, void*, uintptr_t, uintptr_t, int64_t);
-typedef uintptr_t (*LFLpppp_t)(uintptr_t, void*, void*, void*, void*);
 typedef uintptr_t (*LFpLLLp_t)(void*, uintptr_t, uintptr_t, uintptr_t, void*);
 typedef uintptr_t (*LFpLppL_t)(void*, uintptr_t, void*, void*, uintptr_t);
 typedef uintptr_t (*LFpLppp_t)(void*, uintptr_t, void*, void*, void*);
@@ -984,7 +1028,6 @@ typedef void (*vFuiupiu_t)(uint64_t, int64_t, uint64_t, void*, int64_t, uint64_t
 typedef void (*vFuiUUUU_t)(uint64_t, int64_t, uint64_t, uint64_t, uint64_t, uint64_t);
 typedef void (*vFuiffff_t)(uint64_t, int64_t, float, float, float, float);
 typedef void (*vFuidddd_t)(uint64_t, int64_t, double, double, double, double);
-typedef void (*vFuipiup_t)(uint64_t, int64_t, void*, int64_t, uint64_t, void*);
 typedef void (*vFuuiiii_t)(uint64_t, uint64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuuiiiu_t)(uint64_t, uint64_t, int64_t, int64_t, int64_t, uint64_t);
 typedef void (*vFuuiuii_t)(uint64_t, uint64_t, int64_t, uint64_t, int64_t, int64_t);
@@ -1040,7 +1083,6 @@ typedef void (*vFpppppi_t)(void*, void*, void*, void*, void*, int64_t);
 typedef void (*vFpppppp_t)(void*, void*, void*, void*, void*, void*);
 typedef int8_t (*cFppLppi_t)(void*, void*, uintptr_t, void*, void*, int64_t);
 typedef int64_t (*iFEiippi_t)(x64emu_t*, int64_t, int64_t, void*, void*, int64_t);
-typedef int64_t (*iFEipppp_t)(x64emu_t*, int64_t, void*, void*, void*, void*);
 typedef int64_t (*iFElpppp_t)(x64emu_t*, intptr_t, void*, void*, void*, void*);
 typedef int64_t (*iFEpiipp_t)(x64emu_t*, void*, int64_t, int64_t, void*, void*);
 typedef int64_t (*iFEpiipV_t)(x64emu_t*, void*, int64_t, int64_t, void*, void*);
@@ -1050,13 +1092,16 @@ typedef int64_t (*iFEpuppp_t)(x64emu_t*, void*, uint64_t, void*, void*, void*);
 typedef int64_t (*iFEppppp_t)(x64emu_t*, void*, void*, void*, void*, void*);
 typedef int64_t (*iFiiiiii_t)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef int64_t (*iFiiiiip_t)(int64_t, int64_t, int64_t, int64_t, int64_t, void*);
-typedef int64_t (*iFiiiLwp_t)(int64_t, int64_t, int64_t, uintptr_t, int16_t, void*);
+typedef int64_t (*iFiiiuwp_t)(int64_t, int64_t, int64_t, uint64_t, int16_t, void*);
 typedef int64_t (*iFiuiipi_t)(int64_t, uint64_t, int64_t, int64_t, void*, int64_t);
 typedef int64_t (*iFipiipi_t)(int64_t, void*, int64_t, int64_t, void*, int64_t);
 typedef int64_t (*iFipuufp_t)(int64_t, void*, uint64_t, uint64_t, float, void*);
 typedef int64_t (*iFipupup_t)(int64_t, void*, uint64_t, void*, uint64_t, void*);
 typedef int64_t (*iFipuppp_t)(int64_t, void*, uint64_t, void*, void*, void*);
 typedef int64_t (*iFuppppp_t)(uint64_t, void*, void*, void*, void*, void*);
+typedef int64_t (*iFdipppL_t)(double, int64_t, void*, void*, void*, uintptr_t);
+typedef int64_t (*iFDipppL_t)(long double, int64_t, void*, void*, void*, uintptr_t);
+typedef int64_t (*iFlpippp_t)(intptr_t, void*, int64_t, void*, void*, void*);
 typedef int64_t (*iFLppipp_t)(uintptr_t, void*, void*, int64_t, void*, void*);
 typedef int64_t (*iFpiiiii_t)(void*, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef int64_t (*iFpiiipp_t)(void*, int64_t, int64_t, int64_t, void*, void*);
@@ -1066,6 +1111,9 @@ typedef int64_t (*iFpiuupp_t)(void*, int64_t, uint64_t, uint64_t, void*, void*);
 typedef int64_t (*iFpippip_t)(void*, int64_t, void*, void*, int64_t, void*);
 typedef int64_t (*iFpipppL_t)(void*, int64_t, void*, void*, void*, uintptr_t);
 typedef int64_t (*iFpipppp_t)(void*, int64_t, void*, void*, void*, void*);
+typedef int64_t (*iFpWpppp_t)(void*, uint16_t, void*, void*, void*, void*);
+typedef int64_t (*iFpuiCpp_t)(void*, uint64_t, int64_t, uint8_t, void*, void*);
+typedef int64_t (*iFpuippp_t)(void*, uint64_t, int64_t, void*, void*, void*);
 typedef int64_t (*iFpupuui_t)(void*, uint64_t, void*, uint64_t, uint64_t, int64_t);
 typedef int64_t (*iFppiiuu_t)(void*, void*, int64_t, int64_t, uint64_t, uint64_t);
 typedef int64_t (*iFppiipi_t)(void*, void*, int64_t, int64_t, void*, int64_t);
@@ -1100,6 +1148,7 @@ typedef uint64_t (*UFpippup_t)(void*, int64_t, void*, void*, uint64_t, void*);
 typedef intptr_t (*lFipipLu_t)(int64_t, void*, int64_t, void*, uintptr_t, uint64_t);
 typedef intptr_t (*lFipLipu_t)(int64_t, void*, uintptr_t, int64_t, void*, uint64_t);
 typedef intptr_t (*lFipLipp_t)(int64_t, void*, uintptr_t, int64_t, void*, void*);
+typedef intptr_t (*lFipLpLL_t)(int64_t, void*, uintptr_t, void*, uintptr_t, uintptr_t);
 typedef uintptr_t (*LFpipipi_t)(void*, int64_t, void*, int64_t, void*, int64_t);
 typedef uintptr_t (*LFSpLiip_t)(void*, void*, uintptr_t, int64_t, int64_t, void*);
 typedef void* (*pFEpippp_t)(x64emu_t*, void*, int64_t, void*, void*, void*);
@@ -1133,10 +1182,8 @@ typedef void* (*pFSpiiii_t)(void*, void*, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFEpppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFiiiiiip_t)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, void*);
 typedef void (*vFiiiiuup_t)(int64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t, void*);
-typedef void (*vFiiupuip_t)(int64_t, int64_t, uint64_t, void*, uint64_t, int64_t, void*);
 typedef void (*vFiiffffp_t)(int64_t, int64_t, float, float, float, float, void*);
 typedef void (*vFiipllli_t)(int64_t, int64_t, void*, intptr_t, intptr_t, intptr_t, int64_t);
-typedef void (*vFiupuuup_t)(int64_t, uint64_t, void*, uint64_t, uint64_t, uint64_t, void*);
 typedef void (*vFuiiiiii_t)(uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuiiiuip_t)(uint64_t, int64_t, int64_t, int64_t, uint64_t, int64_t, void*);
 typedef void (*vFuiiiuup_t)(uint64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t, void*);
@@ -1200,18 +1247,21 @@ typedef int64_t (*iFEpppppL_t)(x64emu_t*, void*, void*, void*, void*, void*, uin
 typedef int64_t (*iFEpppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*);
 typedef int64_t (*iFiiiiiip_t)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, void*);
 typedef int64_t (*iFpiiiiii_t)(void*, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
-typedef int64_t (*iFpiiiLwp_t)(void*, int64_t, int64_t, int64_t, uintptr_t, int16_t, void*);
+typedef int64_t (*iFpiiiuwp_t)(void*, int64_t, int64_t, int64_t, uint64_t, int16_t, void*);
 typedef int64_t (*iFpiiuuiu_t)(void*, int64_t, int64_t, uint64_t, uint64_t, int64_t, uint64_t);
 typedef int64_t (*iFpiipppp_t)(void*, int64_t, int64_t, void*, void*, void*, void*);
 typedef int64_t (*iFpiuiipp_t)(void*, int64_t, uint64_t, int64_t, int64_t, void*, void*);
 typedef int64_t (*iFpiupiii_t)(void*, int64_t, uint64_t, void*, int64_t, int64_t, int64_t);
 typedef int64_t (*iFpippLpp_t)(void*, int64_t, void*, void*, uintptr_t, void*, void*);
+typedef int64_t (*iFpippppW_t)(void*, int64_t, void*, void*, void*, void*, uint16_t);
 typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*);
 typedef int64_t (*iFpIIpppp_t)(void*, int64_t, int64_t, void*, void*, void*, void*);
+typedef int64_t (*iFpWppppW_t)(void*, uint16_t, void*, void*, void*, void*, uint16_t);
+typedef int64_t (*iFpuiCuCp_t)(void*, uint64_t, int64_t, uint8_t, uint64_t, uint8_t, void*);
 typedef int64_t (*iFpuuiuui_t)(void*, uint64_t, uint64_t, int64_t, uint64_t, uint64_t, int64_t);
 typedef int64_t (*iFpuupppp_t)(void*, uint64_t, uint64_t, void*, void*, void*, void*);
 typedef int64_t (*iFpupuuui_t)(void*, uint64_t, void*, uint64_t, uint64_t, uint64_t, int64_t);
-typedef int64_t (*iFpupLpLi_t)(void*, uint64_t, void*, uintptr_t, void*, uintptr_t, int64_t);
+typedef int64_t (*iFpupupui_t)(void*, uint64_t, void*, uint64_t, void*, uint64_t, int64_t);
 typedef int64_t (*iFpuppppp_t)(void*, uint64_t, void*, void*, void*, void*, void*);
 typedef int64_t (*iFpLipipi_t)(void*, uintptr_t, int64_t, void*, int64_t, void*, int64_t);
 typedef int64_t (*iFppiiiip_t)(void*, void*, int64_t, int64_t, int64_t, int64_t, void*);
@@ -1241,6 +1291,7 @@ typedef uint64_t (*uFuippppp_t)(uint64_t, int64_t, void*, void*, void*, void*, v
 typedef uint64_t (*uFppiuppp_t)(void*, void*, int64_t, uint64_t, void*, void*, void*);
 typedef void* (*pFEpLiiii_t)(x64emu_t*, void*, uintptr_t, int64_t, int64_t, int64_t, int64_t);
 typedef void* (*pFEpLiiiI_t)(x64emu_t*, void*, uintptr_t, int64_t, int64_t, int64_t, int64_t);
+typedef void* (*pFEpLiiil_t)(x64emu_t*, void*, uintptr_t, int64_t, int64_t, int64_t, intptr_t);
 typedef void* (*pFEppppip_t)(x64emu_t*, void*, void*, void*, void*, int64_t, void*);
 typedef void* (*pFEpppppi_t)(x64emu_t*, void*, void*, void*, void*, void*, int64_t);
 typedef void* (*pFifffppp_t)(int64_t, float, float, float, void*, void*, void*);
@@ -1259,13 +1310,10 @@ typedef void* (*pFppppuuu_t)(void*, void*, void*, void*, uint64_t, uint64_t, uin
 typedef void* (*pFpppppuu_t)(void*, void*, void*, void*, void*, uint64_t, uint64_t);
 typedef void* (*pFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFiiiiuuip_t)(int64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t, int64_t, void*);
-typedef void (*vFiupuiuup_t)(int64_t, uint64_t, void*, uint64_t, int64_t, uint64_t, uint64_t, void*);
-typedef void (*vFiupuuuup_t)(int64_t, uint64_t, void*, uint64_t, uint64_t, uint64_t, uint64_t, void*);
 typedef void (*vFilipufip_t)(int64_t, intptr_t, int64_t, void*, uint64_t, float, int64_t, void*);
 typedef void (*vFuiiiiiii_t)(uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuiiiiill_t)(uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, intptr_t, intptr_t);
 typedef void (*vFuiiiiuup_t)(uint64_t, int64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t, void*);
-typedef void (*vFuiiipiup_t)(uint64_t, int64_t, int64_t, int64_t, void*, int64_t, uint64_t, void*);
 typedef void (*vFuiuiiiii_t)(uint64_t, int64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuiuiiiip_t)(uint64_t, int64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, void*);
 typedef void (*vFuiulplpp_t)(uint64_t, int64_t, uint64_t, intptr_t, void*, intptr_t, void*, void*);
@@ -1297,11 +1345,9 @@ typedef int64_t (*iFEpuuLppp_t)(x64emu_t*, void*, uint64_t, uint64_t, uintptr_t,
 typedef int64_t (*iFEppppipp_t)(x64emu_t*, void*, void*, void*, void*, int64_t, void*, void*);
 typedef int64_t (*iFiiiiiiip_t)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, void*);
 typedef int64_t (*iFiiupiupi_t)(int64_t, int64_t, uint64_t, void*, int64_t, uint64_t, void*, int64_t);
-typedef int64_t (*iFuiifpppp_t)(uint64_t, int64_t, int64_t, float, void*, void*, void*, void*);
 typedef int64_t (*iFuipuuluf_t)(uint64_t, int64_t, void*, uint64_t, uint64_t, intptr_t, uint64_t, float);
+typedef int64_t (*iFuuuuuuuu_t)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
 typedef int64_t (*iFullfpppp_t)(uint64_t, intptr_t, intptr_t, float, void*, void*, void*, void*);
-typedef int64_t (*iFLLLLLLLL_t)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
-typedef int64_t (*iFpiiiiipi_t)(void*, int64_t, int64_t, int64_t, int64_t, int64_t, void*, int64_t);
 typedef int64_t (*iFpWCuWCuu_t)(void*, uint16_t, uint8_t, uint64_t, uint16_t, uint8_t, uint64_t, uint64_t);
 typedef int64_t (*iFpWWipppp_t)(void*, uint16_t, uint16_t, int64_t, void*, void*, void*, void*);
 typedef int64_t (*iFpuippLpp_t)(void*, uint64_t, int64_t, void*, void*, uintptr_t, void*, void*);
@@ -1340,14 +1386,12 @@ typedef void (*vFuiiiillli_t)(uint64_t, int64_t, int64_t, int64_t, int64_t, intp
 typedef void (*vFuiiilliip_t)(uint64_t, int64_t, int64_t, int64_t, intptr_t, intptr_t, int64_t, int64_t, void*);
 typedef void (*vFuiiillilp_t)(uint64_t, int64_t, int64_t, int64_t, intptr_t, intptr_t, int64_t, intptr_t, void*);
 typedef void (*vFuiuiiiiip_t)(uint64_t, int64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, void*);
-typedef void (*vFuiupuffup_t)(uint64_t, int64_t, uint64_t, void*, uint64_t, float, float, uint64_t, void*);
 typedef void (*vFuuiiiiiii_t)(uint64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuuiuiiiii_t)(uint64_t, uint64_t, int64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuuiuiiiip_t)(uint64_t, uint64_t, int64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, void*);
 typedef void (*vFuuiuiiuup_t)(uint64_t, uint64_t, int64_t, uint64_t, int64_t, int64_t, uint64_t, uint64_t, void*);
 typedef void (*vFuuuiiiiip_t)(uint64_t, uint64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t, void*);
 typedef void (*vFuuuuuuuuu_t)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
-typedef void (*vFuupiuiuuf_t)(uint64_t, uint64_t, void*, int64_t, uint64_t, int64_t, uint64_t, uint64_t, float);
 typedef void (*vFuffffffff_t)(uint64_t, float, float, float, float, float, float, float, float);
 typedef void (*vFffuuuufff_t)(float, float, uint64_t, uint64_t, uint64_t, uint64_t, float, float, float);
 typedef void (*vFddddddddd_t)(double, double, double, double, double, double, double, double, double);
@@ -1368,7 +1412,7 @@ typedef int64_t (*iFipiipippi_t)(int64_t, void*, int64_t, int64_t, void*, int64_
 typedef int64_t (*iFuilpluluf_t)(uint64_t, int64_t, intptr_t, void*, intptr_t, uint64_t, intptr_t, uint64_t, float);
 typedef int64_t (*iFdddpppppp_t)(double, double, double, void*, void*, void*, void*, void*, void*);
 typedef int64_t (*iFpipLpiiip_t)(void*, int64_t, void*, uintptr_t, void*, int64_t, int64_t, int64_t, void*);
-typedef int64_t (*iFpLLLLLLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+typedef int64_t (*iFpuuuuuuuu_t)(void*, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
 typedef int64_t (*iFppiiiiiii_t)(void*, void*, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef int64_t (*iFppiuiippL_t)(void*, void*, int64_t, uint64_t, int64_t, int64_t, void*, void*, uintptr_t);
 typedef int64_t (*iFpppiiipip_t)(void*, void*, void*, int64_t, int64_t, int64_t, void*, int64_t, void*);
@@ -1401,7 +1445,6 @@ typedef void (*vFuuiuiiiiip_t)(uint64_t, uint64_t, int64_t, uint64_t, int64_t, i
 typedef void (*vFuuiuiiiuup_t)(uint64_t, uint64_t, int64_t, uint64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t, void*);
 typedef void (*vFuuuuuuuiii_t)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, int64_t, int64_t, int64_t);
 typedef void (*vFuuuuuuuuuu_t)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
-typedef void (*vFuupiiupuuf_t)(uint64_t, uint64_t, void*, int64_t, int64_t, uint64_t, void*, uint64_t, uint64_t, float);
 typedef void (*vFuffiiffiip_t)(uint64_t, float, float, int64_t, int64_t, float, float, int64_t, int64_t, void*);
 typedef void (*vFuddiiddiip_t)(uint64_t, double, double, int64_t, int64_t, double, double, int64_t, int64_t, void*);
 typedef void (*vFffffffffff_t)(float, float, float, float, float, float, float, float, float, float);
@@ -1490,8 +1533,6 @@ typedef void* (*pFipppppppppppppppppppppp_t)(int64_t, void*, void*, void*, void*
 
 #if defined(HAVE_LD80BITS)
 typedef long double (*DFD_t)(long double);
-typedef long double (*DFDD_t)(long double, long double);
-typedef long double (*DFDp_t)(long double, void*);
 #endif
 
 #if !defined(HAVE_LD80BITS)
@@ -1519,7 +1560,6 @@ void vFU(x64emu_t *emu, uintptr_t fcn) { vFU_t fn = (vFU_t)fcn; fn((uint64_t)R_R
 void vFf(x64emu_t *emu, uintptr_t fcn) { vFf_t fn = (vFf_t)fcn; fn(emu->xmm[0].f[0]); }
 void vFd(x64emu_t *emu, uintptr_t fcn) { vFd_t fn = (vFd_t)fcn; fn(emu->xmm[0].d[0]); }
 void vFl(x64emu_t *emu, uintptr_t fcn) { vFl_t fn = (vFl_t)fcn; fn((intptr_t)R_RDI); }
-void vFL(x64emu_t *emu, uintptr_t fcn) { vFL_t fn = (vFL_t)fcn; fn((uintptr_t)R_RDI); }
 void vFp(x64emu_t *emu, uintptr_t fcn) { vFp_t fn = (vFp_t)fcn; fn((void*)R_RDI); }
 void vFS(x64emu_t *emu, uintptr_t fcn) { vFS_t fn = (vFS_t)fcn; fn(io_convert((void*)R_RDI)); }
 void cFv(x64emu_t *emu, uintptr_t fcn) { cFv_t fn = (cFv_t)fcn; R_RAX=fn(); }
@@ -1528,17 +1568,22 @@ void cFu(x64emu_t *emu, uintptr_t fcn) { cFu_t fn = (cFu_t)fcn; R_RAX=fn((uint64
 void cFf(x64emu_t *emu, uintptr_t fcn) { cFf_t fn = (cFf_t)fcn; R_RAX=fn(emu->xmm[0].f[0]); }
 void cFp(x64emu_t *emu, uintptr_t fcn) { cFp_t fn = (cFp_t)fcn; R_RAX=fn((void*)R_RDI); }
 void wFp(x64emu_t *emu, uintptr_t fcn) { wFp_t fn = (wFp_t)fcn; R_RAX=fn((void*)R_RDI); }
+void iFE(x64emu_t *emu, uintptr_t fcn) { iFE_t fn = (iFE_t)fcn; R_RAX=(int64_t)fn(emu); }
 void iFv(x64emu_t *emu, uintptr_t fcn) { iFv_t fn = (iFv_t)fcn; R_RAX=(int64_t)fn(); }
 void iFw(x64emu_t *emu, uintptr_t fcn) { iFw_t fn = (iFw_t)fcn; R_RAX=(int64_t)fn((int16_t)R_RDI); }
 void iFi(x64emu_t *emu, uintptr_t fcn) { iFi_t fn = (iFi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI); }
+void iFI(x64emu_t *emu, uintptr_t fcn) { iFI_t fn = (iFI_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI); }
 void iFu(x64emu_t *emu, uintptr_t fcn) { iFu_t fn = (iFu_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI); }
 void iFU(x64emu_t *emu, uintptr_t fcn) { iFU_t fn = (iFU_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI); }
 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 iFD(x64emu_t *emu, uintptr_t fcn) { iFD_t fn = (iFD_t)fcn; R_RAX=(int64_t)fn(LD2localLD((void*)(R_RSP + 8))); }
+void iFl(x64emu_t *emu, uintptr_t fcn) { iFl_t fn = (iFl_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI); }
 void iFL(x64emu_t *emu, uintptr_t fcn) { iFL_t fn = (iFL_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI); }
 void iFp(x64emu_t *emu, uintptr_t fcn) { iFp_t fn = (iFp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI); }
 void iFO(x64emu_t *emu, uintptr_t fcn) { iFO_t fn = (iFO_t)fcn; R_RAX=(int64_t)fn(of_convert((int32_t)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 IFI(x64emu_t *emu, uintptr_t fcn) { IFI_t fn = (IFI_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI); }
 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); }
@@ -1549,9 +1594,9 @@ 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=(uint64_t)fn(); }
 void uFi(x64emu_t *emu, uintptr_t fcn) { uFi_t fn = (uFi_t)fcn; R_RAX=(uint64_t)fn((int64_t)R_RDI); }
 void uFu(x64emu_t *emu, uintptr_t fcn) { uFu_t fn = (uFu_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI); }
-void uFU(x64emu_t *emu, uintptr_t fcn) { uFU_t fn = (uFU_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI); }
 void uFd(x64emu_t *emu, uintptr_t fcn) { uFd_t fn = (uFd_t)fcn; R_RAX=(uint64_t)fn(emu->xmm[0].d[0]); }
 void uFl(x64emu_t *emu, uintptr_t fcn) { uFl_t fn = (uFl_t)fcn; R_RAX=(uint64_t)fn((intptr_t)R_RDI); }
+void uFL(x64emu_t *emu, uintptr_t fcn) { uFL_t fn = (uFL_t)fcn; R_RAX=(uint64_t)fn((uintptr_t)R_RDI); }
 void uFp(x64emu_t *emu, uintptr_t fcn) { uFp_t fn = (uFp_t)fcn; R_RAX=(uint64_t)fn((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((uint64_t)R_RDI); }
@@ -1570,7 +1615,6 @@ void lFv(x64emu_t *emu, uintptr_t fcn) { lFv_t fn = (lFv_t)fcn; R_RAX=(intptr_t)
 void lFi(x64emu_t *emu, uintptr_t fcn) { lFi_t fn = (lFi_t)fcn; R_RAX=(intptr_t)fn((int64_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 LFE(x64emu_t *emu, uintptr_t fcn) { LFE_t fn = (LFE_t)fcn; R_RAX=(uintptr_t)fn(emu); }
 void LFv(x64emu_t *emu, uintptr_t fcn) { LFv_t fn = (LFv_t)fcn; R_RAX=(uintptr_t)fn(); }
 void LFL(x64emu_t *emu, uintptr_t fcn) { LFL_t fn = (LFL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI); }
 void LFp(x64emu_t *emu, uintptr_t fcn) { LFp_t fn = (LFp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI); }
@@ -1609,6 +1653,7 @@ void vFff(x64emu_t *emu, uintptr_t fcn) { vFff_t fn = (vFff_t)fcn; fn(emu->xmm[0
 void vFfp(x64emu_t *emu, uintptr_t fcn) { vFfp_t fn = (vFfp_t)fcn; fn(emu->xmm[0].f[0], (void*)R_RDI); }
 void vFdd(x64emu_t *emu, uintptr_t fcn) { vFdd_t fn = (vFdd_t)fcn; fn(emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void vFlp(x64emu_t *emu, uintptr_t fcn) { vFlp_t fn = (vFlp_t)fcn; fn((intptr_t)R_RDI, (void*)R_RSI); }
+void vFLL(x64emu_t *emu, uintptr_t fcn) { vFLL_t fn = (vFLL_t)fcn; fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void vFLp(x64emu_t *emu, uintptr_t fcn) { vFLp_t fn = (vFLp_t)fcn; fn((uintptr_t)R_RDI, (void*)R_RSI); }
 void vFpi(x64emu_t *emu, uintptr_t fcn) { vFpi_t fn = (vFpi_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI); }
 void vFpu(x64emu_t *emu, uintptr_t fcn) { vFpu_t fn = (vFpu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI); }
@@ -1623,23 +1668,23 @@ void cFpp(x64emu_t *emu, uintptr_t fcn) { cFpp_t fn = (cFpp_t)fcn; R_RAX=fn((voi
 void iFEp(x64emu_t *emu, uintptr_t fcn) { iFEp_t fn = (iFEp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI); }
 void iFwp(x64emu_t *emu, uintptr_t fcn) { iFwp_t fn = (iFwp_t)fcn; R_RAX=(int64_t)fn((int16_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 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 iFiu(x64emu_t *emu, uintptr_t fcn) { iFiu_t fn = (iFiu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI); }
-void iFiU(x64emu_t *emu, uintptr_t fcn) { iFiU_t fn = (iFiU_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI); }
 void iFil(x64emu_t *emu, uintptr_t fcn) { iFil_t fn = (iFil_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (intptr_t)R_RSI); }
+void iFiL(x64emu_t *emu, uintptr_t fcn) { iFiL_t fn = (iFiL_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uintptr_t)R_RSI); }
 void iFip(x64emu_t *emu, uintptr_t fcn) { iFip_t fn = (iFip_t)fcn; R_RAX=(int64_t)fn((int64_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 iFui(x64emu_t *emu, uintptr_t fcn) { iFui_t fn = (iFui_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI); }
 void iFuu(x64emu_t *emu, uintptr_t fcn) { iFuu_t fn = (iFuu_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
+void iFuL(x64emu_t *emu, uintptr_t fcn) { iFuL_t fn = (iFuL_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uintptr_t)R_RSI); }
 void iFup(x64emu_t *emu, uintptr_t fcn) { iFup_t fn = (iFup_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI); }
-void iFli(x64emu_t *emu, uintptr_t fcn) { iFli_t fn = (iFli_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI, (int64_t)R_RSI); }
-void iFLi(x64emu_t *emu, uintptr_t fcn) { iFLi_t fn = (iFLi_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (int64_t)R_RSI); }
+void iFlp(x64emu_t *emu, uintptr_t fcn) { iFlp_t fn = (iFlp_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI, (void*)R_RSI); }
 void iFLL(x64emu_t *emu, uintptr_t fcn) { iFLL_t fn = (iFLL_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void iFLp(x64emu_t *emu, uintptr_t fcn) { iFLp_t fn = (iFLp_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
 void iFpw(x64emu_t *emu, uintptr_t fcn) { iFpw_t fn = (iFpw_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int16_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, (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, (int64_t)R_RSI); }
 void iFpC(x64emu_t *emu, uintptr_t fcn) { iFpC_t fn = (iFpC_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint8_t)R_RSI); }
+void iFpW(x64emu_t *emu, uintptr_t fcn) { iFpW_t fn = (iFpW_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint16_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, (uint64_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, (uint64_t)R_RSI); }
 void iFpf(x64emu_t *emu, uintptr_t fcn) { iFpf_t fn = (iFpf_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, emu->xmm[0].f[0]); }
@@ -1658,7 +1703,9 @@ void CFpi(x64emu_t *emu, uintptr_t fcn) { CFpi_t fn = (CFpi_t)fcn; R_RAX=(unsign
 void CFpu(x64emu_t *emu, uintptr_t fcn) { CFpu_t fn = (CFpu_t)fcn; R_RAX=(unsigned char)fn((void*)R_RDI, (uint64_t)R_RSI); }
 void CFpp(x64emu_t *emu, uintptr_t fcn) { CFpp_t fn = (CFpp_t)fcn; R_RAX=(unsigned char)fn((void*)R_RDI, (void*)R_RSI); }
 void uFEp(x64emu_t *emu, uintptr_t fcn) { uFEp_t fn = (uFEp_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI); }
+void uFii(x64emu_t *emu, uintptr_t fcn) { uFii_t fn = (uFii_t)fcn; R_RAX=(uint64_t)fn((int64_t)R_RDI, (int64_t)R_RSI); }
 void uFiu(x64emu_t *emu, uintptr_t fcn) { uFiu_t fn = (uFiu_t)fcn; R_RAX=(uint64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI); }
+void uFip(x64emu_t *emu, uintptr_t fcn) { uFip_t fn = (uFip_t)fcn; R_RAX=(uint64_t)fn((int64_t)R_RDI, (void*)R_RSI); }
 void uFui(x64emu_t *emu, uintptr_t fcn) { uFui_t fn = (uFui_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI); }
 void uFuu(x64emu_t *emu, uintptr_t fcn) { uFuu_t fn = (uFuu_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
 void uFup(x64emu_t *emu, uintptr_t fcn) { uFup_t fn = (uFup_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (void*)R_RSI); }
@@ -1669,7 +1716,6 @@ void uFpU(x64emu_t *emu, uintptr_t fcn) { uFpU_t fn = (uFpU_t)fcn; R_RAX=(uint64
 void uFpL(x64emu_t *emu, uintptr_t fcn) { uFpL_t fn = (uFpL_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (uintptr_t)R_RSI); }
 void uFpp(x64emu_t *emu, uintptr_t fcn) { uFpp_t fn = (uFpp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI); }
 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((int64_t)R_RDI, (int64_t)R_RSI); }
 void UFuu(x64emu_t *emu, uintptr_t fcn) { UFuu_t fn = (UFuu_t)fcn; R_RAX=fn((uint64_t)R_RDI, (uint64_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 UFpp(x64emu_t *emu, uintptr_t fcn) { UFpp_t fn = (UFpp_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI); }
@@ -1684,24 +1730,27 @@ void dFdi(x64emu_t *emu, uintptr_t fcn) { dFdi_t fn = (dFdi_t)fcn; emu->xmm[0].d
 void dFdd(x64emu_t *emu, uintptr_t fcn) { dFdd_t fn = (dFdd_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void dFdD(x64emu_t *emu, uintptr_t fcn) { dFdD_t fn = (dFdD_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], LD2localLD((void*)(R_RSP + 8))); }
 void dFdp(x64emu_t *emu, uintptr_t fcn) { dFdp_t fn = (dFdp_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], (void*)R_RDI); }
-void dFLL(x64emu_t *emu, uintptr_t fcn) { dFLL_t fn = (dFLL_t)fcn; emu->xmm[0].d[0]=fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
+void dFll(x64emu_t *emu, uintptr_t fcn) { dFll_t fn = (dFll_t)fcn; emu->xmm[0].d[0]=fn((intptr_t)R_RDI, (intptr_t)R_RSI); }
 void dFpi(x64emu_t *emu, uintptr_t fcn) { dFpi_t fn = (dFpi_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (int64_t)R_RSI); }
 void dFpp(x64emu_t *emu, uintptr_t fcn) { dFpp_t fn = (dFpp_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI); }
+void DFDi(x64emu_t *emu, uintptr_t fcn) { DFDi_t fn = (DFDi_t)fcn; long double ld=fn(LD2localLD((void*)(R_RSP + 8)), (int64_t)R_RDI); fpu_do_push(emu); ST0val = ld; }
+void DFDD(x64emu_t *emu, uintptr_t fcn) { DFDD_t fn = (DFDD_t)fcn; long double ld=fn(LD2localLD((void*)(R_RSP + 8)), LD2localLD((void*)(R_RSP + 24))); fpu_do_push(emu); ST0val = ld; }
+void DFDp(x64emu_t *emu, uintptr_t fcn) { DFDp_t fn = (DFDp_t)fcn; long double ld=fn(LD2localLD((void*)(R_RSP + 8)), (void*)R_RDI); fpu_do_push(emu); ST0val = ld; }
 void DFpp(x64emu_t *emu, uintptr_t fcn) { DFpp_t fn = (DFpp_t)fcn; long double ld=fn((void*)R_RDI, (void*)R_RSI); fpu_do_push(emu); ST0val = ld; }
+void lFii(x64emu_t *emu, uintptr_t fcn) { lFii_t fn = (lFii_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI); }
 void lFll(x64emu_t *emu, uintptr_t fcn) { lFll_t fn = (lFll_t)fcn; R_RAX=(intptr_t)fn((intptr_t)R_RDI, (intptr_t)R_RSI); }
 void lFpi(x64emu_t *emu, uintptr_t fcn) { lFpi_t fn = (lFpi_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int64_t)R_RSI); }
 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 LFii(x64emu_t *emu, uintptr_t fcn) { LFii_t fn = (LFii_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI); }
+void LFuu(x64emu_t *emu, uintptr_t fcn) { LFuu_t fn = (LFuu_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint64_t)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, (int64_t)R_RSI); }
-void LFLp(x64emu_t *emu, uintptr_t fcn) { LFLp_t fn = (LFLp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
 void LFpi(x64emu_t *emu, uintptr_t fcn) { LFpi_t fn = (LFpi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI); }
 void LFpL(x64emu_t *emu, uintptr_t fcn) { LFpL_t fn = (LFpL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI); }
 void LFpp(x64emu_t *emu, uintptr_t fcn) { LFpp_t fn = (LFpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI); }
 void pFEp(x64emu_t *emu, uintptr_t fcn) { pFEp_t fn = (pFEp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI); }
 void pFii(x64emu_t *emu, uintptr_t fcn) { pFii_t fn = (pFii_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI); }
 void pFiu(x64emu_t *emu, uintptr_t fcn) { pFiu_t fn = (pFiu_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (uint64_t)R_RSI); }
-void pFiL(x64emu_t *emu, uintptr_t fcn) { pFiL_t fn = (pFiL_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (uintptr_t)R_RSI); }
 void pFip(x64emu_t *emu, uintptr_t fcn) { pFip_t fn = (pFip_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI); }
 void pFui(x64emu_t *emu, uintptr_t fcn) { pFui_t fn = (pFui_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (int64_t)R_RSI); }
 void pFuu(x64emu_t *emu, uintptr_t fcn) { pFuu_t fn = (pFuu_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
@@ -1772,9 +1821,11 @@ void vFpdd(x64emu_t *emu, uintptr_t fcn) { vFpdd_t fn = (vFpdd_t)fcn; fn((void*)
 void vFpll(x64emu_t *emu, uintptr_t fcn) { vFpll_t fn = (vFpll_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void vFpLi(x64emu_t *emu, uintptr_t fcn) { vFpLi_t fn = (vFpLi_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX); }
 void vFpLL(x64emu_t *emu, uintptr_t fcn) { vFpLL_t fn = (vFpLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
+void vFpLp(x64emu_t *emu, uintptr_t fcn) { vFpLp_t fn = (vFpLp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void vFppi(x64emu_t *emu, uintptr_t fcn) { vFppi_t fn = (vFppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
 void vFppu(x64emu_t *emu, uintptr_t fcn) { vFppu_t fn = (vFppu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
 void vFppd(x64emu_t *emu, uintptr_t fcn) { vFppd_t fn = (vFppd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0]); }
+void vFppl(x64emu_t *emu, uintptr_t fcn) { vFppl_t fn = (vFppl_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX); }
 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 iFEiw(x64emu_t *emu, uintptr_t fcn) { iFEiw_t fn = (iFEiw_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (int16_t)R_RSI); }
@@ -1786,40 +1837,44 @@ void iFEpi(x64emu_t *emu, uintptr_t fcn) { iFEpi_t fn = (iFEpi_t)fcn; R_RAX=(int
 void iFEpL(x64emu_t *emu, uintptr_t fcn) { iFEpL_t fn = (iFEpL_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI); }
 void iFEpp(x64emu_t *emu, uintptr_t fcn) { iFEpp_t fn = (iFEpp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
 void iFEpV(x64emu_t *emu, uintptr_t fcn) { iFEpV_t fn = (iFEpV_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)(R_RSP + 8)); }
+void iFEpA(x64emu_t *emu, uintptr_t fcn) { iFEpA_t fn = (iFEpA_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
 void iFESp(x64emu_t *emu, uintptr_t fcn) { iFESp_t fn = (iFESp_t)fcn; R_RAX=(int64_t)fn(emu, io_convert((void*)R_RDI), (void*)R_RSI); }
 void iFwww(x64emu_t *emu, uintptr_t fcn) { iFwww_t fn = (iFwww_t)fcn; R_RAX=(int64_t)fn((int16_t)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX); }
 void iFwpp(x64emu_t *emu, uintptr_t fcn) { iFwpp_t fn = (iFwpp_t)fcn; R_RAX=(int64_t)fn((int16_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFiwC(x64emu_t *emu, uintptr_t fcn) { iFiwC_t fn = (iFiwC_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int16_t)R_RSI, (uint8_t)R_RDX); }
 void iFiii(x64emu_t *emu, uintptr_t fcn) { iFiii_t fn = (iFiii_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void iFiiu(x64emu_t *emu, uintptr_t fcn) { iFiiu_t fn = (iFiiu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX); }
-void iFiiL(x64emu_t *emu, uintptr_t fcn) { iFiiL_t fn = (iFiiL_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uintptr_t)R_RDX); }
+void iFiil(x64emu_t *emu, uintptr_t fcn) { iFiil_t fn = (iFiil_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (intptr_t)R_RDX); }
 void iFiip(x64emu_t *emu, uintptr_t fcn) { iFiip_t fn = (iFiip_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
 void iFiiO(x64emu_t *emu, uintptr_t fcn) { iFiiO_t fn = (iFiiO_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, of_convert((int32_t)R_RDX)); }
 void iFiuu(x64emu_t *emu, uintptr_t fcn) { iFiuu_t fn = (iFiuu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); }
+void iFill(x64emu_t *emu, uintptr_t fcn) { iFill_t fn = (iFill_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void iFiLi(x64emu_t *emu, uintptr_t fcn) { iFiLi_t fn = (iFiLi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX); }
+void iFiLp(x64emu_t *emu, uintptr_t fcn) { iFiLp_t fn = (iFiLp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void iFiLN(x64emu_t *emu, uintptr_t fcn) { iFiLN_t fn = (iFiLN_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void iFipi(x64emu_t *emu, uintptr_t fcn) { iFipi_t fn = (iFipi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
 void iFipu(x64emu_t *emu, uintptr_t fcn) { iFipu_t fn = (iFipu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
 void iFipL(x64emu_t *emu, uintptr_t fcn) { iFipL_t fn = (iFipL_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void iFipp(x64emu_t *emu, uintptr_t fcn) { iFipp_t fn = (iFipp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFipO(x64emu_t *emu, uintptr_t fcn) { iFipO_t fn = (iFipO_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, of_convert((int32_t)R_RDX)); }
+void iFuwp(x64emu_t *emu, uintptr_t fcn) { iFuwp_t fn = (iFuwp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (int16_t)R_RSI, (void*)R_RDX); }
+void iFuui(x64emu_t *emu, uintptr_t fcn) { iFuui_t fn = (iFuui_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX); }
 void iFuuu(x64emu_t *emu, uintptr_t fcn) { iFuuu_t fn = (iFuuu_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); }
 void iFuup(x64emu_t *emu, uintptr_t fcn) { iFuup_t fn = (iFuup_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void iFuff(x64emu_t *emu, uintptr_t fcn) { iFuff_t fn = (iFuff_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void iFuLL(x64emu_t *emu, uintptr_t fcn) { iFuLL_t fn = (iFuLL_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
+void iFuLp(x64emu_t *emu, uintptr_t fcn) { iFuLp_t fn = (iFuLp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void iFupL(x64emu_t *emu, uintptr_t fcn) { iFupL_t fn = (iFupL_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
+void iFupp(x64emu_t *emu, uintptr_t fcn) { iFupp_t fn = (iFupp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFfff(x64emu_t *emu, uintptr_t fcn) { iFfff_t fn = (iFfff_t)fcn; R_RAX=(int64_t)fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
-void iFlll(x64emu_t *emu, uintptr_t fcn) { iFlll_t fn = (iFlll_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
-void iFLwp(x64emu_t *emu, uintptr_t fcn) { iFLwp_t fn = (iFLwp_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (int16_t)R_RSI, (void*)R_RDX); }
 void iFLip(x64emu_t *emu, uintptr_t fcn) { iFLip_t fn = (iFLip_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
-void iFLLp(x64emu_t *emu, uintptr_t fcn) { iFLLp_t fn = (iFLLp_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
+void iFLLi(x64emu_t *emu, uintptr_t fcn) { iFLLi_t fn = (iFLLi_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX); }
 void iFLpp(x64emu_t *emu, uintptr_t fcn) { iFLpp_t fn = (iFLpp_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFpwp(x64emu_t *emu, uintptr_t fcn) { iFpwp_t fn = (iFpwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int16_t)R_RSI, (void*)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, (int64_t)R_RDX); }
 void iFpiu(x64emu_t *emu, uintptr_t fcn) { iFpiu_t fn = (iFpiu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX); }
 void iFpiL(x64emu_t *emu, uintptr_t fcn) { iFpiL_t fn = (iFpiL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (uintptr_t)R_RDX); }
 void iFpip(x64emu_t *emu, uintptr_t fcn) { iFpip_t fn = (iFpip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)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, (int64_t)R_RDX); }
 void iFpui(x64emu_t *emu, uintptr_t fcn) { iFpui_t fn = (iFpui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX); }
 void iFpuu(x64emu_t *emu, uintptr_t fcn) { iFpuu_t fn = (iFpuu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); }
 void iFpuU(x64emu_t *emu, uintptr_t fcn) { iFpuU_t fn = (iFpuU_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); }
@@ -1834,6 +1889,7 @@ void iFpli(x64emu_t *emu, uintptr_t fcn) { iFpli_t fn = (iFpli_t)fcn; R_RAX=(int
 void iFpll(x64emu_t *emu, uintptr_t fcn) { iFpll_t fn = (iFpll_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void iFplp(x64emu_t *emu, uintptr_t fcn) { iFplp_t fn = (iFplp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX); }
 void iFpLi(x64emu_t *emu, uintptr_t fcn) { iFpLi_t fn = (iFpLi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX); }
+void iFpLu(x64emu_t *emu, uintptr_t fcn) { iFpLu_t fn = (iFpLu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint64_t)R_RDX); }
 void iFpLL(x64emu_t *emu, uintptr_t fcn) { iFpLL_t fn = (iFpLL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 void iFpLp(x64emu_t *emu, uintptr_t fcn) { iFpLp_t fn = (iFpLp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void iFppi(x64emu_t *emu, uintptr_t fcn) { iFppi_t fn = (iFppi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
@@ -1855,45 +1911,49 @@ void uFEpu(x64emu_t *emu, uintptr_t fcn) { uFEpu_t fn = (uFEpu_t)fcn; R_RAX=(uin
 void uFEpU(x64emu_t *emu, uintptr_t fcn) { uFEpU_t fn = (uFEpU_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI); }
 void uFipu(x64emu_t *emu, uintptr_t fcn) { uFipu_t fn = (uFipu_t)fcn; R_RAX=(uint64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
 void uFuip(x64emu_t *emu, uintptr_t fcn) { uFuip_t fn = (uFuip_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
-void uFuui(x64emu_t *emu, uintptr_t fcn) { uFuui_t fn = (uFuui_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX); }
 void uFuuu(x64emu_t *emu, uintptr_t fcn) { uFuuu_t fn = (uFuuu_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); }
 void uFuup(x64emu_t *emu, uintptr_t fcn) { uFuup_t fn = (uFuup_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void uFupu(x64emu_t *emu, uintptr_t fcn) { uFupu_t fn = (uFupu_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
 void uFupp(x64emu_t *emu, uintptr_t fcn) { uFupp_t fn = (uFupp_t)fcn; R_RAX=(uint64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void uFpii(x64emu_t *emu, uintptr_t fcn) { uFpii_t fn = (uFpii_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void uFpip(x64emu_t *emu, uintptr_t fcn) { uFpip_t fn = (uFpip_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
 void uFpCi(x64emu_t *emu, uintptr_t fcn) { uFpCi_t fn = (uFpCi_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (uint8_t)R_RSI, (int64_t)R_RDX); }
 void uFpui(x64emu_t *emu, uintptr_t fcn) { uFpui_t fn = (uFpui_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX); }
 void uFpuu(x64emu_t *emu, uintptr_t fcn) { uFpuu_t fn = (uFpuu_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); }
+void uFpup(x64emu_t *emu, uintptr_t fcn) { uFpup_t fn = (uFpup_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void uFpLp(x64emu_t *emu, uintptr_t fcn) { uFpLp_t fn = (uFpLp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void uFppi(x64emu_t *emu, uintptr_t fcn) { uFppi_t fn = (uFppi_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
 void uFppu(x64emu_t *emu, uintptr_t fcn) { uFppu_t fn = (uFppu_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
 void uFppp(x64emu_t *emu, uintptr_t fcn) { uFppp_t fn = (uFppp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void UFppi(x64emu_t *emu, uintptr_t fcn) { UFppi_t fn = (UFppi_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
-void fFuii(x64emu_t *emu, uintptr_t fcn) { fFuii_t fn = (fFuii_t)fcn; emu->xmm[0].f[0]=fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void fFull(x64emu_t *emu, uintptr_t fcn) { fFull_t fn = (fFull_t)fcn; emu->xmm[0].f[0]=fn((uint64_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void fFfff(x64emu_t *emu, uintptr_t fcn) { fFfff_t fn = (fFfff_t)fcn; emu->xmm[0].f[0]=fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void fFffp(x64emu_t *emu, uintptr_t fcn) { fFffp_t fn = (fFffp_t)fcn; emu->xmm[0].f[0]=fn(emu->xmm[0].f[0], emu->xmm[1].f[0], (void*)R_RDI); }
 void fFppL(x64emu_t *emu, uintptr_t fcn) { fFppL_t fn = (fFppL_t)fcn; emu->xmm[0].f[0]=fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
+void fFppp(x64emu_t *emu, uintptr_t fcn) { fFppp_t fn = (fFppp_t)fcn; emu->xmm[0].f[0]=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void dFddd(x64emu_t *emu, uintptr_t fcn) { dFddd_t fn = (dFddd_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
 void dFddp(x64emu_t *emu, uintptr_t fcn) { dFddp_t fn = (dFddp_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RDI); }
 void dFppi(x64emu_t *emu, uintptr_t fcn) { dFppi_t fn = (dFppi_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
 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 DFppp(x64emu_t *emu, uintptr_t fcn) { DFppp_t fn = (DFppp_t)fcn; long double ld=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); fpu_do_push(emu); ST0val = ld; }
+void lFili(x64emu_t *emu, uintptr_t fcn) { lFili_t fn = (lFili_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (intptr_t)R_RSI, (int64_t)R_RDX); }
+void lFilL(x64emu_t *emu, uintptr_t fcn) { lFilL_t fn = (lFilL_t)fcn; R_RAX=(intptr_t)fn((int64_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((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
 void lFipL(x64emu_t *emu, uintptr_t fcn) { lFipL_t fn = (lFipL_t)fcn; R_RAX=(intptr_t)fn((int64_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); }
 void lFlpi(x64emu_t *emu, uintptr_t fcn) { lFlpi_t fn = (lFlpi_t)fcn; R_RAX=(intptr_t)fn((intptr_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
-void lFpip(x64emu_t *emu, uintptr_t fcn) { lFpip_t fn = (lFpip_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
+void lFpli(x64emu_t *emu, uintptr_t fcn) { lFpli_t fn = (lFpli_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int64_t)R_RDX); }
 void lFpLu(x64emu_t *emu, uintptr_t fcn) { lFpLu_t fn = (lFpLu_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint64_t)R_RDX); }
 void lFppi(x64emu_t *emu, uintptr_t fcn) { lFppi_t fn = (lFppi_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int64_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 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 LFipL(x64emu_t *emu, uintptr_t fcn) { LFipL_t fn = (LFipL_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
-void LFLLi(x64emu_t *emu, uintptr_t fcn) { LFLLi_t fn = (LFLLi_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX); }
-void LFLLI(x64emu_t *emu, uintptr_t fcn) { LFLLI_t fn = (LFLLI_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX); }
+void LFLLl(x64emu_t *emu, uintptr_t fcn) { LFLLl_t fn = (LFLLl_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (intptr_t)R_RDX); }
 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, (uint64_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, (int64_t)R_RSI, (int64_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, (uint64_t)R_RSI, (void*)R_RDX); }
+void LFpip(x64emu_t *emu, uintptr_t fcn) { LFpip_t fn = (LFpip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_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, (int64_t)R_RDX); }
 void LFpLp(x64emu_t *emu, uintptr_t fcn) { LFpLp_t fn = (LFpLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void LFppi(x64emu_t *emu, uintptr_t fcn) { LFppi_t fn = (LFppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
@@ -1913,7 +1973,9 @@ void pFuii(x64emu_t *emu, uintptr_t fcn) { pFuii_t fn = (pFuii_t)fcn; R_RAX=(uin
 void pFupi(x64emu_t *emu, uintptr_t fcn) { pFupi_t fn = (pFupi_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
 void pFupL(x64emu_t *emu, uintptr_t fcn) { pFupL_t fn = (pFupL_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void pFUpi(x64emu_t *emu, uintptr_t fcn) { pFUpi_t fn = (pFUpi_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
+void pFdip(x64emu_t *emu, uintptr_t fcn) { pFdip_t fn = (pFdip_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int64_t)R_RDI, (void*)R_RSI); }
 void pFddd(x64emu_t *emu, uintptr_t fcn) { pFddd_t fn = (pFddd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void pFDip(x64emu_t *emu, uintptr_t fcn) { pFDip_t fn = (pFDip_t)fcn; R_RAX=(uintptr_t)fn(LD2localLD((void*)(R_RSP + 8)), (int64_t)R_RDI, (void*)R_RSI); }
 void pFpii(x64emu_t *emu, uintptr_t fcn) { pFpii_t fn = (pFpii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void pFpiu(x64emu_t *emu, uintptr_t fcn) { pFpiu_t fn = (pFpiu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (uint64_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, (int64_t)R_RSI, (intptr_t)R_RDX); }
@@ -1940,6 +2002,7 @@ void pFpOM(x64emu_t *emu, uintptr_t fcn) { pFpOM_t fn = (pFpOM_t)fcn; R_RAX=(uin
 void pFSpl(x64emu_t *emu, uintptr_t fcn) { pFSpl_t fn = (pFSpl_t)fcn; R_RAX=(uintptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (intptr_t)R_RDX); }
 void vFEipp(x64emu_t *emu, uintptr_t fcn) { vFEipp_t fn = (vFEipp_t)fcn; fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFEipV(x64emu_t *emu, uintptr_t fcn) { vFEipV_t fn = (vFEipV_t)fcn; fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); }
+void vFEipA(x64emu_t *emu, uintptr_t fcn) { vFEipA_t fn = (vFEipA_t)fcn; fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFEpii(x64emu_t *emu, uintptr_t fcn) { vFEpii_t fn = (vFEpii_t)fcn; fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void vFEpip(x64emu_t *emu, uintptr_t fcn) { vFEpip_t fn = (vFEpip_t)fcn; fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
 void vFEpup(x64emu_t *emu, uintptr_t fcn) { vFEpup_t fn = (vFEpup_t)fcn; fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
@@ -2040,6 +2103,7 @@ void iFEppi(x64emu_t *emu, uintptr_t fcn) { iFEppi_t fn = (iFEppi_t)fcn; R_RAX=(
 void iFEppL(x64emu_t *emu, uintptr_t fcn) { iFEppL_t fn = (iFEppL_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void iFEppp(x64emu_t *emu, uintptr_t fcn) { iFEppp_t fn = (iFEppp_t)fcn; R_RAX=(int64_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=(int64_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=(int64_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=(int64_t)fn(emu, (void*)R_RDI, of_convert((int32_t)R_RSI), (uint64_t)R_RDX); }
 void iFwwww(x64emu_t *emu, uintptr_t fcn) { iFwwww_t fn = (iFwwww_t)fcn; R_RAX=(int64_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=(int64_t)fn((int16_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -2047,14 +2111,15 @@ void iFiiii(x64emu_t *emu, uintptr_t fcn) { iFiiii_t fn = (iFiiii_t)fcn; R_RAX=(
 void iFiiiu(x64emu_t *emu, uintptr_t fcn) { iFiiiu_t fn = (iFiiiu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX); }
 void iFiiip(x64emu_t *emu, uintptr_t fcn) { iFiiip_t fn = (iFiiip_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void iFiiiN(x64emu_t *emu, uintptr_t fcn) { iFiiiN_t fn = (iFiiiN_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
+void iFiiui(x64emu_t *emu, uintptr_t fcn) { iFiiui_t fn = (iFiiui_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX); }
 void iFiill(x64emu_t *emu, uintptr_t fcn) { iFiill_t fn = (iFiill_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
-void iFiiLi(x64emu_t *emu, uintptr_t fcn) { iFiiLi_t fn = (iFiiLi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX); }
 void iFiipi(x64emu_t *emu, uintptr_t fcn) { iFiipi_t fn = (iFiipi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
 void iFiipp(x64emu_t *emu, uintptr_t fcn) { iFiipp_t fn = (iFiipp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void iFiuwp(x64emu_t *emu, uintptr_t fcn) { iFiuwp_t fn = (iFiuwp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI, (int16_t)R_RDX, (void*)R_RCX); }
 void iFiuii(x64emu_t *emu, uintptr_t fcn) { iFiuii_t fn = (iFiuii_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
-void iFiupi(x64emu_t *emu, uintptr_t fcn) { iFiupi_t fn = (iFiupi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
+void iFiupp(x64emu_t *emu, uintptr_t fcn) { iFiupp_t fn = (iFiupp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_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=(int64_t)fn((int64_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (int64_t)R_RCX); }
-void iFiLwp(x64emu_t *emu, uintptr_t fcn) { iFiLwp_t fn = (iFiLwp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uintptr_t)R_RSI, (int16_t)R_RDX, (void*)R_RCX); }
+void iFillu(x64emu_t *emu, uintptr_t fcn) { iFillu_t fn = (iFillu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint64_t)R_RCX); }
 void iFipii(x64emu_t *emu, uintptr_t fcn) { iFipii_t fn = (iFipii_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void iFipip(x64emu_t *emu, uintptr_t fcn) { iFipip_t fn = (iFipip_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void iFipui(x64emu_t *emu, uintptr_t fcn) { iFipui_t fn = (iFipui_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX); }
@@ -2062,14 +2127,18 @@ void iFipup(x64emu_t *emu, uintptr_t fcn) { iFipup_t fn = (iFipup_t)fcn; R_RAX=(
 void iFipLi(x64emu_t *emu, uintptr_t fcn) { iFipLi_t fn = (iFipLi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX); }
 void iFipLp(x64emu_t *emu, uintptr_t fcn) { iFipLp_t fn = (iFipLp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void iFippi(x64emu_t *emu, uintptr_t fcn) { iFippi_t fn = (iFippi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
-void iFippu(x64emu_t *emu, uintptr_t fcn) { iFippu_t fn = (iFippu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX); }
 void iFippL(x64emu_t *emu, uintptr_t fcn) { iFippL_t fn = (iFippL_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFippp(x64emu_t *emu, uintptr_t fcn) { iFippp_t fn = (iFippp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFipON(x64emu_t *emu, uintptr_t fcn) { iFipON_t fn = (iFipON_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, of_convert((int32_t)R_RDX), (void*)R_RCX); }
 void iFuipp(x64emu_t *emu, uintptr_t fcn) { iFuipp_t fn = (iFuipp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFuuff(x64emu_t *emu, uintptr_t fcn) { iFuuff_t fn = (iFuuff_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
+void iFuupi(x64emu_t *emu, uintptr_t fcn) { iFuupi_t fn = (iFuupi_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
+void iFupLp(x64emu_t *emu, uintptr_t fcn) { iFupLp_t fn = (iFupLp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void iFuppi(x64emu_t *emu, uintptr_t fcn) { iFuppi_t fn = (iFuppi_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
 void iFuppp(x64emu_t *emu, uintptr_t fcn) { iFuppp_t fn = (iFuppp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void iFLLiW(x64emu_t *emu, uintptr_t fcn) { iFLLiW_t fn = (iFLLiW_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (uint16_t)R_RCX); }
+void iFpwww(x64emu_t *emu, uintptr_t fcn) { iFpwww_t fn = (iFpwww_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX, (int16_t)R_RCX); }
+void iFpwpp(x64emu_t *emu, uintptr_t fcn) { iFpwpp_t fn = (iFpwpp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int16_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpiii(x64emu_t *emu, uintptr_t fcn) { iFpiii_t fn = (iFpiii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void iFpiiu(x64emu_t *emu, uintptr_t fcn) { iFpiiu_t fn = (iFpiiu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX); }
 void iFpiid(x64emu_t *emu, uintptr_t fcn) { iFpiid_t fn = (iFpiid_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, emu->xmm[0].d[0]); }
@@ -2080,10 +2149,12 @@ void iFpiup(x64emu_t *emu, uintptr_t fcn) { iFpiup_t fn = (iFpiup_t)fcn; R_RAX=(
 void iFpild(x64emu_t *emu, uintptr_t fcn) { iFpild_t fn = (iFpild_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (intptr_t)R_RDX, emu->xmm[0].d[0]); }
 void iFpipi(x64emu_t *emu, uintptr_t fcn) { iFpipi_t fn = (iFpipi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
 void iFpipC(x64emu_t *emu, uintptr_t fcn) { iFpipC_t fn = (iFpipC_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (uint8_t)R_RCX); }
+void iFpipu(x64emu_t *emu, uintptr_t fcn) { iFpipu_t fn = (iFpipu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX); }
 void iFpipp(x64emu_t *emu, uintptr_t fcn) { iFpipp_t fn = (iFpipp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpipV(x64emu_t *emu, uintptr_t fcn) { iFpipV_t fn = (iFpipV_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
 void iFpCCC(x64emu_t *emu, uintptr_t fcn) { iFpCCC_t fn = (iFpCCC_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX); }
 void iFpWWu(x64emu_t *emu, uintptr_t fcn) { iFpWWu_t fn = (iFpWWu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint64_t)R_RCX); }
+void iFpuwp(x64emu_t *emu, uintptr_t fcn) { iFpuwp_t fn = (iFpuwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int16_t)R_RDX, (void*)R_RCX); }
 void iFpuiL(x64emu_t *emu, uintptr_t fcn) { iFpuiL_t fn = (iFpuiL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpuip(x64emu_t *emu, uintptr_t fcn) { iFpuip_t fn = (iFpuip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void iFpuui(x64emu_t *emu, uintptr_t fcn) { iFpuui_t fn = (iFpuui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX); }
@@ -2097,8 +2168,12 @@ void iFpupp(x64emu_t *emu, uintptr_t fcn) { iFpupp_t fn = (iFpupp_t)fcn; R_RAX=(
 void iFpupV(x64emu_t *emu, uintptr_t fcn) { iFpupV_t fn = (iFpupV_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
 void iFplii(x64emu_t *emu, uintptr_t fcn) { iFplii_t fn = (iFplii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void iFplip(x64emu_t *emu, uintptr_t fcn) { iFplip_t fn = (iFplip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
-void iFpLwp(x64emu_t *emu, uintptr_t fcn) { iFpLwp_t fn = (iFpLwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int16_t)R_RDX, (void*)R_RCX); }
+void iFpLii(x64emu_t *emu, uintptr_t fcn) { iFpLii_t fn = (iFpLii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
+void iFpLLu(x64emu_t *emu, uintptr_t fcn) { iFpLLu_t fn = (iFpLLu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uint64_t)R_RCX); }
 void iFpLpi(x64emu_t *emu, uintptr_t fcn) { iFpLpi_t fn = (iFpLpi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
+void iFpLpf(x64emu_t *emu, uintptr_t fcn) { iFpLpf_t fn = (iFpLpf_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, emu->xmm[0].f[0]); }
+void iFpLpd(x64emu_t *emu, uintptr_t fcn) { iFpLpd_t fn = (iFpLpd_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, emu->xmm[0].d[0]); }
+void iFpLpD(x64emu_t *emu, uintptr_t fcn) { iFpLpD_t fn = (iFpLpD_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, LD2localLD((void*)(R_RSP + 8))); }
 void iFpLpL(x64emu_t *emu, uintptr_t fcn) { iFpLpL_t fn = (iFpLpL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFpLpp(x64emu_t *emu, uintptr_t fcn) { iFpLpp_t fn = (iFpLpp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)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, (int64_t)R_RDX, (int64_t)R_RCX); }
@@ -2136,21 +2211,24 @@ void uFppiu(x64emu_t *emu, uintptr_t fcn) { uFppiu_t fn = (uFppiu_t)fcn; R_RAX=(
 void uFpppi(x64emu_t *emu, uintptr_t fcn) { uFpppi_t fn = (uFpppi_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
 void uFpppp(x64emu_t *emu, uintptr_t fcn) { uFpppp_t fn = (uFpppp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void UFpipp(x64emu_t *emu, uintptr_t fcn) { UFpipp_t fn = (UFpipp_t)fcn; R_RAX=fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
-void DFppiL(x64emu_t *emu, uintptr_t fcn) { DFppiL_t fn = (DFppiL_t)fcn; long double ld=fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX); fpu_do_push(emu); ST0val = ld; }
+void UFppip(x64emu_t *emu, uintptr_t fcn) { UFppip_t fn = (UFppip_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void lFEpip(x64emu_t *emu, uintptr_t fcn) { lFEpip_t fn = (lFEpip_t)fcn; R_RAX=(intptr_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
 void lFEppL(x64emu_t *emu, uintptr_t fcn) { lFEppL_t fn = (lFEppL_t)fcn; R_RAX=(intptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
+void lFiiLu(x64emu_t *emu, uintptr_t fcn) { lFiiLu_t fn = (lFiiLu_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uintptr_t)R_RDX, (uint64_t)R_RCX); }
 void lFiipL(x64emu_t *emu, uintptr_t fcn) { lFiipL_t fn = (lFiipL_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
-void lFilpp(x64emu_t *emu, uintptr_t fcn) { lFilpp_t fn = (lFilpp_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
-void lFipiI(x64emu_t *emu, uintptr_t fcn) { lFipiI_t fn = (lFipiI_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_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((int64_t)R_RDI, (void*)R_RSI, (int64_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((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX); }
 void lFipLI(x64emu_t *emu, uintptr_t fcn) { lFipLI_t fn = (lFipLI_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX); }
+void lFipLu(x64emu_t *emu, uintptr_t fcn) { lFipLu_t fn = (lFipLu_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint64_t)R_RCX); }
 void lFipLl(x64emu_t *emu, uintptr_t fcn) { lFipLl_t fn = (lFipLl_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX); }
 void lFipLL(x64emu_t *emu, uintptr_t fcn) { lFipLL_t fn = (lFipLL_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
+void lFipLp(x64emu_t *emu, uintptr_t fcn) { lFipLp_t fn = (lFipLp_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void lFippL(x64emu_t *emu, uintptr_t fcn) { lFippL_t fn = (lFippL_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
-void lFlpip(x64emu_t *emu, uintptr_t fcn) { lFlpip_t fn = (lFlpip_t)fcn; R_RAX=(intptr_t)fn((intptr_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
+void lFuipp(x64emu_t *emu, uintptr_t fcn) { lFuipp_t fn = (lFuipp_t)fcn; R_RAX=(intptr_t)fn((uint64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void lFpili(x64emu_t *emu, uintptr_t fcn) { lFpili_t fn = (lFpili_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (intptr_t)R_RDX, (int64_t)R_RCX); }
 void lFpilp(x64emu_t *emu, uintptr_t fcn) { lFpilp_t fn = (lFpilp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (intptr_t)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, (int64_t)R_RDX, (int64_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, (int64_t)R_RDX, (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 LFippL(x64emu_t *emu, uintptr_t fcn) { LFippL_t fn = (LFippL_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void LFpuuu(x64emu_t *emu, uintptr_t fcn) { LFpuuu_t fn = (LFpuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX); }
@@ -2171,11 +2249,13 @@ void pFiiii(x64emu_t *emu, uintptr_t fcn) { pFiiii_t fn = (pFiiii_t)fcn; R_RAX=(
 void pFiiiu(x64emu_t *emu, uintptr_t fcn) { pFiiiu_t fn = (pFiiiu_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX); }
 void pFiiup(x64emu_t *emu, uintptr_t fcn) { pFiiup_t fn = (pFiiup_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX); }
 void pFippi(x64emu_t *emu, uintptr_t fcn) { pFippi_t fn = (pFippi_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
-void pFippL(x64emu_t *emu, uintptr_t fcn) { pFippL_t fn = (pFippL_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
+void pFippu(x64emu_t *emu, uintptr_t fcn) { pFippu_t fn = (pFippu_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX); }
 void pFuiii(x64emu_t *emu, uintptr_t fcn) { pFuiii_t fn = (pFuiii_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void pFulli(x64emu_t *emu, uintptr_t fcn) { pFulli_t fn = (pFulli_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (int64_t)R_RCX); }
 void pFullu(x64emu_t *emu, uintptr_t fcn) { pFullu_t fn = (pFullu_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint64_t)R_RCX); }
+void pFdipp(x64emu_t *emu, uintptr_t fcn) { pFdipp_t fn = (pFdipp_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void pFdddd(x64emu_t *emu, uintptr_t fcn) { pFdddd_t fn = (pFdddd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
+void pFDipp(x64emu_t *emu, uintptr_t fcn) { pFDipp_t fn = (pFDipp_t)fcn; R_RAX=(uintptr_t)fn(LD2localLD((void*)(R_RSP + 8)), (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void pFlfff(x64emu_t *emu, uintptr_t fcn) { pFlfff_t fn = (pFlfff_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void pFpiii(x64emu_t *emu, uintptr_t fcn) { pFpiii_t fn = (pFpiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void pFpiip(x64emu_t *emu, uintptr_t fcn) { pFpiip_t fn = (pFpiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
@@ -2234,7 +2314,6 @@ void vFiplll(x64emu_t *emu, uintptr_t fcn) { vFiplll_t fn = (vFiplll_t)fcn; fn((
 void vFuiiii(x64emu_t *emu, uintptr_t fcn) { vFuiiii_t fn = (vFuiiii_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void vFuiiiu(x64emu_t *emu, uintptr_t fcn) { vFuiiiu_t fn = (vFuiiiu_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8); }
 void vFuiiip(x64emu_t *emu, uintptr_t fcn) { vFuiiip_t fn = (vFuiiip_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
-void vFuiiup(x64emu_t *emu, uintptr_t fcn) { vFuiiup_t fn = (vFuiiup_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
 void vFuiifi(x64emu_t *emu, uintptr_t fcn) { vFuiifi_t fn = (vFuiifi_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, emu->xmm[0].f[0], (int64_t)R_RCX); }
 void vFuiIII(x64emu_t *emu, uintptr_t fcn) { vFuiIII_t fn = (vFuiIII_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void vFuiuii(x64emu_t *emu, uintptr_t fcn) { vFuiuii_t fn = (vFuiuii_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
@@ -2306,6 +2385,7 @@ void iFEpipp(x64emu_t *emu, uintptr_t fcn) { iFEpipp_t fn = (iFEpipp_t)fcn; R_RA
 void iFEpipV(x64emu_t *emu, uintptr_t fcn) { iFEpipV_t fn = (iFEpipV_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
 void iFEpLpp(x64emu_t *emu, uintptr_t fcn) { iFEpLpp_t fn = (iFEpLpp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFEpLpV(x64emu_t *emu, uintptr_t fcn) { iFEpLpV_t fn = (iFEpLpV_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
+void iFEpLpA(x64emu_t *emu, uintptr_t fcn) { iFEpLpA_t fn = (iFEpLpA_t)fcn; R_RAX=(int64_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=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void iFEppip(x64emu_t *emu, uintptr_t fcn) { iFEppip_t fn = (iFEppip_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void iFEppiV(x64emu_t *emu, uintptr_t fcn) { iFEppiV_t fn = (iFEppiV_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)(R_RSP + 8)); }
@@ -2316,29 +2396,33 @@ void iFEpppV(x64emu_t *emu, uintptr_t fcn) { iFEpppV_t fn = (iFEpppV_t)fcn; R_RA
 void iFiiipu(x64emu_t *emu, uintptr_t fcn) { iFiiipu_t fn = (iFiiipu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (uint64_t)R_R8); }
 void iFiiipp(x64emu_t *emu, uintptr_t fcn) { iFiiipp_t fn = (iFiiipp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFiiupp(x64emu_t *emu, uintptr_t fcn) { iFiiupp_t fn = (iFiiupp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFiipup(x64emu_t *emu, uintptr_t fcn) { iFiipup_t fn = (iFiipup_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
+void iFiuLip(x64emu_t *emu, uintptr_t fcn) { iFiuLip_t fn = (iFiuLip_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
 void iFiLLLL(x64emu_t *emu, uintptr_t fcn) { iFiLLLL_t fn = (iFiLLLL_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uintptr_t)R_RSI, (uintptr_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=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void iFipipi(x64emu_t *emu, uintptr_t fcn) { iFipipi_t fn = (iFipipi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFipipu(x64emu_t *emu, uintptr_t fcn) { iFipipu_t fn = (iFipipu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (uint64_t)R_R8); }
 void iFipuip(x64emu_t *emu, uintptr_t fcn) { iFipuip_t fn = (iFipuip_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
+void iFipuui(x64emu_t *emu, uintptr_t fcn) { iFipuui_t fn = (iFipuui_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8); }
 void iFippLi(x64emu_t *emu, uintptr_t fcn) { iFippLi_t fn = (iFippLi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (int64_t)R_R8); }
 void iFippLp(x64emu_t *emu, uintptr_t fcn) { iFippLp_t fn = (iFippLp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void iFipppi(x64emu_t *emu, uintptr_t fcn) { iFipppi_t fn = (iFipppi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFipppp(x64emu_t *emu, uintptr_t fcn) { iFipppp_t fn = (iFipppp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFuppLp(x64emu_t *emu, uintptr_t fcn) { iFuppLp_t fn = (iFuppLp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
-void iFlppLp(x64emu_t *emu, uintptr_t fcn) { iFlppLp_t fn = (iFlppLp_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
+void iFpwwww(x64emu_t *emu, uintptr_t fcn) { iFpwwww_t fn = (iFpwwww_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX, (int16_t)R_RCX, (int16_t)R_R8); }
+void iFpwppp(x64emu_t *emu, uintptr_t fcn) { iFpwppp_t fn = (iFpwppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpiiii(x64emu_t *emu, uintptr_t fcn) { iFpiiii_t fn = (iFpiiii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void iFpiiiu(x64emu_t *emu, uintptr_t fcn) { iFpiiiu_t fn = (iFpiiiu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8); }
 void iFpiiiL(x64emu_t *emu, uintptr_t fcn) { iFpiiiL_t fn = (iFpiiiL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uintptr_t)R_R8); }
 void iFpiiip(x64emu_t *emu, uintptr_t fcn) { iFpiiip_t fn = (iFpiiip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
+void iFpiiui(x64emu_t *emu, uintptr_t fcn) { iFpiiui_t fn = (iFpiiui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8); }
 void iFpiiuu(x64emu_t *emu, uintptr_t fcn) { iFpiiuu_t fn = (iFpiiuu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8); }
-void iFpiiLi(x64emu_t *emu, uintptr_t fcn) { iFpiiLi_t fn = (iFpiiLi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX, (int64_t)R_R8); }
 void iFpiipi(x64emu_t *emu, uintptr_t fcn) { iFpiipi_t fn = (iFpiipi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFpiipp(x64emu_t *emu, uintptr_t fcn) { iFpiipp_t fn = (iFpiipp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void iFpiLwp(x64emu_t *emu, uintptr_t fcn) { iFpiLwp_t fn = (iFpiLwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (uintptr_t)R_RDX, (int16_t)R_RCX, (void*)R_R8); }
+void iFpiuwp(x64emu_t *emu, uintptr_t fcn) { iFpiuwp_t fn = (iFpiuwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (int16_t)R_RCX, (void*)R_R8); }
 void iFpipii(x64emu_t *emu, uintptr_t fcn) { iFpipii_t fn = (iFpipii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void iFpipiL(x64emu_t *emu, uintptr_t fcn) { iFpipiL_t fn = (iFpipiL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (uintptr_t)R_R8); }
-void iFpippi(x64emu_t *emu, uintptr_t fcn) { iFpippi_t fn = (iFpippi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
+void iFpippW(x64emu_t *emu, uintptr_t fcn) { iFpippW_t fn = (iFpippW_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8); }
 void iFpippp(x64emu_t *emu, uintptr_t fcn) { iFpippp_t fn = (iFpippp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpCCCC(x64emu_t *emu, uintptr_t fcn) { iFpCCCC_t fn = (iFpCCCC_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8); }
 void iFpuuip(x64emu_t *emu, uintptr_t fcn) { iFpuuip_t fn = (iFpuuip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
@@ -2347,17 +2431,18 @@ void iFpuuup(x64emu_t *emu, uintptr_t fcn) { iFpuuup_t fn = (iFpuuup_t)fcn; R_RA
 void iFpuuLL(x64emu_t *emu, uintptr_t fcn) { iFpuuLL_t fn = (iFpuuLL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
 void iFpuupp(x64emu_t *emu, uintptr_t fcn) { iFpuupp_t fn = (iFpuupp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFplluu(x64emu_t *emu, uintptr_t fcn) { iFplluu_t fn = (iFplluu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8); }
+void iFpLiLi(x64emu_t *emu, uintptr_t fcn) { iFpLiLi_t fn = (iFpLiLi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX, (int64_t)R_R8); }
 void iFpLlpp(x64emu_t *emu, uintptr_t fcn) { iFpLlpp_t fn = (iFpLlpp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFppiip(x64emu_t *emu, uintptr_t fcn) { iFppiip_t fn = (iFppiip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
 void iFppiup(x64emu_t *emu, uintptr_t fcn) { iFppiup_t fn = (iFppiup_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
 void iFppiLi(x64emu_t *emu, uintptr_t fcn) { iFppiLi_t fn = (iFppiLi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX, (int64_t)R_R8); }
 void iFppipi(x64emu_t *emu, uintptr_t fcn) { iFppipi_t fn = (iFppipi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFppipp(x64emu_t *emu, uintptr_t fcn) { iFppipp_t fn = (iFppipp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFppuwp(x64emu_t *emu, uintptr_t fcn) { iFppuwp_t fn = (iFppuwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (int16_t)R_RCX, (void*)R_R8); }
 void iFppuip(x64emu_t *emu, uintptr_t fcn) { iFppuip_t fn = (iFppuip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
 void iFppupi(x64emu_t *emu, uintptr_t fcn) { iFppupi_t fn = (iFppupi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFppupp(x64emu_t *emu, uintptr_t fcn) { iFppupp_t fn = (iFppupp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFppllp(x64emu_t *emu, uintptr_t fcn) { iFppllp_t fn = (iFppllp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8); }
-void iFppLwp(x64emu_t *emu, uintptr_t fcn) { iFppLwp_t fn = (iFppLwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int16_t)R_RCX, (void*)R_R8); }
 void iFppLpi(x64emu_t *emu, uintptr_t fcn) { iFppLpi_t fn = (iFppLpi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFppLpL(x64emu_t *emu, uintptr_t fcn) { iFppLpL_t fn = (iFppLpL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void iFppLpp(x64emu_t *emu, uintptr_t fcn) { iFppLpp_t fn = (iFppLpp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -2382,9 +2467,9 @@ void uFpplip(x64emu_t *emu, uintptr_t fcn) { uFpplip_t fn = (uFpplip_t)fcn; R_RA
 void uFppppu(x64emu_t *emu, uintptr_t fcn) { uFppppu_t fn = (uFppppu_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint64_t)R_R8); }
 void uFppppp(x64emu_t *emu, uintptr_t fcn) { uFppppp_t fn = (uFppppp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void UFuiiii(x64emu_t *emu, uintptr_t fcn) { UFuiiii_t fn = (UFuiiii_t)fcn; R_RAX=fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
+void lFipili(x64emu_t *emu, uintptr_t fcn) { lFipili_t fn = (lFipili_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (intptr_t)R_RCX, (int64_t)R_R8); }
 void lFipLli(x64emu_t *emu, uintptr_t fcn) { lFipLli_t fn = (lFipLli_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX, (int64_t)R_R8); }
 void lFipLLi(x64emu_t *emu, uintptr_t fcn) { lFipLLi_t fn = (lFipLLi_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (int64_t)R_R8); }
-void LFLpppp(x64emu_t *emu, uintptr_t fcn) { LFLpppp_t fn = (LFLpppp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void LFpLLLp(x64emu_t *emu, uintptr_t fcn) { LFpLLLp_t fn = (LFpLLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void LFpLppL(x64emu_t *emu, uintptr_t fcn) { LFpLppL_t fn = (LFpLppL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void LFpLppp(x64emu_t *emu, uintptr_t fcn) { LFpLppp_t fn = (LFpLppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -2463,7 +2548,6 @@ void vFuiupiu(x64emu_t *emu, uintptr_t fcn) { vFuiupiu_t fn = (vFuiupiu_t)fcn; f
 void vFuiUUUU(x64emu_t *emu, uintptr_t fcn) { vFuiUUUU_t fn = (vFuiUUUU_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9); }
 void vFuiffff(x64emu_t *emu, uintptr_t fcn) { vFuiffff_t fn = (vFuiffff_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0]); }
 void vFuidddd(x64emu_t *emu, uintptr_t fcn) { vFuidddd_t fn = (vFuidddd_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
-void vFuipiup(x64emu_t *emu, uintptr_t fcn) { vFuipiup_t fn = (vFuipiup_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (void*)R_R9); }
 void vFuuiiii(x64emu_t *emu, uintptr_t fcn) { vFuuiiii_t fn = (vFuuiiii_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
 void vFuuiiiu(x64emu_t *emu, uintptr_t fcn) { vFuuiiiu_t fn = (vFuuiiiu_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (uint64_t)R_R9); }
 void vFuuiuii(x64emu_t *emu, uintptr_t fcn) { vFuuiuii_t fn = (vFuuiuii_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
@@ -2519,7 +2603,6 @@ void vFpppppi(x64emu_t *emu, uintptr_t fcn) { vFpppppi_t fn = (vFpppppi_t)fcn; f
 void vFpppppp(x64emu_t *emu, uintptr_t fcn) { vFpppppp_t fn = (vFpppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void cFppLppi(x64emu_t *emu, uintptr_t fcn) { cFppLppi_t fn = (cFppLppi_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int64_t)R_R9); }
 void iFEiippi(x64emu_t *emu, uintptr_t fcn) { iFEiippi_t fn = (iFEiippi_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
-void iFEipppp(x64emu_t *emu, uintptr_t fcn) { iFEipppp_t fn = (iFEipppp_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFElpppp(x64emu_t *emu, uintptr_t fcn) { iFElpppp_t fn = (iFElpppp_t)fcn; R_RAX=(int64_t)fn(emu, (intptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEpiipp(x64emu_t *emu, uintptr_t fcn) { iFEpiipp_t fn = (iFEpiipp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEpiipV(x64emu_t *emu, uintptr_t fcn) { iFEpiipV_t fn = (iFEpiipV_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
@@ -2529,13 +2612,16 @@ void iFEpuppp(x64emu_t *emu, uintptr_t fcn) { iFEpuppp_t fn = (iFEpuppp_t)fcn; R
 void iFEppppp(x64emu_t *emu, uintptr_t fcn) { iFEppppp_t fn = (iFEppppp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFiiiiii(x64emu_t *emu, uintptr_t fcn) { iFiiiiii_t fn = (iFiiiiii_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
 void iFiiiiip(x64emu_t *emu, uintptr_t fcn) { iFiiiiip_t fn = (iFiiiiip_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9); }
-void iFiiiLwp(x64emu_t *emu, uintptr_t fcn) { iFiiiLwp_t fn = (iFiiiLwp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX, (int16_t)R_R8, (void*)R_R9); }
+void iFiiiuwp(x64emu_t *emu, uintptr_t fcn) { iFiiiuwp_t fn = (iFiiiuwp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (int16_t)R_R8, (void*)R_R9); }
 void iFiuiipi(x64emu_t *emu, uintptr_t fcn) { iFiuiipi_t fn = (iFiuiipi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (int64_t)R_R9); }
 void iFipiipi(x64emu_t *emu, uintptr_t fcn) { iFipiipi_t fn = (iFipiipi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (int64_t)R_R9); }
 void iFipuufp(x64emu_t *emu, uintptr_t fcn) { iFipuufp_t fn = (iFipuufp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, emu->xmm[0].f[0], (void*)R_R8); }
 void iFipupup(x64emu_t *emu, uintptr_t fcn) { iFipupup_t fn = (iFipupup_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (uint64_t)R_R8, (void*)R_R9); }
 void iFipuppp(x64emu_t *emu, uintptr_t fcn) { iFipuppp_t fn = (iFipuppp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFuppppp(x64emu_t *emu, uintptr_t fcn) { iFuppppp_t fn = (iFuppppp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFdipppL(x64emu_t *emu, uintptr_t fcn) { iFdipppL_t fn = (iFdipppL_t)fcn; R_RAX=(int64_t)fn(emu->xmm[0].d[0], (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
+void iFDipppL(x64emu_t *emu, uintptr_t fcn) { iFDipppL_t fn = (iFDipppL_t)fcn; R_RAX=(int64_t)fn(LD2localLD((void*)(R_RSP + 8)), (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
+void iFlpippp(x64emu_t *emu, uintptr_t fcn) { iFlpippp_t fn = (iFlpippp_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFLppipp(x64emu_t *emu, uintptr_t fcn) { iFLppipp_t fn = (iFLppipp_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpiiiii(x64emu_t *emu, uintptr_t fcn) { iFpiiiii_t fn = (iFpiiiii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
 void iFpiiipp(x64emu_t *emu, uintptr_t fcn) { iFpiiipp_t fn = (iFpiiipp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -2545,6 +2631,9 @@ void iFpiuupp(x64emu_t *emu, uintptr_t fcn) { iFpiuupp_t fn = (iFpiuupp_t)fcn; R
 void iFpippip(x64emu_t *emu, uintptr_t fcn) { iFpippip_t fn = (iFpippip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8, (void*)R_R9); }
 void iFpipppL(x64emu_t *emu, uintptr_t fcn) { iFpipppL_t fn = (iFpipppL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void iFpipppp(x64emu_t *emu, uintptr_t fcn) { iFpipppp_t fn = (iFpipppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFpWpppp(x64emu_t *emu, uintptr_t fcn) { iFpWpppp_t fn = (iFpWpppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFpuiCpp(x64emu_t *emu, uintptr_t fcn) { iFpuiCpp_t fn = (iFpuiCpp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (uint8_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFpuippp(x64emu_t *emu, uintptr_t fcn) { iFpuippp_t fn = (iFpuippp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpupuui(x64emu_t *emu, uintptr_t fcn) { iFpupuui_t fn = (iFpupuui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (int64_t)R_R9); }
 void iFppiiuu(x64emu_t *emu, uintptr_t fcn) { iFppiiuu_t fn = (iFppiiuu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9); }
 void iFppiipi(x64emu_t *emu, uintptr_t fcn) { iFppiipi_t fn = (iFppiipi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (int64_t)R_R9); }
@@ -2579,6 +2668,7 @@ void UFpippup(x64emu_t *emu, uintptr_t fcn) { UFpippup_t fn = (UFpippup_t)fcn; R
 void lFipipLu(x64emu_t *emu, uintptr_t fcn) { lFipipLu_t fn = (lFipipLu_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uint64_t)R_R9); }
 void lFipLipu(x64emu_t *emu, uintptr_t fcn) { lFipLipu_t fn = (lFipLipu_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (uint64_t)R_R9); }
 void lFipLipp(x64emu_t *emu, uintptr_t fcn) { lFipLipp_t fn = (lFipLipp_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void lFipLpLL(x64emu_t *emu, uintptr_t fcn) { lFipLpLL_t fn = (lFipLpLL_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); }
 void LFpipipi(x64emu_t *emu, uintptr_t fcn) { LFpipipi_t fn = (LFpipipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (void*)R_R8, (int64_t)R_R9); }
 void LFSpLiip(x64emu_t *emu, uintptr_t fcn) { LFSpLiip_t fn = (LFSpLiip_t)fcn; R_RAX=(uintptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9); }
 void pFEpippp(x64emu_t *emu, uintptr_t fcn) { pFEpippp_t fn = (pFEpippp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -2612,10 +2702,8 @@ void pFSpiiii(x64emu_t *emu, uintptr_t fcn) { pFSpiiii_t fn = (pFSpiiii_t)fcn; R
 void vFEpppppp(x64emu_t *emu, uintptr_t fcn) { vFEpppppp_t fn = (vFEpppppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFiiiiiip(x64emu_t *emu, uintptr_t fcn) { vFiiiiiip_t fn = (vFiiiiiip_t)fcn; fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFiiiiuup(x64emu_t *emu, uintptr_t fcn) { vFiiiiuup_t fn = (vFiiiiuup_t)fcn; fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(void**)(R_RSP + 8)); }
-void vFiiupuip(x64emu_t *emu, uintptr_t fcn) { vFiiupuip_t fn = (vFiiupuip_t)fcn; fn((int64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (uint64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFiiffffp(x64emu_t *emu, uintptr_t fcn) { vFiiffffp_t fn = (vFiiffffp_t)fcn; fn((int64_t)R_RDI, (int64_t)R_RSI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], (void*)R_RDX); }
 void vFiipllli(x64emu_t *emu, uintptr_t fcn) { vFiipllli_t fn = (vFiipllli_t)fcn; fn((int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9, *(int64_t*)(R_RSP + 8)); }
-void vFiupuuup(x64emu_t *emu, uintptr_t fcn) { vFiupuuup_t fn = (vFiupuuup_t)fcn; fn((int64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFuiiiiii(x64emu_t *emu, uintptr_t fcn) { vFuiiiiii_t fn = (vFuiiiiii_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
 void vFuiiiuip(x64emu_t *emu, uintptr_t fcn) { vFuiiiuip_t fn = (vFuiiiuip_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFuiiiuup(x64emu_t *emu, uintptr_t fcn) { vFuiiiuup_t fn = (vFuiiiuup_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -2679,18 +2767,21 @@ void iFEpppppL(x64emu_t *emu, uintptr_t fcn) { iFEpppppL_t fn = (iFEpppppL_t)fcn
 void iFEpppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppppp_t fn = (iFEpppppp_t)fcn; R_RAX=(int64_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=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiiiiii(x64emu_t *emu, uintptr_t fcn) { iFpiiiiii_t fn = (iFpiiiiii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
-void iFpiiiLwp(x64emu_t *emu, uintptr_t fcn) { iFpiiiLwp_t fn = (iFpiiiLwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uintptr_t)R_R8, (int16_t)R_R9, *(void**)(R_RSP + 8)); }
+void iFpiiiuwp(x64emu_t *emu, uintptr_t fcn) { iFpiiiuwp_t fn = (iFpiiiuwp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (int16_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiiuuiu(x64emu_t *emu, uintptr_t fcn) { iFpiiuuiu_t fn = (iFpiiuuiu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (int64_t)R_R9, *(uint64_t*)(R_RSP + 8)); }
 void iFpiipppp(x64emu_t *emu, uintptr_t fcn) { iFpiipppp_t fn = (iFpiipppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiuiipp(x64emu_t *emu, uintptr_t fcn) { iFpiuiipp_t fn = (iFpiuiipp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiupiii(x64emu_t *emu, uintptr_t fcn) { iFpiupiii_t fn = (iFpiupiii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
 void iFpippLpp(x64emu_t *emu, uintptr_t fcn) { iFpippLpp_t fn = (iFpippLpp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void iFpippppW(x64emu_t *emu, uintptr_t fcn) { iFpippppW_t fn = (iFpippppW_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint16_t*)(R_RSP + 8)); }
 void iFpippppp(x64emu_t *emu, uintptr_t fcn) { iFpippppp_t fn = (iFpippppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpIIpppp(x64emu_t *emu, uintptr_t fcn) { iFpIIpppp_t fn = (iFpIIpppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void iFpWppppW(x64emu_t *emu, uintptr_t fcn) { iFpWppppW_t fn = (iFpWppppW_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint16_t*)(R_RSP + 8)); }
+void iFpuiCuCp(x64emu_t *emu, uintptr_t fcn) { iFpuiCuCp_t fn = (iFpuiCuCp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (uint8_t)R_RCX, (uint64_t)R_R8, (uint8_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpuuiuui(x64emu_t *emu, uintptr_t fcn) { iFpuuiuui_t fn = (iFpuuiuui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
 void iFpuupppp(x64emu_t *emu, uintptr_t fcn) { iFpuupppp_t fn = (iFpuupppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpupuuui(x64emu_t *emu, uintptr_t fcn) { iFpupuuui_t fn = (iFpupuuui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
-void iFpupLpLi(x64emu_t *emu, uintptr_t fcn) { iFpupLpLi_t fn = (iFpupLpLi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(int64_t*)(R_RSP + 8)); }
+void iFpupupui(x64emu_t *emu, uintptr_t fcn) { iFpupupui_t fn = (iFpupupui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (void*)R_R8, (uint64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
 void iFpuppppp(x64emu_t *emu, uintptr_t fcn) { iFpuppppp_t fn = (iFpuppppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpLipipi(x64emu_t *emu, uintptr_t fcn) { iFpLipipi_t fn = (iFpLipipi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8, (void*)R_R9, *(int64_t*)(R_RSP + 8)); }
 void iFppiiiip(x64emu_t *emu, uintptr_t fcn) { iFppiiiip_t fn = (iFppiiiip_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, (int64_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -2720,6 +2811,7 @@ void uFuippppp(x64emu_t *emu, uintptr_t fcn) { uFuippppp_t fn = (uFuippppp_t)fcn
 void uFppiuppp(x64emu_t *emu, uintptr_t fcn) { uFppiuppp_t fn = (uFppiuppp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 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, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)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, (int64_t)R_RDX, (int64_t)R_RCX, (int64_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, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (intptr_t)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, (int64_t)R_R8, (void*)R_R9); }
 void pFEpppppi(x64emu_t *emu, uintptr_t fcn) { pFEpppppi_t fn = (pFEpppppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int64_t)R_R9); }
 void pFifffppp(x64emu_t *emu, uintptr_t fcn) { pFifffppp_t fn = (pFifffppp_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -2738,13 +2830,10 @@ void pFppppuuu(x64emu_t *emu, uintptr_t fcn) { pFppppuuu_t fn = (pFppppuuu_t)fcn
 void pFpppppuu(x64emu_t *emu, uintptr_t fcn) { pFpppppuu_t fn = (pFpppppuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8)); }
 void pFppppppp(x64emu_t *emu, uintptr_t fcn) { pFppppppp_t fn = (pFppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFiiiiuuip(x64emu_t *emu, uintptr_t fcn) { vFiiiiuuip_t fn = (vFiiiiuuip_t)fcn; fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(int64_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void vFiupuiuup(x64emu_t *emu, uintptr_t fcn) { vFiupuiuup_t fn = (vFiupuiuup_t)fcn; fn((int64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void vFiupuuuup(x64emu_t *emu, uintptr_t fcn) { vFiupuuuup_t fn = (vFiupuuuup_t)fcn; fn((int64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFilipufip(x64emu_t *emu, uintptr_t fcn) { vFilipufip_t fn = (vFilipufip_t)fcn; fn((int64_t)R_RDI, (intptr_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (uint64_t)R_R8, emu->xmm[0].f[0], (int64_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFuiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFuiiiiiii_t fn = (vFuiiiiiii_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16)); }
 void vFuiiiiill(x64emu_t *emu, uintptr_t fcn) { vFuiiiiill_t fn = (vFuiiiiill_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(intptr_t*)(R_RSP + 8), *(intptr_t*)(R_RSP + 16)); }
 void vFuiiiiuup(x64emu_t *emu, uintptr_t fcn) { vFuiiiiuup_t fn = (vFuiiiiuup_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void vFuiiipiup(x64emu_t *emu, uintptr_t fcn) { vFuiiipiup_t fn = (vFuiiipiup_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (int64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFuiuiiiii(x64emu_t *emu, uintptr_t fcn) { vFuiuiiiii_t fn = (vFuiuiiiii_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16)); }
 void vFuiuiiiip(x64emu_t *emu, uintptr_t fcn) { vFuiuiiiip_t fn = (vFuiuiiiip_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFuiulplpp(x64emu_t *emu, uintptr_t fcn) { vFuiulplpp_t fn = (vFuiulplpp_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (intptr_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -2776,11 +2865,9 @@ void iFEpuuLppp(x64emu_t *emu, uintptr_t fcn) { iFEpuuLppp_t fn = (iFEpuuLppp_t)
 void iFEppppipp(x64emu_t *emu, uintptr_t fcn) { iFEppppipp_t fn = (iFEppppipp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFiiiiiiip(x64emu_t *emu, uintptr_t fcn) { iFiiiiiiip_t fn = (iFiiiiiiip_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFiiupiupi(x64emu_t *emu, uintptr_t fcn) { iFiiupiupi_t fn = (iFiiupiupi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8, (uint64_t)R_R9, *(void**)(R_RSP + 8), *(int64_t*)(R_RSP + 16)); }
-void iFuiifpppp(x64emu_t *emu, uintptr_t fcn) { iFuiifpppp_t fn = (iFuiifpppp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, emu->xmm[0].f[0], (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFuipuuluf(x64emu_t *emu, uintptr_t fcn) { iFuipuuluf_t fn = (iFuipuuluf_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (intptr_t)R_R9, *(uint64_t*)(R_RSP + 8), emu->xmm[0].f[0]); }
+void iFuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { iFuuuuuuuu_t fn = (iFuuuuuuuu_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16)); }
 void iFullfpppp(x64emu_t *emu, uintptr_t fcn) { iFullfpppp_t fn = (iFullfpppp_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, emu->xmm[0].f[0], (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void iFLLLLLLLL(x64emu_t *emu, uintptr_t fcn) { iFLLLLLLLL_t fn = (iFLLLLLLLL_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16)); }
-void iFpiiiiipi(x64emu_t *emu, uintptr_t fcn) { iFpiiiiipi_t fn = (iFpiiiiipi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8), *(int64_t*)(R_RSP + 16)); }
 void iFpWCuWCuu(x64emu_t *emu, uintptr_t fcn) { iFpWCuWCuu_t fn = (iFpWCuWCuu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint8_t)R_RDX, (uint64_t)R_RCX, (uint16_t)R_R8, (uint8_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16)); }
 void iFpWWipppp(x64emu_t *emu, uintptr_t fcn) { iFpWWipppp_t fn = (iFpWWipppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuippLpp(x64emu_t *emu, uintptr_t fcn) { iFpuippLpp_t fn = (iFpuippLpp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -2819,14 +2906,12 @@ void vFuiiiillli(x64emu_t *emu, uintptr_t fcn) { vFuiiiillli_t fn = (vFuiiiillli
 void vFuiiilliip(x64emu_t *emu, uintptr_t fcn) { vFuiiilliip_t fn = (vFuiiilliip_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFuiiillilp(x64emu_t *emu, uintptr_t fcn) { vFuiiillilp_t fn = (vFuiiillilp_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9, *(int64_t*)(R_RSP + 8), *(intptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFuiuiiiiip(x64emu_t *emu, uintptr_t fcn) { vFuiuiiiiip_t fn = (vFuiuiiiiip_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
-void vFuiupuffup(x64emu_t *emu, uintptr_t fcn) { vFuiupuffup_t fn = (vFuiupuffup_t)fcn; fn((uint64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (uint64_t)R_R8, emu->xmm[0].f[0], emu->xmm[1].f[0], (uint64_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFuuiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFuuiiiiiii_t fn = (vFuuiiiiiii_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24)); }
 void vFuuiuiiiii(x64emu_t *emu, uintptr_t fcn) { vFuuiuiiiii_t fn = (vFuuiuiiiii_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24)); }
 void vFuuiuiiiip(x64emu_t *emu, uintptr_t fcn) { vFuuiuiiiip_t fn = (vFuuiuiiiip_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFuuiuiiuup(x64emu_t *emu, uintptr_t fcn) { vFuuiuiiuup_t fn = (vFuuiuiiuup_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFuuuiiiiip(x64emu_t *emu, uintptr_t fcn) { vFuuuiiiiip_t fn = (vFuuuiiiiip_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFuuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFuuuuuuuuu_t fn = (vFuuuuuuuuu_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24)); }
-void vFuupiuiuuf(x64emu_t *emu, uintptr_t fcn) { vFuupiuiuuf_t fn = (vFuupiuiuuf_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (int64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), emu->xmm[0].f[0]); }
 void vFuffffffff(x64emu_t *emu, uintptr_t fcn) { vFuffffffff_t fn = (vFuffffffff_t)fcn; fn((uint64_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0], emu->xmm[6].f[0], emu->xmm[7].f[0]); }
 void vFffuuuufff(x64emu_t *emu, uintptr_t fcn) { vFffuuuufff_t fn = (vFffuuuufff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], (uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0]); }
 void vFddddddddd(x64emu_t *emu, uintptr_t fcn) { vFddddddddd_t fn = (vFddddddddd_t)fcn; fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], emu->xmm[4].d[0], emu->xmm[5].d[0], emu->xmm[6].d[0], emu->xmm[7].d[0], *(double*)(R_RSP + 8)); }
@@ -2847,7 +2932,7 @@ void iFipiipippi(x64emu_t *emu, uintptr_t fcn) { iFipiipippi_t fn = (iFipiipippi
 void iFuilpluluf(x64emu_t *emu, uintptr_t fcn) { iFuilpluluf_t fn = (iFuilpluluf_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8, (uint64_t)R_R9, *(intptr_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), emu->xmm[0].f[0]); }
 void iFdddpppppp(x64emu_t *emu, uintptr_t fcn) { iFdddpppppp_t fn = (iFdddpppppp_t)fcn; R_RAX=(int64_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpipLpiiip(x64emu_t *emu, uintptr_t fcn) { iFpipLpiiip_t fn = (iFpipLpiiip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
-void iFpLLLLLLLL(x64emu_t *emu, uintptr_t fcn) { iFpLLLLLLLL_t fn = (iFpLLLLLLLL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24)); }
+void iFpuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { iFpuuuuuuuu_t fn = (iFpuuuuuuuu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24)); }
 void iFppiiiiiii(x64emu_t *emu, uintptr_t fcn) { iFppiiiiiii_t fn = (iFppiiiiiii_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, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24)); }
 void iFppiuiippL(x64emu_t *emu, uintptr_t fcn) { iFppiuiippL_t fn = (iFppiuiippL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24)); }
 void iFpppiiipip(x64emu_t *emu, uintptr_t fcn) { iFpppiiipip_t fn = (iFpppiiipip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
@@ -2880,7 +2965,6 @@ void vFuuiuiiiiip(x64emu_t *emu, uintptr_t fcn) { vFuuiuiiiiip_t fn = (vFuuiuiii
 void vFuuiuiiiuup(x64emu_t *emu, uintptr_t fcn) { vFuuiuiiiuup_t fn = (vFuuiuiiiuup_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFuuuuuuuiii(x64emu_t *emu, uintptr_t fcn) { vFuuuuuuuiii_t fn = (vFuuuuuuuiii_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24), *(int64_t*)(R_RSP + 32)); }
 void vFuuuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFuuuuuuuuuu_t fn = (vFuuuuuuuuuu_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), *(uint64_t*)(R_RSP + 32)); }
-void vFuupiiupuuf(x64emu_t *emu, uintptr_t fcn) { vFuupiiupuuf_t fn = (vFuupiiupuuf_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (uint64_t)R_R9, *(void**)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), emu->xmm[0].f[0]); }
 void vFuffiiffiip(x64emu_t *emu, uintptr_t fcn) { vFuffiiffiip_t fn = (vFuffiiffiip_t)fcn; fn((uint64_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], (int64_t)R_RSI, (int64_t)R_RDX, emu->xmm[2].f[0], emu->xmm[3].f[0], (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9); }
 void vFuddiiddiip(x64emu_t *emu, uintptr_t fcn) { vFuddiiddiip_t fn = (vFuddiiddiip_t)fcn; fn((uint64_t)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int64_t)R_RSI, (int64_t)R_RDX, emu->xmm[2].d[0], emu->xmm[3].d[0], (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9); }
 void vFffffffffff(x64emu_t *emu, uintptr_t fcn) { vFffffffffff_t fn = (vFffffffffff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0], emu->xmm[6].f[0], emu->xmm[7].f[0], *(float*)(R_RSP + 8), *(float*)(R_RSP + 16)); }
@@ -2969,8 +3053,6 @@ void pFipppppppppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFipppppppppppppp
 
 #if defined(HAVE_LD80BITS)
 void DFD(x64emu_t *emu, uintptr_t fcn) { DFD_t fn = (DFD_t)fcn; long double ld=fn(LD2localLD((void*)(R_RSP + 8))); fpu_do_push(emu); ST0val = ld; }
-void DFDD(x64emu_t *emu, uintptr_t fcn) { DFDD_t fn = (DFDD_t)fcn; long double ld=fn(LD2localLD((void*)(R_RSP + 8)), LD2localLD((void*)(R_RSP + 24))); fpu_do_push(emu); ST0val = ld; }
-void DFDp(x64emu_t *emu, uintptr_t fcn) { DFDp_t fn = (DFDp_t)fcn; long double ld=fn(LD2localLD((void*)(R_RSP + 8)), (void*)R_RDI); fpu_do_push(emu); ST0val = ld; }
 #endif
 
 #if !defined(HAVE_LD80BITS)
@@ -2991,8 +3073,8 @@ void iFEipiip(x64emu_t *emu, uintptr_t fcn) { iFEipiip_t fn = (iFEipiip_t)fcn; R
 #endif
 
 void vFEv(x64emu_t *emu, uintptr_t fcn) { vFE_t fn = (vFE_t)fcn; fn(emu); }
+void iFEv(x64emu_t *emu, uintptr_t fcn) { iFE_t fn = (iFE_t)fcn; R_RAX=(int64_t)fn(emu); }
 void lFEv(x64emu_t *emu, uintptr_t fcn) { lFE_t fn = (lFE_t)fcn; R_RAX=(intptr_t)fn(emu); }
-void LFEv(x64emu_t *emu, uintptr_t fcn) { LFE_t fn = (LFE_t)fcn; R_RAX=(uintptr_t)fn(emu); }
 void pFEv(x64emu_t *emu, uintptr_t fcn) { pFE_t fn = (pFE_t)fcn; R_RAX=(uintptr_t)fn(emu); }
 void iFEvpp(x64emu_t *emu, uintptr_t fcn) { iFEpp_t fn = (iFEpp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RSI, (void*)R_RDX); }
 void pFEppv(x64emu_t *emu, uintptr_t fcn) { pFEpp_t fn = (pFEpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
@@ -3009,7 +3091,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFf) return 2;
 	if (fun == &vFd) return 2;
 	if (fun == &vFl) return 1;
-	if (fun == &vFL) return 1;
 	if (fun == &vFp) return 1;
 	if (fun == &cFv) return 1;
 	if (fun == &cFi) return 1;
@@ -3020,12 +3101,15 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFv) return 1;
 	if (fun == &iFw) return 1;
 	if (fun == &iFi) return 1;
+	if (fun == &iFI) return 1;
 	if (fun == &iFu) return 1;
 	if (fun == &iFU) return 1;
 	if (fun == &iFf) return 2;
 	if (fun == &iFd) return 2;
+	if (fun == &iFl) return 1;
 	if (fun == &iFL) return 1;
 	if (fun == &iFp) return 1;
+	if (fun == &IFI) return 1;
 	if (fun == &IFf) return 2;
 	if (fun == &IFd) return 2;
 	if (fun == &IFp) return 1;
@@ -3036,9 +3120,9 @@ 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;
 	if (fun == &uFp) return 1;
 	if (fun == &UFv) return 1;
 	if (fun == &UFu) return 1;
@@ -3088,6 +3172,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFfp) return 2;
 	if (fun == &vFdd) return 3;
 	if (fun == &vFlp) return 1;
+	if (fun == &vFLL) return 1;
 	if (fun == &vFLp) return 1;
 	if (fun == &vFpi) return 1;
 	if (fun == &vFpu) return 1;
@@ -3099,23 +3184,23 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &cFpp) return 1;
 	if (fun == &iFwp) return 1;
 	if (fun == &iFii) return 1;
-	if (fun == &iFiI) 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 == &iFIi) return 1;
 	if (fun == &iFui) return 1;
 	if (fun == &iFuu) return 1;
+	if (fun == &iFuL) return 1;
 	if (fun == &iFup) return 1;
-	if (fun == &iFli) return 1;
-	if (fun == &iFLi) return 1;
+	if (fun == &iFlp) return 1;
 	if (fun == &iFLL) return 1;
 	if (fun == &iFLp) return 1;
 	if (fun == &iFpw) return 1;
 	if (fun == &iFpi) return 1;
 	if (fun == &iFpI) return 1;
 	if (fun == &iFpC) return 1;
+	if (fun == &iFpW) return 1;
 	if (fun == &iFpu) return 1;
 	if (fun == &iFpU) return 1;
 	if (fun == &iFpf) return 2;
@@ -3130,7 +3215,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &CFpi) return 1;
 	if (fun == &CFpu) return 1;
 	if (fun == &CFpp) 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;
@@ -3140,7 +3227,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpU) 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 == &UFpp) return 1;
@@ -3153,21 +3239,21 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &dFdi) return -2;
 	if (fun == &dFdd) return -3;
 	if (fun == &dFdp) return -2;
-	if (fun == &dFLL) return -1;
+	if (fun == &dFll) return -1;
 	if (fun == &dFpi) return -1;
 	if (fun == &dFpp) return -1;
+	if (fun == &lFii) return 1;
 	if (fun == &lFll) return 1;
 	if (fun == &lFpi) return 1;
 	if (fun == &lFpp) return 1;
 	if (fun == &LFii) return 1;
+	if (fun == &LFuu) return 1;
 	if (fun == &LFLi) return 1;
-	if (fun == &LFLp) return 1;
 	if (fun == &LFpi) return 1;
 	if (fun == &LFpL) return 1;
 	if (fun == &LFpp) return 1;
 	if (fun == &pFii) return 1;
 	if (fun == &pFiu) return 1;
-	if (fun == &pFiL) return 1;
 	if (fun == &pFip) return 1;
 	if (fun == &pFui) return 1;
 	if (fun == &pFuu) return 1;
@@ -3230,9 +3316,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpll) return 1;
 	if (fun == &vFpLi) return 1;
 	if (fun == &vFpLL) return 1;
+	if (fun == &vFpLp) return 1;
 	if (fun == &vFppi) return 1;
 	if (fun == &vFppu) return 1;
 	if (fun == &vFppd) return 2;
+	if (fun == &vFppl) return 1;
 	if (fun == &vFppL) return 1;
 	if (fun == &vFppp) return 1;
 	if (fun == &iFwww) return 1;
@@ -3240,31 +3328,34 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiwC) return 1;
 	if (fun == &iFiii) return 1;
 	if (fun == &iFiiu) return 1;
-	if (fun == &iFiiL) return 1;
+	if (fun == &iFiil) return 1;
 	if (fun == &iFiip) return 1;
 	if (fun == &iFiuu) return 1;
+	if (fun == &iFill) return 1;
 	if (fun == &iFiLi) return 1;
+	if (fun == &iFiLp) return 1;
 	if (fun == &iFipi) return 1;
 	if (fun == &iFipu) return 1;
 	if (fun == &iFipL) return 1;
 	if (fun == &iFipp) return 1;
+	if (fun == &iFuwp) return 1;
+	if (fun == &iFuui) return 1;
 	if (fun == &iFuuu) return 1;
 	if (fun == &iFuup) return 1;
 	if (fun == &iFuff) return 3;
 	if (fun == &iFuLL) return 1;
+	if (fun == &iFuLp) return 1;
 	if (fun == &iFupL) return 1;
+	if (fun == &iFupp) return 1;
 	if (fun == &iFfff) return 4;
-	if (fun == &iFlll) return 1;
-	if (fun == &iFLwp) return 1;
 	if (fun == &iFLip) return 1;
-	if (fun == &iFLLp) return 1;
+	if (fun == &iFLLi) return 1;
 	if (fun == &iFLpp) return 1;
 	if (fun == &iFpwp) return 1;
 	if (fun == &iFpii) return 1;
 	if (fun == &iFpiu) return 1;
 	if (fun == &iFpiL) return 1;
 	if (fun == &iFpip) return 1;
-	if (fun == &iFpIi) return 1;
 	if (fun == &iFpui) return 1;
 	if (fun == &iFpuu) return 1;
 	if (fun == &iFpuU) return 1;
@@ -3279,6 +3370,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpll) return 1;
 	if (fun == &iFplp) return 1;
 	if (fun == &iFpLi) return 1;
+	if (fun == &iFpLu) return 1;
 	if (fun == &iFpLL) return 1;
 	if (fun == &iFpLp) return 1;
 	if (fun == &iFppi) return 1;
@@ -3295,44 +3387,47 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &IFppi) return 1;
 	if (fun == &uFipu) return 1;
 	if (fun == &uFuip) return 1;
-	if (fun == &uFuui) return 1;
 	if (fun == &uFuuu) return 1;
 	if (fun == &uFuup) return 1;
 	if (fun == &uFupu) return 1;
 	if (fun == &uFupp) return 1;
+	if (fun == &uFpii) return 1;
 	if (fun == &uFpip) return 1;
 	if (fun == &uFpCi) return 1;
 	if (fun == &uFpui) return 1;
 	if (fun == &uFpuu) return 1;
+	if (fun == &uFpup) return 1;
 	if (fun == &uFpLp) return 1;
 	if (fun == &uFppi) return 1;
 	if (fun == &uFppu) return 1;
 	if (fun == &uFppp) return 1;
 	if (fun == &UFppi) return 1;
-	if (fun == &fFuii) return -1;
 	if (fun == &fFull) return -1;
 	if (fun == &fFfff) return -4;
 	if (fun == &fFffp) return -3;
 	if (fun == &fFppL) return -1;
+	if (fun == &fFppp) return -1;
 	if (fun == &dFddd) return -4;
 	if (fun == &dFddp) return -3;
 	if (fun == &dFppi) return -1;
 	if (fun == &dFppp) 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;
 	if (fun == &lFlpi) return 1;
-	if (fun == &lFpip) return 1;
+	if (fun == &lFpli) return 1;
 	if (fun == &lFpLu) return 1;
 	if (fun == &lFppi) return 1;
 	if (fun == &lFppL) return 1;
+	if (fun == &lFppp) return 1;
 	if (fun == &LFipL) return 1;
-	if (fun == &LFLLi) return 1;
-	if (fun == &LFLLI) return 1;
+	if (fun == &LFLLl) return 1;
 	if (fun == &LFLpu) return 1;
 	if (fun == &LFLpL) return 1;
 	if (fun == &LFpii) return 1;
-	if (fun == &LFpup) return 1;
+	if (fun == &LFpip) return 1;
 	if (fun == &LFpLi) return 1;
 	if (fun == &LFpLp) return 1;
 	if (fun == &LFppi) return 1;
@@ -3348,6 +3443,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFupi) return 1;
 	if (fun == &pFupL) return 1;
 	if (fun == &pFUpi) return 1;
+	if (fun == &pFdip) return 2;
 	if (fun == &pFddd) return 4;
 	if (fun == &pFpii) return 1;
 	if (fun == &pFpiu) return 1;
@@ -3458,14 +3554,15 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiiii) return 1;
 	if (fun == &iFiiiu) return 1;
 	if (fun == &iFiiip) return 1;
+	if (fun == &iFiiui) return 1;
 	if (fun == &iFiill) return 1;
-	if (fun == &iFiiLi) return 1;
 	if (fun == &iFiipi) return 1;
 	if (fun == &iFiipp) return 1;
+	if (fun == &iFiuwp) return 1;
 	if (fun == &iFiuii) return 1;
-	if (fun == &iFiupi) return 1;
+	if (fun == &iFiupp) return 1;
 	if (fun == &iFilli) return 1;
-	if (fun == &iFiLwp) return 1;
+	if (fun == &iFillu) return 1;
 	if (fun == &iFipii) return 1;
 	if (fun == &iFipip) return 1;
 	if (fun == &iFipui) return 1;
@@ -3473,13 +3570,17 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFipLi) return 1;
 	if (fun == &iFipLp) return 1;
 	if (fun == &iFippi) return 1;
-	if (fun == &iFippu) return 1;
 	if (fun == &iFippL) return 1;
 	if (fun == &iFippp) return 1;
 	if (fun == &iFuipp) return 1;
 	if (fun == &iFuuff) return 3;
+	if (fun == &iFuupi) return 1;
+	if (fun == &iFupLp) return 1;
 	if (fun == &iFuppi) return 1;
 	if (fun == &iFuppp) return 1;
+	if (fun == &iFLLiW) return 1;
+	if (fun == &iFpwww) return 1;
+	if (fun == &iFpwpp) return 1;
 	if (fun == &iFpiii) return 1;
 	if (fun == &iFpiiu) return 1;
 	if (fun == &iFpiid) return 2;
@@ -3490,9 +3591,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpild) return 2;
 	if (fun == &iFpipi) return 1;
 	if (fun == &iFpipC) return 1;
+	if (fun == &iFpipu) return 1;
 	if (fun == &iFpipp) return 1;
 	if (fun == &iFpCCC) return 1;
 	if (fun == &iFpWWu) return 1;
+	if (fun == &iFpuwp) return 1;
 	if (fun == &iFpuiL) return 1;
 	if (fun == &iFpuip) return 1;
 	if (fun == &iFpuui) return 1;
@@ -3505,8 +3608,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpupp) return 1;
 	if (fun == &iFplii) return 1;
 	if (fun == &iFplip) return 1;
-	if (fun == &iFpLwp) return 1;
+	if (fun == &iFpLii) return 1;
+	if (fun == &iFpLLu) return 1;
 	if (fun == &iFpLpi) return 1;
+	if (fun == &iFpLpf) return 2;
+	if (fun == &iFpLpd) return 2;
 	if (fun == &iFpLpL) return 1;
 	if (fun == &iFpLpp) return 1;
 	if (fun == &iFppii) return 1;
@@ -3541,18 +3647,22 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpppi) return 1;
 	if (fun == &uFpppp) return 1;
 	if (fun == &UFpipp) return 1;
+	if (fun == &UFppip) return 1;
+	if (fun == &lFiiLu) return 1;
 	if (fun == &lFiipL) return 1;
-	if (fun == &lFilpp) return 1;
-	if (fun == &lFipiI) return 1;
+	if (fun == &lFipil) return 1;
 	if (fun == &lFipLi) return 1;
 	if (fun == &lFipLI) return 1;
+	if (fun == &lFipLu) return 1;
 	if (fun == &lFipLl) return 1;
 	if (fun == &lFipLL) return 1;
+	if (fun == &lFipLp) return 1;
 	if (fun == &lFippL) return 1;
-	if (fun == &lFlpip) return 1;
+	if (fun == &lFuipp) return 1;
 	if (fun == &lFpili) return 1;
 	if (fun == &lFpilp) return 1;
 	if (fun == &lFppii) return 1;
+	if (fun == &lFppip) return 1;
 	if (fun == &lFpppL) return 1;
 	if (fun == &LFippL) return 1;
 	if (fun == &LFpuuu) return 1;
@@ -3567,10 +3677,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFiiiu) return 1;
 	if (fun == &pFiiup) return 1;
 	if (fun == &pFippi) return 1;
-	if (fun == &pFippL) return 1;
+	if (fun == &pFippu) return 1;
 	if (fun == &pFuiii) return 1;
 	if (fun == &pFulli) return 1;
 	if (fun == &pFullu) return 1;
+	if (fun == &pFdipp) return 2;
 	if (fun == &pFdddd) return 5;
 	if (fun == &pFlfff) return 4;
 	if (fun == &pFpiii) return 1;
@@ -3625,7 +3736,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFuiiii) return 1;
 	if (fun == &vFuiiiu) return 1;
 	if (fun == &vFuiiip) return 1;
-	if (fun == &vFuiiup) return 1;
 	if (fun == &vFuiifi) return 2;
 	if (fun == &vFuiIII) return 1;
 	if (fun == &vFuiuii) return 1;
@@ -3692,29 +3802,33 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiiipu) return 1;
 	if (fun == &iFiiipp) return 1;
 	if (fun == &iFiiupp) return 1;
+	if (fun == &iFiipup) return 1;
+	if (fun == &iFiuLip) return 1;
 	if (fun == &iFiLLLL) return 1;
 	if (fun == &iFipiii) return 1;
 	if (fun == &iFipipi) return 1;
 	if (fun == &iFipipu) return 1;
 	if (fun == &iFipuip) return 1;
+	if (fun == &iFipuui) return 1;
 	if (fun == &iFippLi) return 1;
 	if (fun == &iFippLp) return 1;
 	if (fun == &iFipppi) return 1;
 	if (fun == &iFipppp) return 1;
 	if (fun == &iFuppLp) return 1;
-	if (fun == &iFlppLp) return 1;
+	if (fun == &iFpwwww) return 1;
+	if (fun == &iFpwppp) return 1;
 	if (fun == &iFpiiii) return 1;
 	if (fun == &iFpiiiu) return 1;
 	if (fun == &iFpiiiL) return 1;
 	if (fun == &iFpiiip) return 1;
+	if (fun == &iFpiiui) return 1;
 	if (fun == &iFpiiuu) return 1;
-	if (fun == &iFpiiLi) return 1;
 	if (fun == &iFpiipi) return 1;
 	if (fun == &iFpiipp) return 1;
-	if (fun == &iFpiLwp) return 1;
+	if (fun == &iFpiuwp) return 1;
 	if (fun == &iFpipii) return 1;
 	if (fun == &iFpipiL) return 1;
-	if (fun == &iFpippi) return 1;
+	if (fun == &iFpippW) return 1;
 	if (fun == &iFpippp) return 1;
 	if (fun == &iFpCCCC) return 1;
 	if (fun == &iFpuuip) return 1;
@@ -3723,17 +3837,18 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpuuLL) return 1;
 	if (fun == &iFpuupp) return 1;
 	if (fun == &iFplluu) return 1;
+	if (fun == &iFpLiLi) return 1;
 	if (fun == &iFpLlpp) return 1;
 	if (fun == &iFppiip) return 1;
 	if (fun == &iFppiup) return 1;
 	if (fun == &iFppiLi) return 1;
 	if (fun == &iFppipi) return 1;
 	if (fun == &iFppipp) return 1;
+	if (fun == &iFppuwp) return 1;
 	if (fun == &iFppuip) return 1;
 	if (fun == &iFppupi) return 1;
 	if (fun == &iFppupp) return 1;
 	if (fun == &iFppllp) return 1;
-	if (fun == &iFppLwp) return 1;
 	if (fun == &iFppLpi) return 1;
 	if (fun == &iFppLpL) return 1;
 	if (fun == &iFppLpp) return 1;
@@ -3757,9 +3872,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFppppu) return 1;
 	if (fun == &uFppppp) return 1;
 	if (fun == &UFuiiii) return 1;
+	if (fun == &lFipili) return 1;
 	if (fun == &lFipLli) return 1;
 	if (fun == &lFipLLi) return 1;
-	if (fun == &LFLpppp) return 1;
 	if (fun == &LFpLLLp) return 1;
 	if (fun == &LFpLppL) return 1;
 	if (fun == &LFpLppp) return 1;
@@ -3825,7 +3940,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFuiUUUU) return 1;
 	if (fun == &vFuiffff) return 5;
 	if (fun == &vFuidddd) return 5;
-	if (fun == &vFuipiup) return 1;
 	if (fun == &vFuuiiii) return 1;
 	if (fun == &vFuuiiiu) return 1;
 	if (fun == &vFuuiuii) return 1;
@@ -3881,13 +3995,15 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &cFppLppi) return 1;
 	if (fun == &iFiiiiii) return 1;
 	if (fun == &iFiiiiip) return 1;
-	if (fun == &iFiiiLwp) return 1;
+	if (fun == &iFiiiuwp) return 1;
 	if (fun == &iFiuiipi) return 1;
 	if (fun == &iFipiipi) return 1;
 	if (fun == &iFipuufp) return 2;
 	if (fun == &iFipupup) return 1;
 	if (fun == &iFipuppp) return 1;
 	if (fun == &iFuppppp) return 1;
+	if (fun == &iFdipppL) return 2;
+	if (fun == &iFlpippp) return 1;
 	if (fun == &iFLppipp) return 1;
 	if (fun == &iFpiiiii) return 1;
 	if (fun == &iFpiiipp) return 1;
@@ -3897,6 +4013,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpippip) return 1;
 	if (fun == &iFpipppL) return 1;
 	if (fun == &iFpipppp) return 1;
+	if (fun == &iFpWpppp) return 1;
+	if (fun == &iFpuiCpp) return 1;
+	if (fun == &iFpuippp) return 1;
 	if (fun == &iFpupuui) return 1;
 	if (fun == &iFppiiuu) return 1;
 	if (fun == &iFppiipi) return 1;
@@ -3931,6 +4050,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFipipLu) return 1;
 	if (fun == &lFipLipu) return 1;
 	if (fun == &lFipLipp) return 1;
+	if (fun == &lFipLpLL) return 1;
 	if (fun == &LFpipipi) return 1;
 	if (fun == &pFiiiiii) return 1;
 	if (fun == &pFiCiiCi) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 661b66cd..d5bb59d6 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -1,5 +1,5 @@
 /*******************************************************************
- * File automatically generated by rebuild_wrappers.py (v2.0.1.14) *
+ * File automatically generated by rebuild_wrappers.py (v2.0.2.15) *
  *******************************************************************/
 #ifndef __WRAPPER_H_
 #define __WRAPPER_H_
@@ -12,21 +12,24 @@ typedef struct x64emu_s x64emu_t;
 typedef void (*wrapper_t)(x64emu_t* emu, uintptr_t fnc);
 
 // list of defined wrapper
-// v = void, i = int32, u = uint32, U/I= (u)int64
-// l = signed long, L = unsigned long (long is an int with the size of a pointer)
-// p = pointer, P = void* on the stack
-// f = float, d = double, D = long double, K = fake long double
-// V = vaargs, E = current x86emu struct, e = ref to current x86emu struct
-// 0 = constant 0, 1 = constant 1
-// o = stdout
+// E = current x86emu struct
+// v = void
 // C = unsigned byte c = char
 // W = unsigned short w = short
+// u = uint32, i = int32
+// U = uint64, I= int64
+// L = unsigned long, l = signed long (long is an int with the size of a pointer)
+// H = Huge 128bits value/struct
+// p = pointer, P = void* on the stack
+// f = float, d = double, D = long double, K = fake long double
+// V = vaargs
 // O = libc O_ flags bitfield
+// o = stdout
 // S = _IO_2_1_stdXXX_ pointer (or FILE*)
 // N = ... automatically sending 1 arg
 // M = ... automatically sending 2 args
-// H = Huge 128bits value/struct
 // A = va_list
+// 0 = constant 0, 1 = constant 1
 
 void vFE(x64emu_t *emu, uintptr_t fnc);
 void vFv(x64emu_t *emu, uintptr_t fnc);
@@ -36,7 +39,6 @@ void vFU(x64emu_t *emu, uintptr_t fnc);
 void vFf(x64emu_t *emu, uintptr_t fnc);
 void vFd(x64emu_t *emu, uintptr_t fnc);
 void vFl(x64emu_t *emu, uintptr_t fnc);
-void vFL(x64emu_t *emu, uintptr_t fnc);
 void vFp(x64emu_t *emu, uintptr_t fnc);
 void vFS(x64emu_t *emu, uintptr_t fnc);
 void cFv(x64emu_t *emu, uintptr_t fnc);
@@ -45,17 +47,22 @@ void cFu(x64emu_t *emu, uintptr_t fnc);
 void cFf(x64emu_t *emu, uintptr_t fnc);
 void cFp(x64emu_t *emu, uintptr_t fnc);
 void wFp(x64emu_t *emu, uintptr_t fnc);
+void iFE(x64emu_t *emu, uintptr_t fnc);
 void iFv(x64emu_t *emu, uintptr_t fnc);
 void iFw(x64emu_t *emu, uintptr_t fnc);
 void iFi(x64emu_t *emu, uintptr_t fnc);
+void iFI(x64emu_t *emu, uintptr_t fnc);
 void iFu(x64emu_t *emu, uintptr_t fnc);
 void iFU(x64emu_t *emu, uintptr_t fnc);
 void iFf(x64emu_t *emu, uintptr_t fnc);
 void iFd(x64emu_t *emu, uintptr_t fnc);
+void iFD(x64emu_t *emu, uintptr_t fnc);
+void iFl(x64emu_t *emu, uintptr_t fnc);
 void iFL(x64emu_t *emu, uintptr_t fnc);
 void iFp(x64emu_t *emu, uintptr_t fnc);
 void iFO(x64emu_t *emu, uintptr_t fnc);
 void iFS(x64emu_t *emu, uintptr_t fnc);
+void 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);
@@ -66,9 +73,9 @@ 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 UFv(x64emu_t *emu, uintptr_t fnc);
 void UFu(x64emu_t *emu, uintptr_t fnc);
@@ -87,7 +94,6 @@ void lFv(x64emu_t *emu, uintptr_t fnc);
 void lFi(x64emu_t *emu, uintptr_t fnc);
 void lFl(x64emu_t *emu, uintptr_t fnc);
 void lFp(x64emu_t *emu, uintptr_t fnc);
-void LFE(x64emu_t *emu, uintptr_t fnc);
 void LFv(x64emu_t *emu, uintptr_t fnc);
 void LFL(x64emu_t *emu, uintptr_t fnc);
 void LFp(x64emu_t *emu, uintptr_t fnc);
@@ -126,6 +132,7 @@ void vFff(x64emu_t *emu, uintptr_t fnc);
 void vFfp(x64emu_t *emu, uintptr_t fnc);
 void vFdd(x64emu_t *emu, uintptr_t fnc);
 void vFlp(x64emu_t *emu, uintptr_t fnc);
+void vFLL(x64emu_t *emu, uintptr_t fnc);
 void vFLp(x64emu_t *emu, uintptr_t fnc);
 void vFpi(x64emu_t *emu, uintptr_t fnc);
 void vFpu(x64emu_t *emu, uintptr_t fnc);
@@ -140,23 +147,23 @@ void cFpp(x64emu_t *emu, uintptr_t fnc);
 void iFEp(x64emu_t *emu, uintptr_t fnc);
 void iFwp(x64emu_t *emu, uintptr_t fnc);
 void iFii(x64emu_t *emu, uintptr_t fnc);
-void iFiI(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 iFIi(x64emu_t *emu, uintptr_t fnc);
 void iFui(x64emu_t *emu, uintptr_t fnc);
 void iFuu(x64emu_t *emu, uintptr_t fnc);
+void iFuL(x64emu_t *emu, uintptr_t fnc);
 void iFup(x64emu_t *emu, uintptr_t fnc);
-void iFli(x64emu_t *emu, uintptr_t fnc);
-void iFLi(x64emu_t *emu, uintptr_t fnc);
+void iFlp(x64emu_t *emu, uintptr_t fnc);
 void iFLL(x64emu_t *emu, uintptr_t fnc);
 void iFLp(x64emu_t *emu, uintptr_t fnc);
 void iFpw(x64emu_t *emu, uintptr_t fnc);
 void iFpi(x64emu_t *emu, uintptr_t fnc);
 void iFpI(x64emu_t *emu, uintptr_t fnc);
 void iFpC(x64emu_t *emu, uintptr_t fnc);
+void iFpW(x64emu_t *emu, uintptr_t fnc);
 void iFpu(x64emu_t *emu, uintptr_t fnc);
 void iFpU(x64emu_t *emu, uintptr_t fnc);
 void iFpf(x64emu_t *emu, uintptr_t fnc);
@@ -175,7 +182,9 @@ void CFpi(x64emu_t *emu, uintptr_t fnc);
 void CFpu(x64emu_t *emu, uintptr_t fnc);
 void CFpp(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 uFui(x64emu_t *emu, uintptr_t fnc);
 void uFuu(x64emu_t *emu, uintptr_t fnc);
 void uFup(x64emu_t *emu, uintptr_t fnc);
@@ -186,7 +195,6 @@ void uFpU(x64emu_t *emu, uintptr_t fnc);
 void uFpL(x64emu_t *emu, uintptr_t fnc);
 void uFpp(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 UFpp(x64emu_t *emu, uintptr_t fnc);
@@ -201,24 +209,27 @@ void dFdi(x64emu_t *emu, uintptr_t fnc);
 void dFdd(x64emu_t *emu, uintptr_t fnc);
 void dFdD(x64emu_t *emu, uintptr_t fnc);
 void dFdp(x64emu_t *emu, uintptr_t fnc);
-void dFLL(x64emu_t *emu, uintptr_t fnc);
+void dFll(x64emu_t *emu, uintptr_t fnc);
 void dFpi(x64emu_t *emu, uintptr_t fnc);
 void dFpp(x64emu_t *emu, uintptr_t fnc);
+void DFDi(x64emu_t *emu, uintptr_t fnc);
+void DFDD(x64emu_t *emu, uintptr_t fnc);
+void DFDp(x64emu_t *emu, uintptr_t fnc);
 void DFpp(x64emu_t *emu, uintptr_t fnc);
+void lFii(x64emu_t *emu, uintptr_t fnc);
 void lFll(x64emu_t *emu, uintptr_t fnc);
 void lFpi(x64emu_t *emu, uintptr_t fnc);
 void lFpp(x64emu_t *emu, uintptr_t fnc);
 void LFEL(x64emu_t *emu, uintptr_t fnc);
 void LFii(x64emu_t *emu, uintptr_t fnc);
+void LFuu(x64emu_t *emu, uintptr_t fnc);
 void LFLi(x64emu_t *emu, uintptr_t fnc);
-void LFLp(x64emu_t *emu, uintptr_t fnc);
 void LFpi(x64emu_t *emu, uintptr_t fnc);
 void LFpL(x64emu_t *emu, uintptr_t fnc);
 void LFpp(x64emu_t *emu, uintptr_t fnc);
 void pFEp(x64emu_t *emu, uintptr_t fnc);
 void pFii(x64emu_t *emu, uintptr_t fnc);
 void pFiu(x64emu_t *emu, uintptr_t fnc);
-void pFiL(x64emu_t *emu, uintptr_t fnc);
 void pFip(x64emu_t *emu, uintptr_t fnc);
 void pFui(x64emu_t *emu, uintptr_t fnc);
 void pFuu(x64emu_t *emu, uintptr_t fnc);
@@ -289,9 +300,11 @@ void vFpdd(x64emu_t *emu, uintptr_t fnc);
 void vFpll(x64emu_t *emu, uintptr_t fnc);
 void vFpLi(x64emu_t *emu, uintptr_t fnc);
 void vFpLL(x64emu_t *emu, uintptr_t fnc);
+void vFpLp(x64emu_t *emu, uintptr_t fnc);
 void vFppi(x64emu_t *emu, uintptr_t fnc);
 void vFppu(x64emu_t *emu, uintptr_t fnc);
 void vFppd(x64emu_t *emu, uintptr_t fnc);
+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 iFEiw(x64emu_t *emu, uintptr_t fnc);
@@ -303,40 +316,44 @@ void iFEpi(x64emu_t *emu, uintptr_t fnc);
 void iFEpL(x64emu_t *emu, uintptr_t fnc);
 void iFEpp(x64emu_t *emu, uintptr_t fnc);
 void iFEpV(x64emu_t *emu, uintptr_t fnc);
+void iFEpA(x64emu_t *emu, uintptr_t fnc);
 void iFESp(x64emu_t *emu, uintptr_t fnc);
 void iFwww(x64emu_t *emu, uintptr_t fnc);
 void iFwpp(x64emu_t *emu, uintptr_t fnc);
 void iFiwC(x64emu_t *emu, uintptr_t fnc);
 void iFiii(x64emu_t *emu, uintptr_t fnc);
 void iFiiu(x64emu_t *emu, uintptr_t fnc);
-void iFiiL(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 iFiuu(x64emu_t *emu, uintptr_t fnc);
+void iFill(x64emu_t *emu, uintptr_t fnc);
 void iFiLi(x64emu_t *emu, uintptr_t fnc);
+void iFiLp(x64emu_t *emu, uintptr_t fnc);
 void iFiLN(x64emu_t *emu, uintptr_t fnc);
 void iFipi(x64emu_t *emu, uintptr_t fnc);
 void iFipu(x64emu_t *emu, uintptr_t fnc);
 void iFipL(x64emu_t *emu, uintptr_t fnc);
 void iFipp(x64emu_t *emu, uintptr_t fnc);
 void iFipO(x64emu_t *emu, uintptr_t fnc);
+void iFuwp(x64emu_t *emu, uintptr_t fnc);
+void iFuui(x64emu_t *emu, uintptr_t fnc);
 void iFuuu(x64emu_t *emu, uintptr_t fnc);
 void iFuup(x64emu_t *emu, uintptr_t fnc);
 void iFuff(x64emu_t *emu, uintptr_t fnc);
 void iFuLL(x64emu_t *emu, uintptr_t fnc);
+void iFuLp(x64emu_t *emu, uintptr_t fnc);
 void iFupL(x64emu_t *emu, uintptr_t fnc);
+void iFupp(x64emu_t *emu, uintptr_t fnc);
 void iFfff(x64emu_t *emu, uintptr_t fnc);
-void iFlll(x64emu_t *emu, uintptr_t fnc);
-void iFLwp(x64emu_t *emu, uintptr_t fnc);
 void iFLip(x64emu_t *emu, uintptr_t fnc);
-void iFLLp(x64emu_t *emu, uintptr_t fnc);
+void iFLLi(x64emu_t *emu, uintptr_t fnc);
 void iFLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpwp(x64emu_t *emu, uintptr_t fnc);
 void iFpii(x64emu_t *emu, uintptr_t fnc);
 void iFpiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiL(x64emu_t *emu, uintptr_t fnc);
 void iFpip(x64emu_t *emu, uintptr_t fnc);
-void iFpIi(x64emu_t *emu, uintptr_t fnc);
 void iFpui(x64emu_t *emu, uintptr_t fnc);
 void iFpuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuU(x64emu_t *emu, uintptr_t fnc);
@@ -351,6 +368,7 @@ void iFpli(x64emu_t *emu, uintptr_t fnc);
 void iFpll(x64emu_t *emu, uintptr_t fnc);
 void iFplp(x64emu_t *emu, uintptr_t fnc);
 void iFpLi(x64emu_t *emu, uintptr_t fnc);
+void iFpLu(x64emu_t *emu, uintptr_t fnc);
 void iFpLL(x64emu_t *emu, uintptr_t fnc);
 void iFpLp(x64emu_t *emu, uintptr_t fnc);
 void iFppi(x64emu_t *emu, uintptr_t fnc);
@@ -372,45 +390,49 @@ void uFEpu(x64emu_t *emu, uintptr_t fnc);
 void uFEpU(x64emu_t *emu, uintptr_t fnc);
 void uFipu(x64emu_t *emu, uintptr_t fnc);
 void uFuip(x64emu_t *emu, uintptr_t fnc);
-void uFuui(x64emu_t *emu, uintptr_t fnc);
 void uFuuu(x64emu_t *emu, uintptr_t fnc);
 void uFuup(x64emu_t *emu, uintptr_t fnc);
 void uFupu(x64emu_t *emu, uintptr_t fnc);
 void uFupp(x64emu_t *emu, uintptr_t fnc);
+void uFpii(x64emu_t *emu, uintptr_t fnc);
 void uFpip(x64emu_t *emu, uintptr_t fnc);
 void uFpCi(x64emu_t *emu, uintptr_t fnc);
 void uFpui(x64emu_t *emu, uintptr_t fnc);
 void uFpuu(x64emu_t *emu, uintptr_t fnc);
+void uFpup(x64emu_t *emu, uintptr_t fnc);
 void uFpLp(x64emu_t *emu, uintptr_t fnc);
 void uFppi(x64emu_t *emu, uintptr_t fnc);
 void uFppu(x64emu_t *emu, uintptr_t fnc);
 void uFppp(x64emu_t *emu, uintptr_t fnc);
 void UFppi(x64emu_t *emu, uintptr_t fnc);
-void fFuii(x64emu_t *emu, uintptr_t fnc);
 void fFull(x64emu_t *emu, uintptr_t fnc);
 void fFfff(x64emu_t *emu, uintptr_t fnc);
 void fFffp(x64emu_t *emu, uintptr_t fnc);
 void fFppL(x64emu_t *emu, uintptr_t fnc);
+void fFppp(x64emu_t *emu, uintptr_t fnc);
 void dFddd(x64emu_t *emu, uintptr_t fnc);
 void dFddp(x64emu_t *emu, uintptr_t fnc);
 void dFppi(x64emu_t *emu, uintptr_t fnc);
 void dFppp(x64emu_t *emu, uintptr_t fnc);
+void DFppp(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);
 void lFlpi(x64emu_t *emu, uintptr_t fnc);
-void lFpip(x64emu_t *emu, uintptr_t fnc);
+void lFpli(x64emu_t *emu, uintptr_t fnc);
 void lFpLu(x64emu_t *emu, uintptr_t fnc);
 void lFppi(x64emu_t *emu, uintptr_t fnc);
 void lFppL(x64emu_t *emu, uintptr_t fnc);
+void lFppp(x64emu_t *emu, uintptr_t fnc);
 void lFSpl(x64emu_t *emu, uintptr_t fnc);
 void LFipL(x64emu_t *emu, uintptr_t fnc);
-void LFLLi(x64emu_t *emu, uintptr_t fnc);
-void LFLLI(x64emu_t *emu, uintptr_t fnc);
+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 LFpup(x64emu_t *emu, uintptr_t fnc);
+void LFpip(x64emu_t *emu, uintptr_t fnc);
 void LFpLi(x64emu_t *emu, uintptr_t fnc);
 void LFpLp(x64emu_t *emu, uintptr_t fnc);
 void LFppi(x64emu_t *emu, uintptr_t fnc);
@@ -430,7 +452,9 @@ void pFuii(x64emu_t *emu, uintptr_t fnc);
 void pFupi(x64emu_t *emu, uintptr_t fnc);
 void pFupL(x64emu_t *emu, uintptr_t fnc);
 void pFUpi(x64emu_t *emu, uintptr_t fnc);
+void pFdip(x64emu_t *emu, uintptr_t fnc);
 void pFddd(x64emu_t *emu, uintptr_t fnc);
+void pFDip(x64emu_t *emu, uintptr_t fnc);
 void pFpii(x64emu_t *emu, uintptr_t fnc);
 void pFpiu(x64emu_t *emu, uintptr_t fnc);
 void pFpil(x64emu_t *emu, uintptr_t fnc);
@@ -457,6 +481,7 @@ void pFpOM(x64emu_t *emu, uintptr_t fnc);
 void pFSpl(x64emu_t *emu, uintptr_t fnc);
 void vFEipp(x64emu_t *emu, uintptr_t fnc);
 void vFEipV(x64emu_t *emu, uintptr_t fnc);
+void vFEipA(x64emu_t *emu, uintptr_t fnc);
 void vFEpii(x64emu_t *emu, uintptr_t fnc);
 void vFEpip(x64emu_t *emu, uintptr_t fnc);
 void vFEpup(x64emu_t *emu, uintptr_t fnc);
@@ -557,6 +582,7 @@ void iFEppi(x64emu_t *emu, uintptr_t fnc);
 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 iFwwww(x64emu_t *emu, uintptr_t fnc);
 void iFwppp(x64emu_t *emu, uintptr_t fnc);
@@ -564,14 +590,15 @@ 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 iFiiui(x64emu_t *emu, uintptr_t fnc);
 void iFiill(x64emu_t *emu, uintptr_t fnc);
-void iFiiLi(x64emu_t *emu, uintptr_t fnc);
 void iFiipi(x64emu_t *emu, uintptr_t fnc);
 void iFiipp(x64emu_t *emu, uintptr_t fnc);
+void iFiuwp(x64emu_t *emu, uintptr_t fnc);
 void iFiuii(x64emu_t *emu, uintptr_t fnc);
-void iFiupi(x64emu_t *emu, uintptr_t fnc);
+void iFiupp(x64emu_t *emu, uintptr_t fnc);
 void iFilli(x64emu_t *emu, uintptr_t fnc);
-void iFiLwp(x64emu_t *emu, uintptr_t fnc);
+void iFillu(x64emu_t *emu, uintptr_t fnc);
 void iFipii(x64emu_t *emu, uintptr_t fnc);
 void iFipip(x64emu_t *emu, uintptr_t fnc);
 void iFipui(x64emu_t *emu, uintptr_t fnc);
@@ -579,14 +606,18 @@ void iFipup(x64emu_t *emu, uintptr_t fnc);
 void iFipLi(x64emu_t *emu, uintptr_t fnc);
 void iFipLp(x64emu_t *emu, uintptr_t fnc);
 void iFippi(x64emu_t *emu, uintptr_t fnc);
-void iFippu(x64emu_t *emu, uintptr_t fnc);
 void iFippL(x64emu_t *emu, uintptr_t fnc);
 void iFippp(x64emu_t *emu, uintptr_t fnc);
 void iFipON(x64emu_t *emu, uintptr_t fnc);
 void iFuipp(x64emu_t *emu, uintptr_t fnc);
 void iFuuff(x64emu_t *emu, uintptr_t fnc);
+void iFuupi(x64emu_t *emu, uintptr_t fnc);
+void iFupLp(x64emu_t *emu, uintptr_t fnc);
 void iFuppi(x64emu_t *emu, uintptr_t fnc);
 void iFuppp(x64emu_t *emu, uintptr_t fnc);
+void iFLLiW(x64emu_t *emu, uintptr_t fnc);
+void iFpwww(x64emu_t *emu, uintptr_t fnc);
+void iFpwpp(x64emu_t *emu, uintptr_t fnc);
 void iFpiii(x64emu_t *emu, uintptr_t fnc);
 void iFpiiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiid(x64emu_t *emu, uintptr_t fnc);
@@ -597,10 +628,12 @@ void iFpiup(x64emu_t *emu, uintptr_t fnc);
 void iFpild(x64emu_t *emu, uintptr_t fnc);
 void iFpipi(x64emu_t *emu, uintptr_t fnc);
 void iFpipC(x64emu_t *emu, uintptr_t fnc);
+void iFpipu(x64emu_t *emu, uintptr_t fnc);
 void iFpipp(x64emu_t *emu, uintptr_t fnc);
 void iFpipV(x64emu_t *emu, uintptr_t fnc);
 void iFpCCC(x64emu_t *emu, uintptr_t fnc);
 void iFpWWu(x64emu_t *emu, uintptr_t fnc);
+void iFpuwp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiL(x64emu_t *emu, uintptr_t fnc);
 void iFpuip(x64emu_t *emu, uintptr_t fnc);
 void iFpuui(x64emu_t *emu, uintptr_t fnc);
@@ -614,8 +647,12 @@ void iFpupp(x64emu_t *emu, uintptr_t fnc);
 void iFpupV(x64emu_t *emu, uintptr_t fnc);
 void iFplii(x64emu_t *emu, uintptr_t fnc);
 void iFplip(x64emu_t *emu, uintptr_t fnc);
-void iFpLwp(x64emu_t *emu, uintptr_t fnc);
+void iFpLii(x64emu_t *emu, uintptr_t fnc);
+void iFpLLu(x64emu_t *emu, uintptr_t fnc);
 void iFpLpi(x64emu_t *emu, uintptr_t fnc);
+void iFpLpf(x64emu_t *emu, uintptr_t fnc);
+void iFpLpd(x64emu_t *emu, uintptr_t fnc);
+void iFpLpD(x64emu_t *emu, uintptr_t fnc);
 void iFpLpL(x64emu_t *emu, uintptr_t fnc);
 void iFpLpp(x64emu_t *emu, uintptr_t fnc);
 void iFppii(x64emu_t *emu, uintptr_t fnc);
@@ -653,21 +690,24 @@ void uFppiu(x64emu_t *emu, uintptr_t fnc);
 void uFpppi(x64emu_t *emu, uintptr_t fnc);
 void uFpppp(x64emu_t *emu, uintptr_t fnc);
 void UFpipp(x64emu_t *emu, uintptr_t fnc);
-void DFppiL(x64emu_t *emu, uintptr_t fnc);
+void UFppip(x64emu_t *emu, uintptr_t fnc);
 void lFEpip(x64emu_t *emu, uintptr_t fnc);
 void lFEppL(x64emu_t *emu, uintptr_t fnc);
+void lFiiLu(x64emu_t *emu, uintptr_t fnc);
 void lFiipL(x64emu_t *emu, uintptr_t fnc);
-void lFilpp(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);
+void lFipLu(x64emu_t *emu, uintptr_t fnc);
 void lFipLl(x64emu_t *emu, uintptr_t fnc);
 void lFipLL(x64emu_t *emu, uintptr_t fnc);
+void lFipLp(x64emu_t *emu, uintptr_t fnc);
 void lFippL(x64emu_t *emu, uintptr_t fnc);
-void lFlpip(x64emu_t *emu, uintptr_t fnc);
+void lFuipp(x64emu_t *emu, uintptr_t fnc);
 void lFpili(x64emu_t *emu, uintptr_t fnc);
 void lFpilp(x64emu_t *emu, uintptr_t fnc);
 void lFppii(x64emu_t *emu, uintptr_t fnc);
+void lFppip(x64emu_t *emu, uintptr_t fnc);
 void lFpppL(x64emu_t *emu, uintptr_t fnc);
 void LFippL(x64emu_t *emu, uintptr_t fnc);
 void LFpuuu(x64emu_t *emu, uintptr_t fnc);
@@ -688,11 +728,13 @@ void pFiiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiiu(x64emu_t *emu, uintptr_t fnc);
 void pFiiup(x64emu_t *emu, uintptr_t fnc);
 void pFippi(x64emu_t *emu, uintptr_t fnc);
-void pFippL(x64emu_t *emu, uintptr_t fnc);
+void pFippu(x64emu_t *emu, uintptr_t fnc);
 void pFuiii(x64emu_t *emu, uintptr_t fnc);
 void pFulli(x64emu_t *emu, uintptr_t fnc);
 void pFullu(x64emu_t *emu, uintptr_t fnc);
+void pFdipp(x64emu_t *emu, uintptr_t fnc);
 void pFdddd(x64emu_t *emu, uintptr_t fnc);
+void pFDipp(x64emu_t *emu, uintptr_t fnc);
 void pFlfff(x64emu_t *emu, uintptr_t fnc);
 void pFpiii(x64emu_t *emu, uintptr_t fnc);
 void pFpiip(x64emu_t *emu, uintptr_t fnc);
@@ -751,7 +793,6 @@ void vFiplll(x64emu_t *emu, uintptr_t fnc);
 void vFuiiii(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFuiiip(x64emu_t *emu, uintptr_t fnc);
-void vFuiiup(x64emu_t *emu, uintptr_t fnc);
 void vFuiifi(x64emu_t *emu, uintptr_t fnc);
 void vFuiIII(x64emu_t *emu, uintptr_t fnc);
 void vFuiuii(x64emu_t *emu, uintptr_t fnc);
@@ -823,6 +864,7 @@ void iFEpipp(x64emu_t *emu, uintptr_t fnc);
 void iFEpipV(x64emu_t *emu, uintptr_t fnc);
 void iFEpLpp(x64emu_t *emu, uintptr_t fnc);
 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);
@@ -833,29 +875,33 @@ void iFEpppV(x64emu_t *emu, uintptr_t fnc);
 void iFiiipu(x64emu_t *emu, uintptr_t fnc);
 void iFiiipp(x64emu_t *emu, uintptr_t fnc);
 void iFiiupp(x64emu_t *emu, uintptr_t fnc);
+void iFiipup(x64emu_t *emu, uintptr_t fnc);
+void iFiuLip(x64emu_t *emu, uintptr_t fnc);
 void iFiLLLL(x64emu_t *emu, uintptr_t fnc);
 void iFipiii(x64emu_t *emu, uintptr_t fnc);
 void iFipipi(x64emu_t *emu, uintptr_t fnc);
 void iFipipu(x64emu_t *emu, uintptr_t fnc);
 void iFipuip(x64emu_t *emu, uintptr_t fnc);
+void iFipuui(x64emu_t *emu, uintptr_t fnc);
 void iFippLi(x64emu_t *emu, uintptr_t fnc);
 void iFippLp(x64emu_t *emu, uintptr_t fnc);
 void iFipppi(x64emu_t *emu, uintptr_t fnc);
 void iFipppp(x64emu_t *emu, uintptr_t fnc);
 void iFuppLp(x64emu_t *emu, uintptr_t fnc);
-void iFlppLp(x64emu_t *emu, uintptr_t fnc);
+void iFpwwww(x64emu_t *emu, uintptr_t fnc);
+void iFpwppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiii(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiL(x64emu_t *emu, uintptr_t fnc);
 void iFpiiip(x64emu_t *emu, uintptr_t fnc);
+void iFpiiui(x64emu_t *emu, uintptr_t fnc);
 void iFpiiuu(x64emu_t *emu, uintptr_t fnc);
-void iFpiiLi(x64emu_t *emu, uintptr_t fnc);
 void iFpiipi(x64emu_t *emu, uintptr_t fnc);
 void iFpiipp(x64emu_t *emu, uintptr_t fnc);
-void iFpiLwp(x64emu_t *emu, uintptr_t fnc);
+void iFpiuwp(x64emu_t *emu, uintptr_t fnc);
 void iFpipii(x64emu_t *emu, uintptr_t fnc);
 void iFpipiL(x64emu_t *emu, uintptr_t fnc);
-void iFpippi(x64emu_t *emu, uintptr_t fnc);
+void iFpippW(x64emu_t *emu, uintptr_t fnc);
 void iFpippp(x64emu_t *emu, uintptr_t fnc);
 void iFpCCCC(x64emu_t *emu, uintptr_t fnc);
 void iFpuuip(x64emu_t *emu, uintptr_t fnc);
@@ -864,17 +910,18 @@ void iFpuuup(x64emu_t *emu, uintptr_t fnc);
 void iFpuuLL(x64emu_t *emu, uintptr_t fnc);
 void iFpuupp(x64emu_t *emu, uintptr_t fnc);
 void iFplluu(x64emu_t *emu, uintptr_t fnc);
+void iFpLiLi(x64emu_t *emu, uintptr_t fnc);
 void iFpLlpp(x64emu_t *emu, uintptr_t fnc);
 void iFppiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiup(x64emu_t *emu, uintptr_t fnc);
 void iFppiLi(x64emu_t *emu, uintptr_t fnc);
 void iFppipi(x64emu_t *emu, uintptr_t fnc);
 void iFppipp(x64emu_t *emu, uintptr_t fnc);
+void iFppuwp(x64emu_t *emu, uintptr_t fnc);
 void iFppuip(x64emu_t *emu, uintptr_t fnc);
 void iFppupi(x64emu_t *emu, uintptr_t fnc);
 void iFppupp(x64emu_t *emu, uintptr_t fnc);
 void iFppllp(x64emu_t *emu, uintptr_t fnc);
-void iFppLwp(x64emu_t *emu, uintptr_t fnc);
 void iFppLpi(x64emu_t *emu, uintptr_t fnc);
 void iFppLpL(x64emu_t *emu, uintptr_t fnc);
 void iFppLpp(x64emu_t *emu, uintptr_t fnc);
@@ -899,9 +946,9 @@ void uFpplip(x64emu_t *emu, uintptr_t fnc);
 void uFppppu(x64emu_t *emu, uintptr_t fnc);
 void uFppppp(x64emu_t *emu, uintptr_t fnc);
 void UFuiiii(x64emu_t *emu, uintptr_t fnc);
+void lFipili(x64emu_t *emu, uintptr_t fnc);
 void lFipLli(x64emu_t *emu, uintptr_t fnc);
 void lFipLLi(x64emu_t *emu, uintptr_t fnc);
-void LFLpppp(x64emu_t *emu, uintptr_t fnc);
 void LFpLLLp(x64emu_t *emu, uintptr_t fnc);
 void LFpLppL(x64emu_t *emu, uintptr_t fnc);
 void LFpLppp(x64emu_t *emu, uintptr_t fnc);
@@ -980,7 +1027,6 @@ void vFuiupiu(x64emu_t *emu, uintptr_t fnc);
 void vFuiUUUU(x64emu_t *emu, uintptr_t fnc);
 void vFuiffff(x64emu_t *emu, uintptr_t fnc);
 void vFuidddd(x64emu_t *emu, uintptr_t fnc);
-void vFuipiup(x64emu_t *emu, uintptr_t fnc);
 void vFuuiiii(x64emu_t *emu, uintptr_t fnc);
 void vFuuiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFuuiuii(x64emu_t *emu, uintptr_t fnc);
@@ -1036,7 +1082,6 @@ void vFpppppi(x64emu_t *emu, uintptr_t fnc);
 void vFpppppp(x64emu_t *emu, uintptr_t fnc);
 void cFppLppi(x64emu_t *emu, uintptr_t fnc);
 void iFEiippi(x64emu_t *emu, uintptr_t fnc);
-void iFEipppp(x64emu_t *emu, uintptr_t fnc);
 void iFElpppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpiipp(x64emu_t *emu, uintptr_t fnc);
 void iFEpiipV(x64emu_t *emu, uintptr_t fnc);
@@ -1046,13 +1091,16 @@ void iFEpuppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppp(x64emu_t *emu, uintptr_t fnc);
 void iFiiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFiiiiip(x64emu_t *emu, uintptr_t fnc);
-void iFiiiLwp(x64emu_t *emu, uintptr_t fnc);
+void iFiiiuwp(x64emu_t *emu, uintptr_t fnc);
 void iFiuiipi(x64emu_t *emu, uintptr_t fnc);
 void iFipiipi(x64emu_t *emu, uintptr_t fnc);
 void iFipuufp(x64emu_t *emu, uintptr_t fnc);
 void iFipupup(x64emu_t *emu, uintptr_t fnc);
 void iFipuppp(x64emu_t *emu, uintptr_t fnc);
 void iFuppppp(x64emu_t *emu, uintptr_t fnc);
+void iFdipppL(x64emu_t *emu, uintptr_t fnc);
+void iFDipppL(x64emu_t *emu, uintptr_t fnc);
+void iFlpippp(x64emu_t *emu, uintptr_t fnc);
 void iFLppipp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFpiiipp(x64emu_t *emu, uintptr_t fnc);
@@ -1062,6 +1110,9 @@ void iFpiuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpippip(x64emu_t *emu, uintptr_t fnc);
 void iFpipppL(x64emu_t *emu, uintptr_t fnc);
 void iFpipppp(x64emu_t *emu, uintptr_t fnc);
+void iFpWpppp(x64emu_t *emu, uintptr_t fnc);
+void iFpuiCpp(x64emu_t *emu, uintptr_t fnc);
+void iFpuippp(x64emu_t *emu, uintptr_t fnc);
 void iFpupuui(x64emu_t *emu, uintptr_t fnc);
 void iFppiiuu(x64emu_t *emu, uintptr_t fnc);
 void iFppiipi(x64emu_t *emu, uintptr_t fnc);
@@ -1096,6 +1147,7 @@ void UFpippup(x64emu_t *emu, uintptr_t fnc);
 void lFipipLu(x64emu_t *emu, uintptr_t fnc);
 void lFipLipu(x64emu_t *emu, uintptr_t fnc);
 void lFipLipp(x64emu_t *emu, uintptr_t fnc);
+void lFipLpLL(x64emu_t *emu, uintptr_t fnc);
 void LFpipipi(x64emu_t *emu, uintptr_t fnc);
 void LFSpLiip(x64emu_t *emu, uintptr_t fnc);
 void pFEpippp(x64emu_t *emu, uintptr_t fnc);
@@ -1129,10 +1181,8 @@ void pFSpiiii(x64emu_t *emu, uintptr_t fnc);
 void vFEpppppp(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiiip(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiuup(x64emu_t *emu, uintptr_t fnc);
-void vFiiupuip(x64emu_t *emu, uintptr_t fnc);
 void vFiiffffp(x64emu_t *emu, uintptr_t fnc);
 void vFiipllli(x64emu_t *emu, uintptr_t fnc);
-void vFiupuuup(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiuip(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiuup(x64emu_t *emu, uintptr_t fnc);
@@ -1196,18 +1246,21 @@ 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 iFpiiiiii(x64emu_t *emu, uintptr_t fnc);
-void iFpiiiLwp(x64emu_t *emu, uintptr_t fnc);
+void iFpiiiuwp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiuuiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiuiipp(x64emu_t *emu, uintptr_t fnc);
 void iFpiupiii(x64emu_t *emu, uintptr_t fnc);
 void iFpippLpp(x64emu_t *emu, uintptr_t fnc);
+void iFpippppW(x64emu_t *emu, uintptr_t fnc);
 void iFpippppp(x64emu_t *emu, uintptr_t fnc);
 void iFpIIpppp(x64emu_t *emu, uintptr_t fnc);
+void iFpWppppW(x64emu_t *emu, uintptr_t fnc);
+void iFpuiCuCp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuiuui(x64emu_t *emu, uintptr_t fnc);
 void iFpuupppp(x64emu_t *emu, uintptr_t fnc);
 void iFpupuuui(x64emu_t *emu, uintptr_t fnc);
-void iFpupLpLi(x64emu_t *emu, uintptr_t fnc);
+void iFpupupui(x64emu_t *emu, uintptr_t fnc);
 void iFpuppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpLipipi(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiip(x64emu_t *emu, uintptr_t fnc);
@@ -1237,6 +1290,7 @@ void uFuippppp(x64emu_t *emu, uintptr_t fnc);
 void uFppiuppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiii(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiiI(x64emu_t *emu, uintptr_t fnc);
+void pFEpLiiil(x64emu_t *emu, uintptr_t fnc);
 void pFEppppip(x64emu_t *emu, uintptr_t fnc);
 void pFEpppppi(x64emu_t *emu, uintptr_t fnc);
 void pFifffppp(x64emu_t *emu, uintptr_t fnc);
@@ -1255,13 +1309,10 @@ void pFppppuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpppppuu(x64emu_t *emu, uintptr_t fnc);
 void pFppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiuuip(x64emu_t *emu, uintptr_t fnc);
-void vFiupuiuup(x64emu_t *emu, uintptr_t fnc);
-void vFiupuuuup(x64emu_t *emu, uintptr_t fnc);
 void vFilipufip(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiiill(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiiuup(x64emu_t *emu, uintptr_t fnc);
-void vFuiiipiup(x64emu_t *emu, uintptr_t fnc);
 void vFuiuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFuiuiiiip(x64emu_t *emu, uintptr_t fnc);
 void vFuiulplpp(x64emu_t *emu, uintptr_t fnc);
@@ -1293,11 +1344,9 @@ void iFEpuuLppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppipp(x64emu_t *emu, uintptr_t fnc);
 void iFiiiiiiip(x64emu_t *emu, uintptr_t fnc);
 void iFiiupiupi(x64emu_t *emu, uintptr_t fnc);
-void iFuiifpppp(x64emu_t *emu, uintptr_t fnc);
 void iFuipuuluf(x64emu_t *emu, uintptr_t fnc);
+void iFuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFullfpppp(x64emu_t *emu, uintptr_t fnc);
-void iFLLLLLLLL(x64emu_t *emu, uintptr_t fnc);
-void iFpiiiiipi(x64emu_t *emu, uintptr_t fnc);
 void iFpWCuWCuu(x64emu_t *emu, uintptr_t fnc);
 void iFpWWipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuippLpp(x64emu_t *emu, uintptr_t fnc);
@@ -1336,14 +1385,12 @@ void vFuiiiillli(x64emu_t *emu, uintptr_t fnc);
 void vFuiiilliip(x64emu_t *emu, uintptr_t fnc);
 void vFuiiillilp(x64emu_t *emu, uintptr_t fnc);
 void vFuiuiiiiip(x64emu_t *emu, uintptr_t fnc);
-void vFuiupuffup(x64emu_t *emu, uintptr_t fnc);
 void vFuuiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFuuiuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFuuiuiiiip(x64emu_t *emu, uintptr_t fnc);
 void vFuuiuiiuup(x64emu_t *emu, uintptr_t fnc);
 void vFuuuiiiiip(x64emu_t *emu, uintptr_t fnc);
 void vFuuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
-void vFuupiuiuuf(x64emu_t *emu, uintptr_t fnc);
 void vFuffffffff(x64emu_t *emu, uintptr_t fnc);
 void vFffuuuufff(x64emu_t *emu, uintptr_t fnc);
 void vFddddddddd(x64emu_t *emu, uintptr_t fnc);
@@ -1364,7 +1411,7 @@ void iFipiipippi(x64emu_t *emu, uintptr_t fnc);
 void iFuilpluluf(x64emu_t *emu, uintptr_t fnc);
 void iFdddpppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpipLpiiip(x64emu_t *emu, uintptr_t fnc);
-void iFpLLLLLLLL(x64emu_t *emu, uintptr_t fnc);
+void iFpuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFppiuiippL(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiipip(x64emu_t *emu, uintptr_t fnc);
@@ -1397,7 +1444,6 @@ void vFuuiuiiiiip(x64emu_t *emu, uintptr_t fnc);
 void vFuuiuiiiuup(x64emu_t *emu, uintptr_t fnc);
 void vFuuuuuuuiii(x64emu_t *emu, uintptr_t fnc);
 void vFuuuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
-void vFuupiiupuuf(x64emu_t *emu, uintptr_t fnc);
 void vFuffiiffiip(x64emu_t *emu, uintptr_t fnc);
 void vFuddiiddiip(x64emu_t *emu, uintptr_t fnc);
 void vFffffffffff(x64emu_t *emu, uintptr_t fnc);
@@ -1486,8 +1532,6 @@ void pFipppppppppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 
 #if defined(HAVE_LD80BITS)
 void DFD(x64emu_t *emu, uintptr_t fnc);
-void DFDD(x64emu_t *emu, uintptr_t fnc);
-void DFDp(x64emu_t *emu, uintptr_t fnc);
 #endif
 
 #if !defined(HAVE_LD80BITS)
@@ -1508,8 +1552,8 @@ void iFEipiip(x64emu_t *emu, uintptr_t fnc);
 #endif
 
 void vFEv(x64emu_t *emu, uintptr_t fnc);
+void iFEv(x64emu_t *emu, uintptr_t fnc);
 void lFEv(x64emu_t *emu, uintptr_t fnc);
-void LFEv(x64emu_t *emu, uintptr_t fnc);
 void pFEv(x64emu_t *emu, uintptr_t fnc);
 void iFEvpp(x64emu_t *emu, uintptr_t fnc);
 void pFEppv(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedbz2.c b/src/wrapped/wrappedbz2.c
index b53ec5ec..faf81726 100755
--- a/src/wrapped/wrappedbz2.c
+++ b/src/wrapped/wrappedbz2.c
@@ -140,12 +140,12 @@ typedef struct {
 
 
 #define WRAP_BZ(A) \
-    A->bzalloc = find_alloc_Fct(A->bzalloc);        \
+    A->bzalloc = find_alloc_Fct(A->bzalloc); \
     A->bzfree = find_free_Fct(A->bzfree);
 
-#define UNWRAP_BZ(A) if(A->bzalloc || A->bzfree)    \
-    A->bzalloc = reverse_alloc_Fct(A->bzalloc);     \
-    A->bzfree = reverse_free_Fct(A->bzfree);
+#define UNWRAP_BZ(A) \
+    if(A->bzalloc) A->bzalloc = reverse_alloc_Fct(A->bzalloc); \
+    if(A->bzfree) A->bzfree = reverse_free_Fct(A->bzfree);
 
 EXPORT int my_BZ2_bzCompressInit(x64emu_t* emu, my_bz_stream_t* strm, int blocksize, int verbosity, int work)
 {
diff --git a/src/wrapped/wrappedcrypto.c b/src/wrapped/wrappedcrypto.c
index 566539e4..b94f0a30 100755
--- a/src/wrapped/wrappedcrypto.c
+++ b/src/wrapped/wrappedcrypto.c
@@ -25,9 +25,6 @@ const char* cryptoName = "libcrypto.so.1.0.0";
 
 static library_t* my_lib = NULL;
 
-typedef int64_t (*iFpplppi_t) (void*, void*, long, void*, void*, int64_t);
-#define ADDED_FUNCTIONS() \
-    GO(ENGINE_ctrl_cmd, iFpplppi_t)
 #include "generated/wrappedcryptotypes.h"
 
 typedef struct crypto_my_s {
diff --git a/src/wrapped/wrappedfreetype_private.h b/src/wrapped/wrappedfreetype_private.h
index 3bc29754..9bf765e3 100755
--- a/src/wrapped/wrappedfreetype_private.h
+++ b/src/wrapped/wrappedfreetype_private.h
@@ -15,25 +15,10 @@ GO(FT_Bitmap_Done, iFpp)
 GO(FT_Bitmap_Embolden, iFppll)
 GO(FT_Bitmap_Init, vFp)
 GO(FT_Bitmap_New, vFp)
-//GO(FTC_CMapCache_Lookup, 
-//GO(FTC_CMapCache_New, 
 //GO(FT_CeilFix, 
-//GO(FTC_ImageCache_Lookup, 
-//GO(FTC_ImageCache_LookupScaler, 
-//GO(FTC_ImageCache_New, 
 //GO(FT_ClassicKern_Free, 
 //GO(FT_ClassicKern_Validate, 
-//GO(FTC_Manager_Done, 
-//GO(FTC_Manager_LookupFace, 
-//GO(FTC_Manager_LookupSize, 
-//GO(FTC_Manager_New, 
-//GO(FTC_Manager_RemoveFaceID, 
-//GO(FTC_Manager_Reset, 
-//GO(FTC_Node_Unref, 
 GO(FT_Cos, lFl)
-//GO(FTC_SBitCache_Lookup, 
-//GO(FTC_SBitCache_LookupScaler, 
-//GO(FTC_SBitCache_New, 
 //GO(FT_DivFix, 
 GO(FT_Done_Face, iFp)
 GO(FT_Done_FreeType, iFp)
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index 2ed2081f..e18c3f87 100755
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -8,19 +8,19 @@
 // uid_t is u32
 // gid_t is u32
 
-//GO(a64l, 
+GO(a64l, lFp)
 GO(abort, vFv)
 //DATAB(__abort_msg, 
-//GO(abs, 
+GO(abs, iFi)
 GO(accept, iFipp)
 GO(accept4, iFippi)
 GOW(access, iFpi)
-//GO(acct, 
+GO(acct, iFp)
 GOW(addmntent, iFpp)
-//GOW(addseverity, 
-//GOW(adjtime, 
-//GO(__adjtimex, 
-//GOW(adjtimex, 
+GOW(addseverity, iFip)
+GOW(adjtime, iFpp)
+GO(__adjtimex, iFp)
+GOW(adjtimex, iFp)
 //GOW(advance, 
 GO(alarm, uFu)
 GOW(aligned_alloc, pFLL)
@@ -29,89 +29,89 @@ GOW(alphasort64, iFpp)
 //GO(__arch_prctl, 
 //GOW(arch_prctl, 
 //DATA(argp_err_exit_status, 
-//GOW(argp_error, 
-//GOW(argp_failure, 
-//GOW(argp_help, 
-//GOW(argp_parse, 
+//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, 
-//GOW(argp_usage, 
-//GOW(argz_add, 
-//GOW(argz_add_sep, 
-//GOW(argz_append, 
-//GO(__argz_count, 
-//GOW(argz_count, 
-//GOW(argz_create, 
-//GOW(argz_create_sep, 
-//GO(argz_delete, 
-//GOW(argz_extract, 
-//GOW(argz_insert, 
-//GO(__argz_next, 
-//GOW(argz_next, 
-//GOW(argz_replace, 
-//GO(__argz_stringify, 
-//GOW(argz_stringify, 
+//GOW(argp_state_help, vF!pu)
+//GOW(argp_usage, vF!)
+GOW(argz_add, iFppp)
+GOW(argz_add_sep, iFpppi)
+GOW(argz_append, iFpppL)
+GO(__argz_count, LFpL)
+GOW(argz_count, LFpL)
+GOW(argz_create, iFppp)
+GOW(argz_create_sep, iFpipp)
+GO(argz_delete, vFppp)
+GOW(argz_extract, vFpLp)
+GOW(argz_insert, iFpppp)
+GO(__argz_next, pFpLp)
+GOW(argz_next, pFpLp)
+GOW(argz_replace, iFppppp)
+GO(__argz_stringify, vFpLi)
+GOW(argz_stringify, vFpLi)
 GO(asctime, pFp)
 GOW(asctime_r, pFpp)
 GOM(__asprintf, iFEppV)
-GOM(asprintf, iFEppV)   //Weak
+GOWM(asprintf, iFEppV)
 GOM(__asprintf_chk, iFEpipV)
-//GO(__assert, 
+GO(__assert, vFppi)
 GO(__assert_fail, vFppup)
 GO(__assert_perror_fail, vFipup)
 GO(atof, dFp)
 GO(atoi, iFp)
 GO(atol, lFp)
 GO(atoll, IFp)
-//GO(authdes_create, 
-//GO(authdes_getucred, 
-//GO(authdes_pk_create, 
-//GO(_authenticate, 
-//GO(authnone_create, 
-//GO(authunix_create, 
-//GO(authunix_create_default, 
+//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)
 //GO(__backtrace, 
-GOM(backtrace, iFEpi)   //weak
+GOWM(backtrace, iFEpi)
 //GO(__backtrace_symbols, 
-GOM(backtrace_symbols, pFEpi)  //weak
+GOWM(backtrace_symbols, pFEpi)
 //GO(__backtrace_symbols_fd, 
-GOM(backtrace_symbols_fd, vFEpii)   //weak
+GOWM(backtrace_symbols_fd, vFEpii)
 GOW(basename, pFp)
 GO(bcmp, iFppL)
 GO(bcopy, vFppL)
-//GO(bdflush, 
+//GO(bdflush, // Deprecated
 GOW(bind, iFipu)
-//GO(bindresvport, 
+//GO(bindresvport, iFi!)
 GOW(bindtextdomain, pFpp)
 GOW(bind_textdomain_codeset, pFpp)
 GOW(brk, iFp)
 //GO(__bsd_getpgrp, 
 //GOW(bsd_signal, 
 GOM(bsearch, pFEppLLp)
-GOW(btowc, iFi)
+GOW(btowc, uFi)
 GO(__bzero, vFpL)
 GOW(bzero, vFpL)
-//GO(c16rtomb, 
-//GOW(c32rtomb, 
+//GO(c16rtomb, LFpW!)
+//GOW(c32rtomb, LFpu!)
 GOW(calloc, pFLL)
-//GO(callrpc, 
-//GO(__call_tls_dtors, 
+//GO(callrpc, iFpLLL@p@p)
+//GO(__call_tls_dtors, vFv)
 GOW(canonicalize_file_name, pFp)
 //GO(capget, 
 //GO(capset, 
 GO(catclose, iFp)
 GO(catgets, pFpiip)
 GO(catopen, pFpi)
-//GO(cbc_crypt, 
+//GO(cbc_crypt, // Deprecated
 GO(cfgetispeed, uFp)
 GO(cfgetospeed, uFp)
 GO(cfmakeraw, vFp)
 GO2(cfree, vFp, free)
 GO(cfsetispeed, iFpu)
 GO(cfsetospeed, iFpu)
-GO(cfsetspeed, iFpi)
+GO(cfsetspeed, iFpu)
 GOW(chdir, iFp)
 DATA(__check_rhosts_file, sizeof(void*))
 //GO(chflags, 
@@ -123,32 +123,32 @@ GOW(clearenv, iFv)
 GO(clearerr, vFp)
 GO(clearerr_unlocked, vFp)
 //GO(clnt_broadcast, 
-//GO(clnt_create, 
-//GO(clnt_pcreateerror, 
-//GO(clnt_perrno, 
-//GO(clnt_perror, 
-//GO(clntraw_create, 
-//GO(clnt_spcreateerror, 
-//GO(clnt_sperrno, 
-//GO(clnt_sperror, 
-//GO(clnttcp_create, 
-//GO(clntudp_bufcreate, 
-//GO(clntudp_create, 
-//GO(clntunix_create, 
-GO(clock, LFv)
-//GO(clock_adjtime, 
+//GO(clnt_create, !FpLLp)
+GO(clnt_pcreateerror, vFp)
+GO(clnt_perrno, vFu)
+//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(clock, lFv)
+GO(clock_adjtime, iFip)
 //GO(__clock_getcpuclockid, 
-//GOW(clock_getcpuclockid, 
+GOW(clock_getcpuclockid, iFip)
 //GO(__clock_getres, 
-//GOW(clock_getres, 
+GOW(clock_getres, iFip)
 //GO(__clock_gettime, 
-//GOW(clock_gettime, 
+GOW(clock_gettime, iFip)
 //GO(__clock_nanosleep, 
-//GOW(clock_nanosleep, 
+GOW(clock_nanosleep, iFiipp)
 //GO(__clock_settime, 
-//GOW(clock_settime, 
+GOW(clock_settime, iFip)
 //GO(__clone, 
-//GOW(clone, 
+//GOW(clone, iF@pipV)
 //GO(__close, 
 GOW(close, iFi)
 GOW(closedir, iFp)
@@ -159,15 +159,15 @@ GO(confstr, LFipL)
 //GO(__confstr_chk, 
 GOW(__connect, iFipu)
 GOW(connect, iFipu)
-//GO(copy_file_range, 
+GO(copy_file_range, lFipipLu)
 //GO(__copy_grp, 
-//GOW(copysign, 
-//GOW(copysignf, 
-//GOW(copysignl, 
+GOW(copysign, dFdd)
+GOW(copysignf, fFff)
+GOW(copysignl, DFDD)
 GOW(creat, iFpu)
 GOW(creat64, iFpu)
 //GO(create_module, 
-//GO(ctermid, 
+GO(ctermid, pFp)
 GO(ctime, pFp)
 GO(ctime_r, pFpp)
 //DATA(__ctype32_b, 
@@ -184,29 +184,29 @@ GO(__ctype_toupper_loc, pFv)
 //DATAB(__curbrk, 
 GO(cuserid, pFp)
 GOM(__cxa_atexit, iFEppp)
-//GO(__cxa_at_quick_exit, 
+//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, 
 //GO(__cyg_profile_func_exit, 
-//GO(daemon, 
+GO(daemon, iFii)
 //DATAB(__daylight, 
 GO(__dcgettext, pFppi)
 GOW(dcgettext, pFppi)
 GOW(dcngettext, pFpppLi)
 //GO(__default_morecore, 
-//GO(delete_module, 
-//GO(des_setparity, 
+//GO(delete_module, // Deprecated
+//GO(des_setparity, // Deprecated
 GO(__dgettext, pFpp)
 GOW(dgettext, pFpp)
-GO(difftime, dFLL)
+GO(difftime, dFll)
 GO(dirfd, iFp)
 GO(dirname, pFp)
-GO(div, UFii)
+GO(div, LFii)
 //GO(_dl_addr, 
 //GO(_dl_catch_error, 
 //GO(_dl_catch_exception, 
-GOM(dl_iterate_phdr, iFEpp) //Weak
+GOWM(dl_iterate_phdr, iFEpp)
 //GO(_dl_mcount_wrapper, 
 //GO(_dl_mcount_wrapper_check, 
 //DATAB(_dl_open_hook, 
@@ -216,47 +216,47 @@ GOM(dl_iterate_phdr, iFEpp) //Weak
 //GO(_dl_sym, 
 //GO(_dl_vsym, 
 GOW(dngettext, pFpppL)
-//GO(dprintf, 
+//GO(dprintf, iFipV)
 //GO(__dprintf_chk, 
 GO(drand48, dFv)
-//GO(drand48_r, 
+GO(drand48_r, iFpp)
 GOW(dup, iFi)
 GO(__dup2, iFii)
 GOW(dup2, iFii)
 GOW(dup3, iFiiO)
 GO(__duplocale, pFp)
 GOW(duplocale, pFp)
-//GO(dysize, 
+GO(dysize, iFi)
 GOW(eaccess, iFpi)
 //GO(ecb_crypt, 
-//GO(ecvt, 
-//GOW(ecvt_r, 
-//GO(endaliasent, 
-//GO(endfsent, 
-//GO(endgrent, 
+GO(ecvt, pFdipp)
+GOW(ecvt_r, iFdipppL)
+GO(endaliasent, vFv)
+GO(endfsent, vFv)
+GO(endgrent, vFv)
 GO(endhostent, vFv)
 GO(__endmntent, iFp)
 GOW(endmntent, iFp)
-//GO(endnetent, 
-//GO(endnetgrent, 
+GO(endnetent, vFv)
+GO(endnetgrent, vFv)
 GO(endprotoent, vFv)
-//GO(endpwent, 
-//GO(endrpcent, 
+GO(endpwent, vFv)
+GO(endrpcent, vFv)
 GO(endservent, vFv)
 //GO(endsgent, 
-//GO(endspent, 
-//GOW(endttyent, 
-//GO(endusershell, 
-//GOW(endutent, 
-//GO(endutxent, 
+GO(endspent, vFv)
+GOW(endttyent, iFv)
+GO(endusershell, vFv)
+GOW(endutent, vFv)
+GO(endutxent, vFv)
 DATA(environ, sizeof(void*))
 DATAB(__environ, sizeof(void*))
-//GO(envz_add, 
-//GO(envz_entry, 
-//GO(envz_get, 
-//GO(envz_merge, 
-//GO(envz_remove, 
-//GO(envz_strip, 
+GO(envz_add, iFpppp)
+GO(envz_entry, pFpLp)
+GO(envz_get, pFpLp)
+GO(envz_merge, iFpppLi)
+GO(envz_remove, vFppp)
+GO(envz_strip, vFpp)
 GO(epoll_create, iFi)
 GO(epoll_create1, iFO)
 #ifdef NOALIGN
@@ -269,44 +269,44 @@ GOM(epoll_pwait, iFEipiip)
 GOM(epoll_wait, iFEipii)
 #endif
 GO(erand48, dFp)
-//GOW(erand48_r, 
+GOW(erand48_r, iFppp)
 GOM(err, vFEipV)
 //DATAB(errno, 
 GO(__errno_location, pFv)
-//GOW(error, 
-//GOW(error_at_line, 
+//GOW(error, vFiipV)
+//GOW(error_at_line, vFiipupV)
 //DATAB(error_message_count, 
 //DATAB(error_one_per_line, 
 //DATAB(error_print_progname, 
-GOM(errx, iFEipV)
-//GO(ether_aton, 
-//GO(ether_aton_r, 
-//GO(ether_hostton, 
-//GO(ether_line, 
-//GO(ether_ntoa, 
-//GO(ether_ntoa_r, 
-//GO(ether_ntohost, 
+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!)
 GOW(euidaccess, iFpi)
 GO(eventfd, iFui)
 GO(eventfd_read, iFip)
-GO(eventfd_write, iFiU)
-GOM(execl, iFEpV)
-//GO(execle, 
-GOM(execlp, iFEpV)
+GO(eventfd_write, iFiL)
+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
 GOM(execv, iFEpp)
-GOM(execve, iFEppp) //Weak
+GOWM(execve, iFEppp)
 GOM(execvp, iFEpp)
-//GOW(execvpe, 
+GOW(execvpe, iFppp)
 GO(_exit, vFi)
 GO(exit, vFi)
 GOW(_Exit, vFi)
-//GO(explicit_bzero, 
+GO(explicit_bzero, vFpL)
 //GO(__explicit_bzero_chk, 
 GO(faccessat, iFipii)
 GOW(fallocate, iFiill)
 GO(fallocate64, iFiill)
-//GO(fanotify_init, 
-//GO(fanotify_mark, 
+GO(fanotify_init, iFuu)
+GO(fanotify_mark, iFiuLip)
 //GO(fattach, 
 GO(__fbufsize, LFp)
 GOW(fchdir, iFi)
@@ -314,14 +314,14 @@ GOW(fchdir, iFi)
 GOW(fchmod, iFiu)
 GO(fchmodat, iFipui)
 GOW(fchown, iFiuu)
-//GO(fchownat, 
+GO(fchownat, iFipuui)
 GO(fclose, iFp)
 GOW(fcloseall, iFv)
-GOM(__fcntl, iFEiiN)    //Weak
-GOM(fcntl, iFEiiN)      //Weak
-GOM(fcntl64, iFEiiN)    //Weak
-//GO(fcvt, 
-//GOW(fcvt_r, 
+GOWM(__fcntl, iFEiiN)
+GOWM(fcntl, iFEiiN)
+GOWM(fcntl64, iFEiiN)
+GO(fcvt, pFdipp)
+GOW(fcvt_r, iFdipppL)
 GO(fdatasync, iFi)
 GO(__fdelt_chk, LFL)
 //GO(__fdelt_warn, 
@@ -333,32 +333,32 @@ GOW(feof, iFp)
 GOW(feof_unlocked, iFp)
 GOW(ferror, iFp)
 GOW(ferror_unlocked, iFp)
-//GO(fexecve, 
+GO(fexecve, iFipp)
 GOW(fflush, iFS)
 GO(fflush_unlocked, iFS)
 //GO(__ffs, 
-//GO(ffs, 
-//GOW(ffsl, 
-//GO(ffsll, 
+GO(ffs, iFi)
+GOW(ffsl, iFl)
+GO(ffsll, iFI)
 GOW(fgetc, iFp)
 GOW(fgetc_unlocked, iFp)
-//GO(fgetgrent, 
-//GOW(fgetgrent_r, 
-GO(fgetpos, lFpp)
-GO(fgetpos64, lFpp)
-//GO(fgetpwent, 
-//GOW(fgetpwent_r, 
+GO(fgetgrent, pFp)
+GOW(fgetgrent_r, iFpppLp)
+GO(fgetpos, iFpp)
+GO(fgetpos64, iFpp)
+GO(fgetpwent, pFp)
+GOW(fgetpwent_r, iFpppLp)
 GOW(fgets, pFpip)
 GO(__fgets_chk, pFpLip)
 //GO(fgetsgent, 
 //GOW(fgetsgent_r, 
-//GO(fgetspent, 
-//GOW(fgetspent_r, 
+GO(fgetspent, pFp)
+GOW(fgetspent_r, iFpppLp)
 GOW(fgets_unlocked, pFpip)
 //GO(__fgets_unlocked_chk, 
 GOW(fgetwc, uFp)
 GOW(fgetwc_unlocked, uFp)
-//GO(fgetws, 
+GO(fgetws, pFpip)
 //GO(__fgetws_chk, 
 GO(fgetws_unlocked, pFpip)
 //GO(__fgetws_unlocked_chk, 
@@ -369,24 +369,23 @@ GO(__finite, iFd)
 GOW(finite, iFd)
 GO(__finitef, iFf)
 GOW(finitef, iFf)
-//GO(__finitel, 
-//GOW(finitel, 
+GO(__finitel, iFD)
+GOW(finitel, iFD)
 GO(__flbf, iFp)
 GO(flistxattr, lFipL)
 GOW(flock, iFii)
 GOW(flockfile, vFp)
 GOW(_flushlbf, vFv)
-//GO(fmemopen, 
-//GO(fmemopen, 
-//GO(fmtmsg, 
+GO(fmemopen, pFpLp)
+GO(fmtmsg, iFlpippp)
 GO(fnmatch, iFppi)
 GOM(fopen, pFEpp)
-GOM(fopen64, pFEpp)  // Weak
-//GO(fopencookie, 
+GOWM(fopen64, pFEpp)
+//GO(fopencookie, pFpp?)
 //GO(__fork, 
-GOM(fork, lFEv) // Weak
+GOWM(fork, iFEv)
 //GO(__fortify_fail, 
-//GOW(fpathconf, 
+GOW(fpathconf, lFii)
 GO(__fpending, LFp)
 GOM(fprintf, iFEppV)
 GOM(__fprintf_chk, iFEpipV)
@@ -396,8 +395,8 @@ GO(fputc, iFip)
 GO(fputc_unlocked, iFip)
 GOW(fputs, iFpp)
 GOW(fputs_unlocked, iFpp)
-GO(fputwc, iFip)
-GO(fputwc_unlocked, iFip)
+GO(fputwc, uFip)
+GO(fputwc_unlocked, uFip)
 GO(fputws, iFpp)
 GO(fputws_unlocked, iFpp)
 GOW(fread, LFpLLp)
@@ -414,37 +413,37 @@ GOW(freelocale, vFp)
 GO(fremovexattr, iFip)
 GO(freopen, pFppp)
 GO(freopen64, pFppp)
-//GOW(frexp, 
-//GOW(frexpf, 
-//GOW(frexpl, 
+GOW(frexp, dFdp)
+GOW(frexpf, fFfp)
+GOW(frexpl, DFDp)
 GOM(fscanf, iFEppV)
 GO(fseek, iFpli)
 GOW(fseeko, iFpli)
-GO(__fseeko64, iFpIi)
-GOW(fseeko64, iFpIi)
+GO(__fseeko64, iFpli)
+GOW(fseeko64, iFpli)
 GO(__fsetlocking, iFpi)
 GO(fsetpos, iFpp)
 GO(fsetpos64, iFpp)
 GO(fsetxattr, iFippLi)
 GOW(fstatfs, iFip)
 GOW(fstatfs64, iFip)
-//GOW(fstatvfs, 
-//GOW(fstatvfs64, 
+GOW(fstatvfs, iFip)
+GOW(fstatvfs64, iFip)
 GO(fsync, iFi)
 GOW(ftell, lFp)
 GOW(ftello, lFp)
-GO(__ftello64, IFp)
-GOW(ftello64, IFp)
+GO(__ftello64, lFp)
+GOW(ftello64, lFp)
 GO(ftime, iFp)
 GO(ftok, iFpi)
 GOW(ftruncate, iFil)
-GOW(ftruncate64, iFiI)
+GOW(ftruncate64, iFil)
 GOW(ftrylockfile, iFp)
-//GOW(fts64_children, 
-//GOW(fts64_close, 
-//GOW(fts64_open, 
-//GOW(fts64_read, 
-//GOW(fts64_set, 
+//GOW(fts64_children, !F!i)
+//GOW(fts64_close, iF!)
+//GOW(fts64_open, !Fpi@)
+//GOW(fts64_read, !F!)
+//GOW(fts64_set, iF!!i)
 GO(fts_children, pFpi)
 GO(fts_close, iFp)
 GOM(fts_open, pFEpip)
@@ -455,15 +454,15 @@ GOM(ftw64, iFEppi)
 GOW(funlockfile, vFp)
 GO(futimens, iFip)
 GOW(futimes, iFip)
-//GO(futimesat, 
-//GO(fwide, 
-GOM(fwprintf, iFEppV)   //Weak
+GO(futimesat, iFipp)
+GO(fwide, iFpi)
+GOWM(fwprintf, iFEppV)
 //GO(__fwprintf_chk, 
 GO(__fwritable, iFp)
 GOW(fwrite, LFpLLp)
 GO(fwrite_unlocked, LFpLLp)
 GO(__fwriting, iFp)
-//GO(fwscanf, 
+//GO(fwscanf, iFppV)
 GOM(__fxstat, iFEiip)
 GOM(__fxstat64, iFEiip)
 GOM(__fxstatat, iFEiippi)
@@ -474,45 +473,47 @@ GO(gai_strerror, pFi)
 //GO(__gconv_get_cache, 
 //GO(__gconv_get_modules_db, 
 //GO(__gconv_transliterate, 
-//GO(gcvt, 
+GO(gcvt, pFdip)
 GO(getaddrinfo, iFpppp)
-//GO(getaliasbyname, 
-//GO(getaliasbyname_r, 
-//GO(getaliasent, 
-//GO(getaliasent_r, 
+GO(getaliasbyname, pFp)
+GO(getaliasbyname_r, iFpppLp)
+GO(getaliasent, pFv)
+GO(getaliasent_r, iFppLp)
 //GO(__getauxval, 
-GOM(getauxval, LFEL)    //Weak
-//GOW(get_avphys_pages, 
+GOWM(getauxval, LFEL)
+GOW(get_avphys_pages, lFv)
 GOW(getc, iFp)
 GO(getchar, iFv)
 GO(getchar_unlocked, iFv)
-GOM(getcontext, iFEp)   //Weak
+GOWM(getcontext, iFEp)
+GOW(getcpu, iFpp)
 GOW(getc_unlocked, iFp)
 GO(get_current_dir_name, pFv)
 GOW(getcwd, pFpL)
 GO(__getcwd_chk, pFpLL)
 GO(getdate, pFp)
 //DATAB(getdate_err, 
-//GOW(getdate_r, 
-GOW(__getdelim, iFppip)
-GOW(getdelim, iFppip)
-//GOW(getdirentries, 
-//GO(getdirentries64, 
-//GO(getdomainname, 
+GOW(getdate_r, iFpp)
+GOW(__getdelim, lFppip)
+GOW(getdelim, lFppip)
+GOW(getdents64, lFipL)
+GOW(getdirentries, lFipLp)
+GOW(getdirentries64, lFipLp)
+GO(getdomainname, iFpL)
 //GO(__getdomainname_chk, 
 GOW(getdtablesize, iFv)
-GOW(getegid, iFv)
+GOW(getegid, uFv)
 GO(getentropy, iFpL)
 GO(getenv, pFp)
-GOW(geteuid, pFv)
-//GO(getfsent, 
-//GO(getfsfile, 
-//GO(getfsspec, 
-GOW(getgid, iFv)
+GOW(geteuid, uFv)
+GO(getfsent, pFv)
+GO(getfsfile, pFp)
+GO(getfsspec, pFp)
+GOW(getgid, uFv)
 GO(getgrent, pFv)
-//GO(getgrent_r, 
-GO(getgrgid, pFl)
-GO(getgrgid_r, iFlppLp)
+GO(getgrent_r, iFppLp)
+GO(getgrgid, pFu)
+GO(getgrgid_r, iFuppLp)
 GO(getgrnam, pFp)
 GO(getgrnam_r, iFpppLp)
 GO(getgrouplist, iFpupp)
@@ -526,14 +527,14 @@ GO(gethostbyname2_r, iFpippLpp)
 GO(gethostbyname_r, iFpppLpp)
 GO(gethostent, pFv)
 GO(gethostent_r, iFppLpp)
-//GO(gethostid, 
+GO(gethostid, lFv)
 GOW(gethostname, iFpL)
 //GO(__gethostname_chk, 
 GOW(getifaddrs, iFp)
-//GO(getipv4sourcefilter, 
-GOW(getitimer, iFip)
-//GO(get_kernel_syms, 
-GOW(getline, iFppp)
+//GO(getipv4sourcefilter, iFi??pp!)
+GOW(getitimer, iFup)
+//GO(get_kernel_syms, // Deprecated
+GOW(getline, lFppp)
 GO(getloadavg, iFpi)
 GO(getlogin, pFv)
 GOW(getlogin_r, iFpL)
@@ -541,18 +542,18 @@ GOW(getlogin_r, iFpL)
 GO(getmntent, pFp)
 GO(__getmntent_r, pFpppi)
 GOW(getmntent_r, pFpppi)
-//GO(getmsg, 
-//GO(get_myaddress, 
-GO(getnameinfo, iFpupLpLi)
-//GO(getnetbyaddr, 
-//GO(getnetbyaddr_r, 
-//GO(getnetbyname, 
-//GO(getnetbyname_r, 
-//GO(getnetent, 
-//GO(getnetent_r, 
-//GO(getnetgrent, 
-//GOW(getnetgrent_r, 
-//GO(getnetname, 
+//GO(getmsg, // Deprecated
+//GO(get_myaddress, vF!)
+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(getnetgrent, iFppp)
+GOW(getnetgrent_r, iFppppL)
+GO(getnetname, iFp)
 GOW(get_nprocs, iFv)
 GOW(get_nprocs_conf, iFv)
 GOM(getopt, iFipp)
@@ -560,28 +561,28 @@ GOM(getopt_long, iFipppp)
 GOM(getopt_long_only, iFipppp)
 GO(__getpagesize, iFv)
 GOW(getpagesize, iFv)
-//GO(getpass, 
+GO(getpass, pFp)
 GOW(getpeername, iFipp)
-GO(__getpgid, lFl)
-GOW(getpgid, lFl)
-//GO(getpgrp, 
-//GOW(get_phys_pages, 
+GO(__getpgid, iFi)
+GOW(getpgid, iFi)
+GO(getpgrp, iFv)
+GOW(get_phys_pages, lFv)
 GO(__getpid, uFv)
-GO(getpid, uFv)
-//GO(getpmsg, 
-GOW(getppid, pFv)
-GOW(getpriority, iFii)
+GO(getpid, iFv)
+//GO(getpmsg, // Deprecated
+GOW(getppid, iFv)
+GOW(getpriority, iFuu)
 GO(getprotobyname, pFp)
 GO(getprotobyname_r, iFpppLp)
-GO(getprotobynumber, pFp)
+GO(getprotobynumber, pFi)
 GO(getprotobynumber_r, iFippLp)
 GO(getprotoent, pFv)
 GO(getprotoent_r, iFppLp)
-//GOW(getpt, 
-//GO(getpublickey, 
-//GOW(getpw, 
-//GO(getpwent, 
-//GO(getpwent_r, 
+GOW(getpt, iFv)
+GO(getpublickey, iFpp)
+GOW(getpw, iFup)
+GO(getpwent, pFv)
+GO(getpwent_r, iFppLp)
 GO(getpwnam, pFp)
 GO(getpwnam_r, iFpppLp)
 GO(getpwuid, pFu)
@@ -590,153 +591,154 @@ GO(getrandom, lFpLu)
 GO(getresgid, iFppp)
 GO(getresuid, iFppp)
 GO(__getrlimit, iFip)
-GOW(getrlimit, iFip)
-GOW(getrlimit64, iFip)
-//GO(getrpcbyname, 
-//GO(getrpcbyname_r, 
-//GO(getrpcbynumber, 
-//GO(getrpcbynumber_r, 
-//GO(getrpcent, 
-//GO(getrpcent_r, 
-//GO(getrpcport, 
+GOW(getrlimit, iFup)
+GOW(getrlimit64, iFup)
+GO(getrpcbyname, pFp)
+GO(getrpcbyname_r, iFpppLp)
+GO(getrpcbynumber, pFi)
+GO(getrpcbynumber_r, iFippLp)
+GO(getrpcent, pFv)
+GO(getrpcent_r, iFppLp)
+GO(getrpcport, iFpLLu)
 GOW(getrusage, iFip)
-//GOW(gets, 
+//GOW(gets, // Deprecated
 //GO(__gets_chk, 
-//GO(getsecretkey, 
+GO(getsecretkey, iFppp)
 GO(getservbyname, pFpp)
-//GO(getservbyname_r, 
+//GO(getservbyname_r, iFpp!pL!)
 GO(getservbyport, pFip)
-//GO(getservbyport_r, 
+//GO(getservbyport_r, iFip!pL!)
 GO(getservent, pFv)
-//GO(getservent_r, 
+//GO(getservent_r, iF!pL!)
 //GO(getsgent, 
 //GO(getsgent_r, 
 //GO(getsgnam, 
 //GO(getsgnam_r, 
-GO(getsid, lFl)
+GO(getsid, iFi)
 GOW(getsockname, iFipp)
 GOW(getsockopt, iFiiipp)
-//GO(getsourcefilter, 
-//GO(getspent, 
-//GO(getspent_r, 
-//GO(getspnam, 
-//GO(getspnam_r, 
-//GO(getsubopt, 
+//GO(getsourcefilter, iFiupupp!)
+GO(getspent, pFv)
+GO(getspent_r, iFppLp)
+GO(getspnam, pFp)
+GO(getspnam_r, iFpppLp)
+GO(getsubopt, iFppp)
 GOW(gettext, pFp)
+GOW(gettid, iFv)
 GO(__gettimeofday, iFpp)
 GO(gettimeofday, iFpp)
-//GOW(getttyent, 
-//GOW(getttynam, 
+GOW(getttyent, pFv)
+GOW(getttynam, pFp)
 GOW(getuid, uFv)
-//GO(getusershell, 
-//GOW(getutent, 
-//GOW(getutent_r, 
-//GOW(getutid, 
-//GOW(getutid_r, 
-//GOW(getutline, 
-//GOW(getutline_r, 
-//GO(getutmp, 
-//GO(getutmpx, 
-//GO(getutxent, 
-//GO(getutxid, 
-//GO(getutxline, 
-//GO(getw, 
+GO(getusershell, pFv)
+GOW(getutent, pFv)
+GOW(getutent_r, iFpp)
+GOW(getutid, pFp)
+GOW(getutid_r, iFppp)
+GOW(getutline, pFp)
+GOW(getutline_r, iFppp)
+GO(getutmp, vFpp)
+GO(getutmpx, vFpp)
+GO(getutxent, pFv)
+GO(getutxid, pFp)
+GO(getutxline, pFp)
+GO(getw, iFp)
 GOW(getwc, uFp)
-//GO(getwchar, 
-GO(getwchar_unlocked, uFp)
+GO(getwchar, uFv)
+GO(getwchar_unlocked, uFv)
 GOW(getwc_unlocked, uFp)
-//GO(getwd, 
+GO(getwd, pFp)
 //GO(__getwd_chk, 
 GO(getxattr, lFpppL)
 GOM(glob, iFEpipp)
 GOM(glob64, iFEpipp)
 GO(globfree, vFp)
 GOW(globfree64, vFp)
-//GOW(glob_pattern_p, 
+GOW(glob_pattern_p, iFpi)
 GO(gmtime, pFp)
 GO(__gmtime_r, pFpp)
 GOW(gmtime_r, pFpp)
-GOW(gnu_dev_major, uFU)
-GOW(gnu_dev_makedev, UFii)
-GOW(gnu_dev_minor, uFU)
+GOW(gnu_dev_major, uFL)
+GOW(gnu_dev_makedev, LFuu)
+GOW(gnu_dev_minor, uFL)
 GOW(gnu_get_libc_release, pFv)
 GOW(gnu_get_libc_version, pFv)
-//GO(grantpt, 
-//GOW(group_member, 
-//GOW(gsignal, 
-//GO(gtty, 
+GO(grantpt, iFi)
+GOW(group_member, iFu)
+GOW(gsignal, iFi)
+//GO(gtty, // Deprecated
 GOW(hasmntopt, pFpp)
-//GO(hcreate, 
-//GOW(hcreate_r, 
-//GOW(hdestroy, 
-//GOW(hdestroy_r, 
+GO(hcreate, iFL)
+//GOW(hcreate_r, iFL!)
+GOW(hdestroy, vFv)
+//GOW(hdestroy_r, vF!)
 //DATA(h_errlist, 
 //DATAB(__h_errno, 
 GO(__h_errno_location, pFv)
 GO(herror, vFp)
-//GO(host2netname, 
-//GO(hsearch, 
-//GOW(hsearch_r, 
+GO(host2netname, iFppp)
+//GO(hsearch, pF?u)
+//GOW(hsearch_r, iF?up!)
 GO(hstrerror, pFi)
 GO(htonl, uFu)
-GO(htons, uFu)
-GO(iconv, LFLpppp)
-GO(iconv_close, iFL)
-GO(iconv_open, LFpp)
+GO(htons, WFW)
+GO(iconv, LFppppp)
+GO(iconv_close, iFp)
+GO(iconv_open, pFpp)
 //GO(__idna_from_dns_encoding, 
 //GO(__idna_to_dns_encoding, 
 GOW(if_freenameindex, vFp)
 GOW(if_indextoname, pFup)
 GOW(if_nameindex, pFv)
 GOW(if_nametoindex, uFp)
-//GOW(imaxabs, 
-//GOW(imaxdiv, 
+GOW(imaxabs, lFl)
+//GOW(imaxdiv, ?Fll)
 DATA(in6addr_any, 16)  // type V
 DATA(in6addr_loopback, 16)  //type V
-//GOI(index, 
-//GO(inet6_opt_append, 
-//GO(inet6_opt_find, 
-//GO(inet6_opt_finish, 
-//GO(inet6_opt_get_val, 
-//GO(inet6_opt_init, 
-//GO(inet6_option_alloc, 
-//GO(inet6_option_append, 
-//GO(inet6_option_find, 
-//GO(inet6_option_init, 
-//GO(inet6_option_next, 
-//GO(inet6_option_space, 
-//GO(inet6_opt_next, 
-//GO(inet6_opt_set_val, 
-//GO(inet6_rth_add, 
-//GO(inet6_rth_getaddr, 
-//GO(inet6_rth_init, 
-//GO(inet6_rth_reverse, 
-//GO(inet6_rth_segments, 
-//GO(inet6_rth_space, 
+GO(index, pFpi)
+GO(inet6_opt_append, iFpuiCuCp)
+GO(inet6_opt_find, iFpuiCpp)
+GO(inet6_opt_finish, iFpui)
+GO(inet6_opt_get_val, iFpipu)
+GO(inet6_opt_init, iFpu)
+GO(inet6_option_alloc, pFpiii)
+GO(inet6_option_append, iFppii)
+GO(inet6_option_find, iFppi)
+GO(inet6_option_init, iFppi)
+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_init, pFpuii)
+GO(inet6_rth_reverse, iFpp)
+GO(inet6_rth_segments, iFp)
+GO(inet6_rth_space, uFii)
 //GO(__inet6_scopeid_pton, 
 GOW(inet_addr, uFp)
 GOW(inet_aton, iFpp)
 //GO(__inet_aton_exact, 
-//GO(inet_lnaof, 
-//GOW(inet_makeaddr, 
-//GO(inet_netof, 
-GO(inet_network, iFp)
-//GO(inet_nsap_addr, 
+//GO(inet_lnaof, uF?)
+//GOW(inet_makeaddr, ?Fuu)
+//GO(inet_netof, uF?)
+GO(inet_network, uFp)
+GO(inet_nsap_addr, uFppi)
 GO(inet_nsap_ntoa, pFipp)
-GO(inet_ntoa, pFu)
-GO(inet_ntop, iFippu)
+GO(inet_ntoa, pFu) // Really?
+GO(inet_ntop, pFippu)
 GOW(inet_pton, iFipp)
 //GO(__inet_pton_length, 
-//GO(initgroups, 
-//GO(init_module, 
+GO(initgroups, iFpu)
+//GO(init_module, // Deprecated
 GOW(initstate, pFupL)
-//GOW(initstate_r, 
-//GO(innetgr, 
+GOW(initstate_r, iFupLp)
+GO(innetgr, iFpppp)
 GO(inotify_add_watch, iFipu)
 GO(inotify_init, iFv)
 GO(inotify_init1, iFi)
 GO(inotify_rm_watch, iFii)
-//GO(insque, 
+GO(insque, vFpp)
 //GO(__internal_endnetgrent, 
 //GO(__internal_getnetgrent_r, 
 //GO(__internal_setnetgrent, 
@@ -818,8 +820,8 @@ DATA(_IO_list_all, sizeof(void*))
 //GO(_IO_marker_difference, 
 //GO(_IO_padn, 
 //GO(_IO_peekc_locked, 
-//GO(ioperm, 
-//GO(iopl, 
+GO(ioperm, iFLLi)
+GO(iopl, iFi)
 //GO(_IO_popen, 
 //GO(_IO_printf, 
 //GO(_IO_proc_close, 
@@ -874,143 +876,143 @@ DATA(_IO_list_all, sizeof(void*))
 //GO(_IO_wfile_xsputn, 
 //GO(_IO_wmarker_delta, 
 //GO(_IO_wsetb, 
-//GO(iruserok, 
-//GO(iruserok_af, 
+GO(iruserok, iFuipp)
+GO(iruserok_af, iFpippW)
 GO(isalnum, iFi)
 //GO(__isalnum_l, 
-//GOW(isalnum_l, 
+//GOW(isalnum_l, iFi!)
 GO(isalpha, iFi)
 //GO(__isalpha_l, 
 GOW(isalpha_l, iFip)
 GO(isascii, iFi)
 //GOW(__isascii_l, 
-//GO(isastream, 
+//GO(isastream, // Deprecated
 GOW(isatty, iFi)
 GO(isblank, iFi)
 //GO(__isblank_l, 
-//GOW(isblank_l, 
+//GOW(isblank_l, iFi!)
 GO(iscntrl, iFi)
 //GO(__iscntrl_l, 
-//GOW(iscntrl_l, 
+//GOW(iscntrl_l, iFi!)
 //GO(__isctype, 
-//GOW(isctype, 
+GOW(isctype, iFii)
 GO(isdigit, iFi)
 //GO(__isdigit_l, 
-//GOW(isdigit_l, 
-//GO(isfdtype, 
+//GOW(isdigit_l, iFi!)
+GO(isfdtype, iFii)
 GO(isgraph, iFi)
 //GO(__isgraph_l, 
-//GOW(isgraph_l, 
+//GOW(isgraph_l, iFi!)
 GO(__isinf, iFd)
 GOW(isinf, iFd)
 GO(__isinff, iFf)
 GOW(isinff, iFf)
-//GO(__isinfl, 
-//GOW(isinfl, 
+GO(__isinfl, iFD)
+GOW(isinfl, iFD)
 GO(islower, iFi)
 //GO(__islower_l, 
-//GOW(islower_l, 
+//GOW(islower_l, iFi!)
 GO(__isnan, iFd)
 GOW(isnan, iFd)
 GO(__isnanf, iFf)
 GOW(isnanf, iFf)
-//GO(__isnanl, 
-//GOW(isnanl, 
+GO(__isnanl, iFD)
+GOW(isnanl, iFD)
 GOM(__isoc99_fscanf, iFEppV)
-//GO(__isoc99_fwscanf, 
-//GO(__isoc99_scanf, 
+//GO(__isoc99_fwscanf, iFppV)
+//GO(__isoc99_scanf, iFpV)
 GOM(__isoc99_sscanf, iFEppV)
-//GO(__isoc99_swscanf, 
+//GO(__isoc99_swscanf, iFppV)
 GOM(__isoc99_vfscanf, iFEppp)
-//GO(__isoc99_vfwscanf, 
-//GO(__isoc99_vscanf, 
+//GO(__isoc99_vfwscanf, iFppA)
+//GO(__isoc99_vscanf, iFpA)
 GOM(__isoc99_vsscanf, iFEppp)
-//GO(__isoc99_vswscanf, 
-//GO(__isoc99_vwscanf, 
-//GO(__isoc99_wscanf, 
+//GO(__isoc99_vswscanf, iFppA)
+//GO(__isoc99_vwscanf, iFpA)
+//GO(__isoc99_wscanf, iFpV)
 GO(isprint, iFi)
 //GO(__isprint_l, 
-//GOW(isprint_l, 
+//GOW(isprint_l, iFi!)
 GO(ispunct, iFi)
 //GO(__ispunct_l, 
-//GOW(ispunct_l, 
+//GOW(ispunct_l, iFi!)
 GO(isspace, iFi)
 //GO(__isspace_l, 
-//GOW(isspace_l, 
+//GOW(isspace_l, iFi!)
 GO(isupper, iFi)
 //GO(__isupper_l, 
-//GOW(isupper_l, 
-GOW(iswalnum, iFi)
+//GOW(isupper_l, iFi!)
+GOW(iswalnum, iFu)
 //GO(__iswalnum_l, 
-GOW(iswalnum_l, iFip)
-GOW(iswalpha, iFi)
+GOW(iswalnum_l, iFup)
+GOW(iswalpha, iFu)
 //GO(__iswalpha_l, 
-GOW(iswalpha_l, iFip)
-GOW(iswblank, iFi)
+GOW(iswalpha_l, iFup)
+GOW(iswblank, iFu)
 //GO(__iswblank_l, 
-GOW(iswblank_l, iFip)
-GOW(iswcntrl, iFi)
+GOW(iswblank_l, iFup)
+GOW(iswcntrl, iFu)
 //GO(__iswcntrl_l, 
-GOW(iswcntrl_l, iFip)
+GOW(iswcntrl_l, iFup)
 //GO(__iswctype, 
-//GOW(iswctype, 
+GOW(iswctype, iFuL)
 GO(__iswctype_l, iFuLL)
-//GOW(iswctype_l, 
-GOW(iswdigit, iFi)
+GOW(iswctype_l, iFuLp)
+GOW(iswdigit, iFu)
 //GO(__iswdigit_l, 
-GOW(iswdigit_l, iFip)
-GOW(iswgraph, iFi)
+GOW(iswdigit_l, iFup)
+GOW(iswgraph, iFu)
 //GO(__iswgraph_l, 
-GOW(iswgraph_l, iFip)
-GOW(iswlower, iFi)
+GOW(iswgraph_l, iFup)
+GOW(iswlower, iFu)
 //GO(__iswlower_l, 
-GOW(iswlower_l, iFip)
-GOW(iswprint, iFi)
+GOW(iswlower_l, iFup)
+GOW(iswprint, iFu)
 //GO(__iswprint_l, 
-GOW(iswprint_l, iFip)
-GOW(iswpunct, iFi)
+GOW(iswprint_l, iFup)
+GOW(iswpunct, iFu)
 //GO(__iswpunct_l, 
-GOW(iswpunct_l, iFip)
-GOW(iswspace, iFi)
+GOW(iswpunct_l, iFup)
+GOW(iswspace, iFu)
 //GO(__iswspace_l, 
-GOW(iswspace_l, iFip)
-GOW(iswupper, iFi)
+GOW(iswspace_l, iFup)
+GOW(iswupper, iFu)
 //GO(__iswupper_l, 
-GOW(iswupper_l, iFip)
-GOW(iswxdigit, iFi)
+GOW(iswupper_l, iFup)
+GOW(iswxdigit, iFu)
 //GO(__iswxdigit_l, 
-GOW(iswxdigit_l, iFip)
+GOW(iswxdigit_l, iFup)
 GO(isxdigit, iFi)
 //GO(__isxdigit_l, 
 GOW(isxdigit_l, iFip)
 //GO(__ivaliduser, 
-GO(jrand48, iFp)
-//GOW(jrand48_r, 
-//GO(key_decryptsession, 
-//GO(key_decryptsession_pk, 
+GO(jrand48, lFp)
+GOW(jrand48_r, iFppp)
+//GO(key_decryptsession, iFp!)
+//GO(key_decryptsession_pk, iFp!!)
 //DATAB(__key_decryptsession_pk_LOCAL, 
-//GO(key_encryptsession, 
-//GO(key_encryptsession_pk, 
+//GO(key_encryptsession, iFp!)
+//GO(key_encryptsession_pk, iFp!!)
 //DATAB(__key_encryptsession_pk_LOCAL, 
-//GO(key_gendes, 
+//GO(key_gendes, iF!)
 //DATAB(__key_gendes_LOCAL, 
-//GO(key_get_conv, 
-//GO(key_secretkey_is_set, 
+//GO(key_get_conv, iFp!)
+GO(key_secretkey_is_set, iFv)
 //GO(key_setnet, 
-//GO(key_setsecret, 
-GOW(kill, iFli)
+GO(key_setsecret, iFp)
+GOW(kill, iFii)
 GO(killpg, iFii)
-//GO(klogctl, 
-//GO(l64a, 
-//GO(labs, 
-//GO(lchmod, 
+GO(klogctl, iFipi)
+GO(l64a, pFl)
+GO(labs, lFl)
+GO(lchmod, iFpu)
 GOW(lchown, iFpuu)
-//GOW(lckpwdf, 
+GOW(lckpwdf, iFv)
 GO(lcong48, vFp)
-//GOW(lcong48_r, 
-//GOW(ldexp, 
-//GOW(ldexpf, 
-//GOW(ldexpl, 
+GOW(lcong48_r, iFpp)
+GOW(ldexp, dFdi)
+GOW(ldexpf, fFfi)
+GOW(ldexpl, DFDi)
 GO(ldiv, HFll)
 GOM(lfind, pFEpppLp)
 GO(lgetxattr, lFpppL)
@@ -1075,41 +1077,41 @@ GOW(link, iFpp)
 GO(linkat, iFipipi)
 GOW(listen, iFii)
 GO(listxattr, lFppL)
-//GO(llabs, 
-//GO(lldiv, 
+GO(llabs, IFI)
+//GO(lldiv, ?FII)
 GO(llistxattr, lFppL)
-//GO(llseek, 
+//GO(llseek, // Deprecated
 //DATAB(loc1, 
 //DATAB(loc2, 
 GO(localeconv, pFv)
 GO(localtime, pFp)
 GOW(localtime_r, pFpp)
-//GO(lockf, 
-//GOW(lockf64, 
+GO(lockf, iFiil)
+GOW(lockf64, iFiil)
 //DATAB(locs, 
-GOM(_longjmp, vFEpi)    //Weak
-GOM(longjmp, vFEpi) //weak
+GOWM(_longjmp, vFEpi)
+GOWM(longjmp, vFEpi)
 GOM(__longjmp_chk, vFEpi)
 GO(lrand48, lFv)
-//GO(lrand48_r, 
+GO(lrand48_r, iFpp)
 GO(lremovexattr, iFpp)
 GOM(lsearch, pFEpppLp)
 GO(__lseek, IFiIi)
-GOW(lseek, IFiIi)
-GOW(lseek64, IFiIi)
+GOW(lseek, lFili)
+GOW(lseek64, lFili)
 GO(lsetxattr, iFpppLi)
 GO(lutimes, iFpp)
 GOM(__lxstat, iFEipp)
 GOM(__lxstat64, iFEipp)
 GO(__madvise, iFpLi)
 GOW(madvise, iFpLi)
-GOM(makecontext, iFEppiV)   //weak
-//GOW(mallinfo, 
+GOWM(makecontext, iFEppiV)
+//GOW(mallinfo, ?Fv)
 GOM(malloc, pFL) // need to wrap to clear allocated memory?
-//GO(malloc_get_state, 
-//GOW(malloc_info, 
-//GO(malloc_set_state, 
-//GOW(malloc_stats, 
+//GO(malloc_get_state, // Obsolete
+GOW(malloc_info, iFip)
+//GO(malloc_set_state, // Obsolete
+GOW(malloc_stats, vFv)
 GOW(malloc_trim, iFL)
 GOW(malloc_usable_size, LFp)
 GOW(mallopt, iFii)
@@ -1117,8 +1119,8 @@ GOW(mallopt, iFii)
 GO(mblen, iFpL)
 GO(__mbrlen, LFpLp)
 GOW(mbrlen, LFpLp)
-//GO(mbrtoc16, 
-//GOW(mbrtoc32, 
+//GO(mbrtoc16, LFppL!)
+//GOW(mbrtoc32, LFppL!)
 GO(__mbrtowc, LFppLp)
 GOW(mbrtowc, LFppLp)
 GOW(mbsinit, iFp)
@@ -1129,9 +1131,9 @@ GOW(mbsrtowcs, LFppLp)
 GO(mbstowcs, LFppL)
 //GO(__mbstowcs_chk, 
 GO(mbtowc, iFppL)
-//GO(mcheck, 
-//GO(mcheck_check_all, 
-//GO(mcheck_pedantic, 
+//GO(mcheck, iF@)
+GO(mcheck_check_all, vFv)
+//GO(mcheck_pedantic, iF@)
 //GO(_mcleanup, 
 GO(_mcount, vFpp)
 GO2(mcount, vFpp, _mcount)
@@ -1141,14 +1143,14 @@ GO(memchr, pFpiL)
 GO(memcmp, iFppL)
 GO(memcpy, pFppL)
 GO(__memcpy_chk, pFppuL)
-//GO(memfd_create, 
-//GO(memfrob, 
+GO(memfd_create, iFpu)
+GO(memfrob, pFpL)
 GOW(memmem, pFpLpL)
 GO(memmove, pFppL)
 GO(__memmove_chk, pFppLL)
-//GOI(__mempcpy, 
+GO(__mempcpy, pFppL)
 GO(mempcpy, pFppL)
-//GOI(__mempcpy_chk, 
+//GO(__mempcpy_chk, 
 GOW(memrchr, pFpiL)
 GO(memset, pFpiL)
 GO(__memset_chk, pFpiLL)
@@ -1162,70 +1164,68 @@ GO(mkfifo, iFpu)
 GO(mkfifoat, iFipu)
 GO(mkostemp, iFpi)
 GOW(mkostemp64, iFpi)
-//GO(mkostemps, 
-//GOW(mkostemps64, 
+GO(mkostemps, iFpii)
+GOW(mkostemps64, iFpii)
 GO(mkstemp, iFp)
 GOW(mkstemp64, iFp)
-//GO(mkstemps, 
-//GOW(mkstemps64, 
+GO(mkstemps, iFpi)
+GOW(mkstemps64, iFpi)
 GO(__mktemp, pFp)
 GOW(mktemp, pFp)
-GO(mktime, LFp)
+GO(mktime, lFp)
 GO(mlock, iFpL)
-//GO(mlock2, 
+GO(mlock2, iFpLu)
 GO(mlockall, iFi)
 //GO(__mmap, 
-GOM(mmap, pFEpLiiiI)    //weak
-GOM(mmap64, pFEpLiiiI)  //weak
-//GOW(modf, 
-//GOW(modff, 
-//GOW(modfl, 
-//GOW(modify_ldt, 
+GOWM(mmap, pFEpLiiil)
+GOWM(mmap64, pFEpLiiil)
+GOW(modf, dFdp)
+GOW(modff, fFfp)
+GOW(modfl, DFDp)
+//GOW(modify_ldt, // Deprecated
 //GOW(moncontrol, 
 //GO(__monstartup, 
 //GOW(monstartup, 
-//DATA(__morecore, 
+//DATA(__morecore, // Compat-only
 GOW(mount, iFpppLp)
-//GO(mprobe, 
+GO(mprobe, iFp)
 //GO(__mprotect, 
-GOM(mprotect, iFEpLi) //weak
+GOWM(mprotect, iFEpLi)
 GO(mrand48, lFv)
-//GO(mrand48_r, 
+GO(mrand48_r, iFpp)
 GOM(mremap, pFEpLLiN) //weal
 GO(msgctl, iFiip)
 GO(msgget, iFii)
 GOW(msgrcv, lFipLli)
 GOW(msgsnd, iFipLi)
 GO(msync, iFpLi)
-//GO(mtrace, 
+GO(mtrace, vFv)
 GO(munlock, iFpL)
 GO(munlockall, iFv)
 //GO(__munmap, 
-GOM(munmap, iFEpL)  //weak
-//GO(muntrace, 
+GOWM(munmap, iFEpL)
+GO(muntrace, vFv)
 GO(name_to_handle_at, iFipppi)
 GO(__nanosleep, iFpp)
 GOW(nanosleep, iFpp)
 //GO(__nanosleep_nocancel, 
 //GO(__netlink_assert_response, 
-//GO(netname2host, 
-//GO(netname2user, 
+GO(netname2host, iFppi)
+GO(netname2user, iFppppp)
 GO(__newlocale, pFipp)
 GOW(newlocale, pFipp)
-//GO(nfsservctl, 
-//GO(nftw, 
-//GO(nftw, 
+//GO(nfsservctl, // Deprecated
+//GO(nftw, iFp@ii)
 GOM(nftw64, iFEppii)
-//GO(nftw64, 
 GOW(ngettext, pFppL)
-//GO(nice, 
+GO(nice, iFi)
 //DATAB(_nl_domain_bindings, 
-GO(nl_langinfo, pFu)
+GO(nl_langinfo, pFi)
 GO(__nl_langinfo_l, pFup)
-GOW(nl_langinfo_l, pFup)
+GOW(nl_langinfo_l, pFip)
 //DATAB(_nl_msg_cat_cntr, 
 GO(nrand48, lFp)
-//GOW(nrand48_r, 
+GOW(nrand48_r, iFppp)
 //GO(__nss_configure_lookup, 
 //GO(__nss_database_lookup, 
 //GO(__nss_disable_nscd, 
@@ -1248,9 +1248,9 @@ GO(nrand48, lFp)
 //GO(__nss_services_lookup2, 
 GOW(ntohl, uFu)
 GOW(ntohs, WFW)
-//GOW(ntp_adjtime, 
-//GO(ntp_gettime, 
-//GO(ntp_gettimex, 
+GOW(ntp_adjtime, iFp)
+//GO(ntp_gettime, iF!)
+//GO(ntp_gettimex, iF!)
 //DATAB(_null_auth, 
 //DATAB(_obstack, 
 //GO(_obstack_allocated_p, 
@@ -1262,117 +1262,119 @@ GOW(ntohs, WFW)
 //GO(obstack_free, 
 //GO(_obstack_memory_used, 
 //GO(_obstack_newchunk, 
-//GOW(obstack_printf, 
+//GOW(obstack_printf, iFppV)
 //GO(__obstack_printf_chk, 
-//GOW(obstack_vprintf, 
+//GOW(obstack_vprintf, iFppA)
 //GO(__obstack_vprintf_chk, 
-//GOW(on_exit, 
-GOM(__open, iFEpOu) //Weak
-GOM(open, iFEpOu)    //Weak
+//GOW(on_exit, iF@p)
+GOWM(__open, iFEpOu)
+GOWM(open, iFEpOu)
 GO(__open_2, iFpO)
 //GOW(__open64, 
-GOM(open64, iFEpOu) //Weak
+GOWM(open64, iFEpOu)
 GO(__open64_2, iFpO)
 //GO(__open64_nocancel, 
 GOW(openat, iFipON)
 GO(__openat_2, iFipO)
 GOW(openat64, iFipON)
 GO(__openat64_2, iFipO)
-//GO(open_by_handle_at, 
+GO(open_by_handle_at, iFipO)
 //GO(__open_catalog, 
 GOW(opendir, pFp)
 GO(openlog, vFpii)
-//GOW(open_memstream, 
+GOW(open_memstream, pFpp)
 //GO(__open_nocancel, 
-//GO(open_wmemstream, 
+GO(open_wmemstream, pFpp)
 DATA(optarg, sizeof(void*))
 DATA(opterr, sizeof(int))
 DATA(optind, sizeof(int))
 DATA(optopt, sizeof(int))
 GO(__overflow, iFpi)
 //GO(parse_printf_format, 
-//GO(passwd2des, 
-GOW(pathconf, iFpi)
+//GO(passwd2des, // Deprecated
+GOW(pathconf, lFpi)
 GOW(pause, iFv)
 //GO(__pause_nocancel, 
 GO(pclose, iFp)
 GO(perror, vFp)
-//GOW(personality, 
+GOW(personality, iFL)
 GO(__pipe, iFp)
 GOW(pipe, iFp)
 GOW(pipe2, iFpO)
-//GO(pivot_root, 
-//GO(pkey_alloc, 
-//GO(pkey_free, 
-//GO(pkey_get, 
-//GO(pkey_mprotect, 
-//GO(pkey_set, 
-//GO(pmap_getmaps, 
-//GO(pmap_getport, 
-//GO(pmap_rmtcall, 
-//GO(pmap_set, 
-//GO(pmap_unset, 
+//GO(pivot_root, // Deprecated
+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)
+GO(pmap_set, iFLLiW)
+GO(pmap_unset, iFLL)
 GO(__poll, iFpLi)
 GOW(poll, iFpLi)
 GO(__poll_chk, iFpuiL)
 GO(popen, pFpp)
 GO(posix_fadvise, iFilli)
 GOW(posix_fadvise64, iFilli)
-//GO(posix_fallocate, 
-//GO(posix_fallocate64, 
+GO(posix_fallocate, iFill)
+GO(posix_fallocate64, iFill)
 //GO(__posix_getopt, 
-//GO(posix_madvise, 
+GO(posix_madvise, iFpLi)
 GOW(posix_memalign, iFpLL)
-//GOW(posix_openpt, 
-GO(posix_spawn, iFpppppp)   //Need wrapping?
-GO(posix_spawnattr_destroy, iFp)
+GOW(posix_openpt, iFi)
+GO(posix_spawn, iFpppppp) // Need wrapping?
+GOW(posix_spawnattr_destroy, iFp)
 GO(posix_spawnattr_getflags, iFpp)
-//GO(posix_spawnattr_getpgroup, 
-//GO(posix_spawnattr_getschedparam, 
-//GO(posix_spawnattr_getschedpolicy, 
+//GO(posix_spawnattr_getpgroup, iF!p)
+//GO(posix_spawnattr_getschedparam, iF!!)
+//GO(posix_spawnattr_getschedpolicy, iF!p)
 GO(posix_spawnattr_getsigdefault, iFpp)
 GO(posix_spawnattr_getsigmask, iFpp)
-GO(posix_spawnattr_init, iFp)
-GO(posix_spawnattr_setflags, iFpw)
-//GO(posix_spawnattr_setpgroup, 
-//GO(posix_spawnattr_setschedparam, 
-//GO(posix_spawnattr_setschedpolicy, 
-GO(posix_spawnattr_setsigdefault, iFpp)
-GO(posix_spawnattr_setsigmask, iFpp)
-//GO(posix_spawn_file_actions_addclose, 
-GO(posix_spawn_file_actions_adddup2, iFpii)
-//GO(posix_spawn_file_actions_addopen, 
-GO(posix_spawn_file_actions_destroy, iFp)
-GO(posix_spawn_file_actions_init, iFp)
+GOW(posix_spawnattr_init, iFp)
+GOW(posix_spawnattr_setflags, iFpw)
+//GO(posix_spawnattr_setpgroup, iF!i)
+//GO(posix_spawnattr_setschedparam, iF!!)
+//GO(posix_spawnattr_setschedpolicy, iF!i)
+GOW(posix_spawnattr_setsigdefault, iFpp)
+GOW(posix_spawnattr_setsigmask, iFpp)
+//GO(posix_spawn_file_actions_addchdir_np, iF!p)
+//GOW(posix_spawn_file_actions_addclose, iF!i)
+GOW(posix_spawn_file_actions_adddup2, iFpii)
+//GO(posix_spawn_file_actions_addfchdir_np, iF!i)
+//GOW(posix_spawn_file_actions_addopen, iF!ipiu)
+GOW(posix_spawn_file_actions_destroy, iFp)
+GOW(posix_spawn_file_actions_init, iFp)
 GO(posix_spawnp, iFpppppp)
 GO(ppoll, iFpLpp)
 //GO(__ppoll_chk, 
 GOW(prctl, iFiLLLL)
 GOW(pread, lFipLl)
 GOW(__pread64, lFipLI)
-GOW(pread64, lFipLI)
+GOW(pread64, lFipLl)
 //GO(__pread64_chk, 
 //GO(__pread_chk, 
-//GO(preadv, 
-//GO(preadv2, 
-GO(preadv64, lFipiI)
-//GO(preadv64v2, 
+GO(preadv, lFipil)
+GO(preadv2, lFipili)
+GO(preadv64, lFipil)
+GO(preadv64v2, lFipili)
 GOM(printf, iFEpV)
 GOM(__printf_chk, iFEipV)
 //GO(__printf_fp, 
 //GO(printf_size, 
 //GO(printf_size_info, 
-//GO(prlimit, 
-//GOW(prlimit64, 
-//GO(process_vm_readv, 
-//GO(process_vm_writev, 
-//GOW(profil, 
+GO(prlimit, iFiupp)
+GOW(prlimit64, iFiupp)
+GO(process_vm_readv, lFipLpLL)
+GO(process_vm_writev, lFipLpLL)
+GOW(profil, iFpLLu)
 //GO(__profile_frequency, 
 DATA(__progname, sizeof(void*))
 DATA(__progname_full, sizeof(void))
-//GOW(pselect, 
-//GO(psiginfo, 
-//GO(psignal, 
+//GOW(pselect, iFi!!!p!)
+//GO(psiginfo, vF!p)
+GO(psignal, vFip)
 //GO(pthread_attr_destroy, 
 //GO(pthread_attr_getdetachstate, 
 //GO(pthread_attr_getinheritsched, 
@@ -1388,17 +1390,11 @@ DATA(__progname_full, sizeof(void))
 //GO(pthread_condattr_destroy, 
 //GO(pthread_condattr_init, 
 //GO(pthread_cond_broadcast, 
-//GO(pthread_cond_broadcast, 
-//GO(pthread_cond_destroy, 
 //GO(pthread_cond_destroy, 
 //GO(pthread_cond_init, 
-//GO(pthread_cond_init, 
 //GO(pthread_cond_signal, 
-//GO(pthread_cond_signal, 
-//GO(pthread_cond_timedwait, 
 //GO(pthread_cond_timedwait, 
 //GO(pthread_cond_wait, 
-//GO(pthread_cond_wait, 
 //GO(pthread_equal, 
 //GO(pthread_exit, 
 //GO(pthread_getschedparam, 
@@ -1410,81 +1406,79 @@ DATA(__progname_full, sizeof(void))
 //GO(pthread_setcancelstate, 
 //GO(pthread_setcanceltype, 
 //GO(pthread_setschedparam, 
-GO(ptrace, lFilpp)
-//GO(ptsname, 
-//GOW(ptsname_r, 
+GO(ptrace, lFuipp)
+GO(ptsname, pFi)
+GOW(ptsname_r, iFipL)
 //GO(__ptsname_r_chk, 
 GOW(putc, iFip)
 GO(putchar, iFi)
 GO(putchar_unlocked, iFi)
-GO(putc_unlocked, iFip)
+GOW(putc_unlocked, iFip)
 GO(putenv, iFp)
-//GO(putgrent, 
-//GO(putmsg, 
-//GO(putpmsg, 
-//GO(putpwent, 
+GO(putgrent, iFpp)
+//GO(putmsg, // Deprecated
+//GO(putpmsg, // Deprecated
+GO(putpwent, iFpp)
 GOW(puts, iFp)
 //GO(putsgent, 
-//GO(putspent, 
+GO(putspent, iFpp)
 GOW(pututline, pFp)
-//GO(pututxline, 
-//GO(putw, 
-GO(putwc, iFip)
-//GO(putwchar, 
-GO(putwchar_unlocked, iFi)
-GO(putwc_unlocked, iFip)
+GO(pututxline, pFp)
+GO(putw, iFip)
+GO(putwc, uFip)
+GO(putwchar, uFi)
+GO(putwchar_unlocked, uFi)
+GO(putwc_unlocked, uFip)
 GOW(pvalloc, pFL)
 GOW(pwrite, lFipLl)
 //GOW(__pwrite64, 
-GOW(pwrite64, lFipLI)
-//GO(pwritev, 
-//GO(pwritev2, 
-GO(pwritev64, lFipiI)
-//GO(pwritev64v2, 
-//GO(qecvt, 
-//GOW(qecvt_r, 
-//GO(qfcvt, 
-//GOW(qfcvt_r, 
-//GO(qgcvt, 
+GOW(pwrite64, lFipLl)
+GO(pwritev, lFipil)
+GO(pwritev2, lFipili)
+GO(pwritev64, lFipil)
+GO(pwritev64v2, lFipili)
+GO(qecvt, pFDipp)
+GOW(qecvt_r, iFDipppL)
+GO(qfcvt, pFDipp)
+GOW(qfcvt_r, iFDipppL)
+GO(qgcvt, pFDip)
 GOM(qsort, vFEpLLp)
-GOM(qsort_r, vFEpLLpp)  //Weak
-//GO(query_module, 
-//GO(quick_exit, 
-//GO(quick_exit, 
-//GO(quotactl, 
+GOWM(qsort_r, vFEpLLpp)
+//GO(query_module, // Deprecated
+GO(quick_exit, vFi)
+GO(quotactl, iFipip)
 GO(raise, iFi)
 GO(rand, iFv)
 GOW(random, lFv)
-//GOW(random_r, 
+GOW(random_r, iFpp)
 GO(rand_r, iFp)
 GO(__rawmemchr, pFpi)
 GO(rawmemchr, pFpi)
-//GO(rcmd, 
-//GO(rcmd_af, 
+GO(rcmd, iFpWpppp)
+GO(rcmd_af, iFpWppppW)
 //DATAB(__rcmd_errstr, 
 GOW(__read, lFipL)
 GO(read, lFipL)
-//GOW(readahead, 
+GOW(readahead, lFilL)
 GO(__read_chk, lFipLL)
-GOW(readdir, pFp) // struct direct is 280 byts on x86_64 and ARM64
+GOW(readdir, pFp) // struct dirent is 280 bytes on x86_64 and ARM64
 GOW(readdir64, pFp)
 GOW(readdir64_r, iFppp)
 GOW(readdir_r, iFppp)
-GOM(readlink, lFEppL)   //weak
-GO(readlinkat, pFippL)
+GOWM(readlink, lFEppL)
+GO(readlinkat, lFippL)
 //GO(__readlinkat_chk, 
 //GO(__readlink_chk, 
 //GO(__read_nocancel, 
 GOW(readv, lFipi)
 GO(realloc, pFpL)
-//GOW(reallocarray, 
+GOW(reallocarray, pFpLL)
 GOM(realpath, pFEpp)
-//GO(realpath, 
 GO2(__realpath_chk, pFEppv, my_realpath)
 //GO(reboot, 
-//GOW(re_comp, 
-//GOW(re_compile_fastmap, 
-//GOW(re_compile_pattern, 
+//GOW(re_comp, // Deprecated
+GOW(re_compile_fastmap, iFp)
+GOW(re_compile_pattern, pFpLp)
 GOW(__recv, lFipLi)
 GOW(recv, lFipLi)
 GO(__recv_chk, lFipLLi)
@@ -1492,7 +1486,7 @@ GOW(recvfrom, lFipLipp)
 //GO(__recvfrom_chk, 
 GO(recvmmsg, iFipuip)
 GOW(recvmsg, lFipi)
-//GOW(re_exec, 
+//GOW(re_exec, // Deprecated
 GOW(regcomp, iFppi)
 GOW(regerror, LFippL)
 GO(regexec, iFppLpi)
@@ -1502,22 +1496,22 @@ GOM(__register_atfork, iFEpppp)
 //GOW(register_printf_modifier, 
 //GOW(register_printf_specifier, 
 //GOW(register_printf_type, 
-//GO(registerrpc, 
-//GOW(remap_file_pages, 
-//GOW(re_match, 
-//GOW(re_match_2, 
+//GO(registerrpc, // Deprecated?
+GOW(remap_file_pages, iFpLiLi)
+//GOW(re_match, iFppii!)
+//GOW(re_match_2, iFppipii!i)
 //DATA(re_max_failures, 
 GO(remove, iFp)
 GO(removexattr, iFpp)
-//GO(remque, 
+GO(remque, vFp)
 GO(rename, iFpp)
 GOW(renameat, iFipip)
 GOW(renameat2, iFipipu)
 //DATAB(_res, 
-//GOW(re_search, 
-//GOW(re_search_2, 
-//GOW(re_set_registers, 
-//GOW(re_set_syntax, 
+//GOW(re_search, iFppiii!)
+//GOW(re_search_2, iFppipiii!i)
+//GOW(re_set_registers, vFp!upp)
+GOW(re_set_syntax, LFL)
 //DATAB(_res_hconf, 
 GO(__res_iclose, vFpi)
 GO(__res_init, iFv)
@@ -1531,62 +1525,62 @@ GO(__res_ninit, iFp)
 //GO(__res_randomid, 
 GO(__res_state, pFv)
 //DATAB(re_syntax_options, 
-//GOW(revoke, 
+GOW(revoke, iFp)
 GO(rewind, vFp)
 GOW(rewinddir, vFp)
-//GO(rexec, 
-//GO(rexec_af, 
+GO(rexec, iFpipppp)
+GO(rexec_af, iFpippppW)
 //DATAB(rexecoptions, 
-//GOI(rindex, 
+GO(rindex, pFpi)
 GOW(rmdir, iFp)
 //DATAB(rpc_createerr, 
-//GO(_rpc_dtablesize, 
-//GO(__rpc_thread_createerr, 
-//GO(__rpc_thread_svc_fdset, 
-//GO(__rpc_thread_svc_max_pollfd, 
-//GO(__rpc_thread_svc_pollfd, 
-//GO(rpmatch, 
-//GO(rresvport, 
-//GO(rresvport_af, 
-//GO(rtime, 
-//GO(ruserok, 
-//GO(ruserok_af, 
+GO(_rpc_dtablesize, iFv)
+//GO(__rpc_thread_createerr, !Fv)
+//GO(__rpc_thread_svc_fdset, !Fv)
+GO(__rpc_thread_svc_max_pollfd, pFv)
+GO(__rpc_thread_svc_pollfd, pFv)
+GO(rpmatch, iFp)
+GO(rresvport, iFp)
+GO(rresvport_af, iFpW)
+//GO(rtime, iF!!!)
+GO(ruserok, iFpipp)
+GO(ruserok_af, iFpippW)
 //GO(ruserpass, 
 GO(__sbrk, pFl)
 GOW(sbrk, pFl)
-//GOW(scalbn, 
-//GOW(scalbnf, 
-//GOW(scalbnl, 
-GOM(scandir, iFEpppp)   //weak
-GOM(scandir64, iFEpppp) //weak
-GOM(scandirat, iFEipppp)    //weak
-//GO(scandirat64, 
-//GO(scanf, 
+GOW(scalbn, dFdi)
+GOW(scalbnf, fFfi)
+GOW(scalbnl, DFDi)
+GOWM(scandir, iFEpppp)
+GOWM(scandir64, iFEpppp)
+GOWM(scandirat, iFipppp)
+//GO(scandirat64, iFipp@@)
+//GO(scanf, iFpV)
 GO(__sched_cpualloc, pFL)
 GO(__sched_cpucount, iFLp)
 GO(__sched_cpufree, vFp)
-GO(sched_getaffinity, iFLLp)
-//GO(sched_getcpu, 
-GO(__sched_getparam, iFLp)
-GOW(sched_getparam, iFLp)
+GO(sched_getaffinity, iFiLp)
+GO(sched_getcpu, iFv)
+GO(__sched_getparam, iFip)
+GOW(sched_getparam, iFip)
 GO(__sched_get_priority_max, iFi)
 GOW(sched_get_priority_max, iFi)
 GO(__sched_get_priority_min, iFi)
 GOW(sched_get_priority_min, iFi)
-//GO(__sched_getscheduler, 
-GOW(sched_getscheduler, iFp)
-//GOW(sched_rr_get_interval, 
-GO(sched_setaffinity, iFLLp)
-//GOW(sched_setparam, 
-//GO(__sched_setscheduler, 
-GOW(sched_setscheduler, iFpip)
+//GO(__sched_getscheduler, iFi)
+GOW(sched_getscheduler, iFi)
+GOW(sched_rr_get_interval, iFip)
+GO(sched_setaffinity, iFiLp)
+//GOW(sched_setparam, iFi!)
+//GO(__sched_setscheduler, iFiip)
+GOW(sched_setscheduler, iFiip)
 GO(__sched_yield, iFv)
 GOW(sched_yield, iFv)
 GO2(__secure_getenv, pFp, getenv)   // not always present
 GOW(secure_getenv, pFp)
 GO(seed48, pFp)
-//GOW(seed48_r, 
-GO(seekdir, vFpi)
+GOW(seed48_r, iFpp)
+GO(seekdir, vFpl)
 GO(__select, iFipppp)
 GOW(select, iFipppp)
 GOM(semctl, iFiiiN)
@@ -1601,80 +1595,80 @@ GO(__sendmmsg, iFipui)
 GOW(sendmmsg, iFipui)
 GOW(sendmsg, lFipi)
 GOW(sendto, lFipLipu)
-//GO(setaliasent, 
+GO(setaliasent, vFv)
 GO(setbuf, vFpp)
 GOW(setbuffer, vFppL)
-//GOW(setcontext, 
-//GO(setdomainname, 
+//GOW(setcontext, iF!)
+GO(setdomainname, iFpL)
 GO(setegid, iFu)
 GOW(setenv, iFppi)
-//GO(_seterr_reply, 
+//GO(_seterr_reply, vF!!)
 GO(seteuid, iFu)
-//GO(setfsent, 
-//GO(setfsgid, 
-//GO(setfsuid, 
-GOW(setgid, iFp)
-//GO(setgrent, 
-GO(setgroups, iFip)
+GO(setfsent, iFv)
+GO(setfsgid, iFu)
+GO(setfsuid, iFu)
+GOW(setgid, iFu)
+GO(setgrent, vFv)
+GO(setgroups, iFLp)
 GO(sethostent, vFi)
-//GO(sethostid, 
+GO(sethostid, iFl)
 GO(sethostname, iFpL)
-//GO(setipv4sourcefilter, 
-GOW(setitimer, iFipp)
+//GO(setipv4sourcefilter, iFi??uu!)
+GOW(setitimer, iFupp)
 GOM(_setjmp, iFEp)
 GOM(setjmp, iFEp)
 GO(setlinebuf, vFp)
 GO(setlocale, pFip)
-//GO(setlogin, 
+GO(setlogin, iFp)
 GO(setlogmask, iFi)
 GO(__setmntent, pFpp)
 GOW(setmntent, pFpp)
-//GO(setnetent, 
-//GO(setnetgrent, 
+GO(setnetent, vFi)
+GO(setnetgrent, iFp)
 GO(setns, iFii)
 GO(__setpgid, iFpp)
-GOW(setpgid, iFpp)
-GO(setpgrp, lFv)
-GOW(setpriority, iFiii)
+GOW(setpgid, iFii)
+GO(setpgrp, iFv)
+GOW(setpriority, iFuui)
 GO(setprotoent, vFi)
-//GO(setpwent, 
-//GOW(setregid, 
-GOW(setresgid, iFlll)
+GO(setpwent, vFv)
+GOW(setregid, iFuu)
+GOW(setresgid, iFuuu)
 GOW(setresuid, iFuuu)
 GOW(setreuid, iFuu)
-GOW(setrlimit, iFip)
-GOW(setrlimit64, iFip)
-//GO(setrpcent, 
+GOW(setrlimit, iFup)
+GOW(setrlimit64, iFup)
+GO(setrpcent, vFi)
 GO(setservent, vFi)
 //GO(setsgent, 
-GOW(setsid, pFv)
+GOW(setsid, iFv)
 GOW(setsockopt, iFiiipu)
-//GO(setsourcefilter, 
-//GO(setspent, 
+//GO(setsourcefilter, iFiupuuu!)
+GO(setspent, vFv)
 GOW(setstate, pFp)
-//GOW(setstate_r, 
+GOW(setstate_r, iFpp)
 GOW(settimeofday, iFpp)
-//GOW(setttyent, 
+GOW(setttyent, iFv)
 GOW(setuid, iFu)
-//GO(setusershell, 
-//GOW(setutent, 
-//GO(setutxent, 
+GO(setusershell, vFv)
+GOW(setutent, vFv)
+GO(setutxent, vFv)
 GOW(setvbuf, iFppiL)
 GO(setxattr, iFpppLi)
 //GO(sgetsgent, 
 //GOW(sgetsgent_r, 
-//GO(sgetspent, 
-//GOW(sgetspent_r, 
+GO(sgetspent, pFp)
+GOW(sgetspent_r, iFpppLp)
 GO(shmat, pFipi)
 GO(shmctl, iFiip)
 GO(shmdt, iFp)
 GO(shmget, iFiLi)
 GOW(shutdown, iFii)
-GOM(__sigaction, iFEipp)  // Weak
-GOM(sigaction, iFEipp)    // Weak
+GOWM(__sigaction, iFEipp)
+GOWM(sigaction, iFEipp)
 GO(__sigaddset, iFpi)
 GO(sigaddset, iFpi)
-GOM(sigaltstack, iFEpp) // Weak
+GOWM(sigaltstack, iFEpp)
 //GO(sigandset, 
 GOW(sigblock, iFi)
 //GO(__sigdelset, 
@@ -1684,40 +1678,40 @@ GO(sigfillset, iFp)
 GO(siggetmask, iFv)
 GO(sighold, iFi)
 GO(sigignore, iFi)
-//GO(siginterrupt, 
-//GO(sigisemptyset, 
+GO(siginterrupt, iFii)
+//GO(sigisemptyset, iF!)
 //GO(__sigismember, 
 GO(sigismember, iFpi)
 GOM(siglongjmp, vFEpi)
-GOM(signal, pFEip)  //Weak
-//GO(signalfd, 
+GOWM(signal, pFEip)
+//GO(signalfd, iFi!i)
 GO(__signbit, iFd)
 GO(__signbitf, iFf)
-//GO(__signbitl, 
-//GO(sigorset, 
+GO(__signbitl, iFD)
+//GO(sigorset, iF!!!)
 //GO(__sigpause, 
-//GOW(sigpause, 
+//GOW(sigpause, // Deprecated
 GO(sigpending, iFp)
 GOW(sigprocmask, iFipp)
-//GOW(sigqueue, 
+//GOW(sigqueue, iFii?)
 GO(sigrelse, iFi)
-//GOW(sigreturn, 
+//GOW(sigreturn, iF!)
 GOM(sigset, pFEip)
 GOM(__sigsetjmp, iFEpi)
 GOW(sigsetmask, iFi)
-//GO(sigstack, 
+//GO(sigstack, iF!!)
 GO(__sigsuspend, iFp)
 GOW(sigsuspend, iFp)
 GO(__sigtimedwait, iFppp)
 GOW(sigtimedwait, iFppp)
-//GO(sigvec, 
+//GO(sigvec, // Deprecated
 GOW(sigwait, iFpp)
 GOW(sigwaitinfo, iFpp)
 GOW(sleep, uFu)
 GOM(__snprintf, iFEpLpV)
-GOM(snprintf, iFEpLpV)  //Weak
-GOM(__snprintf_chk, iFEpLiLpV)  //Weak
-//GO(sockatmark, 
+GOWM(snprintf, iFEpLpV)
+GOWM(__snprintf_chk, iFEpLiLpV)
+GO(sockatmark, iFi)
 GO(__socket, iFiii)
 GOW(socket, iFiii)
 GOW(socketpair, iFiiip)
@@ -1727,11 +1721,11 @@ GOM(__sprintf_chk, iFEpilpV)
 //GOW(sprofil, 
 GOW(srand, vFu)
 GO(srand48, vFl)
-//GOW(srand48_r, 
+GOW(srand48_r, iFlp)
 GOW(srandom, vFu)
-//GOW(srandom_r, 
+GOW(srandom_r, iFup)
 GOM(sscanf, iFEppV)
-//GOW(ssignal, 
+//GOW(ssignal, @Fi@)
 //GO(sstk, 
 GOM(__stack_chk_fail, vFEv)
 //GO(__statfs, 
@@ -1739,13 +1733,13 @@ GOW(statfs, iFpp)
 GOW(statfs64, iFpp)
 GOW(statvfs, iFpp)
 GOW(statvfs64, iFpp)
-//GO(statx, 
+//GO(statx, iFipiu!)
 DATA(stderr, sizeof(void*))
 DATA(stdin, sizeof(void*))
 DATA(stdout, sizeof(void*))
 //GOW(step, 
-//GO(stime, 
-//GOI(__stpcpy, 
+//GO(stime, // Deprecated
+GO(__stpcpy, pFpp)
 GO(stpcpy, pFpp)
 GO(__stpcpy_chk, pFppL)
 //GO(__stpcpy_small, 
@@ -1754,8 +1748,8 @@ GOW(stpncpy, pFppL)
 GO(__stpncpy_chk, pFppLL)
 GO(__strcasecmp, iFpp)
 GO(strcasecmp, iFpp)
-//GOI(__strcasecmp_l, 
-//GOI(strcasecmp_l, 
+//GO(__strcasecmp_l, 
+GO(strcasecmp_l, iFppp)
 GO(__strcasestr, pFpp)
 GOW(strcasestr, pFpp)
 GO(strcat, pFpp)
@@ -1779,25 +1773,25 @@ GO(strerror, pFi)
 GO(strerror_l, pFip)
 GO(__strerror_r, pFipL)
 GOW(strerror_r, pFipL)
-//GO(strfmon, 
+//GO(strfmon, lFpLpV)
 //GO(__strfmon_l, 
-//GOW(strfmon_l, 
-//GO(strfromd, 
-//GO(strfromf, 
+//GOW(strfmon_l, lFpLppV)
+GO(strfromd, iFpLpd)
+GO(strfromf, iFpLpf)
 //GO(strfromf128, 
-//GOW(strfromf32, 
-//GOW(strfromf32x, 
-//GOW(strfromf64, 
-//GOW(strfromf64x, 
-//GO(strfroml, 
-//GO(strfry, 
+GOW(strfromf32, iFpLpf)
+GOW(strfromf32x, iFpLpd)
+GOW(strfromf64, iFpLpd)
+GOW(strfromf64x, iFpLpD)
+GO(strfroml, iFpLpD)
+GO(strfry, pFp)
 GO(strftime, LFpLpp)
 GO(__strftime_l, LFpLppL)
-GOW(strftime_l, LFpLppL)
+GOW(strftime_l, LFpLppp)
 GO(strlen, LFp)
 GO(strncasecmp, iFppL)
-//GOI(__strncasecmp_l, 
-//GOI(strncasecmp_l, 
+//GO(__strncasecmp_l, 
+GO(strncasecmp_l, iFppLp)
 GO(strncat, pFppL)
 GO(__strncat_chk, pFppLL)
 GO(strncmp, iFppL)
@@ -1810,7 +1804,7 @@ GO(strpbrk, pFpp)
 //GO(__strpbrk_c2, 
 //GO(__strpbrk_c3, 
 GO(strptime, pFppp)
-//GOW(strptime_l, 
+//GOW(strptime_l, pFppp!)
 GO(strrchr, pFpi)
 GOW(strsep, pFpp)
 //GO(__strsep_1c, 
@@ -1833,19 +1827,19 @@ GO(strtof, fFpp)
 //GO(__strtof128_internal, 
 //GOW(strtof128_l, 
 //GO(__strtof128_nan, 
-//GOW(strtof32, 
-//GOW(strtof32_l, 
-//GOW(strtof32x, 
-//GOW(strtof32x_l, 
-//GOW(strtof64, 
-//GOW(strtof64_l, 
-//GOW(strtof64x, 
-//GOW(strtof64x_l, 
+GOW(strtof32, fFpp)
+//GOW(strtof32_l, fFpp!)
+GOW(strtof32x, dFpp)
+//GOW(strtof32x_l, dFpp!)
+GOW(strtof64, dFpp)
+//GOW(strtof64_l, dFpp!)
+GOW(strtof64x, DFpp)
+//GOW(strtof64x_l, DFpp!)
 //GO(__strtof_internal, 
 GO(__strtof_l, fFppL)
-GOW(strtof_l, fFppL)
+GOW(strtof_l, fFppp)
 //GO(__strtof_nan, 
-GO(strtoimax, IFppi)
+GO(strtoimax, lFppi)
 GO(strtok, pFpp)
 GO(__strtok_r, pFppp)
 GOW(strtok_r, pFppp)
@@ -1853,63 +1847,63 @@ GOW(strtok_r, pFppp)
 GOW(strtol, lFppi)
 GO(strtold, DFpp)
 //GO(__strtold_internal, 
-GO(__strtold_l, DFppiL)
-GOW(strtold_l, DFppiL)
+GO(__strtold_l, DFppp)
+GOW(strtold_l, DFppp)
 //GO(__strtold_nan, 
 GO(__strtol_internal, lFppii)
 GO(__strtol_l, lFppi)
-GOW(strtol_l, lFppi)
-GOW(strtoll, lFppi)
+GOW(strtol_l, lFppip)
+GOW(strtoll, IFppi)
 //GO(__strtoll_internal, 
 GOW(__strtoll_l, IFppip)
 GOW(strtoll_l, IFppip)
-//GOW(strtoq, 
+GOW(strtoq, IFppi)
 GOW(strtoul, LFppi)
 GO(__strtoul_internal, LFppii)
 //GO(__strtoul_l, 
-//GOW(strtoul_l, 
-GOW(strtoull, LFppi)
+GOW(strtoul_l, LFppip)
+GOW(strtoull, UFppi)
 //GO(__strtoull_internal, 
 GOW(__strtoull_l, LFppip)
-GOW(strtoull_l, LFppip)
-//GO(strtoumax, 
-//GOW(strtouq, 
+GOW(strtoull_l, UFppip)
+GO(strtoumax, LFppi)
+GOW(strtouq, UFppi)
 //GO(__strverscmp, 
 GOW(strverscmp, iFpp)
 GO(strxfrm, LFppL)
 GO(__strxfrm_l, LFppLL)
-GOW(strxfrm_l, LFppLL)
-//GO(stty, 
+GOW(strxfrm_l, LFppLp)
+//GO(stty, // Deprecated
 //DATAB(svcauthdes_stats, 
-//GO(svcerr_auth, 
-//GO(svcerr_decode, 
-//GO(svcerr_noproc, 
-//GO(svcerr_noprog, 
-//GO(svcerr_progvers, 
-//GO(svcerr_systemerr, 
-//GO(svcerr_weakauth, 
-//GO(svc_exit, 
-//GO(svcfd_create, 
+//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(svc_exit, vFv)
+//GO(svcfd_create, !Fiuu)
 //DATAB(svc_fdset, 
-//GO(svc_getreq, 
-//GO(svc_getreq_common, 
-//GO(svc_getreq_poll, 
-//GO(svc_getreqset, 
+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, 
-//GO(svc_register, 
-//GO(svc_run, 
-//GO(svc_sendreply, 
-//GO(svctcp_create, 
-//GO(svcudp_bufcreate, 
-//GO(svcudp_create, 
+//GO(svcraw_create, !Fv)
+//GO(svc_register, iF!LL@L)
+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, 
+//GO(svcunix_create, !Fiuup)
 //GO(svcunixfd_create, 
-//GO(svc_unregister, 
-//GO(swab, 
-GOM(swapcontext, iFEpp) //Weak
+GO(svc_unregister, vFLL)
+GO(swab, vFppl)
+GOWM(swapcontext, iFEpp)
 //GOW(swapoff, 
 //GOW(swapon, 
 GOM(swprintf, iFEpLpV)
@@ -1918,59 +1912,57 @@ GOM(swscanf, iFEppV)
 GOW(symlink, iFpp)
 GO(symlinkat, iFpip)
 GO(sync, vFv)
-//GO(sync_file_range, 
+GO(sync_file_range, iFillu)
 GO(syncfs, iFi)
-GOM(syscall, LFEv)
+GOM(syscall, lFEv)
 GO(__sysconf, lFi)
 GOW(sysconf, lFi)
 GO(__sysctl, iFpipppL)
-GOW(sysctl, iFpipppL)
+GOW(sysctl, iFpipppL) // Deprecated
 DATA(_sys_errlist, sizeof(void*))
 DATA(sys_errlist, sizeof(void*))
 GOW(sysinfo, iFp)
 GOM(syslog, vFEipV)
 GOM(__syslog_chk, vFEiipV)
 //DATA(sys_sigabbrev, 
-//DATA(sys_sigabbrev, 
-//DATA(_sys_siglist, 
 //DATA(_sys_siglist, 
 //DATA(sys_siglist, 
-//DATA(sys_siglist, 
 GOW(system, iFp)
 GOM(__sysv_signal, pFEip)
-GOM(sysv_signal, pFEip)  // Weak
+GOWM(sysv_signal, pFEip)
 GOW(tcdrain, iFi)
 GO(tcflow, iFii)
 GO(tcflush, iFii)
 GOW(tcgetattr, iFip)
 GO(tcgetpgrp, iFi)
-//GO(tcgetsid, 
+GO(tcgetsid, iFi)
 GO(tcsendbreak, iFii)
 GO(tcsetattr, iFiip)
 GO(tcsetpgrp, iFii)
 //GO(__tdelete, 
-//GOW(tdelete, 
-//GOW(tdestroy, 
-//GO(tee, 
-GO(telldir, iFp)
+//GOW(tdelete, pFpp@)
+//GOW(tdestroy, vFp@)
+GO(tee, lFiiLu)
+GO(telldir, lFp)
 GO(tempnam, pFpp)
 GOW(textdomain, pFp)
 //GO(__tfind, 
-//GOW(tfind, 
+//GOW(tfind, pFpp@)
+GOW(tgkill, iFiii)
 //GO(thrd_current, 
 //GO(thrd_equal, 
 //GO(thrd_sleep, 
 //GO(thrd_yield, 
-GO(time, LFp)
-GO(timegm, LFp)
-//GOW(timelocal, 
+GO(time, lFp)
+GO(timegm, lFp)
+GOW(timelocal, lFp)
 GO(timerfd_create, iFii)
 GO(timerfd_gettime, iFip)
 GO(timerfd_settime, iFiipp)
-GOW(times, LFp)
-//GO(timespec_get, 
+GOW(times, lFp)
+GO(timespec_get, iFpi)
 DATAB(__timezone, sizeof(void*))
-DATAV(timezone, sizeof(void*))  //type V
+DATAV(timezone, sizeof(void*))
 GO(tmpfile, pFv)
 GOW(tmpfile64, pFv)
 GO(tmpnam, pFp)
@@ -1979,136 +1971,137 @@ GO(toascii, iFi)
 //GOW(__toascii_l, 
 GO(_tolower, iFi)
 GO(tolower, iFi)
-//GO(__tolower_l, 
+//GO(__tolower_l, iFi!)
 GOW(tolower_l, iFip)
-//GO(_toupper, 
+GO(_toupper, iFi)
 GO(toupper, iFi)
-//GO(__toupper_l, 
+//GO(__toupper_l, iFi!)
 GOW(toupper_l, iFip)
 //GO(__towctrans, 
-//GOW(towctrans, 
+GOW(towctrans, uFup)
 //GO(__towctrans_l, 
-//GOW(towctrans_l, 
-GOW(towlower, iFi)
+GOW(towctrans_l, uFupp)
+GOW(towlower, uFu)
 GO(__towlower_l, iFip)
-GOW(towlower_l, iFip)
-GOW(towupper, iFi)
+GOW(towlower_l, uFup)
+GOW(towupper, uFu)
 GO(__towupper_l, iFip)
-GOW(towupper_l, iFip)
+GOW(towupper_l, uFup)
 //GO(tr_break, 
 GOW(truncate, iFpl)
-GOW(truncate64, iFpI)
+GOW(truncate64, iFpl)
 //GO(__tsearch, 
-//GOW(tsearch, 
+//GOW(tsearch, pFpp@)
 GO(ttyname, pFi)
 GOW(ttyname_r, iFipL)
 //GO(__ttyname_r_chk, 
-//GO(ttyslot, 
+GO(ttyslot, iFv)
 //GO(__twalk, 
-//GOW(twalk, 
+//GOW(twalk, vFp@)
+//GOW(twalk_r, vFp@p)
 DATA(__tzname, sizeof(void*))
 DATA(tzname, sizeof(void*)) //type V
 GOW(tzset, vFv)
-//GO(ualarm, 
+GO(ualarm, uFuu)
 GO(__uflow, iFp)
-//GOW(ulckpwdf, 
-//GOW(ulimit, 
+GOW(ulckpwdf, iFv)
+//GOW(ulimit, lFiV) // Deprecated
 GOW(umask, uFu)
 GOW(umount, iFp)
 GOW(umount2, iFpi)
-GOM(uname, iFp) //Weak
+GOWM(uname, iFp)
 GO(__underflow, iFp)
 GOW(ungetc, iFip)
-GO(ungetwc, iFip)
+GO(ungetwc, uFup)
 GOW(unlink, iFp)
-//GO(unlinkat, 
-//GO(unlockpt, 
+GO(unlinkat, iFipi)
+GO(unlockpt, iFi)
 GOW(unsetenv, iFp)
-//GO(unshare, 
-//GOW(updwtmp, 
-//GO(updwtmpx, 
-//GO(uselib, 
+GO(unshare, iFi)
+GOW(updwtmp, vFpp)
+GO(updwtmpx, vFpp)
+//GO(uselib, // Deprecated
 GO(__uselocale, pFp)
 GOW(uselocale, pFp)
-//GO(user2netname, 
+GO(user2netname, iFpup)
 GO(usleep, iFu)
-//GO(ustat, 
+//GO(ustat, // Deprecated
 GO(utime, iFpp)
 GO(utimensat, iFippi)
 GOW(utimes, iFpp)
-//GOW(utmpname, 
-//GO(utmpxname, 
+GOW(utmpname, iFp)
+GO(utmpxname, iFp)
 GOW(valloc, pFL)
-GOM(vasprintf, iFEppp)   //weak
+GOWM(vasprintf, iFEppA)
 GOM(__vasprintf_chk, iFEpipp)
-//GOW(vdprintf, 
+//GOW(vdprintf, iFipA)
 //GO(__vdprintf_chk, 
-//GO(verr, 
-//GO(verrx, 
+//GO(verr, vFipA)
+//GO(verrx, vFipA)
 GOW(versionsort, iFpp)
 GOW(versionsort64, iFpp)
 //GO(__vfork, 
-//GOW(vfork, 
-GOM(vfprintf, iFEppp)
+//GOW(vfork, iFv)
+GOM(vfprintf, iFEppA)
 GOM(__vfprintf_chk, iFEpvpp)
 //GO(__vfscanf, 
-GOM(vfscanf, iFEppp)    //Weak
-//GOW(vfwprintf, 
+GOWM(vfscanf, iFEppA)
+//GOW(vfwprintf, iFppA)
 //GO(__vfwprintf_chk, 
-//GOW(vfwscanf, 
-//GO(vhangup, 
-//GO(vlimit, 
-//GO(vmsplice, 
-GOM(vprintf, iFEpp)
+//GOW(vfwscanf, iFppA)
+GO(vhangup, iFv)
+//GO(vlimit, // Deprecated
+GO(vmsplice, lFipLu)
+GOM(vprintf, iFEpA)
 GOM(__vprintf_chk, iFEvpp)
-//GOW(vscanf, 
-GOM(__vsnprintf, iFEpLpp)  // Weak
-GOM(vsnprintf, iFEpLpp)    // Weak
+//GOW(vscanf, iFpA)
+GOWM(__vsnprintf, iFEpLpA)
+GOWM(vsnprintf, iFEpLpA)
 GOM(__vsnprintf_chk, iFEpLvvpp)
-GOM(vsprintf, iFEpppp) //Weak
+GOWM(vsprintf, iFEppA)
 GOM(__vsprintf_chk, iFEpvvppp)
-GOM(__vsscanf, iFEppp)  //Weak
-GOM(vsscanf, iFEppp)    //Weak
-GOM(vswprintf, iFEpuppp)    // Weak
-GOM(__vswprintf_chk, iFEpuvvppp)    // Weak
-//GO(vswscanf, 
-GOM(vsyslog, vFEipp)
+GOWM(__vsscanf, iFEppp)
+GOWM(vsscanf, iFEppA)
+GOWM(vswprintf, iFEpLpA)
+GOWM(__vswprintf_chk, iFEpuvvppp)
+//GO(vswscanf, iFppA)
+GOM(vsyslog, vFEipA)
 //GO(__vsyslog_chk, 
-//GO(vtimes, 
-//GO(vwarn, 
-//GO(vwarnx, 
-//GO(vwprintf, 
+//GO(vtimes, // Deprecated
+//GO(vwarn, vFpA)
+//GO(vwarnx, vFpA)
+//GO(vwprintf, iFpA)
 //GO(__vwprintf_chk, 
-//GO(vwscanf, 
+//GO(vwscanf, iFpA)
 GOW(__wait, lFp)
-GOW(wait, lFp)
-GOW(wait3, lFpip)
-GOW(wait4, lFlpip)
-GOW(waitid, iFiupi)
+GOW(wait, iFp)
+GOW(wait3, iFpip)
+GOW(wait4, iFipip)
+GOW(waitid, iFuupi)
 GO(__waitpid, lFlpi)
-GOW(waitpid, lFlpi)
+GOW(waitpid, iFipi)
 GOM(warn, vFEpV)
 GOM(warnx, vFEpV)
-//GOW(wcpcpy, 
+GOW(wcpcpy, pFpp)
 //GO(__wcpcpy_chk, 
-//GOW(wcpncpy, 
+GOW(wcpncpy, pFppL)
 //GO(__wcpncpy_chk, 
-GOW(wcrtomb, LFpup)
+GOW(wcrtomb, LFpip)
 //GO(__wcrtomb_chk, 
 GOW(wcscasecmp, iFpp)
 //GO(__wcscasecmp_l, 
-//GOW(wcscasecmp_l, 
+//GOW(wcscasecmp_l, iFpp!)
 GOW(wcscat, pFpp)
 //GO(__wcscat_chk, 
 GO(wcschr, pFpi)
-//GOW(wcschrnul, 
+GOW(wcschrnul, pFpi)
 GO(wcscmp, iFpp)
 GOW(wcscoll, iFpp)
 GO(__wcscoll_l, iFppp)
 GOW(wcscoll_l, iFppp)
 GO(wcscpy, pFpp)
 GO(__wcscpy_chk, pFppL)
-//GO(wcscspn, 
+GO(wcscspn, LFpp)
 GO(wcsdup, pFp)
 GO(wcsftime, LFpLpp)
 GO(__wcsftime_l, LFpLppp)
@@ -2116,83 +2109,83 @@ GOW(wcsftime_l, LFpLppp)
 GO(wcslen, LFp)
 GOW(wcsncasecmp, iFppL)
 //GO(__wcsncasecmp_l, 
-//GOW(wcsncasecmp_l, 
+//GOW(wcsncasecmp_l, iFppL!)
 GO(wcsncat, pFppL)
 //GO(__wcsncat_chk, 
 GO(wcsncmp, iFppL)
 GOW(wcsncpy, pFppL)
 //GO(__wcsncpy_chk, 
+GO(wcsnlen, LFpL)
 GOW(wcsnrtombs, LFppLLp)
 //GO(__wcsnrtombs_chk, 
-GO(wcsnlen, LFpL)
-//GO(wcspbrk, 
+GO(wcspbrk, pFpp)
 GO(wcsrchr, pFpi)
 GOW(wcsrtombs, LFppLp)
 //GO(__wcsrtombs_chk, 
-//GO(wcsspn, 
+GO(wcsspn, LFpp)
 GO(wcsstr, pFpp)
 GO(wcstod, dFpp)
 //GO(__wcstod_internal, 
 //GO(__wcstod_l, 
-//GOW(wcstod_l, 
+//GOW(wcstod_l, dFpp!)
 GO(wcstof, fFpp)
 //GO(wcstof128, 
 //GO(__wcstof128_internal, 
 //GOW(wcstof128_l, 
-//GOW(wcstof32, 
-//GOW(wcstof32_l, 
-//GOW(wcstof32x, 
-//GOW(wcstof32x_l, 
-//GOW(wcstof64, 
-//GOW(wcstof64_l, 
-//GOW(wcstof64x, 
-//GOW(wcstof64x_l, 
+GOW(wcstof32, fFpp)
+//GOW(wcstof32_l, fFpp!)
+GOW(wcstof32x, dFpp)
+//GOW(wcstof32x_l, dFpp!)
+GOW(wcstof64, dFpp)
+//GOW(wcstof64_l, dFpp!)
+GOW(wcstof64x, DFpp)
+//GOW(wcstof64x_l, DFpp!)
 //GO(__wcstof_internal, 
 //GO(__wcstof_l, 
-//GOW(wcstof_l, 
-//GO(wcstoimax, 
-//GO(wcstok, 
+//GOW(wcstof_l, fFpp!)
+GO(wcstoimax, lFppi)
+GO(wcstok, pFppp)
 GOW(wcstol, lFppi)
-//GO(wcstold, 
+GO(wcstold, DFpp)
 //GO(__wcstold_internal, 
 //GO(__wcstold_l, 
-//GOW(wcstold_l, 
+//GOW(wcstold_l, DFpp!)
 //GO(__wcstol_internal, 
 //GO(__wcstol_l, 
-//GOW(wcstol_l, 
+//GOW(wcstol_l, lFppi!)
 GOW(wcstoll, IFppi)
 //GO(__wcstoll_internal, 
 //GOW(__wcstoll_l, 
-//GOW(wcstoll_l, 
+//GOW(wcstoll_l, IFppi!)
 GO(wcstombs, LFppL)
 //GO(__wcstombs_chk, 
-//GOW(wcstoq, 
+GOW(wcstoq, IFppi)
 GOW(wcstoul, LFppi)
 //GO(__wcstoul_internal, 
 //GO(__wcstoul_l, 
-//GOW(wcstoul_l, 
+//GOW(wcstoul_l, LFppi!)
 GOW(wcstoull, UFppi)
 //GO(__wcstoull_internal, 
 //GOW(__wcstoull_l, 
-//GOW(wcstoull_l, 
-//GO(wcstoumax, 
-//GOW(wcstouq, 
-//GOW(wcswcs, 
+//GOW(wcstoull_l, UFppi!)
+GO(wcstoumax, LFppi)
+GOW(wcstouq, UFppi)
+GOW(wcswcs, pFpp)
 GO(wcswidth, iFpL)
 GO(wcsxfrm, LFppL)
 GO(__wcsxfrm_l, LFppLL)
-GOW(wcsxfrm_l, LFppLL)
-GO(wctob, iFi)
+GOW(wcsxfrm_l, LFppLp)
+GO(wctob, iFu)
 GO(wctomb, iFpi)
 GO(__wctomb_chk, iFpuL)
-//GOW(wctrans, 
+GOW(wctrans, pFp)
 //GO(__wctrans_l, 
-//GOW(wctrans_l, 
+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)
@@ -2200,98 +2193,98 @@ GOW(wmemmove, pFppL)
 //GO(__wmemmove_chk, 
 GOW(wmempcpy, pFppL)
 //GO(__wmempcpy_chk, 
-GO(wmemset, pFpuL)
-//GOI(__wmemset_chk, 
+GO(wmemset, pFpiL)
+//GO(__wmemset_chk, 
 GO(wordexp, iFppi)
 GO(wordfree, vFp)
 //GO(__woverflow, 
-//GO(wprintf, 
+//GO(wprintf, iFpV)
 //GO(__wprintf_chk, 
 GOW(__write, lFipL)
 GOW(write, lFipL)
 //GO(__write_nocancel, 
 GOW(writev, lFipi)
-//GO(wscanf, 
+//GO(wscanf, iFpV)
 //GO(__wuflow, 
 //GO(__wunderflow, 
-//GO(xdecrypt, 
+//GO(xdecrypt, // Deprecated
 //GO(xdr_accepted_reply, 
-//GO(xdr_array, 
+//GO(xdr_array, iF!ppuu@)
 //GO(xdr_authdes_cred, 
 //GO(xdr_authdes_verf, 
-//GO(xdr_authunix_parms, 
-//GO(xdr_bool, 
-//GO(xdr_bytes, 
-//GO(xdr_callhdr, 
-//GO(xdr_callmsg, 
-//GO(xdr_char, 
+//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)
 //GO(xdr_cryptkeyarg, 
 //GO(xdr_cryptkeyarg2, 
 //GO(xdr_cryptkeyres, 
-//GO(xdr_des_block, 
-//GO(xdr_double, 
-//GO(xdr_enum, 
-//GO(xdr_float, 
-//GO(xdr_free, 
+//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)
 //GO(xdr_getcredres, 
-//GO(xdr_hyper, 
-//GO(xdr_int, 
-//GO(xdr_int16_t, 
-//GO(xdr_int32_t, 
-//GO(xdr_int64_t, 
-//GO(xdr_int8_t, 
+//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)
 //GO(xdr_keybuf, 
 //GO(xdr_key_netstarg, 
 //GO(xdr_key_netstres, 
 //GO(xdr_keystatus, 
-//GO(xdr_long, 
-//GO(xdr_longlong_t, 
-//GO(xdrmem_create, 
+//GO(xdr_long, iF!p)
+//GO(xdr_longlong_t, iF!p)
+//GO(xdrmem_create, vF!puu)
 //GO(xdr_netnamestr, 
-//GO(xdr_netobj, 
-//GO(xdr_opaque, 
-//GO(xdr_opaque_auth, 
+//GO(xdr_netobj, iF!!)
+//GO(xdr_opaque, iF!pu)
+//GO(xdr_opaque_auth, iF!!)
 //GO(xdr_pmap, 
 //GO(xdr_pmaplist, 
-//GO(xdr_pointer, 
-//GO(xdr_quad_t, 
-//GO(xdrrec_create, 
-//GO(xdrrec_endofrecord, 
-//GO(xdrrec_eof, 
-//GO(xdrrec_skiprecord, 
-//GO(xdr_reference, 
+//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, 
+//GO(xdr_replymsg, iF!!)
 //GO(xdr_rmtcall_args, 
 //GO(xdr_rmtcallres, 
-//GO(xdr_short, 
-//GO(xdr_sizeof, 
-//GO(xdrstdio_create, 
-//GO(xdr_string, 
-//GO(xdr_u_char, 
-//GO(xdr_u_hyper, 
-//GO(xdr_u_int, 
-//GO(xdr_uint16_t, 
-//GO(xdr_uint32_t, 
-//GO(xdr_uint64_t, 
-//GO(xdr_uint8_t, 
-//GO(xdr_u_long, 
-//GO(xdr_u_longlong_t, 
-//GO(xdr_union, 
+//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!@)
 //GO(xdr_unixcred, 
-//GO(xdr_u_quad_t, 
-//GO(xdr_u_short, 
-//GO(xdr_vector, 
-//GO(xdr_void, 
-//GO(xdr_wrapstring, 
+//GO(xdr_u_quad_t, iF!p)
+//GO(xdr_u_short, iF!p)
+//GO(xdr_vector, iF!puu@)
+GO(xdr_void, iFv)
+//GO(xdr_wrapstring, iF!p)
 //GO(xencrypt, 
 GO(__xmknod, iFipup)
-//GO(__xmknodat, 
+GO(__xmknodat, iFiipup)
 GO(__xpg_basename, pFp)
 GOW(__xpg_sigpause, iFi)
 GO(__xpg_strerror_r, pFipL)
-//GO(xprt_register, 
-//GO(xprt_unregister, 
+//GO(xprt_register, vF!)
+//GO(xprt_unregister, vF!)
 GOM(__xstat, iFEipp)
 GOM(__xstat64, iFEipp)
 
diff --git a/src/wrapped/wrappedlibgl_private.h b/src/wrapped/wrappedlibgl_private.h
index 7dda9761..3d45f20f 100755
--- a/src/wrapped/wrappedlibgl_private.h
+++ b/src/wrapped/wrappedlibgl_private.h
@@ -1113,8 +1113,6 @@ GO(glFogCoordfEXT,vFf)
 GO(glFogCoordfvEXT,vFp)
 //EXT_framebuffer_blit
 GO(glBlitFramebufferEXT,vFiiiiiiiiiu)
-//EXT_framebuffer_multisample
-GO(glRenderbufferStorageMultisampleEXT,vFuiuii)
 //EXT_framebuffer_object
 GO(glBindFramebufferEXT,vFuu)
 GO(glBindRenderbufferEXT,vFuu)
@@ -1580,56 +1578,6 @@ GO(glIsOcclusionQueryNV,iFu)
 GO(glProgramBufferParametersIivNV,vFuuuip)
 GO(glProgramBufferParametersIuivNV,vFuuuip)
 GO(glProgramBufferParametersfvNV,vFuuuip)
-//NV_path_rendering
-GO(glCopyPathNV,vFuu)
-GO(glCoverFillPathInstancedNV,vFiupuuup)
-GO(glCoverFillPathNV,vFuu)
-GO(glCoverStrokePathInstancedNV,vFiupuuup)
-GO(glCoverStrokePathNV,vFuu)
-GO(glDeletePathsNV,vFui)
-GO(glGenPathsNV,uFi)
-GO(glGetPathColorGenfvNV,vFuup)
-GO(glGetPathColorGenivNV,vFuup)
-GO(glGetPathCommandsNV,vFup)
-GO(glGetPathCoordsNV,vFup)
-GO(glGetPathDashArrayNV,vFup)
-GO(glGetPathLengthNV,fFuii)
-GO(glGetPathMetricRangeNV,vFiuiip)
-GO(glGetPathMetricsNV,vFiiupuip)
-GO(glGetPathParameterfvNV,vFuup)
-GO(glGetPathParameterivNV,vFuup)
-GO(glGetPathSpacingNV,vFuiupuffup)
-GO(glGetPathTexGenfvNV,vFuup)
-GO(glGetPathTexGenivNV,vFuup)
-GO(glInterpolatePathsNV,vFuuuf)
-GO(glIsPathNV,iFu)
-GO(glIsPointInFillPathNV,iFuuff)
-GO(glIsPointInStrokePathNV,iFuff)
-GO(glPathColorGenNV,vFuuup)
-GO(glPathCommandsNV,vFuipiup)
-GO(glPathCoordsNV,vFuiup)
-GO(glPathCoverDepthFuncNV,vFu)
-GO(glPathDashArrayNV,vFuip)
-GO(glPathFogGenNV,vFu)
-GO(glPathGlyphRangeNV,vFuupiuiuuf)
-GO(glPathGlyphsNV,vFuupiiupuuf)
-GO(glPathParameterfNV,vFuuf)
-GO(glPathParameterfvNV,vFuup)
-GO(glPathParameteriNV,vFuui)
-GO(glPathParameterivNV,vFuup)
-GO(glPathStencilDepthOffsetNV,vFff)
-GO(glPathStencilFuncNV,vFuiu)
-GO(glPathStringNV,vFuuip)
-GO(glPathSubCommandsNV,vFuiiipiup)
-GO(glPathSubCoordsNV,vFuiiup)
-GO(glPathTexGenNV,vFuuip)
-GO(glPointAlongPathNV,iFuiifpppp)
-GO(glStencilFillPathInstancedNV,vFiupuuuup)
-GO(glStencilFillPathNV,vFuuu)
-GO(glStencilStrokePathInstancedNV,vFiupuiuup)
-GO(glStencilStrokePathNV,vFuiu)
-GO(glTransformPathNV,vFuuup)
-GO(glWeightPathsNV,vFuipp)
 //NV_pixel_data_range
 GO(glFlushPixelDataRangeNV,vFu)
 GO(glPixelDataRangeNV,vFuip)
diff --git a/src/wrapped/wrappedlibm_private.h b/src/wrapped/wrappedlibm_private.h
index ac77b3e7..b8245298 100755
--- a/src/wrapped/wrappedlibm_private.h
+++ b/src/wrapped/wrappedlibm_private.h
@@ -16,7 +16,7 @@ GOW(acoshl, DFD)
 GO2(acoshl, KFK, acosh)
 #endif
 #ifdef HAVE_LD80BITS
-GOW(acpsl, DFD)
+GOW(acosl, DFD)
 #else
 GO2(acosl, KFK, acos)
 #endif
diff --git a/src/wrapped/wrappedlibncurses.c b/src/wrapped/wrappedlibncurses.c
index e9f49643..37ad0021 100755
--- a/src/wrapped/wrappedlibncurses.c
+++ b/src/wrapped/wrappedlibncurses.c
@@ -26,17 +26,8 @@ static library_t* my_lib = NULL;
 
 // this is a simple copy of libncursesw wrapper. TODO: check if ok
 
-typedef void*       (*pFv_t)();
-typedef int         (*iFppV_t)(void*, void*, va_list);
-typedef int         (*iFpiip_t)(void*, int32_t, int32_t, void*);
-typedef int         (*iFiipV_t)(int, int, void*, ...);
-
-#define SUPER() \
-    GO(initscr, pFv_t)      \
-    GO(mvwprintw, iFpiip_t) \
-    GO(vwprintw, iFppV_t)   \
-    GO(stdscr, void*)       \
-    GO(mvprintw, iFiipV_t)
+#define ADDED_FUNCTIONS() GO(stdscr, void*)
+#include "generated/wrappedlibncursestypes.h"
 
 typedef struct libncurses_my_s {
     // functions
diff --git a/src/wrapped/wrappedlibncurses6.c b/src/wrapped/wrappedlibncurses6.c
index 3878d159..8d2e3157 100755
--- a/src/wrapped/wrappedlibncurses6.c
+++ b/src/wrapped/wrappedlibncurses6.c
@@ -26,15 +26,8 @@ static library_t* my_lib = NULL;
 
 // this is a simple copy of libncursesw wrapper. TODO: check if ok
 
-typedef void*       (*pFv_t)();
-typedef int         (*iFppV_t)(void*, void*, va_list);
-typedef int         (*iFpiip_t)(void*, int32_t, int32_t, void*);
-
-#define SUPER() \
-    GO(initscr, pFv_t)      \
-    GO(mvwprintw, iFpiip_t) \
-    GO(vwprintw, iFppV_t)   \
-    GO(stdscr, void*)
+#define ADDED_FUNCTIONS() GO(stdscr, void*)
+#include "generated/wrappedlibncurses6types.h"
 
 typedef struct libncurses6_my_s {
     // functions
@@ -90,6 +83,21 @@ EXPORT int my6_vwprintw(x64emu_t* emu, void* p, void* fmt, x64_va_list_t b)
     return my->vwprintw(p, fmt, VARARGS);
 }
 
+EXPORT int my6_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
+{
+    libncurses6_my_t *my = (libncurses6_my_t*)my_lib->priv.w.p2;
+
+    char* buf = NULL;
+    myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 3);
+    PREPARE_VALIST;
+    int ret = vasprintf(&buf, (const char*)fmt, VARARGS);
+    (void)ret;
+    // pre-bake the fmt/vaarg, because there is no "va_list" version of this function
+    ret = my->mvprintw(x, y, buf);
+    free(buf);
+    return ret;
+}
+
 EXPORT void* my6_initscr()
 {
     libncurses6_my_t *my = (libncurses6_my_t*)my_lib->priv.w.p2;
diff --git a/src/wrapped/wrappedlibncurses6_private.h b/src/wrapped/wrappedlibncurses6_private.h
index e89cf5b7..ef182ab4 100755
--- a/src/wrapped/wrappedlibncurses6_private.h
+++ b/src/wrapped/wrappedlibncurses6_private.h
@@ -2,201 +2,411 @@
 #error Meh....
 #endif
 
-GO(wgetch_events, iFpp)
-GO(wgetnstr_events, iFppip)
-GO(addch, iFL)
+GO(COLOR_PAIR, iFi)
+GO(PAIR_NUMBER, iFi)
+GO(_traceattr, pFu)
+GO(_traceattr2, pFiu)
+GO(_tracecchar_t, pFp)
+GO(_tracecchar_t2, pFip)
+GO(_tracechar, pFi)
+GO(_tracechtype, pFu)
+GO(_tracechtype2, pFiu)
+//GO(_tracef, vFpV)
+GO(add_wch, iFp)
+GO(add_wchnstr, iFpi)
+GO(add_wchstr, iFp)
+GO(addch, iFu)
 GO(addchnstr, iFpi)
 GO(addchstr, iFp)
 GO(addnstr, iFpi)
+GO(addnwstr, iFpi)
 GO(addstr, iFp)
+GO(addwstr, iFp)
+GO(alloc_pair, iFii)
+GO(alloc_pair_sp, iFpii)
+GO(assume_default_colors, iFii)
+GO(assume_default_colors_sp, iFpii)
+GO(attr_get, iFppp)
+GO(attr_off, iFup)
+GO(attr_on, iFup)
+GO(attr_set, iFuwp)
 GO(attroff, iFi)
 GO(attron, iFi)
 GO(attrset, iFi)
-GO(attr_get, iFppp)
-GO(attr_off, iFLp)
-GO(attr_on, iFLp)
-GO(attr_set, iFLwp)
 GO(beep, iFv)
-GO(bkgd, iFL)
-GO(bkgdset, vFL)
-GO(border, iFLLLLLLLL)
-GO(box, iFpLL)
+GO(beep_sp, iFp)
+GO(bkgd, iFu)
+GO(bkgdset, vFu)
+GO(bkgrnd, iFp)
+GO(bkgrndset, vFp)
+GO(border, iFuuuuuuuu)
+GO(border_set, iFpppppppp)
+GO(box, iFpuu)
+GO(box_set, iFppp)
 GO(can_change_color, iFv)
-GO(chgat, iFiLwp)
+GO(can_change_color_sp, iFp)
+GO(chgat, iFiuwp)
 GO(clear, iFv)
 GO(clearok, iFpi)
 GO(clrtobot, iFv)
 GO(clrtoeol, iFv)
 GO(color_content, iFwppp)
+GO(color_content_sp, iFpwppp)
 GO(color_set, iFwp)
-GO(COLOR_PAIR, iFi)
 GO(copywin, iFppiiiiiii)
+GO(curses_trace, uFu)
 GO(delch, iFv)
+GO(deleteln, iFv)
 GO(delscreen, vFp)
 GO(delwin, iFp)
-GO(deleteln, iFv)
 GO(derwin, pFpiiii)
 GO(doupdate, iFv)
+GO(doupdate_sp, iFp)
 GO(dupwin, pFp)
 GO(echo, iFv)
-GO(echochar, iFL)
-GO(erase, iFv)
+GO(echo_sp, iFp)
+GO(echo_wchar, iFp)
+GO(echochar, iFu)
 GO(endwin, iFv)
+GO(endwin_sp, iFp)
+GO(erase, iFv)
+GO(erasewchar, iFp)
+GO(exit_curses, vFi)
+GO(extended_color_content, iFippp)
+GO(extended_color_content_sp, iFpippp)
+GO(extended_pair_content, iFipp)
+GO(extended_pair_content_sp, iFpipp)
+GO(extended_slk_color, iFi)
+GO(extended_slk_color_sp, iFpi)
 GO(filter, vFv)
+GO(filter_sp, vFp)
+GO(find_pair, iFii)
+GO(find_pair_sp, iFpii)
 GO(flash, iFv)
-GO(getbkgd, LFp)
+GO(flash_sp, iFp)
+GO(free_pair, iFi)
+GO(free_pair_sp, iFpi)
+GO(get_escdelay, iFv)
+GO(get_escdelay_sp, iFp)
+GO(get_wch, iFp)
+GO(get_wstr, iFp)
+GO(getattrs, iFp)
+GO(getbegx, iFp)
+GO(getbegy, iFp)
+GO(getbkgd, uFp)
+GO(getbkgrnd, iFp)
+GO(getcchar, iFppppp)
 GO(getch, iFv)
+GO(getcurx, iFp)
+GO(getcury, iFp)
+GO(getmaxx, iFp)
+GO(getmaxy, iFp)
+GO(getmouse, iFp)
+GO(getmouse_sp, iFpp)
+GO(getn_wstr, iFpi)
 GO(getnstr, iFpi)
+GO(getparx, iFp)
+GO(getpary, iFp)
 GO(getstr, iFp)
 GO(getwin, pFp)
+GO(getwin_sp, pFpp)
 GO(has_colors, iFv)
-GO(hline, iFLi)
+GO(has_colors_sp, iFp)
+GO(has_mouse, iFv)
+GO(has_mouse_sp, iFp)
+GO(hline, iFui)
+GO(hline_set, iFpi)
 GO(immedok, vFpi)
-GO(inch, LFv)
+GO(in_wch, iFp)
+GO(in_wchnstr, iFpi)
+GO(in_wchstr, iFp)
+GO(inch, uFv)
 GO(inchnstr, iFpi)
 GO(inchstr, iFp)
-GOM(initscr, pFv)
 GO(init_color, iFwwww)
+GO(init_color_sp, iFpwwww)
+GO(init_extended_color, iFiiii)
+GO(init_extended_color_sp, iFpiiii)
+GO(init_extended_pair, iFiii)
+GO(init_extended_pair_sp, iFpiii)
 GO(init_pair, iFwww)
+GO(init_pair_sp, iFpwww)
+GOM(initscr, pFv)
 GO(innstr, iFpi)
-GO(insch, iFL)
+GO(innwstr, iFpi)
+GO(ins_nwstr, iFpi)
+GO(ins_wch, iFp)
+GO(ins_wstr, iFp)
+GO(insch, iFu)
 GO(insdelln, iFi)
 GO(insertln, iFv)
 GO(insnstr, iFpi)
 GO(insstr, iFp)
 GO(instr, iFp)
-GO(isendwin, iFv)
+GO(inwstr, iFp)
+GO(is_cleared, iFp)
+GO(is_idcok, iFp)
+GO(is_idlok, iFp)
+GO(is_immedok, iFp)
+GO(is_keypad, iFp)
+GO(is_leaveok, iFp)
 GO(is_linetouched, iFpi)
+GO(is_nodelay, iFp)
+GO(is_notimeout, iFp)
+GO(is_pad, iFp)
+GO(is_scrollok, iFp)
+GO(is_subwin, iFp)
+GO(is_syncok, iFp)
+GO(is_term_resized, iFii)
+GO(is_term_resized_sp, iFpii)
 GO(is_wintouched, iFp)
+GO(isendwin, iFv)
+GO(isendwin_sp, iFp)
+GO(key_name, pFi)
+GO(killwchar, iFp)
 GO(leaveok, iFpi)
+GO(mcprint, iFpi)
+GO(mcprint_sp, iFppi)
+GO(mouse_trafo, iFppi)
+GO(mouseinterval, iFi)
+GO(mouseinterval_sp, iFpi)
+GO(mousemask, uFup)
+GO(mousemask_sp, uFpup)
 GO(move, iFii)
-GO(mvaddch, iFiiL)
+GO(mvadd_wch, iFiip)
+GO(mvadd_wchnstr, iFiipi)
+GO(mvadd_wchstr, iFiip)
+GO(mvaddch, iFiiu)
 GO(mvaddchnstr, iFiipi)
 GO(mvaddchstr, iFiip)
 GO(mvaddnstr, iFiipi)
+GO(mvaddnwstr, iFiipi)
 GO(mvaddstr, iFiip)
-GO(mvchgat, iFiiiLwp)
+GO(mvaddwstr, iFiip)
+GO(mvchgat, iFiiiuwp)
 GO(mvcur, iFiiii)
+GO(mvcur_sp, iFpiiii)
 GO(mvdelch, iFii)
 GO(mvderwin, iFpii)
+GO(mvget_wch, iFiip)
+GO(mvget_wstr, iFiip)
 GO(mvgetch, iFii)
+GO(mvgetn_wstr, iFiipi)
 GO(mvgetnstr, iFiipi)
 GO(mvgetstr, iFiip)
-GO(mvhline, iFiiLi)
-GO(mvinch, LFii)
+GO(mvhline, iFiiui)
+GO(mvhline_set, iFiipi)
+GO(mvin_wch, iFiip)
+GO(mvin_wchnstr, iFiipi)
+GO(mvin_wchstr, iFiip)
+GO(mvinch, uFii)
 GO(mvinchnstr, iFiipi)
 GO(mvinchstr, iFiip)
 GO(mvinnstr, iFiipi)
-GO(mvinsch, iFiiL)
+GO(mvinnwstr, iFiipi)
+GO(mvins_nwstr, iFiipi)
+GO(mvins_wch, iFiip)
+GO(mvins_wstr, iFiip)
+GO(mvinsch, iFiiu)
 GO(mvinsnstr, iFiipi)
 GO(mvinsstr, iFiip)
 GO(mvinstr, iFiip)
-//GO(mvprintw, i(i,i,p,...)
-//GO(mvscanw, i(i,i,p,...)
-GO(mvvline, iFiiLi)
-GO(mvwaddch, iFpiiL)
+GO(mvinwstr, iFiip)
+GOM(mvprintw, iFEiipV)
+//GO(mvscanw, iFiipV)
+GO(mvvline, iFiiui)
+GO(mvvline_set, iFiipi)
+GO(mvwadd_wch, iFpiip)
+GO(mvwadd_wchnstr, iFpiipi)
+GO(mvwadd_wchstr, iFpiip)
+GO(mvwaddch, iFpiiu)
 GO(mvwaddchnstr, iFpiipi)
 GO(mvwaddchstr, iFpiip)
 GO(mvwaddnstr, iFpiipi)
+GO(mvwaddnwstr, iFpiipi)
 GO(mvwaddstr, iFpiip)
-GO(mvwchgat, iFpiiiLwp)
+GO(mvwaddwstr, iFpiip)
+GO(mvwchgat, iFpiiiuwp)
 GO(mvwdelch, iFpii)
+GO(mvwget_wch, iFpiip)
+GO(mvwget_wstr, iFpiip)
 GO(mvwgetch, iFpii)
+GO(mvwgetn_wstr, iFpiipi)
 GO(mvwgetnstr, iFpiipi)
 GO(mvwgetstr, iFpiip)
-GO(mvwhline, iFpiiLi)
+GO(mvwhline, iFpiiui)
+GO(mvwhline_set, iFpiipi)
 GO(mvwin, iFpii)
-GO(mvwinch, LFpii)
+GO(mvwin_wch, iFpiip)
+GO(mvwin_wchnstr, iFpiipi)
+GO(mvwin_wchstr, iFpiip)
+GO(mvwinch, uFpii)
 GO(mvwinchnstr, iFpiipi)
 GO(mvwinchstr, iFpiip)
 GO(mvwinnstr, iFpiipi)
-GO(mvwinsch, iFpiiL)
+GO(mvwinnwstr, iFpiipi)
+GO(mvwins_nwstr, iFpiipi)
+GO(mvwins_wch, iFpiip)
+GO(mvwins_wstr, iFpiip)
+GO(mvwinsch, iFpiiu)
 GO(mvwinsnstr, iFpiipi)
 GO(mvwinsstr, iFpiip)
 GO(mvwinstr, iFpiip)
+GO(mvwinwstr, iFpiip)
 GOM(mvwprintw, iFEpiipV)
-//GO(mvwscanw, i(p,i,i,p,...)
-GO(mvwvline, iFpiiLi)
+//GO(mvwscanw, iFpiipV)
+GO(mvwvline, iFpiiui)
+GO(mvwvline_set, iFpiipi)
+GO(new_prescr, pFv)
 GO(newpad, pFii)
+GO(newpad_sp, pFpii)
 GO(newterm, pFppp)
+GO(newterm_sp, pFpppp)
 GO(newwin, pFiiii)
+GO(newwin_sp, pFpiiii)
 GO(nl, iFv)
+GO(nl_sp, iFp)
 GO(noecho, iFv)
+GO(noecho_sp, iFp)
+GO(nofilter, vFv)
+GO(nofilter_sp, vFp)
 GO(nonl, iFv)
+GO(nonl_sp, iFp)
 GO(overlay, iFpp)
 GO(overwrite, iFpp)
 GO(pair_content, iFwpp)
-GO(PAIR_NUMBER, iFi)
-GO(pechochar, iFpL)
+GO(pair_content_sp, iFpwpp)
+GO(pecho_wchar, iFpp)
+GO(pechochar, iFpu)
 GO(pnoutrefresh, iFpiiiiii)
 GO(prefresh, iFpiiiiii)
 GOM(printw, iFEpV)
 GO(putwin, iFpp)
 GO(redrawwin, iFp)
 GO(refresh, iFv)
-//GOM(ripoffline, int(int,int (*)(WINDOW*,int)))
-//GO(scanw, i(p,...)
+GO(reset_color_pairs, vFv)
+GO(reset_color_pairs_sp, vFp)
+GO(resize_term, iFii)
+GO(resize_term_sp, iFpii)
+GO(resizeterm, iFii)
+GO(resizeterm_sp, iFpii)
+//GO(ripoffline, iFi@)
+//GO(ripoffline_sp, iFpi@)
+//GO(scanw, iFpV)
 GO(scr_dump, iFp)
 GO(scr_init, iFp)
+GO(scr_init_sp, iFpp)
+GO(scr_restore, iFp)
+GO(scr_restore_sp, iFpp)
+GO(scr_set, iFp)
+GO(scr_set_sp, iFpp)
 GO(scrl, iFi)
 GO(scroll, iFp)
 GO(scrollok, iFpi)
-GO(scr_restore, iFp)
-GO(scr_set, iFp)
-GO(setscrreg, iFii)
+GO(set_escdelay, iFi)
+GO(set_escdelay_sp, iFpi)
 GO(set_term, pFp)
-GO(slk_attroff, iFL)
-GO(slk_attr_off, iFLp)
-GO(slk_attron, iFL)
-GO(slk_attr_on, iFLp)
-GO(slk_attrset, iFL)
-GO(slk_attr, LFv)
-GO(slk_attr_set, iFLwp)
+GO(setcchar, iFppuwp)
+GO(setscrreg, iFii)
+GO(slk_attr, uFv)
+GO(slk_attr_off, iFup)
+GO(slk_attr_on, iFup)
+GO(slk_attr_set, iFuwp)
+GO(slk_attr_set_sp, iFpuwp)
+GO(slk_attr_sp, uFp)
+GO(slk_attroff, iFu)
+GO(slk_attroff_sp, iFpu)
+GO(slk_attron, iFu)
+GO(slk_attron_sp, iFpu)
+GO(slk_attrset, iFu)
+GO(slk_attrset_sp, iFpu)
 GO(slk_clear, iFv)
+GO(slk_clear_sp, iFp)
 GO(slk_color, iFw)
+GO(slk_color_sp, iFpw)
 GO(slk_init, iFi)
+GO(slk_init_sp, iFpi)
 GO(slk_label, pFi)
+GO(slk_label_sp, pFpi)
 GO(slk_noutrefresh, iFv)
+GO(slk_noutrefresh_sp, iFp)
 GO(slk_refresh, iFv)
+GO(slk_refresh_sp, iFp)
 GO(slk_restore, iFv)
+GO(slk_restore_sp, iFp)
 GO(slk_set, iFipi)
+GO(slk_set_sp, iFpipi)
 GO(slk_touch, iFv)
-GO(standout, iFv)
+GO(slk_touch_sp, iFp)
+GO(slk_wset, iFipi)
 GO(standend, iFv)
+GO(standout, iFv)
 GO(start_color, iFv)
+GO(start_color_sp, iFp)
 GO(subpad, pFpiiii)
 GO(subwin, pFpiiii)
 GO(syncok, iFpi)
-GO(termattrs, LFv)
+GO(term_attrs, uFv)
+GO(term_attrs_sp, uFp)
+GO(termattrs, uFv)
+GO(termattrs_sp, uFp)
 GO(timeout, vFi)
 GO(touchline, iFpii)
 GO(touchwin, iFp)
+GO(trace, vFu)
+GO(unget_wch, iFi)
+GO(unget_wch_sp, iFpi)
 GO(ungetch, iFi)
+GO(ungetch_sp, iFpi)
+GO(ungetmouse, iFp)
+GO(ungetmouse_sp, iFpp)
 GO(untouchwin, iFp)
+GO(use_default_colors, iFv)
+GO(use_default_colors_sp, iFp)
+GO(use_legacy_coding, iFi)
+GO(use_legacy_coding_sp, iFpi)
+//GO(use_screen, iFp@p)
 GO(use_tioctl, vFi)
-GO(vidattr, iFL)
-//GOM(vidputs, iFLP)
-GO(vline, iFLi)
-GOM(vwprintw, iFEppp)
-GO(vw_printw, iFppp)
-GO(vwscanw, iFppp)
-GO(vw_scanw, iFppp)
-GO(waddch, iFpL)
+GO(use_tioctl_sp, vFpi)
+//GO(use_window, iFp@p)
+GO(vid_attr, iFuwp)
+GO(vid_attr_sp, iFpuwp)
+//GO(vid_puts, iFuwp@)
+//GO(vid_puts_sp, iFpuwp@)
+GO(vidattr, iFu)
+GO(vidattr_sp, iFpu)
+//GO(vidputs, iFu@)
+//GO(vidputs_sp, iFpu@)
+GO(vline, iFui)
+GO(vline_set, iFpi)
+//GO(vw_printw, iFppA)
+//GO(vw_scanw, iFppA)
+GOM(vwprintw, iFEppA)
+//GO(vwscanw, iFppA)
+GO(wadd_wch, iFpp)
+GO(wadd_wchnstr, iFppi)
+GO(wadd_wchstr, iFpp)
+GO(waddch, iFpu)
 GO(waddchnstr, iFppi)
 GO(waddchstr, iFpp)
 GO(waddnstr, iFppi)
+GO(waddnwstr, iFppi)
 GO(waddstr, iFpp)
-GO(wattron, iFpi)
+GO(waddwstr, iFpp)
+GO(wattr_get, iFpppp)
+GO(wattr_off, iFpup)
+GO(wattr_on, iFpup)
+GO(wattr_set, iFpuwp)
 GO(wattroff, iFpi)
+GO(wattron, iFpi)
 GO(wattrset, iFpi)
-GO(wattr_get, iFpppp)
-GO(wattr_on, iFpLp)
-GO(wattr_off, iFpLp)
-GO(wattr_set, iFpLwp)
-GO(wbkgd, iFpL)
-GO(wbkgdset, vFpL)
-GO(wborder, iFpLLLLLLLL)
-GO(wchgat, iFpiLwp)
+GO(wbkgd, iFpu)
+GO(wbkgdset, vFpu)
+GO(wbkgrnd, iFpp)
+GO(wbkgrndset, vFpp)
+GO(wborder, iFpuuuuuuuu)
+GO(wborder_set, iFppppppppp)
+GO(wchgat, iFpiuwp)
 GO(wclear, iFp)
 GO(wclrtobot, iFp)
 GO(wclrtoeol, iFp)
@@ -204,212 +414,61 @@ GO(wcolor_set, iFpwp)
 GO(wcursyncup, vFp)
 GO(wdelch, iFp)
 GO(wdeleteln, iFp)
-GO(wechochar, iFpL)
+GO(wecho_wchar, iFpp)
+GO(wechochar, iFpu)
+GO(wenclose, iFpii)
 GO(werase, iFp)
+GO(wget_wch, iFpp)
+GO(wget_wstr, iFpp)
+GO(wgetbkgrnd, iFpp)
 GO(wgetch, iFp)
+GO(wgetch_events, iFpp) // Experimental (absent on some builds)
+GO(wgetdelay, iFp)
+GO(wgetn_wstr, iFppi)
 GO(wgetnstr, iFppi)
+GO(wgetnstr_events, iFppip)
+GO(wgetparent, pFp)
+GO(wgetscrreg, iFppp)
 GO(wgetstr, iFpp)
-GO(whline, iFpLi)
-GO(winch, LFp)
+GO(whline, iFpui)
+GO(whline_set, iFppi)
+GO(win_wch, iFpp)
+GO(win_wchnstr, iFppi)
+GO(win_wchstr, iFpp)
+GO(winch, uFp)
 GO(winchnstr, iFppi)
 GO(winchstr, iFpp)
 GO(winnstr, iFppi)
-GO(winsch, iFpL)
+GO(winnwstr, iFppi)
+GO(wins_nwstr, iFppi)
+GO(wins_wch, iFpp)
+GO(wins_wstr, iFpp)
+GO(winsch, iFpu)
 GO(winsdelln, iFpi)
 GO(winsertln, iFp)
 GO(winsnstr, iFppi)
 GO(winsstr, iFpp)
 GO(winstr, iFpp)
+GO(winwstr, iFpp)
+GO(wmouse_trafo, iFpppi)
 GO(wmove, iFpii)
 GO(wnoutrefresh, iFp)
-//GO(wprintw, i(p,p,...)
+//GO(wprintw, iFppV)
 GO(wredrawln, iFpii)
 GO(wrefresh, iFp)
-//GO(wscanw, i(p,p,...)
+GO(wresize, iFpii)
+//GO(wscanw, iFppV)
 GO(wscrl, iFpi)
 GO(wsetscrreg, iFpii)
-GO(wstandout, iFp)
 GO(wstandend, iFp)
+GO(wstandout, iFp)
 GO(wsyncdown, vFp)
 GO(wsyncup, vFp)
 GO(wtouchln, iFpiii)
-GO(wvline, iFpLi)
-GO(getattrs, iFp)
-GO(getcurx, iFp)
-GO(getcury, iFp)
-GO(getbegx, iFp)
-GO(getbegy, iFp)
-GO(getmaxx, iFp)
-GO(getmaxy, iFp)
-GO(getparx, iFp)
-GO(getpary, iFp)
-GO(is_term_resized, iFii)
-GO(alloc_pair, iFii)
-GO(assume_default_colors, iFii)
-GO(extended_color_content, iFippp)
-GO(extended_pair_content, iFipp)
-GO(extended_slk_color, iFi)
-GO(find_pair, iFii)
-GO(free_pair, iFi)
-GO(get_escdelay, iFv)
-GO(init_extended_color, iFiiii)
-GO(init_extended_pair, iFiii)
-GO(reset_color_pairs, vFv)
-GO(resize_term, iFii)
-GO(resizeterm, iFii)
-GO(set_escdelay, iFi)
-GO(use_default_colors, iFv)
-GO(use_legacy_coding, iFi)
-//GOM(use_screen, iFpPp)
-//GOM(use_window, iFpPp)
-GO(wresize, iFpii)
-GO(nofilter, vFv)
-GO(wgetparent, pFp)
-GO(is_cleared, iFp)
-GO(is_idcok, iFp)
-GO(is_idlok, iFp)
-GO(is_immedok, iFp)
-GO(is_keypad, iFp)
-GO(is_leaveok, iFp)
-GO(is_nodelay, iFp)
-GO(is_notimeout, iFp)
-GO(is_pad, iFp)
-GO(is_scrollok, iFp)
-GO(is_subwin, iFp)
-GO(is_syncok, iFp)
-GO(wgetdelay, iFp)
-GO(wgetscrreg, iFppp)
-GO(add_wch, iFp)
-GO(add_wchnstr, iFpi)
-GO(add_wchstr, iFp)
-GO(addnwstr, iFpi)
-GO(addwstr, iFp)
-GO(bkgrnd, iFp)
-GO(bkgrndset, vFp)
-GO(border_set, iFpppppppp)
-GO(box_set, iFppp)
-GO(echo_wchar, iFp)
-GO(erasewchar, iFp)
-GO(get_wch, iFp)
-GO(get_wstr, iFp)
-GO(getbkgrnd, iFp)
-GO(getcchar, iFppppp)
-GO(getn_wstr, iFpi)
-GO(hline_set, iFpi)
-GO(in_wch, iFp)
-GO(in_wchnstr, iFpi)
-GO(in_wchstr, iFp)
-GO(innwstr, iFpi)
-GO(ins_nwstr, iFpi)
-GO(ins_wch, iFp)
-GO(ins_wstr, iFp)
-GO(inwstr, iFp)
-GO(key_name, pFu)
-GO(killwchar, iFp)
-GO(mvadd_wch, iFiip)
-GO(mvadd_wchnstr, iFiipi)
-GO(mvadd_wchstr, iFiip)
-GO(mvaddnwstr, iFiipi)
-GO(mvaddwstr, iFiip)
-GO(mvget_wch, iFiip)
-GO(mvget_wstr, iFiip)
-GO(mvgetn_wstr, iFiipi)
-GO(mvhline_set, iFiipi)
-GO(mvin_wch, iFiip)
-GO(mvin_wchnstr, iFiipi)
-GO(mvin_wchstr, iFiip)
-GO(mvinnwstr, iFiipi)
-GO(mvins_nwstr, iFiipi)
-GO(mvins_wch, iFiip)
-GO(mvins_wstr, iFiip)
-GO(mvinwstr, iFiip)
-GO(mvvline_set, iFiipi)
-GO(mvwadd_wch, iFpiip)
-GO(mvwadd_wchnstr, iFpiipi)
-GO(mvwadd_wchstr, iFpiip)
-GO(mvwaddnwstr, iFpiipi)
-GO(mvwaddwstr, iFpiip)
-GO(mvwget_wch, iFpiip)
-GO(mvwget_wstr, iFpiip)
-GO(mvwgetn_wstr, iFpiipi)
-GO(mvwhline_set, iFpiipi)
-GO(mvwin_wch, iFpiip)
-GO(mvwin_wchnstr, iFpiipi)
-GO(mvwin_wchstr, iFpiip)
-GO(mvwinnwstr, iFpiipi)
-GO(mvwins_nwstr, iFpiipi)
-GO(mvwins_wch, iFpiip)
-GO(mvwins_wstr, iFpiip)
-GO(mvwinwstr, iFpiip)
-GO(mvwvline_set, iFpiipi)
-GO(pecho_wchar, iFpp)
-GO(setcchar, iFppLwp)
-GO(slk_wset, iFipi)
-GO(term_attrs, LFv)
-GO(unget_wch, iFu)
-GO(vid_attr, iFLwp)
-//GOM(vid_puts, iFLwpP)
-GO(vline_set, iFpi)
-GO(wadd_wch, iFpp)
-GO(wadd_wchnstr, iFppi)
-GO(wadd_wchstr, iFpp)
-GO(waddnwstr, iFppi)
-GO(waddwstr, iFpp)
-GO(wbkgrnd, iFpp)
-GO(wbkgrndset, vFpp)
-GO(wborder_set, iFppppppppp)
-GO(wecho_wchar, iFpp)
-GO(wget_wch, iFpp)
-GO(wget_wstr, iFpp)
-GO(wgetbkgrnd, iFpp)
-GO(wgetn_wstr, iFppi)
-GO(whline_set, iFppi)
-GO(win_wch, iFpp)
-GO(win_wchnstr, iFppi)
-GO(win_wchstr, iFpp)
-GO(winnwstr, iFppi)
-GO(wins_nwstr, iFppi)
-GO(wins_wch, iFpp)
-GO(wins_wstr, iFpp)
-GO(winwstr, iFpp)
 GO(wunctrl, pFp)
+GO(wunctrl_sp, pFpp)
+GO(wvline, iFpui)
 GO(wvline_set, iFppi)
-GO(term_attrs, LFp)
-GO(unget_wch, iFpu)
-GO(vid_attr, iFpLwp)
-//GOM(vid_puts, iFpLwpP)
-GO(_nc_viswbuf, pFp)
-GO(_nc_viswibuf, pFp)
-GO(has_mouse, iFv)
-GO(getmouse, iFp)
-GO(ungetmouse, iFp)
-GO(mousemask, LFLp)
-GO(wenclose, iFpii)
-GO(mouseinterval, iFi)
-GO(wmouse_trafo, iFpppi)
-GO(mouse_trafo, iFppi)
-GO(has_mouse, iFp)
-GO(getmouse, iFpp)
-GO(ungetmouse, iFpp)
-GO(mousemask, LFpLp)
-GO(mouseinterval, iFpi)
-GO(mcprint, iFpi)
-GO(mcprint, iFppi)
-//GO(_tracef, v(p,...) GCC_PRINTFLIKE(1,2)
-GO(_traceattr, pFL)
-GO(_traceattr2, pFiL)
-GO(_tracechar, pFi)
-GO(_tracechtype, pFL)
-GO(_tracechtype2, pFiL)
-GO(_tracecchar_t, pFp)
-GO(_tracecchar_t2, pFip)
-GO(trace, vFu)
-GO(_nc_visbuf, pFp)
-
-GO(putp, iFp)
-GO(setupterm, iFpip)
-GO(tigetstr, pFp)
-GO(tparm, pFplllllllll) // va_arg or 9 long, depending on how old the .h is
 
 DATA(COLOR_PAIRS, sizeof(void*))
 DATA(COLORS, sizeof(void*))
diff --git a/src/wrapped/wrappedlibncurses_private.h b/src/wrapped/wrappedlibncurses_private.h
index f6c0982d..ef182ab4 100755
--- a/src/wrapped/wrappedlibncurses_private.h
+++ b/src/wrapped/wrappedlibncurses_private.h
@@ -2,201 +2,411 @@
 #error Meh....
 #endif
 
-GO(wgetch_events, iFpp)
-GO(wgetnstr_events, iFppip)
-GO(addch, iFL)
+GO(COLOR_PAIR, iFi)
+GO(PAIR_NUMBER, iFi)
+GO(_traceattr, pFu)
+GO(_traceattr2, pFiu)
+GO(_tracecchar_t, pFp)
+GO(_tracecchar_t2, pFip)
+GO(_tracechar, pFi)
+GO(_tracechtype, pFu)
+GO(_tracechtype2, pFiu)
+//GO(_tracef, vFpV)
+GO(add_wch, iFp)
+GO(add_wchnstr, iFpi)
+GO(add_wchstr, iFp)
+GO(addch, iFu)
 GO(addchnstr, iFpi)
 GO(addchstr, iFp)
 GO(addnstr, iFpi)
+GO(addnwstr, iFpi)
 GO(addstr, iFp)
+GO(addwstr, iFp)
+GO(alloc_pair, iFii)
+GO(alloc_pair_sp, iFpii)
+GO(assume_default_colors, iFii)
+GO(assume_default_colors_sp, iFpii)
+GO(attr_get, iFppp)
+GO(attr_off, iFup)
+GO(attr_on, iFup)
+GO(attr_set, iFuwp)
 GO(attroff, iFi)
 GO(attron, iFi)
 GO(attrset, iFi)
-GO(attr_get, iFppp)
-GO(attr_off, iFLp)
-GO(attr_on, iFLp)
-GO(attr_set, iFLwp)
 GO(beep, iFv)
-GO(bkgd, iFL)
-GO(bkgdset, vFL)
-GO(border, iFLLLLLLLL)
-GO(box, iFpLL)
+GO(beep_sp, iFp)
+GO(bkgd, iFu)
+GO(bkgdset, vFu)
+GO(bkgrnd, iFp)
+GO(bkgrndset, vFp)
+GO(border, iFuuuuuuuu)
+GO(border_set, iFpppppppp)
+GO(box, iFpuu)
+GO(box_set, iFppp)
 GO(can_change_color, iFv)
-GO(chgat, iFiLwp)
+GO(can_change_color_sp, iFp)
+GO(chgat, iFiuwp)
 GO(clear, iFv)
 GO(clearok, iFpi)
 GO(clrtobot, iFv)
 GO(clrtoeol, iFv)
 GO(color_content, iFwppp)
+GO(color_content_sp, iFpwppp)
 GO(color_set, iFwp)
-GO(COLOR_PAIR, iFi)
 GO(copywin, iFppiiiiiii)
+GO(curses_trace, uFu)
 GO(delch, iFv)
+GO(deleteln, iFv)
 GO(delscreen, vFp)
 GO(delwin, iFp)
-GO(deleteln, iFv)
 GO(derwin, pFpiiii)
 GO(doupdate, iFv)
+GO(doupdate_sp, iFp)
 GO(dupwin, pFp)
 GO(echo, iFv)
-GO(echochar, iFL)
-GO(erase, iFv)
+GO(echo_sp, iFp)
+GO(echo_wchar, iFp)
+GO(echochar, iFu)
 GO(endwin, iFv)
+GO(endwin_sp, iFp)
+GO(erase, iFv)
+GO(erasewchar, iFp)
+GO(exit_curses, vFi)
+GO(extended_color_content, iFippp)
+GO(extended_color_content_sp, iFpippp)
+GO(extended_pair_content, iFipp)
+GO(extended_pair_content_sp, iFpipp)
+GO(extended_slk_color, iFi)
+GO(extended_slk_color_sp, iFpi)
 GO(filter, vFv)
+GO(filter_sp, vFp)
+GO(find_pair, iFii)
+GO(find_pair_sp, iFpii)
 GO(flash, iFv)
-GO(getbkgd, LFp)
+GO(flash_sp, iFp)
+GO(free_pair, iFi)
+GO(free_pair_sp, iFpi)
+GO(get_escdelay, iFv)
+GO(get_escdelay_sp, iFp)
+GO(get_wch, iFp)
+GO(get_wstr, iFp)
+GO(getattrs, iFp)
+GO(getbegx, iFp)
+GO(getbegy, iFp)
+GO(getbkgd, uFp)
+GO(getbkgrnd, iFp)
+GO(getcchar, iFppppp)
 GO(getch, iFv)
+GO(getcurx, iFp)
+GO(getcury, iFp)
+GO(getmaxx, iFp)
+GO(getmaxy, iFp)
+GO(getmouse, iFp)
+GO(getmouse_sp, iFpp)
+GO(getn_wstr, iFpi)
 GO(getnstr, iFpi)
+GO(getparx, iFp)
+GO(getpary, iFp)
 GO(getstr, iFp)
 GO(getwin, pFp)
+GO(getwin_sp, pFpp)
 GO(has_colors, iFv)
-GO(hline, iFLi)
+GO(has_colors_sp, iFp)
+GO(has_mouse, iFv)
+GO(has_mouse_sp, iFp)
+GO(hline, iFui)
+GO(hline_set, iFpi)
 GO(immedok, vFpi)
-GO(inch, LFv)
+GO(in_wch, iFp)
+GO(in_wchnstr, iFpi)
+GO(in_wchstr, iFp)
+GO(inch, uFv)
 GO(inchnstr, iFpi)
 GO(inchstr, iFp)
-GOM(initscr, pFv)
 GO(init_color, iFwwww)
+GO(init_color_sp, iFpwwww)
+GO(init_extended_color, iFiiii)
+GO(init_extended_color_sp, iFpiiii)
+GO(init_extended_pair, iFiii)
+GO(init_extended_pair_sp, iFpiii)
 GO(init_pair, iFwww)
+GO(init_pair_sp, iFpwww)
+GOM(initscr, pFv)
 GO(innstr, iFpi)
-GO(insch, iFL)
+GO(innwstr, iFpi)
+GO(ins_nwstr, iFpi)
+GO(ins_wch, iFp)
+GO(ins_wstr, iFp)
+GO(insch, iFu)
 GO(insdelln, iFi)
 GO(insertln, iFv)
 GO(insnstr, iFpi)
 GO(insstr, iFp)
 GO(instr, iFp)
-GO(isendwin, iFv)
+GO(inwstr, iFp)
+GO(is_cleared, iFp)
+GO(is_idcok, iFp)
+GO(is_idlok, iFp)
+GO(is_immedok, iFp)
+GO(is_keypad, iFp)
+GO(is_leaveok, iFp)
 GO(is_linetouched, iFpi)
+GO(is_nodelay, iFp)
+GO(is_notimeout, iFp)
+GO(is_pad, iFp)
+GO(is_scrollok, iFp)
+GO(is_subwin, iFp)
+GO(is_syncok, iFp)
+GO(is_term_resized, iFii)
+GO(is_term_resized_sp, iFpii)
 GO(is_wintouched, iFp)
+GO(isendwin, iFv)
+GO(isendwin_sp, iFp)
+GO(key_name, pFi)
+GO(killwchar, iFp)
 GO(leaveok, iFpi)
+GO(mcprint, iFpi)
+GO(mcprint_sp, iFppi)
+GO(mouse_trafo, iFppi)
+GO(mouseinterval, iFi)
+GO(mouseinterval_sp, iFpi)
+GO(mousemask, uFup)
+GO(mousemask_sp, uFpup)
 GO(move, iFii)
-GO(mvaddch, iFiiL)
+GO(mvadd_wch, iFiip)
+GO(mvadd_wchnstr, iFiipi)
+GO(mvadd_wchstr, iFiip)
+GO(mvaddch, iFiiu)
 GO(mvaddchnstr, iFiipi)
 GO(mvaddchstr, iFiip)
 GO(mvaddnstr, iFiipi)
+GO(mvaddnwstr, iFiipi)
 GO(mvaddstr, iFiip)
-GO(mvchgat, iFiiiLwp)
+GO(mvaddwstr, iFiip)
+GO(mvchgat, iFiiiuwp)
 GO(mvcur, iFiiii)
+GO(mvcur_sp, iFpiiii)
 GO(mvdelch, iFii)
 GO(mvderwin, iFpii)
+GO(mvget_wch, iFiip)
+GO(mvget_wstr, iFiip)
 GO(mvgetch, iFii)
+GO(mvgetn_wstr, iFiipi)
 GO(mvgetnstr, iFiipi)
 GO(mvgetstr, iFiip)
-GO(mvhline, iFiiLi)
-GO(mvinch, LFii)
+GO(mvhline, iFiiui)
+GO(mvhline_set, iFiipi)
+GO(mvin_wch, iFiip)
+GO(mvin_wchnstr, iFiipi)
+GO(mvin_wchstr, iFiip)
+GO(mvinch, uFii)
 GO(mvinchnstr, iFiipi)
 GO(mvinchstr, iFiip)
 GO(mvinnstr, iFiipi)
-GO(mvinsch, iFiiL)
+GO(mvinnwstr, iFiipi)
+GO(mvins_nwstr, iFiipi)
+GO(mvins_wch, iFiip)
+GO(mvins_wstr, iFiip)
+GO(mvinsch, iFiiu)
 GO(mvinsnstr, iFiipi)
 GO(mvinsstr, iFiip)
 GO(mvinstr, iFiip)
+GO(mvinwstr, iFiip)
 GOM(mvprintw, iFEiipV)
-//GO(mvscanw, i(i,i,p,...)
-GO(mvvline, iFiiLi)
-GO(mvwaddch, iFpiiL)
+//GO(mvscanw, iFiipV)
+GO(mvvline, iFiiui)
+GO(mvvline_set, iFiipi)
+GO(mvwadd_wch, iFpiip)
+GO(mvwadd_wchnstr, iFpiipi)
+GO(mvwadd_wchstr, iFpiip)
+GO(mvwaddch, iFpiiu)
 GO(mvwaddchnstr, iFpiipi)
 GO(mvwaddchstr, iFpiip)
 GO(mvwaddnstr, iFpiipi)
+GO(mvwaddnwstr, iFpiipi)
 GO(mvwaddstr, iFpiip)
-GO(mvwchgat, iFpiiiLwp)
+GO(mvwaddwstr, iFpiip)
+GO(mvwchgat, iFpiiiuwp)
 GO(mvwdelch, iFpii)
+GO(mvwget_wch, iFpiip)
+GO(mvwget_wstr, iFpiip)
 GO(mvwgetch, iFpii)
+GO(mvwgetn_wstr, iFpiipi)
 GO(mvwgetnstr, iFpiipi)
 GO(mvwgetstr, iFpiip)
-GO(mvwhline, iFpiiLi)
+GO(mvwhline, iFpiiui)
+GO(mvwhline_set, iFpiipi)
 GO(mvwin, iFpii)
-GO(mvwinch, LFpii)
+GO(mvwin_wch, iFpiip)
+GO(mvwin_wchnstr, iFpiipi)
+GO(mvwin_wchstr, iFpiip)
+GO(mvwinch, uFpii)
 GO(mvwinchnstr, iFpiipi)
 GO(mvwinchstr, iFpiip)
 GO(mvwinnstr, iFpiipi)
-GO(mvwinsch, iFpiiL)
+GO(mvwinnwstr, iFpiipi)
+GO(mvwins_nwstr, iFpiipi)
+GO(mvwins_wch, iFpiip)
+GO(mvwins_wstr, iFpiip)
+GO(mvwinsch, iFpiiu)
 GO(mvwinsnstr, iFpiipi)
 GO(mvwinsstr, iFpiip)
 GO(mvwinstr, iFpiip)
+GO(mvwinwstr, iFpiip)
 GOM(mvwprintw, iFEpiipV)
-//GO(mvwscanw, i(p,i,i,p,...)
-GO(mvwvline, iFpiiLi)
+//GO(mvwscanw, iFpiipV)
+GO(mvwvline, iFpiiui)
+GO(mvwvline_set, iFpiipi)
+GO(new_prescr, pFv)
 GO(newpad, pFii)
+GO(newpad_sp, pFpii)
 GO(newterm, pFppp)
+GO(newterm_sp, pFpppp)
 GO(newwin, pFiiii)
+GO(newwin_sp, pFpiiii)
 GO(nl, iFv)
+GO(nl_sp, iFp)
 GO(noecho, iFv)
+GO(noecho_sp, iFp)
+GO(nofilter, vFv)
+GO(nofilter_sp, vFp)
 GO(nonl, iFv)
+GO(nonl_sp, iFp)
 GO(overlay, iFpp)
 GO(overwrite, iFpp)
 GO(pair_content, iFwpp)
-GO(PAIR_NUMBER, iFi)
-GO(pechochar, iFpL)
+GO(pair_content_sp, iFpwpp)
+GO(pecho_wchar, iFpp)
+GO(pechochar, iFpu)
 GO(pnoutrefresh, iFpiiiiii)
 GO(prefresh, iFpiiiiii)
 GOM(printw, iFEpV)
 GO(putwin, iFpp)
 GO(redrawwin, iFp)
 GO(refresh, iFv)
-//GOM(ripoffline, int(int,int (*)(WINDOW*,int)))
-//GO(scanw, i(p,...)
+GO(reset_color_pairs, vFv)
+GO(reset_color_pairs_sp, vFp)
+GO(resize_term, iFii)
+GO(resize_term_sp, iFpii)
+GO(resizeterm, iFii)
+GO(resizeterm_sp, iFpii)
+//GO(ripoffline, iFi@)
+//GO(ripoffline_sp, iFpi@)
+//GO(scanw, iFpV)
 GO(scr_dump, iFp)
 GO(scr_init, iFp)
+GO(scr_init_sp, iFpp)
+GO(scr_restore, iFp)
+GO(scr_restore_sp, iFpp)
+GO(scr_set, iFp)
+GO(scr_set_sp, iFpp)
 GO(scrl, iFi)
 GO(scroll, iFp)
 GO(scrollok, iFpi)
-GO(scr_restore, iFp)
-GO(scr_set, iFp)
-GO(setscrreg, iFii)
+GO(set_escdelay, iFi)
+GO(set_escdelay_sp, iFpi)
 GO(set_term, pFp)
-GO(slk_attroff, iFL)
-GO(slk_attr_off, iFLp)
-GO(slk_attron, iFL)
-GO(slk_attr_on, iFLp)
-GO(slk_attrset, iFL)
-GO(slk_attr, LFv)
-GO(slk_attr_set, iFLwp)
+GO(setcchar, iFppuwp)
+GO(setscrreg, iFii)
+GO(slk_attr, uFv)
+GO(slk_attr_off, iFup)
+GO(slk_attr_on, iFup)
+GO(slk_attr_set, iFuwp)
+GO(slk_attr_set_sp, iFpuwp)
+GO(slk_attr_sp, uFp)
+GO(slk_attroff, iFu)
+GO(slk_attroff_sp, iFpu)
+GO(slk_attron, iFu)
+GO(slk_attron_sp, iFpu)
+GO(slk_attrset, iFu)
+GO(slk_attrset_sp, iFpu)
 GO(slk_clear, iFv)
+GO(slk_clear_sp, iFp)
 GO(slk_color, iFw)
+GO(slk_color_sp, iFpw)
 GO(slk_init, iFi)
+GO(slk_init_sp, iFpi)
 GO(slk_label, pFi)
+GO(slk_label_sp, pFpi)
 GO(slk_noutrefresh, iFv)
+GO(slk_noutrefresh_sp, iFp)
 GO(slk_refresh, iFv)
+GO(slk_refresh_sp, iFp)
 GO(slk_restore, iFv)
+GO(slk_restore_sp, iFp)
 GO(slk_set, iFipi)
+GO(slk_set_sp, iFpipi)
 GO(slk_touch, iFv)
-GO(standout, iFv)
+GO(slk_touch_sp, iFp)
+GO(slk_wset, iFipi)
 GO(standend, iFv)
+GO(standout, iFv)
 GO(start_color, iFv)
+GO(start_color_sp, iFp)
 GO(subpad, pFpiiii)
 GO(subwin, pFpiiii)
 GO(syncok, iFpi)
-GO(termattrs, LFv)
+GO(term_attrs, uFv)
+GO(term_attrs_sp, uFp)
+GO(termattrs, uFv)
+GO(termattrs_sp, uFp)
 GO(timeout, vFi)
 GO(touchline, iFpii)
 GO(touchwin, iFp)
+GO(trace, vFu)
+GO(unget_wch, iFi)
+GO(unget_wch_sp, iFpi)
 GO(ungetch, iFi)
+GO(ungetch_sp, iFpi)
+GO(ungetmouse, iFp)
+GO(ungetmouse_sp, iFpp)
 GO(untouchwin, iFp)
+GO(use_default_colors, iFv)
+GO(use_default_colors_sp, iFp)
+GO(use_legacy_coding, iFi)
+GO(use_legacy_coding_sp, iFpi)
+//GO(use_screen, iFp@p)
 GO(use_tioctl, vFi)
-GO(vidattr, iFL)
-//GOM(vidputs, iFLP)
-GO(vline, iFLi)
-GOM(vwprintw, iFEppp)
-GO(vw_printw, iFppp)
-GO(vwscanw, iFppp)
-GO(vw_scanw, iFppp)
-GO(waddch, iFpL)
+GO(use_tioctl_sp, vFpi)
+//GO(use_window, iFp@p)
+GO(vid_attr, iFuwp)
+GO(vid_attr_sp, iFpuwp)
+//GO(vid_puts, iFuwp@)
+//GO(vid_puts_sp, iFpuwp@)
+GO(vidattr, iFu)
+GO(vidattr_sp, iFpu)
+//GO(vidputs, iFu@)
+//GO(vidputs_sp, iFpu@)
+GO(vline, iFui)
+GO(vline_set, iFpi)
+//GO(vw_printw, iFppA)
+//GO(vw_scanw, iFppA)
+GOM(vwprintw, iFEppA)
+//GO(vwscanw, iFppA)
+GO(wadd_wch, iFpp)
+GO(wadd_wchnstr, iFppi)
+GO(wadd_wchstr, iFpp)
+GO(waddch, iFpu)
 GO(waddchnstr, iFppi)
 GO(waddchstr, iFpp)
 GO(waddnstr, iFppi)
+GO(waddnwstr, iFppi)
 GO(waddstr, iFpp)
-GO(wattron, iFpi)
+GO(waddwstr, iFpp)
+GO(wattr_get, iFpppp)
+GO(wattr_off, iFpup)
+GO(wattr_on, iFpup)
+GO(wattr_set, iFpuwp)
 GO(wattroff, iFpi)
+GO(wattron, iFpi)
 GO(wattrset, iFpi)
-GO(wattr_get, iFpppp)
-GO(wattr_on, iFpLp)
-GO(wattr_off, iFpLp)
-GO(wattr_set, iFpLwp)
-GO(wbkgd, iFpL)
-GO(wbkgdset, vFpL)
-GO(wborder, iFpLLLLLLLL)
-GO(wchgat, iFpiLwp)
+GO(wbkgd, iFpu)
+GO(wbkgdset, vFpu)
+GO(wbkgrnd, iFpp)
+GO(wbkgrndset, vFpp)
+GO(wborder, iFpuuuuuuuu)
+GO(wborder_set, iFppppppppp)
+GO(wchgat, iFpiuwp)
 GO(wclear, iFp)
 GO(wclrtobot, iFp)
 GO(wclrtoeol, iFp)
@@ -204,207 +414,61 @@ GO(wcolor_set, iFpwp)
 GO(wcursyncup, vFp)
 GO(wdelch, iFp)
 GO(wdeleteln, iFp)
-GO(wechochar, iFpL)
+GO(wecho_wchar, iFpp)
+GO(wechochar, iFpu)
+GO(wenclose, iFpii)
 GO(werase, iFp)
+GO(wget_wch, iFpp)
+GO(wget_wstr, iFpp)
+GO(wgetbkgrnd, iFpp)
 GO(wgetch, iFp)
+GO(wgetch_events, iFpp) // Experimental (absent on some builds)
+GO(wgetdelay, iFp)
+GO(wgetn_wstr, iFppi)
 GO(wgetnstr, iFppi)
+GO(wgetnstr_events, iFppip)
+GO(wgetparent, pFp)
+GO(wgetscrreg, iFppp)
 GO(wgetstr, iFpp)
-GO(whline, iFpLi)
-GO(winch, LFp)
+GO(whline, iFpui)
+GO(whline_set, iFppi)
+GO(win_wch, iFpp)
+GO(win_wchnstr, iFppi)
+GO(win_wchstr, iFpp)
+GO(winch, uFp)
 GO(winchnstr, iFppi)
 GO(winchstr, iFpp)
 GO(winnstr, iFppi)
-GO(winsch, iFpL)
+GO(winnwstr, iFppi)
+GO(wins_nwstr, iFppi)
+GO(wins_wch, iFpp)
+GO(wins_wstr, iFpp)
+GO(winsch, iFpu)
 GO(winsdelln, iFpi)
 GO(winsertln, iFp)
 GO(winsnstr, iFppi)
 GO(winsstr, iFpp)
 GO(winstr, iFpp)
+GO(winwstr, iFpp)
+GO(wmouse_trafo, iFpppi)
 GO(wmove, iFpii)
 GO(wnoutrefresh, iFp)
-//GO(wprintw, i(p,p,...)
+//GO(wprintw, iFppV)
 GO(wredrawln, iFpii)
 GO(wrefresh, iFp)
-//GO(wscanw, i(p,p,...)
+GO(wresize, iFpii)
+//GO(wscanw, iFppV)
 GO(wscrl, iFpi)
 GO(wsetscrreg, iFpii)
-GO(wstandout, iFp)
 GO(wstandend, iFp)
+GO(wstandout, iFp)
 GO(wsyncdown, vFp)
 GO(wsyncup, vFp)
 GO(wtouchln, iFpiii)
-GO(wvline, iFpLi)
-GO(getattrs, iFp)
-GO(getcurx, iFp)
-GO(getcury, iFp)
-GO(getbegx, iFp)
-GO(getbegy, iFp)
-GO(getmaxx, iFp)
-GO(getmaxy, iFp)
-GO(getparx, iFp)
-GO(getpary, iFp)
-GO(is_term_resized, iFii)
-GO(alloc_pair, iFii)
-GO(assume_default_colors, iFii)
-GO(extended_color_content, iFippp)
-GO(extended_pair_content, iFipp)
-GO(extended_slk_color, iFi)
-GO(find_pair, iFii)
-GO(free_pair, iFi)
-GO(get_escdelay, iFv)
-GO(init_extended_color, iFiiii)
-GO(init_extended_pair, iFiii)
-GO(reset_color_pairs, vFv)
-GO(resize_term, iFii)
-GO(resizeterm, iFii)
-GO(set_escdelay, iFi)
-GO(use_default_colors, iFv)
-GO(use_legacy_coding, iFi)
-//GOM(use_screen, iFpPp)
-//GOM(use_window, iFpPp)
-GO(wresize, iFpii)
-GO(nofilter, vFv)
-GO(wgetparent, pFp)
-GO(is_cleared, iFp)
-GO(is_idcok, iFp)
-GO(is_idlok, iFp)
-GO(is_immedok, iFp)
-GO(is_keypad, iFp)
-GO(is_leaveok, iFp)
-GO(is_nodelay, iFp)
-GO(is_notimeout, iFp)
-GO(is_pad, iFp)
-GO(is_scrollok, iFp)
-GO(is_subwin, iFp)
-GO(is_syncok, iFp)
-GO(wgetdelay, iFp)
-GO(wgetscrreg, iFppp)
-GO(add_wch, iFp)
-GO(add_wchnstr, iFpi)
-GO(add_wchstr, iFp)
-GO(addnwstr, iFpi)
-GO(addwstr, iFp)
-GO(bkgrnd, iFp)
-GO(bkgrndset, vFp)
-GO(border_set, iFpppppppp)
-GO(box_set, iFppp)
-GO(echo_wchar, iFp)
-GO(erasewchar, iFp)
-GO(get_wch, iFp)
-GO(get_wstr, iFp)
-GO(getbkgrnd, iFp)
-GO(getcchar, iFppppp)
-GO(getn_wstr, iFpi)
-GO(hline_set, iFpi)
-GO(in_wch, iFp)
-GO(in_wchnstr, iFpi)
-GO(in_wchstr, iFp)
-GO(innwstr, iFpi)
-GO(ins_nwstr, iFpi)
-GO(ins_wch, iFp)
-GO(ins_wstr, iFp)
-GO(inwstr, iFp)
-GO(key_name, pFu)
-GO(killwchar, iFp)
-GO(mvadd_wch, iFiip)
-GO(mvadd_wchnstr, iFiipi)
-GO(mvadd_wchstr, iFiip)
-GO(mvaddnwstr, iFiipi)
-GO(mvaddwstr, iFiip)
-GO(mvget_wch, iFiip)
-GO(mvget_wstr, iFiip)
-GO(mvgetn_wstr, iFiipi)
-GO(mvhline_set, iFiipi)
-GO(mvin_wch, iFiip)
-GO(mvin_wchnstr, iFiipi)
-GO(mvin_wchstr, iFiip)
-GO(mvinnwstr, iFiipi)
-GO(mvins_nwstr, iFiipi)
-GO(mvins_wch, iFiip)
-GO(mvins_wstr, iFiip)
-GO(mvinwstr, iFiip)
-GO(mvvline_set, iFiipi)
-GO(mvwadd_wch, iFpiip)
-GO(mvwadd_wchnstr, iFpiipi)
-GO(mvwadd_wchstr, iFpiip)
-GO(mvwaddnwstr, iFpiipi)
-GO(mvwaddwstr, iFpiip)
-GO(mvwget_wch, iFpiip)
-GO(mvwget_wstr, iFpiip)
-GO(mvwgetn_wstr, iFpiipi)
-GO(mvwhline_set, iFpiipi)
-GO(mvwin_wch, iFpiip)
-GO(mvwin_wchnstr, iFpiipi)
-GO(mvwin_wchstr, iFpiip)
-GO(mvwinnwstr, iFpiipi)
-GO(mvwins_nwstr, iFpiipi)
-GO(mvwins_wch, iFpiip)
-GO(mvwins_wstr, iFpiip)
-GO(mvwinwstr, iFpiip)
-GO(mvwvline_set, iFpiipi)
-GO(pecho_wchar, iFpp)
-GO(setcchar, iFppLwp)
-GO(slk_wset, iFipi)
-GO(term_attrs, LFv)
-GO(unget_wch, iFu)
-GO(vid_attr, iFLwp)
-//GOM(vid_puts, iFLwpP)
-GO(vline_set, iFpi)
-GO(wadd_wch, iFpp)
-GO(wadd_wchnstr, iFppi)
-GO(wadd_wchstr, iFpp)
-GO(waddnwstr, iFppi)
-GO(waddwstr, iFpp)
-GO(wbkgrnd, iFpp)
-GO(wbkgrndset, vFpp)
-GO(wborder_set, iFppppppppp)
-GO(wecho_wchar, iFpp)
-GO(wget_wch, iFpp)
-GO(wget_wstr, iFpp)
-GO(wgetbkgrnd, iFpp)
-GO(wgetn_wstr, iFppi)
-GO(whline_set, iFppi)
-GO(win_wch, iFpp)
-GO(win_wchnstr, iFppi)
-GO(win_wchstr, iFpp)
-GO(winnwstr, iFppi)
-GO(wins_nwstr, iFppi)
-GO(wins_wch, iFpp)
-GO(wins_wstr, iFpp)
-GO(winwstr, iFpp)
 GO(wunctrl, pFp)
+GO(wunctrl_sp, pFpp)
+GO(wvline, iFpui)
 GO(wvline_set, iFppi)
-GO(term_attrs, LFp)
-GO(unget_wch, iFpu)
-GO(vid_attr, iFpLwp)
-//GOM(vid_puts, iFpLwpP)
-GO(_nc_viswbuf, pFp)
-GO(_nc_viswibuf, pFp)
-GO(has_mouse, iFv)
-GO(getmouse, iFp)
-GO(ungetmouse, iFp)
-GO(mousemask, LFLp)
-GO(wenclose, iFpii)
-GO(mouseinterval, iFi)
-GO(wmouse_trafo, iFpppi)
-GO(mouse_trafo, iFppi)
-GO(has_mouse, iFp)
-GO(getmouse, iFpp)
-GO(ungetmouse, iFpp)
-GO(mousemask, LFpLp)
-GO(mouseinterval, iFpi)
-GO(mcprint, iFpi)
-GO(mcprint, iFppi)
-//GO(_tracef, v(p,...) GCC_PRINTFLIKE(1,2)
-GO(_traceattr, pFL)
-GO(_traceattr2, pFiL)
-GO(_tracechar, pFi)
-GO(_tracechtype, pFL)
-GO(_tracechtype2, pFiL)
-GO(_tracecchar_t, pFp)
-GO(_tracecchar_t2, pFip)
-GO(trace, vFu)
-GO(_nc_visbuf, pFp)
 
 DATA(COLOR_PAIRS, sizeof(void*))
 DATA(COLORS, sizeof(void*))
diff --git a/src/wrapped/wrappedlibncursesw.c b/src/wrapped/wrappedlibncursesw.c
index 402239c1..f602086a 100755
--- a/src/wrapped/wrappedlibncursesw.c
+++ b/src/wrapped/wrappedlibncursesw.c
@@ -24,15 +24,8 @@ const char* libncurseswName = "libncursesw.so.5";
 
 static library_t* my_lib = NULL;
 
-typedef void*       (*pFv_t)();
-typedef int         (*iFppV_t)(void*, void*, va_list);
-typedef int         (*iFpiip_t)(void*, int32_t, int32_t, void*);
-
-#define SUPER()             \
-    GO(initscr, pFv_t)      \
-    GO(mvwprintw, iFpiip_t) \
-    GO(vwprintw, iFppV_t)   \
-    GO(stdscr, void*)
+#define ADDED_FUNCTIONS() GO(stdscr, void*)
+#include "generated/wrappedlibncurseswtypes.h"
 
 typedef struct libncursesw_my_s {
     // functions
@@ -88,6 +81,21 @@ EXPORT int myw_vwprintw(x64emu_t* emu, void* p, void* fmt, x64_va_list_t b)
     return my->vwprintw(p, fmt, VARARGS);
 }
 
+EXPORT int myw_mvprintw(x64emu_t* emu, int x, int y, void* fmt, void* b)
+{
+    libncursesw_my_t *my = (libncursesw_my_t*)my_lib->priv.w.p2;
+
+    char* buf = NULL;
+    myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 3);
+    PREPARE_VALIST;
+    int ret = vasprintf(&buf, (const char*)fmt, VARARGS);
+    (void)ret;
+    // pre-bake the fmt/vaarg, because there is no "va_list" version of this function
+    ret = my->mvprintw(x, y, buf);
+    free(buf);
+    return ret;
+}
+
 EXPORT void* myw_initscr()
 {
     libncursesw_my_t *my = (libncursesw_my_t*)my_lib->priv.w.p2;
diff --git a/src/wrapped/wrappedlibncursesw_private.h b/src/wrapped/wrappedlibncursesw_private.h
index 76ba44e5..ef182ab4 100755
--- a/src/wrapped/wrappedlibncursesw_private.h
+++ b/src/wrapped/wrappedlibncursesw_private.h
@@ -2,201 +2,411 @@
 #error Meh....
 #endif
 
-GO(wgetch_events, iFpp)
-GO(wgetnstr_events, iFppip)
-GO(addch, iFL)
+GO(COLOR_PAIR, iFi)
+GO(PAIR_NUMBER, iFi)
+GO(_traceattr, pFu)
+GO(_traceattr2, pFiu)
+GO(_tracecchar_t, pFp)
+GO(_tracecchar_t2, pFip)
+GO(_tracechar, pFi)
+GO(_tracechtype, pFu)
+GO(_tracechtype2, pFiu)
+//GO(_tracef, vFpV)
+GO(add_wch, iFp)
+GO(add_wchnstr, iFpi)
+GO(add_wchstr, iFp)
+GO(addch, iFu)
 GO(addchnstr, iFpi)
 GO(addchstr, iFp)
 GO(addnstr, iFpi)
+GO(addnwstr, iFpi)
 GO(addstr, iFp)
+GO(addwstr, iFp)
+GO(alloc_pair, iFii)
+GO(alloc_pair_sp, iFpii)
+GO(assume_default_colors, iFii)
+GO(assume_default_colors_sp, iFpii)
+GO(attr_get, iFppp)
+GO(attr_off, iFup)
+GO(attr_on, iFup)
+GO(attr_set, iFuwp)
 GO(attroff, iFi)
 GO(attron, iFi)
 GO(attrset, iFi)
-GO(attr_get, iFppp)
-GO(attr_off, iFLp)
-GO(attr_on, iFLp)
-GO(attr_set, iFLwp)
 GO(beep, iFv)
-GO(bkgd, iFL)
-GO(bkgdset, vFL)
-GO(border, iFLLLLLLLL)
-GO(box, iFpLL)
+GO(beep_sp, iFp)
+GO(bkgd, iFu)
+GO(bkgdset, vFu)
+GO(bkgrnd, iFp)
+GO(bkgrndset, vFp)
+GO(border, iFuuuuuuuu)
+GO(border_set, iFpppppppp)
+GO(box, iFpuu)
+GO(box_set, iFppp)
 GO(can_change_color, iFv)
-GO(chgat, iFiLwp)
+GO(can_change_color_sp, iFp)
+GO(chgat, iFiuwp)
 GO(clear, iFv)
 GO(clearok, iFpi)
 GO(clrtobot, iFv)
 GO(clrtoeol, iFv)
 GO(color_content, iFwppp)
+GO(color_content_sp, iFpwppp)
 GO(color_set, iFwp)
-GO(COLOR_PAIR, iFi)
 GO(copywin, iFppiiiiiii)
+GO(curses_trace, uFu)
 GO(delch, iFv)
+GO(deleteln, iFv)
 GO(delscreen, vFp)
 GO(delwin, iFp)
-GO(deleteln, iFv)
 GO(derwin, pFpiiii)
 GO(doupdate, iFv)
+GO(doupdate_sp, iFp)
 GO(dupwin, pFp)
 GO(echo, iFv)
-GO(echochar, iFL)
-GO(erase, iFv)
+GO(echo_sp, iFp)
+GO(echo_wchar, iFp)
+GO(echochar, iFu)
 GO(endwin, iFv)
+GO(endwin_sp, iFp)
+GO(erase, iFv)
+GO(erasewchar, iFp)
+GO(exit_curses, vFi)
+GO(extended_color_content, iFippp)
+GO(extended_color_content_sp, iFpippp)
+GO(extended_pair_content, iFipp)
+GO(extended_pair_content_sp, iFpipp)
+GO(extended_slk_color, iFi)
+GO(extended_slk_color_sp, iFpi)
 GO(filter, vFv)
+GO(filter_sp, vFp)
+GO(find_pair, iFii)
+GO(find_pair_sp, iFpii)
 GO(flash, iFv)
-GO(getbkgd, LFp)
+GO(flash_sp, iFp)
+GO(free_pair, iFi)
+GO(free_pair_sp, iFpi)
+GO(get_escdelay, iFv)
+GO(get_escdelay_sp, iFp)
+GO(get_wch, iFp)
+GO(get_wstr, iFp)
+GO(getattrs, iFp)
+GO(getbegx, iFp)
+GO(getbegy, iFp)
+GO(getbkgd, uFp)
+GO(getbkgrnd, iFp)
+GO(getcchar, iFppppp)
 GO(getch, iFv)
+GO(getcurx, iFp)
+GO(getcury, iFp)
+GO(getmaxx, iFp)
+GO(getmaxy, iFp)
+GO(getmouse, iFp)
+GO(getmouse_sp, iFpp)
+GO(getn_wstr, iFpi)
 GO(getnstr, iFpi)
+GO(getparx, iFp)
+GO(getpary, iFp)
 GO(getstr, iFp)
 GO(getwin, pFp)
+GO(getwin_sp, pFpp)
 GO(has_colors, iFv)
-GO(hline, iFLi)
+GO(has_colors_sp, iFp)
+GO(has_mouse, iFv)
+GO(has_mouse_sp, iFp)
+GO(hline, iFui)
+GO(hline_set, iFpi)
 GO(immedok, vFpi)
-GO(inch, LFv)
+GO(in_wch, iFp)
+GO(in_wchnstr, iFpi)
+GO(in_wchstr, iFp)
+GO(inch, uFv)
 GO(inchnstr, iFpi)
 GO(inchstr, iFp)
-GOM(initscr, pFv)
 GO(init_color, iFwwww)
+GO(init_color_sp, iFpwwww)
+GO(init_extended_color, iFiiii)
+GO(init_extended_color_sp, iFpiiii)
+GO(init_extended_pair, iFiii)
+GO(init_extended_pair_sp, iFpiii)
 GO(init_pair, iFwww)
+GO(init_pair_sp, iFpwww)
+GOM(initscr, pFv)
 GO(innstr, iFpi)
-GO(insch, iFL)
+GO(innwstr, iFpi)
+GO(ins_nwstr, iFpi)
+GO(ins_wch, iFp)
+GO(ins_wstr, iFp)
+GO(insch, iFu)
 GO(insdelln, iFi)
 GO(insertln, iFv)
 GO(insnstr, iFpi)
 GO(insstr, iFp)
 GO(instr, iFp)
-GO(isendwin, iFv)
+GO(inwstr, iFp)
+GO(is_cleared, iFp)
+GO(is_idcok, iFp)
+GO(is_idlok, iFp)
+GO(is_immedok, iFp)
+GO(is_keypad, iFp)
+GO(is_leaveok, iFp)
 GO(is_linetouched, iFpi)
+GO(is_nodelay, iFp)
+GO(is_notimeout, iFp)
+GO(is_pad, iFp)
+GO(is_scrollok, iFp)
+GO(is_subwin, iFp)
+GO(is_syncok, iFp)
+GO(is_term_resized, iFii)
+GO(is_term_resized_sp, iFpii)
 GO(is_wintouched, iFp)
+GO(isendwin, iFv)
+GO(isendwin_sp, iFp)
+GO(key_name, pFi)
+GO(killwchar, iFp)
 GO(leaveok, iFpi)
+GO(mcprint, iFpi)
+GO(mcprint_sp, iFppi)
+GO(mouse_trafo, iFppi)
+GO(mouseinterval, iFi)
+GO(mouseinterval_sp, iFpi)
+GO(mousemask, uFup)
+GO(mousemask_sp, uFpup)
 GO(move, iFii)
-GO(mvaddch, iFiiL)
+GO(mvadd_wch, iFiip)
+GO(mvadd_wchnstr, iFiipi)
+GO(mvadd_wchstr, iFiip)
+GO(mvaddch, iFiiu)
 GO(mvaddchnstr, iFiipi)
 GO(mvaddchstr, iFiip)
 GO(mvaddnstr, iFiipi)
+GO(mvaddnwstr, iFiipi)
 GO(mvaddstr, iFiip)
-GO(mvchgat, iFiiiLwp)
+GO(mvaddwstr, iFiip)
+GO(mvchgat, iFiiiuwp)
 GO(mvcur, iFiiii)
+GO(mvcur_sp, iFpiiii)
 GO(mvdelch, iFii)
 GO(mvderwin, iFpii)
+GO(mvget_wch, iFiip)
+GO(mvget_wstr, iFiip)
 GO(mvgetch, iFii)
+GO(mvgetn_wstr, iFiipi)
 GO(mvgetnstr, iFiipi)
 GO(mvgetstr, iFiip)
-GO(mvhline, iFiiLi)
-GO(mvinch, LFii)
+GO(mvhline, iFiiui)
+GO(mvhline_set, iFiipi)
+GO(mvin_wch, iFiip)
+GO(mvin_wchnstr, iFiipi)
+GO(mvin_wchstr, iFiip)
+GO(mvinch, uFii)
 GO(mvinchnstr, iFiipi)
 GO(mvinchstr, iFiip)
 GO(mvinnstr, iFiipi)
-GO(mvinsch, iFiiL)
+GO(mvinnwstr, iFiipi)
+GO(mvins_nwstr, iFiipi)
+GO(mvins_wch, iFiip)
+GO(mvins_wstr, iFiip)
+GO(mvinsch, iFiiu)
 GO(mvinsnstr, iFiipi)
 GO(mvinsstr, iFiip)
 GO(mvinstr, iFiip)
-//GO(mvprintw, i(i,i,p,...)
-//GO(mvscanw, i(i,i,p,...)
-GO(mvvline, iFiiLi)
-GO(mvwaddch, iFpiiL)
+GO(mvinwstr, iFiip)
+GOM(mvprintw, iFEiipV)
+//GO(mvscanw, iFiipV)
+GO(mvvline, iFiiui)
+GO(mvvline_set, iFiipi)
+GO(mvwadd_wch, iFpiip)
+GO(mvwadd_wchnstr, iFpiipi)
+GO(mvwadd_wchstr, iFpiip)
+GO(mvwaddch, iFpiiu)
 GO(mvwaddchnstr, iFpiipi)
 GO(mvwaddchstr, iFpiip)
 GO(mvwaddnstr, iFpiipi)
+GO(mvwaddnwstr, iFpiipi)
 GO(mvwaddstr, iFpiip)
-GO(mvwchgat, iFpiiiLwp)
+GO(mvwaddwstr, iFpiip)
+GO(mvwchgat, iFpiiiuwp)
 GO(mvwdelch, iFpii)
+GO(mvwget_wch, iFpiip)
+GO(mvwget_wstr, iFpiip)
 GO(mvwgetch, iFpii)
+GO(mvwgetn_wstr, iFpiipi)
 GO(mvwgetnstr, iFpiipi)
 GO(mvwgetstr, iFpiip)
-GO(mvwhline, iFpiiLi)
+GO(mvwhline, iFpiiui)
+GO(mvwhline_set, iFpiipi)
 GO(mvwin, iFpii)
-GO(mvwinch, LFpii)
+GO(mvwin_wch, iFpiip)
+GO(mvwin_wchnstr, iFpiipi)
+GO(mvwin_wchstr, iFpiip)
+GO(mvwinch, uFpii)
 GO(mvwinchnstr, iFpiipi)
 GO(mvwinchstr, iFpiip)
 GO(mvwinnstr, iFpiipi)
-GO(mvwinsch, iFpiiL)
+GO(mvwinnwstr, iFpiipi)
+GO(mvwins_nwstr, iFpiipi)
+GO(mvwins_wch, iFpiip)
+GO(mvwins_wstr, iFpiip)
+GO(mvwinsch, iFpiiu)
 GO(mvwinsnstr, iFpiipi)
 GO(mvwinsstr, iFpiip)
 GO(mvwinstr, iFpiip)
+GO(mvwinwstr, iFpiip)
 GOM(mvwprintw, iFEpiipV)
-//GO(mvwscanw, i(p,i,i,p,...)
-GO(mvwvline, iFpiiLi)
+//GO(mvwscanw, iFpiipV)
+GO(mvwvline, iFpiiui)
+GO(mvwvline_set, iFpiipi)
+GO(new_prescr, pFv)
 GO(newpad, pFii)
+GO(newpad_sp, pFpii)
 GO(newterm, pFppp)
+GO(newterm_sp, pFpppp)
 GO(newwin, pFiiii)
+GO(newwin_sp, pFpiiii)
 GO(nl, iFv)
+GO(nl_sp, iFp)
 GO(noecho, iFv)
+GO(noecho_sp, iFp)
+GO(nofilter, vFv)
+GO(nofilter_sp, vFp)
 GO(nonl, iFv)
+GO(nonl_sp, iFp)
 GO(overlay, iFpp)
 GO(overwrite, iFpp)
 GO(pair_content, iFwpp)
-GO(PAIR_NUMBER, iFi)
-GO(pechochar, iFpL)
+GO(pair_content_sp, iFpwpp)
+GO(pecho_wchar, iFpp)
+GO(pechochar, iFpu)
 GO(pnoutrefresh, iFpiiiiii)
 GO(prefresh, iFpiiiiii)
 GOM(printw, iFEpV)
 GO(putwin, iFpp)
 GO(redrawwin, iFp)
 GO(refresh, iFv)
-//GOM(ripoffline, int(int,int (*)(WINDOW*,int)))
-//GO(scanw, i(p,...)
+GO(reset_color_pairs, vFv)
+GO(reset_color_pairs_sp, vFp)
+GO(resize_term, iFii)
+GO(resize_term_sp, iFpii)
+GO(resizeterm, iFii)
+GO(resizeterm_sp, iFpii)
+//GO(ripoffline, iFi@)
+//GO(ripoffline_sp, iFpi@)
+//GO(scanw, iFpV)
 GO(scr_dump, iFp)
 GO(scr_init, iFp)
+GO(scr_init_sp, iFpp)
+GO(scr_restore, iFp)
+GO(scr_restore_sp, iFpp)
+GO(scr_set, iFp)
+GO(scr_set_sp, iFpp)
 GO(scrl, iFi)
 GO(scroll, iFp)
 GO(scrollok, iFpi)
-GO(scr_restore, iFp)
-GO(scr_set, iFp)
-GO(setscrreg, iFii)
+GO(set_escdelay, iFi)
+GO(set_escdelay_sp, iFpi)
 GO(set_term, pFp)
-GO(slk_attroff, iFL)
-GO(slk_attr_off, iFLp)
-GO(slk_attron, iFL)
-GO(slk_attr_on, iFLp)
-GO(slk_attrset, iFL)
-GO(slk_attr, LFv)
-GO(slk_attr_set, iFLwp)
+GO(setcchar, iFppuwp)
+GO(setscrreg, iFii)
+GO(slk_attr, uFv)
+GO(slk_attr_off, iFup)
+GO(slk_attr_on, iFup)
+GO(slk_attr_set, iFuwp)
+GO(slk_attr_set_sp, iFpuwp)
+GO(slk_attr_sp, uFp)
+GO(slk_attroff, iFu)
+GO(slk_attroff_sp, iFpu)
+GO(slk_attron, iFu)
+GO(slk_attron_sp, iFpu)
+GO(slk_attrset, iFu)
+GO(slk_attrset_sp, iFpu)
 GO(slk_clear, iFv)
+GO(slk_clear_sp, iFp)
 GO(slk_color, iFw)
+GO(slk_color_sp, iFpw)
 GO(slk_init, iFi)
+GO(slk_init_sp, iFpi)
 GO(slk_label, pFi)
+GO(slk_label_sp, pFpi)
 GO(slk_noutrefresh, iFv)
+GO(slk_noutrefresh_sp, iFp)
 GO(slk_refresh, iFv)
+GO(slk_refresh_sp, iFp)
 GO(slk_restore, iFv)
+GO(slk_restore_sp, iFp)
 GO(slk_set, iFipi)
+GO(slk_set_sp, iFpipi)
 GO(slk_touch, iFv)
-GO(standout, iFv)
+GO(slk_touch_sp, iFp)
+GO(slk_wset, iFipi)
 GO(standend, iFv)
+GO(standout, iFv)
 GO(start_color, iFv)
+GO(start_color_sp, iFp)
 GO(subpad, pFpiiii)
 GO(subwin, pFpiiii)
 GO(syncok, iFpi)
-GO(termattrs, LFv)
+GO(term_attrs, uFv)
+GO(term_attrs_sp, uFp)
+GO(termattrs, uFv)
+GO(termattrs_sp, uFp)
 GO(timeout, vFi)
 GO(touchline, iFpii)
 GO(touchwin, iFp)
+GO(trace, vFu)
+GO(unget_wch, iFi)
+GO(unget_wch_sp, iFpi)
 GO(ungetch, iFi)
+GO(ungetch_sp, iFpi)
+GO(ungetmouse, iFp)
+GO(ungetmouse_sp, iFpp)
 GO(untouchwin, iFp)
+GO(use_default_colors, iFv)
+GO(use_default_colors_sp, iFp)
+GO(use_legacy_coding, iFi)
+GO(use_legacy_coding_sp, iFpi)
+//GO(use_screen, iFp@p)
 GO(use_tioctl, vFi)
-GO(vidattr, iFL)
-//GOM(vidputs, iFLP)
-GO(vline, iFLi)
-GOM(vwprintw, iFEppp)
-GO(vw_printw, iFppp)
-GO(vwscanw, iFppp)
-GO(vw_scanw, iFppp)
-GO(waddch, iFpL)
+GO(use_tioctl_sp, vFpi)
+//GO(use_window, iFp@p)
+GO(vid_attr, iFuwp)
+GO(vid_attr_sp, iFpuwp)
+//GO(vid_puts, iFuwp@)
+//GO(vid_puts_sp, iFpuwp@)
+GO(vidattr, iFu)
+GO(vidattr_sp, iFpu)
+//GO(vidputs, iFu@)
+//GO(vidputs_sp, iFpu@)
+GO(vline, iFui)
+GO(vline_set, iFpi)
+//GO(vw_printw, iFppA)
+//GO(vw_scanw, iFppA)
+GOM(vwprintw, iFEppA)
+//GO(vwscanw, iFppA)
+GO(wadd_wch, iFpp)
+GO(wadd_wchnstr, iFppi)
+GO(wadd_wchstr, iFpp)
+GO(waddch, iFpu)
 GO(waddchnstr, iFppi)
 GO(waddchstr, iFpp)
 GO(waddnstr, iFppi)
+GO(waddnwstr, iFppi)
 GO(waddstr, iFpp)
-GO(wattron, iFpi)
+GO(waddwstr, iFpp)
+GO(wattr_get, iFpppp)
+GO(wattr_off, iFpup)
+GO(wattr_on, iFpup)
+GO(wattr_set, iFpuwp)
 GO(wattroff, iFpi)
+GO(wattron, iFpi)
 GO(wattrset, iFpi)
-GO(wattr_get, iFpppp)
-GO(wattr_on, iFpLp)
-GO(wattr_off, iFpLp)
-GO(wattr_set, iFpLwp)
-GO(wbkgd, iFpL)
-GO(wbkgdset, vFpL)
-GO(wborder, iFpLLLLLLLL)
-GO(wchgat, iFpiLwp)
+GO(wbkgd, iFpu)
+GO(wbkgdset, vFpu)
+GO(wbkgrnd, iFpp)
+GO(wbkgrndset, vFpp)
+GO(wborder, iFpuuuuuuuu)
+GO(wborder_set, iFppppppppp)
+GO(wchgat, iFpiuwp)
 GO(wclear, iFp)
 GO(wclrtobot, iFp)
 GO(wclrtoeol, iFp)
@@ -204,207 +414,61 @@ GO(wcolor_set, iFpwp)
 GO(wcursyncup, vFp)
 GO(wdelch, iFp)
 GO(wdeleteln, iFp)
-GO(wechochar, iFpL)
+GO(wecho_wchar, iFpp)
+GO(wechochar, iFpu)
+GO(wenclose, iFpii)
 GO(werase, iFp)
+GO(wget_wch, iFpp)
+GO(wget_wstr, iFpp)
+GO(wgetbkgrnd, iFpp)
 GO(wgetch, iFp)
+GO(wgetch_events, iFpp) // Experimental (absent on some builds)
+GO(wgetdelay, iFp)
+GO(wgetn_wstr, iFppi)
 GO(wgetnstr, iFppi)
+GO(wgetnstr_events, iFppip)
+GO(wgetparent, pFp)
+GO(wgetscrreg, iFppp)
 GO(wgetstr, iFpp)
-GO(whline, iFpLi)
-GO(winch, LFp)
+GO(whline, iFpui)
+GO(whline_set, iFppi)
+GO(win_wch, iFpp)
+GO(win_wchnstr, iFppi)
+GO(win_wchstr, iFpp)
+GO(winch, uFp)
 GO(winchnstr, iFppi)
 GO(winchstr, iFpp)
 GO(winnstr, iFppi)
-GO(winsch, iFpL)
+GO(winnwstr, iFppi)
+GO(wins_nwstr, iFppi)
+GO(wins_wch, iFpp)
+GO(wins_wstr, iFpp)
+GO(winsch, iFpu)
 GO(winsdelln, iFpi)
 GO(winsertln, iFp)
 GO(winsnstr, iFppi)
 GO(winsstr, iFpp)
 GO(winstr, iFpp)
+GO(winwstr, iFpp)
+GO(wmouse_trafo, iFpppi)
 GO(wmove, iFpii)
 GO(wnoutrefresh, iFp)
-//GO(wprintw, i(p,p,...)
+//GO(wprintw, iFppV)
 GO(wredrawln, iFpii)
 GO(wrefresh, iFp)
-//GO(wscanw, i(p,p,...)
+GO(wresize, iFpii)
+//GO(wscanw, iFppV)
 GO(wscrl, iFpi)
 GO(wsetscrreg, iFpii)
-GO(wstandout, iFp)
 GO(wstandend, iFp)
+GO(wstandout, iFp)
 GO(wsyncdown, vFp)
 GO(wsyncup, vFp)
 GO(wtouchln, iFpiii)
-GO(wvline, iFpLi)
-GO(getattrs, iFp)
-GO(getcurx, iFp)
-GO(getcury, iFp)
-GO(getbegx, iFp)
-GO(getbegy, iFp)
-GO(getmaxx, iFp)
-GO(getmaxy, iFp)
-GO(getparx, iFp)
-GO(getpary, iFp)
-GO(is_term_resized, iFii)
-GO(alloc_pair, iFii)
-GO(assume_default_colors, iFii)
-GO(extended_color_content, iFippp)
-GO(extended_pair_content, iFipp)
-GO(extended_slk_color, iFi)
-GO(find_pair, iFii)
-GO(free_pair, iFi)
-GO(get_escdelay, iFv)
-GO(init_extended_color, iFiiii)
-GO(init_extended_pair, iFiii)
-GO(reset_color_pairs, vFv)
-GO(resize_term, iFii)
-GO(resizeterm, iFii)
-GO(set_escdelay, iFi)
-GO(use_default_colors, iFv)
-GO(use_legacy_coding, iFi)
-//GOM(use_screen, iFpPp)
-//GOM(use_window, iFpPp)
-GO(wresize, iFpii)
-GO(nofilter, vFv)
-GO(wgetparent, pFp)
-GO(is_cleared, iFp)
-GO(is_idcok, iFp)
-GO(is_idlok, iFp)
-GO(is_immedok, iFp)
-GO(is_keypad, iFp)
-GO(is_leaveok, iFp)
-GO(is_nodelay, iFp)
-GO(is_notimeout, iFp)
-GO(is_pad, iFp)
-GO(is_scrollok, iFp)
-GO(is_subwin, iFp)
-GO(is_syncok, iFp)
-GO(wgetdelay, iFp)
-GO(wgetscrreg, iFppp)
-GO(add_wch, iFp)
-GO(add_wchnstr, iFpi)
-GO(add_wchstr, iFp)
-GO(addnwstr, iFpi)
-GO(addwstr, iFp)
-GO(bkgrnd, iFp)
-GO(bkgrndset, vFp)
-GO(border_set, iFpppppppp)
-GO(box_set, iFppp)
-GO(echo_wchar, iFp)
-GO(erasewchar, iFp)
-GO(get_wch, iFp)
-GO(get_wstr, iFp)
-GO(getbkgrnd, iFp)
-GO(getcchar, iFppppp)
-GO(getn_wstr, iFpi)
-GO(hline_set, iFpi)
-GO(in_wch, iFp)
-GO(in_wchnstr, iFpi)
-GO(in_wchstr, iFp)
-GO(innwstr, iFpi)
-GO(ins_nwstr, iFpi)
-GO(ins_wch, iFp)
-GO(ins_wstr, iFp)
-GO(inwstr, iFp)
-GO(key_name, pFu)
-GO(killwchar, iFp)
-GO(mvadd_wch, iFiip)
-GO(mvadd_wchnstr, iFiipi)
-GO(mvadd_wchstr, iFiip)
-GO(mvaddnwstr, iFiipi)
-GO(mvaddwstr, iFiip)
-GO(mvget_wch, iFiip)
-GO(mvget_wstr, iFiip)
-GO(mvgetn_wstr, iFiipi)
-GO(mvhline_set, iFiipi)
-GO(mvin_wch, iFiip)
-GO(mvin_wchnstr, iFiipi)
-GO(mvin_wchstr, iFiip)
-GO(mvinnwstr, iFiipi)
-GO(mvins_nwstr, iFiipi)
-GO(mvins_wch, iFiip)
-GO(mvins_wstr, iFiip)
-GO(mvinwstr, iFiip)
-GO(mvvline_set, iFiipi)
-GO(mvwadd_wch, iFpiip)
-GO(mvwadd_wchnstr, iFpiipi)
-GO(mvwadd_wchstr, iFpiip)
-GO(mvwaddnwstr, iFpiipi)
-GO(mvwaddwstr, iFpiip)
-GO(mvwget_wch, iFpiip)
-GO(mvwget_wstr, iFpiip)
-GO(mvwgetn_wstr, iFpiipi)
-GO(mvwhline_set, iFpiipi)
-GO(mvwin_wch, iFpiip)
-GO(mvwin_wchnstr, iFpiipi)
-GO(mvwin_wchstr, iFpiip)
-GO(mvwinnwstr, iFpiipi)
-GO(mvwins_nwstr, iFpiipi)
-GO(mvwins_wch, iFpiip)
-GO(mvwins_wstr, iFpiip)
-GO(mvwinwstr, iFpiip)
-GO(mvwvline_set, iFpiipi)
-GO(pecho_wchar, iFpp)
-GO(setcchar, iFppLwp)
-GO(slk_wset, iFipi)
-GO(term_attrs, LFv)
-GO(unget_wch, iFu)
-GO(vid_attr, iFLwp)
-//GOM(vid_puts, iFLwpP)
-GO(vline_set, iFpi)
-GO(wadd_wch, iFpp)
-GO(wadd_wchnstr, iFppi)
-GO(wadd_wchstr, iFpp)
-GO(waddnwstr, iFppi)
-GO(waddwstr, iFpp)
-GO(wbkgrnd, iFpp)
-GO(wbkgrndset, vFpp)
-GO(wborder_set, iFppppppppp)
-GO(wecho_wchar, iFpp)
-GO(wget_wch, iFpp)
-GO(wget_wstr, iFpp)
-GO(wgetbkgrnd, iFpp)
-GO(wgetn_wstr, iFppi)
-GO(whline_set, iFppi)
-GO(win_wch, iFpp)
-GO(win_wchnstr, iFppi)
-GO(win_wchstr, iFpp)
-GO(winnwstr, iFppi)
-GO(wins_nwstr, iFppi)
-GO(wins_wch, iFpp)
-GO(wins_wstr, iFpp)
-GO(winwstr, iFpp)
 GO(wunctrl, pFp)
+GO(wunctrl_sp, pFpp)
+GO(wvline, iFpui)
 GO(wvline_set, iFppi)
-GO(term_attrs, LFp)
-GO(unget_wch, iFpu)
-GO(vid_attr, iFpLwp)
-//GOM(vid_puts, iFpLwpP)
-GO(_nc_viswbuf, pFp)
-GO(_nc_viswibuf, pFp)
-GO(has_mouse, iFv)
-GO(getmouse, iFp)
-GO(ungetmouse, iFp)
-GO(mousemask, LFLp)
-GO(wenclose, iFpii)
-GO(mouseinterval, iFi)
-GO(wmouse_trafo, iFpppi)
-GO(mouse_trafo, iFppi)
-GO(has_mouse, iFp)
-GO(getmouse, iFpp)
-GO(ungetmouse, iFpp)
-GO(mousemask, LFpLp)
-GO(mouseinterval, iFpi)
-GO(mcprint, iFpi)
-GO(mcprint, iFppi)
-//GO(_tracef, v(p,...) GCC_PRINTFLIKE(1,2)
-GO(_traceattr, pFL)
-GO(_traceattr2, pFiL)
-GO(_tracechar, pFi)
-GO(_tracechtype, pFL)
-GO(_tracechtype2, pFiL)
-GO(_tracecchar_t, pFp)
-GO(_tracecchar_t2, pFip)
-GO(trace, vFu)
-GO(_nc_visbuf, pFp)
 
 DATA(COLOR_PAIRS, sizeof(void*))
 DATA(COLORS, sizeof(void*))
diff --git a/src/wrapped/wrappedlibpthread_private.h b/src/wrapped/wrappedlibpthread_private.h
index 1b16199d..9ce05541 100755
--- a/src/wrapped/wrappedlibpthread_private.h
+++ b/src/wrapped/wrappedlibpthread_private.h
@@ -114,7 +114,6 @@ GOM(pthread_cond_wait, iFEpp)
 GOM(pthread_create, iFEpppp)
 GO(pthread_detach, iFL)
 GO(pthread_equal, iFLL)
-//GOM(pthread_exit, vFEp)
 GO(pthread_exit, vFp)
 GOM(pthread_getaffinity_np, iFEpLp)
 GO(pthread_getattr_np, iFLp)
diff --git a/src/wrapped/wrappedlibssl_private.h b/src/wrapped/wrappedlibssl_private.h
index 75a88517..3a5e394b 100755
--- a/src/wrapped/wrappedlibssl_private.h
+++ b/src/wrapped/wrappedlibssl_private.h
@@ -295,7 +295,7 @@ GO(SSL_CTX_new, pFp)
 //GO(SSL_CTX_set_alpn_protos, 
 //GO(SSL_CTX_set_alpn_select_cb, 
 //GO(SSL_CTX_set_cert_cb, 
-//GO(SSL_CTX_set_cert_store, 
+GO(SSL_CTX_set_cert_store, vFpp)
 //GO(SSL_CTX_set_cert_verify_callback, 
 GO(SSL_CTX_set_cipher_list, iFpp)
 GO(SSL_CTX_set_client_CA_list, vFpp)
@@ -471,7 +471,6 @@ GO(SSL_set_accept_state, vFp)
 GO(SSL_set_bio, vFppp)
 //GO(SSL_set_cert_cb, 
 //GO(ssl_set_cert_masks, 
-GO(SSL_CTX_set_cert_store, vFpp)
 GO(SSL_set_cipher_list, iFpp)
 GO(SSL_set_client_CA_list, vFpp)
 //GO(ssl_set_client_disabled, 
@@ -590,4 +589,4 @@ GO(TLSv1_client_method, pFv)
 GO(TLSv1_method, pFv)
 GO(verify_callback, iFip)
 
-GO(TLSv1_server_method, pFv)    // not always present in lib
\ No newline at end of file
+GO(TLSv1_server_method, pFv)    // not always present in lib
diff --git a/src/wrapped/wrappedlibxt_private.h b/src/wrapped/wrappedlibxt_private.h
index 20feb4e3..904c6645 100755
--- a/src/wrapped/wrappedlibxt_private.h
+++ b/src/wrapped/wrappedlibxt_private.h
@@ -240,7 +240,7 @@ GO(XtGrabPointer, iFpiuiipp)
 //GO(_XtHeapFree, 
 //GO(_XtHeapInit, 
 //GO(XtHooksOfDisplay, 
-//GO(_XtInherit, 
+GO(_XtInherit, vFv)
 //GO(XtInitialize, 
 //GO(_XtInitializeActionData, 
 //GO(XtInitializeWidgetClass, 
@@ -439,6 +439,4 @@ GO(XtWindow, pFp)
 //GO(XtWindowOfObject, 
 GO(XtWindowToWidget, pFpp)
 
-GO(_XtInherit, vFv)
-
-DATA(overrideShellClassRec, 96)    // real size? this is full of Callback function, so maybe wrap at some point?
\ No newline at end of file
+DATA(overrideShellClassRec, 96)    // real size? this is full of Callback function, so maybe wrap at some point?
diff --git a/src/wrapped/wrappedlibz.c b/src/wrapped/wrappedlibz.c
index 81756501..02a1b00a 100755
--- a/src/wrapped/wrappedlibz.c
+++ b/src/wrapped/wrappedlibz.c
@@ -122,52 +122,54 @@ static void wrapper_stream_z(x64emu_t* emu, void* str)
     stream->zfree = find_free_Fct(stream->zfree);
 }
 
-EXPORT int32_t my_inflateInit_(x64emu_t* emu, void* str, void* version, int32_t size)
+EXPORT int my_inflateInit_(x64emu_t* emu, void* str, void* version, int size)
 {
     libz_my_t *my = (libz_my_t *)emu->context->zlib->priv.w.p2;
     wrapper_stream_z(emu, str);
     return my->inflateInit_(str, version, size);
 }
 
-EXPORT int32_t my_inflateInit(x64emu_t* emu, void* str)
+EXPORT int my_inflateInit2_(x64emu_t* emu, void* str, int windowBits, void* version, int stream_size)
 {
     libz_my_t *my = (libz_my_t *)emu->context->zlib->priv.w.p2;
     wrapper_stream_z(emu, str);
-    return my->inflateInit(str);
+    return my->inflateInit2_(str, windowBits, version, stream_size);
 }
 
-EXPORT int32_t my_inflateInit2_(x64emu_t* emu, void* str, int windowBits, void* version, int stream_size)
+EXPORT int my_inflateBackInit_(x64emu_t* emu, void* strm, int windowBits, void *window, void* version, int size)
 {
     libz_my_t *my = (libz_my_t *)emu->context->zlib->priv.w.p2;
-    wrapper_stream_z(emu, str);
-    return my->inflateInit2_(str, windowBits, version, stream_size);
+    wrapper_stream_z(emu, strm);
+    return my->inflateBackInit_(strm, windowBits, window, version, size);
 }
 
-EXPORT int32_t my_inflateEnd(x64emu_t* emu, void* str)
+// TODO: remove this?
+EXPORT int my_inflateEnd(x64emu_t* emu, void* str)
 {
     libz_my_t *my = (libz_my_t *)emu->context->zlib->priv.w.p2;
-    int32_t r = my->inflateEnd(str);
+    int r = my->inflateEnd(str);
     return r;
 }
 
-EXPORT int32_t my_deflateInit_(x64emu_t* emu, void* str, int level, void* version, int stream_size)
+EXPORT int my_deflateInit_(x64emu_t* emu, void* str, int level, void* version, int stream_size)
 {
     libz_my_t *my = (libz_my_t *)emu->context->zlib->priv.w.p2;
     wrapper_stream_z(emu, str);
     return my->deflateInit_(str, level, version, stream_size);
 }
 
-EXPORT int32_t my_deflateInit2_(x64emu_t* emu, void* str, int level, int method, int windowBits, int memLevel, int strategy, void* version, int stream_size)
+EXPORT int my_deflateInit2_(x64emu_t* emu, void* str, int level, int method, int windowBits, int memLevel, int strategy, void* version, int stream_size)
 {
     libz_my_t *my = (libz_my_t *)emu->context->zlib->priv.w.p2;
     wrapper_stream_z(emu, str);
     return my->deflateInit2_(str, level, method, windowBits, memLevel, strategy, version, stream_size);
 }
 
-EXPORT int32_t my_deflateEnd(x64emu_t* emu, void* str)
+// TODO: remove this?
+EXPORT int my_deflateEnd(x64emu_t* emu, void* str)
 {
     libz_my_t *my = (libz_my_t *)emu->context->zlib->priv.w.p2;
-    int32_t r = my->deflateEnd(str);
+    int r = my->deflateEnd(str);
     return r;
 }
 
diff --git a/src/wrapped/wrappedlibz_private.h b/src/wrapped/wrappedlibz_private.h
index 80708207..54b3725e 100644
--- a/src/wrapped/wrappedlibz_private.h
+++ b/src/wrapped/wrappedlibz_private.h
@@ -2,104 +2,88 @@
 #error Meh
 #endif
 
-GO(zlibVersion, pFv)
-GO(deflateInit, iFpi)
+GO(adler32, LFLpu)
+GO(adler32_combine, LFLLl)
+GO(adler32_combine64, LFLLl)
+GO(adler32_z, LFLpL)
+GO(compress, iFpppL)
+GO(compress2, iFpppLi)
+GO(compressBound, LFL)
+GO(crc32, LFLpu)
+GO(crc32_combine, LFLLl)
+GO(crc32_combine64, LFLLl)
+GO(crc32_z, LFLpL)
 GO(deflate, iFpi)
-GOM(deflateEnd, iFEp)
-GOM(inflateInit, iFEp)
-GO(inflate, iFpi)
-GOM(inflateEnd, iFEp)
-GO(deflateInit2, iFpiiiiipi)
-GO(deflateSetDictionary, iFppu)
-GO(deflateGetDictionary, iFppp)
+GO(deflateBound, LFpL)
 GO(deflateCopy, iFpp)
-GO(deflateReset, iFp)
+GOM(deflateEnd, iFEp) // TODO: remove "M"?
+GO(deflateGetDictionary, iFppp)
+GOM(deflateInit_, iFEpipi)
+GOM(deflateInit2_, iFEpiiiiipi)
 GO(deflateParams, iFpii)
-GO(deflateTune, iFpiiii)
-GO(deflateBound, LFpL)
 GO(deflatePending, iFppp)
 GO(deflatePrime, iFpii)
+GO(deflateReset, iFp)
+GO(deflateResetKeep, iFp)
+GO(deflateSetDictionary, iFppu)
 GO(deflateSetHeader, iFpp)
-GO(inflateInit2, iFpi)
-GO(inflateSetDictionary, iFppu)
-GO(inflateGetDictionary, iFppp)
-GO(inflateSync, iFp)
-GO(inflateCopy, iFpp)
-GO(inflateReset, iFp)
-GO(inflateReset2, iFpi)
-GO(inflatePrime, iFpii)
-GO(inflateMark, iFp)
-GO(inflateGetHeader, iFpp)
-GO(inflateBackInit, iFpip)
-//GOM(inflateBack, iFpBpBp)  // callbacks...
-GO(inflateBackEnd, iFp)
-GO(zlibCompileFlags, LFv)
-GO(compress, iFpppL)
-GO(compress2, iFpppLi)
-GO(compressBound, LFL)
-GO(uncompress, iFpppL)
-GO(uncompress2, iFpppp)
-GO(gzopen, pFpp)
-GO(gzdopen, pFip)
+GO(deflateTune, iFpiiii)
+GO(get_crc_table, pFv)
 GO(gzbuffer, iFpu)
-GO(gzsetparams, iFpii)
-GO(gzread, iFppu)
+GO(gzclearerr, vFp)
+GO(gzclose, iFp)
+GO(gzclose_r, iFp)
+GO(gzclose_w, iFp)
+GO(gzdirect, iFp)
+GO(gzdopen, pFip)
+GO(gzeof, iFp)
+GO(gzerror, pFpp)
+GO(gzflush, iFpi)
 GO(gzfread, LFpLLp)
-GO(gzwrite, iFppu)
 GO(gzfwrite, LFpLLp)
-//GOM(gzprintf, iFEppVV)
-GO(gzputs, iFpp)
+GO(gzgetc, iFp)
+GO(gzgetc_, iFp)
 GO(gzgets, pFppi)
+GO(gzoffset, lFp)
+GO(gzoffset64, lFp)
+GO(gzopen, pFpp)
+GO(gzopen64, pFpp)
+//GO(gzprintf, iFppV)
 GO(gzputc, iFpi)
-GO(gzgetc, iFp)
-GO(gzungetc, iFip)
-GO(gzflush, iFpi)
-GO(gzseek, iFpii)
+GO(gzputs, iFpp)
+GO(gzread, iFppu)
 GO(gzrewind, iFp)
-GO(gztell, iFp)
-GO(gzoffset, iFp)
-GO(gzeof, iFp)
-GO(gzdirect, iFp)
-GO(gzclose, iFp)
-GO(gzclose_r, iFp)
-GO(gzclose_w, iFp)
-GO(gzerror, pFpp)
-GO(gzclearerr, vFp)
-GO(adler32, LFLpu)
-GO(adler32_z, LFLpL)
-GO(adler32_combine, uFuui)
-GO(crc32, LFLpu)
-GO(crc32_z, LFLpL)
-GO(crc32_combine, uFuui)
-GOM(deflateInit_, iFEpipi)
+GO(gzseek, lFpli)
+GO(gzseek64, lFpli)
+GO(gzsetparams, iFpii)
+GO(gztell, lFp)
+GO(gztell64, lFp)
+GO(gzungetc, iFip)
+//GO(gzvprintf, iFppA)
+GO(gzwrite, iFppu)
+GO(inflate, iFpi)
+//GO(inflateBack, iFp@p@p)
+GO(inflateBackEnd, iFp)
+GOM(inflateBackInit_, iFEpippi)
+GO(inflateCodesUsed, LFp)
+GO(inflateCopy, iFpp)
+GOM(inflateEnd, iFEp) // TODO: remove "M"?
+GO(inflateGetDictionary, iFppp)
+GO(inflateGetHeader, iFpp)
 GOM(inflateInit_, iFEppi)
-GOM(deflateInit2_, iFEpiiiiipi)
 GOM(inflateInit2_, iFEpipi)
-GO(inflateBackInit_, iFpippi)
-GO(gzgetc_, iFp)
-GO(gzopen64, pFpp)
-GO(gzseek64, IFpIi)
-GO(gztell64, IFp)
-GO(gzoffset64, IFp)
-GO(adler32_combine64, LFLLI)
-GO(crc32_combine64, LFLLI)
-GO(gzopen64, pFpp)
-GO(gzseek64, iFpii)
-GO(gztell64, iFp)
-GO(gzoffset64, iFp)
-GO(gzopen, pFpp)
-GO(gzseek, iFpii)
-GO(gztell, iFp)
-GO(gzoffset, iFp)
-GO(adler32_combine, LFLLi)
-GO(crc32_combine, LFLLi)
-GO(zError, pFi)
+GO(inflateMark, lFp)
+GO(inflatePrime, iFpii)
+GO(inflateReset, iFp)
+GO(inflateReset2, iFpi)
+GO(inflateResetKeep, iFp)
+GO(inflateSetDictionary, iFppu)
+GO(inflateSync, iFp)
 GO(inflateSyncPoint, iFp)
-GO(get_crc_table, pFv)
 GO(inflateUndermine, iFpi)
 GO(inflateValidate, iFpi)
-GO(inflateCodesUsed, uFp)
-GO(inflateResetKeep, iFp)
-GO(deflateResetKeep, iFp)
-GO(gzopen_w, pFpp)  // Win32 only?
-//GOM(gzvprintf iFEppVV)
+GO(uncompress, iFpppL)
+GO(uncompress2, iFpppp)
+GO(zError, pFi)
+GO(zlibCompileFlags, LFv)
+GO(zlibVersion, pFv)
diff --git a/src/wrapped/wrappedsdl2mixer_private.h b/src/wrapped/wrappedsdl2mixer_private.h
index 58d8e371..db332fe7 100755
--- a/src/wrapped/wrappedsdl2mixer_private.h
+++ b/src/wrapped/wrappedsdl2mixer_private.h
@@ -62,7 +62,6 @@ GO(Mix_QuerySpec,iFppp)
 GO(Mix_QuickLoad_RAW,pFpu)
 GO(Mix_QuickLoad_WAV,pFp)
 GO(Mix_Quit,vFv)
-GO(Mix_Pause, vFi)
 GOM(Mix_RegisterEffect, iFEippp)
 GO(Mix_ReserveChannels,iFi)
 GO(Mix_Resume,vFi)
@@ -83,4 +82,3 @@ GOM(Mix_UnregisterEffect, iFEip)
 GO(Mix_Volume,iFii)
 GO(Mix_VolumeChunk,iFpi)
 GO(Mix_VolumeMusic,iFi)
-
diff --git a/src/wrapped/wrappedtcmallocminimal_private.h b/src/wrapped/wrappedtcmallocminimal_private.h
index 4bc2f317..d7fc06da 100755
--- a/src/wrapped/wrappedtcmallocminimal_private.h
+++ b/src/wrapped/wrappedtcmallocminimal_private.h
@@ -76,8 +76,6 @@ GOM(munmap, iFEpL)
 GO(nallocx, LFLi)
 GO(__posix_memalign, iFpuu)
 GO(posix_memalign, iFpuu)
-GO(__libc_pvalloc, pFL)
-GO(__libc_realloc, pFpL)
 //GO(RunningOnValgrind, 
 GO(sbrk, pFl)
 //GO(tc_calloc, 
diff --git a/src/wrapped/wrappedxml2_private.h b/src/wrapped/wrappedxml2_private.h
index 6c297d1a..6703763b 100755
--- a/src/wrapped/wrappedxml2_private.h
+++ b/src/wrapped/wrappedxml2_private.h
@@ -407,16 +407,12 @@ GO(xmlGetUTF8Char, iFpp)
 //GO(__xmlGlobalInitMutexLock, 
 //GO(__xmlGlobalInitMutexUnlock, 
 GO(xmlHandleEntity, vFpp)   // obsolete, might be removed
-//GO(xmlHasFeature, 
-GO(xmlHasNsProp, pFppp)
-GO(xmlHasProp, pFpp)
 GO(xmlHashAddEntry, iFppp)
 GO(xmlHashAddEntry2, iFpppp)
 GO(xmlHashAddEntry3, iFppppp)
 GOM(xmlHashCopy, pFEpp)
 GO(xmlHashCreate, pFi)
 GO(xmlHashCreateDict, pFip)
-GO(xmlHasFeature, iFi)
 GOM(xmlHashFree, vFEpp)
 GO(xmlHashLookup, pFpp)
 GO(xmlHashLookup2, pFppp)
@@ -435,6 +431,7 @@ GO(xmlHashSize, iFp)
 GOM(xmlHashUpdateEntry, iFEpppp)
 GOM(xmlHashUpdateEntry2, iFEppppp)
 GOM(xmlHashUpdateEntry3, iFEpppppp)
+GO(xmlHasFeature, iFi)
 GO(xmlHasNsProp, pFppp)
 GO(xmlHasProp, pFpp)
 //GO(__xmlIndentTreeOutput, 
@@ -1608,4 +1605,4 @@ GO(xmlXPathWrapString, pFp)
 DATAM(xmlFree, sizeof(void*))
 DATAM(xmlMalloc, sizeof(void*))
 DATAM(xmlRealloc, sizeof(void*))
-DATAM(xmlMemStrdup, sizeof(void*))
\ No newline at end of file
+DATAM(xmlMemStrdup, sizeof(void*))