Used wrapperhelper on glib2, gmodule2, gio2 and gconf2 wrapped lib

8 files changed, 1592 insertions, 1324 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 75d05eaf..d83672f7 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -43,6 +43,7 @@
 #() IFd
 #() IFp
 #() CFC
+#() CFW
 #() CFu
 #() CFl
 #() CFL
@@ -84,7 +85,6 @@
 #() pFv
 #() pFw
 #() pFi
-#() pFI
 #() pFC
 #() pFW
 #() pFu
@@ -107,7 +107,6 @@
 #() vFcc
 #() vFww
 #() vFii
-#() vFiI
 #() vFiW
 #() vFiu
 #() vFiU
@@ -174,6 +173,7 @@
 #() iFUp
 #() iFli
 #() iFlp
+#() iFLi
 #() iFLu
 #() iFLL
 #() iFLp
@@ -199,6 +199,7 @@
 #() IFpd
 #() CFip
 #() CFui
+#() CFuW
 #() CFuu
 #() CFuL
 #() CFpi
@@ -218,6 +219,7 @@
 #() uFpu
 #() uFpU
 #() uFpf
+#() uFpl
 #() uFpL
 #() uFpp
 #() UFEp
@@ -259,6 +261,7 @@
 #() LFuu
 #() LFLi
 #() LFLL
+#() LFLp
 #() LFpi
 #() LFpL
 #() LFpp
@@ -272,20 +275,20 @@
 #() pFiV
 #() pFII
 #() pFui
-#() pFuC
 #() pFuu
 #() pFup
-#() pFUi
 #() pFUU
 #() pFdi
 #() pFdd
 #() pFlp
 #() pFLi
+#() pFLC
 #() pFLu
 #() pFLL
 #() pFLp
 #() pFpi
 #() pFpC
+#() pFpW
 #() pFpu
 #() pFpU
 #() pFpd
@@ -403,6 +406,7 @@
 #() vFppl
 #() vFppL
 #() vFppp
+#() wFppp
 #() iFEiw
 #() iFEip
 #() iFEWW
@@ -435,7 +439,7 @@
 #() iFipL
 #() iFipp
 #() iFipO
-#() iFCiW
+#() iFCuW
 #() iFuwp
 #() iFuip
 #() iFuui
@@ -465,6 +469,7 @@
 #() iFpui
 #() iFpuu
 #() iFpuU
+#() iFpul
 #() iFpuL
 #() iFpup
 #() iFpUi
@@ -498,11 +503,12 @@
 #() IFpIi
 #() IFppi
 #() IFppI
-#() IFppu
 #() IFSIi
 #() CFipp
 #() CFuff
 #() CFuLu
+#() CFppp
+#() WFppp
 #() uFEpW
 #() uFEpu
 #() uFEpU
@@ -535,7 +541,6 @@
 #() UFUUU
 #() UFpiU
 #() UFppi
-#() UFppu
 #() fFuii
 #() fFfff
 #() fFffp
@@ -558,11 +563,13 @@
 #() lFpLu
 #() lFpLp
 #() lFppi
+#() lFppu
 #() lFppL
 #() lFppp
 #() lFSpl
 #() LFEpA
 #() LFipL
+#() LFuui
 #() LFLLl
 #() LFLpu
 #() LFLpL
@@ -571,6 +578,7 @@
 #() LFpLi
 #() LFpLp
 #() LFppi
+#() LFppu
 #() LFppL
 #() LFppp
 #() LFSpL
@@ -587,18 +595,21 @@
 #() pFiiu
 #() pFiip
 #() pFiIi
-#() pFiIp
 #() pFipi
 #() pFipL
 #() pFipp
 #() pFIpi
-#() pFCiW
+#() pFCuW
 #() pFWWW
+#() pFuip
 #() pFuui
 #() pFuuu
 #() pFulu
+#() pFulp
 #() pFupi
+#() pFupl
 #() pFupL
+#() pFupp
 #() pFUpi
 #() pFdip
 #() pFdUU
@@ -615,6 +626,7 @@
 #() pFpCC
 #() pFpCu
 #() pFpWW
+#() pFpWp
 #() pFpui
 #() pFpuu
 #() pFpuL
@@ -744,6 +756,7 @@
 #() vFffff
 #() vFdddd
 #() vFllii
+#() vFLuui
 #() vFpiii
 #() vFpiiu
 #() vFpiip
@@ -756,7 +769,7 @@
 #() vFpipi
 #() vFpipp
 #() vFpIdi
-#() vFpCiW
+#() vFpCuW
 #() vFpuip
 #() vFpuui
 #() vFpuuu
@@ -793,10 +806,9 @@
 #() vFpplp
 #() vFppLp
 #() vFpppi
-#() vFpppI
 #() vFpppu
-#() vFpppU
 #() vFpppd
+#() vFpppl
 #() vFpppL
 #() vFpppp
 #() cFpiii
@@ -853,7 +865,6 @@
 #() iFippp
 #() iFipON
 #() iFuiup
-#() iFuipu
 #() iFuipp
 #() iFuupi
 #() iFupLp
@@ -882,7 +893,9 @@
 #() iFpIip
 #() iFpCCC
 #() iFpCpi
+#() iFpCpp
 #() iFpWWu
+#() iFpWpp
 #() iFpuwp
 #() iFpuiL
 #() iFpuip
@@ -904,6 +917,7 @@
 #() iFpUpp
 #() iFplii
 #() iFplip
+#() iFplpp
 #() iFpLii
 #() iFpLip
 #() iFpLLu
@@ -943,7 +957,6 @@
 #() IFpIip
 #() IFppii
 #() IFppip
-#() IFpppp
 #() IFSIii
 #() CFuuff
 #() CFpupp
@@ -972,7 +985,6 @@
 #() UFpUui
 #() UFppii
 #() UFppip
-#() UFpppp
 #() dFpppp
 #() lFEipV
 #() lFEpip
@@ -992,13 +1004,17 @@
 #() lFpili
 #() lFpilp
 #() lFpuip
+#() lFplpp
+#() lFpLpp
 #() lFppii
 #() lFppip
 #() lFpppL
+#() lFpppp
 #() LFEppL
 #() LFEppp
 #() LFippL
 #() LFippp
+#() LFuipL
 #() LFpuuu
 #() LFpLCL
 #() LFpLLp
@@ -1023,6 +1039,7 @@
 #() pFiiiu
 #() pFiiuu
 #() pFiiup
+#() pFiiLp
 #() pFiipi
 #() pFiipp
 #() pFiIIi
@@ -1032,6 +1049,7 @@
 #() pFippi
 #() pFippu
 #() pFuuii
+#() pFuuip
 #() pFullu
 #() pFffff
 #() pFdipp
@@ -1042,6 +1060,7 @@
 #() pFpiii
 #() pFpiip
 #() pFpiuu
+#() pFpiLi
 #() pFpiLL
 #() pFpipi
 #() pFpipd
@@ -1049,6 +1068,7 @@
 #() pFpCWp
 #() pFpCuW
 #() pFpCuu
+#() pFpWWW
 #() pFpuii
 #() pFpuip
 #() pFpuWp
@@ -1057,12 +1077,17 @@
 #() pFpuup
 #() pFpupi
 #() pFpupu
+#() pFpupp
 #() pFpdIU
 #() pFplpl
 #() pFplpp
 #() pFpLip
+#() pFpLup
 #() pFpLLp
+#() pFpLpi
+#() pFpLpl
 #() pFpLpL
+#() pFpLpp
 #() pFppii
 #() pFppiu
 #() pFppiL
@@ -1077,6 +1102,7 @@
 #() pFppUU
 #() pFppdd
 #() pFppll
+#() pFppLi
 #() pFppLL
 #() pFppLp
 #() pFpppi
@@ -1336,11 +1362,13 @@
 #() iFpuuup
 #() iFpuuLL
 #() iFpuupp
+#() iFpulpp
 #() iFpupiU
 #() iFpupup
 #() iFpuppp
 #() iFpUiUi
 #() iFpUupp
+#() iFplupp
 #() iFplluu
 #() iFpLiLi
 #() iFpLlpp
@@ -1361,7 +1389,6 @@
 #() iFppupp
 #() iFppllp
 #() iFpplpp
-#() iFppLip
 #() iFppLup
 #() iFppLpi
 #() iFppLpL
@@ -1370,6 +1397,7 @@
 #() iFpppiL
 #() iFpppip
 #() iFpppui
+#() iFpppup
 #() iFpppUi
 #() iFpppLi
 #() iFpppLp
@@ -1404,6 +1432,8 @@
 #() lFipLLi
 #() lFipLpp
 #() lFpuipC
+#() lFppupp
+#() lFppLpp
 #() LFELppi
 #() LFEpppp
 #() LFuiCiu
@@ -1430,9 +1460,12 @@
 #() pFiiiii
 #() pFiiipL
 #() pFipipL
-#() pFipppu
 #() pFuiiiu
 #() pFuiupp
+#() pFupLpl
+#() pFupLpL
+#() pFLuppp
+#() pFLpppi
 #() pFpiiii
 #() pFpiiip
 #() pFpiiuu
@@ -1461,8 +1494,10 @@
 #() pFppiup
 #() pFppipi
 #() pFppipp
+#() pFppWpp
 #() pFppuuu
 #() pFppuup
+#() pFppupp
 #() pFppddi
 #() pFppLii
 #() pFppLLp
@@ -1599,6 +1634,7 @@
 #() vFppiipi
 #() vFppiipp
 #() vFppilpp
+#() vFppipLp
 #() vFppippi
 #() vFppippp
 #() vFppuuuu
@@ -1682,28 +1718,29 @@
 #() iFppiiuu
 #() iFppiipi
 #() iFppiipp
+#() iFppiupp
 #() iFppipii
 #() iFppipiL
 #() iFppipip
-#() iFppIipp
 #() iFppIppp
 #() iFppuiii
 #() iFppuiiL
-#() iFppuipp
 #() iFppuIII
 #() iFppuupp
 #() iFppupip
 #() iFppuppp
-#() iFppUipp
 #() iFppUUup
 #() iFppdidd
+#() iFpplupp
 #() iFpplppi
 #() iFppLupp
+#() iFppLppp
 #() iFpppiuu
 #() iFpppipi
 #() iFpppipp
 #() iFpppuii
 #() iFpppupu
+#() iFpppupp
 #() iFpppLpp
 #() iFppppii
 #() iFppppiu
@@ -1733,6 +1770,8 @@
 #() lFipLipu
 #() lFipLipp
 #() lFipLpLL
+#() lFppLipp
+#() lFpppLpp
 #() LFEupppp
 #() LFELpppi
 #() LFEppppi
@@ -1752,6 +1791,7 @@
 #() pFEppppV
 #() pFEppApp
 #() pFiiiiii
+#() pFiiiiid
 #() pFiCiiCi
 #() pFipippp
 #() pFdddddd
@@ -1768,16 +1808,19 @@
 #() pFpuuuuu
 #() pFpuuupu
 #() pFpuuUUU
+#() pFpupppp
 #() pFplpppp
 #() pFppiiii
-#() pFppiipp
 #() pFppiCCC
+#() pFppiupp
 #() pFppippi
 #() pFppippp
-#() pFpppiii
-#() pFpppiui
+#() pFppuppp
+#() pFpplppp
 #() pFpppiup
 #() pFpppupp
+#() pFpppLii
+#() pFpppLui
 #() pFppppii
 #() pFppppWW
 #() pFpppppi
@@ -1875,6 +1918,7 @@
 #() vFppipiip
 #() vFppipipp
 #() vFppipppp
+#() vFppCuupp
 #() vFppddddi
 #() vFppddpii
 #() vFppLpppi
@@ -1938,7 +1982,12 @@
 #() iFppipppi
 #() iFppipppp
 #() iFppuipiL
+#() iFppuippp
+#() iFppuuppp
+#() iFppupupp
+#() iFppliupp
 #() iFppLiipp
+#() iFppLippp
 #() iFpppiiii
 #() iFpppiiuu
 #() iFpppiiup
@@ -1948,6 +1997,7 @@
 #() iFpppippp
 #() iFpppuiii
 #() iFppppiii
+#() iFppppilp
 #() iFppppipp
 #() iFppppdpi
 #() iFpppppip
@@ -1972,6 +2022,7 @@
 #() pFifffppp
 #() pFuupupup
 #() pFdiiiIiI
+#() pFpiiiiid
 #() pFpiiUdii
 #() pFpipippp
 #() pFpCuwwWW
@@ -1979,26 +2030,26 @@
 #() pFpCuuwwp
 #() pFpCuuuuu
 #() pFpCpWWup
+#() pFpWppWpp
 #() pFpuuuwwu
 #() pFpuupwwC
 #() pFplppppp
 #() pFpLppiip
 #() pFppiiipp
 #() pFppiiCCC
-#() pFppiippp
 #() pFppipipp
 #() pFppipLpp
+#() pFppuippp
 #() pFppuuppp
-#() pFppLiiip
+#() pFppliuip
+#() pFpplipup
 #() pFppLipip
 #() pFpppccci
 #() pFpppiiii
-#() pFpppiipp
-#() pFpppIIIi
 #() pFpppCCCi
+#() pFpppuipp
 #() pFpppuuui
 #() pFpppuupp
-#() pFpppUUUi
 #() pFpppfffi
 #() pFpppdddi
 #() pFpppllli
@@ -2060,7 +2111,6 @@
 #() vFppiiiiii
 #() vFppiiipii
 #() vFppipipii
-#() vFppippDDC
 #() vFppipppui
 #() vFppippppi
 #() vFppippppp
@@ -2116,6 +2166,7 @@
 #() uFppuuuupp
 #() uFppuuuppi
 #() uFppuppppp
+#() uFpppppupp
 #() LFELpLpLpi
 #() LFEpiupppp
 #() pFEiplllpp
@@ -2126,13 +2177,12 @@
 #() pFEppppppi
 #() pFEppppppp
 #() pFiippipip
-#() pFiipppppp
+#() pFiupppppp
 #() pFuiiiuuuu
 #() pFuupupipp
 #() pFpiiiiiuu
 #() pFpiUdiiUi
 #() pFpipiiiip
-#() pFpipppppp
 #() pFpCCuuwwC
 #() pFpCuwwWWu
 #() pFpCuuuCup
@@ -2141,6 +2191,7 @@
 #() pFpuuuuupp
 #() pFpuuuupup
 #() pFpuuupwwp
+#() pFpupppppp
 #() pFpdwwWWui
 #() pFplpppppp
 #() pFppiiiiii
@@ -2187,6 +2238,7 @@
 #() vFppiiiiipi
 #() vFppiiipiii
 #() vFppiipiiii
+#() vFppippDpDC
 #() vFppipppiii
 #() vFppipppiip
 #() vFppuuiiiii
@@ -2210,7 +2262,7 @@
 #() iFpdiiiUiUp
 #() iFppiiiiiii
 #() iFppiuiippL
-#() iFppLpiippp
+#() iFppLpiuppp
 #() iFpppiiipip
 #() iFpppiiuuii
 #() iFpppiipiiu
@@ -2220,7 +2272,10 @@
 #() uFEipippppp
 #() uFEpppufppp
 #() uFuulpiuiuf
+#() uFppLpLuppp
 #() uFppppppppp
+#() lFpppipiipp
+#() lFpppippppp
 #() LFEppppppii
 #() pFEppiiuuLi
 #() pFEppuippuu
@@ -2236,8 +2291,8 @@
 #() pFppiiuuuLL
 #() pFppipppppp
 #() pFpppiiiiii
-#() pFpppiipppp
 #() pFpppWWWWWp
+#() pFpppuipppp
 #() pFpppppiipp
 #() pFpppppuuCC
 #() iWEpuuiippu
@@ -2347,7 +2402,7 @@
 #() pFEpipppppppi
 #() pFEppiiLpppip
 #() pFEppuiipuuii
-#() pFpppppppiipp
+#() pFpppppppuipp
 #() pFppppppppppp
 #() iWEpuipuppppp
 #() iWEpuuiiuippu
@@ -2399,6 +2454,7 @@
 #() uFppppuuupppppp
 #() pFpCuuwwWWWWuup
 #() pFpuupppwwwwWWC
+#() pFpppppppuipppp
 #() pFppppppppppppp
 #() vFippppppppppppp
 #() vFuffiiffiiffiip
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 92dcb962..8a393d6f 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -79,6 +79,7 @@ typedef int64_t (*IFf_t)(float);
 typedef int64_t (*IFd_t)(double);
 typedef int64_t (*IFp_t)(void*);
 typedef uint8_t (*CFC_t)(uint8_t);
+typedef uint8_t (*CFW_t)(uint16_t);
 typedef uint8_t (*CFu_t)(uint32_t);
 typedef uint8_t (*CFl_t)(intptr_t);
 typedef uint8_t (*CFL_t)(uintptr_t);
@@ -120,7 +121,6 @@ typedef void* (*pFE_t)(x64emu_t*);
 typedef void* (*pFv_t)(void);
 typedef void* (*pFw_t)(int16_t);
 typedef void* (*pFi_t)(int32_t);
-typedef void* (*pFI_t)(int64_t);
 typedef void* (*pFC_t)(uint8_t);
 typedef void* (*pFW_t)(uint16_t);
 typedef void* (*pFu_t)(uint32_t);
@@ -143,7 +143,6 @@ typedef void (*vFEp_t)(x64emu_t*, void*);
 typedef void (*vFcc_t)(int8_t, int8_t);
 typedef void (*vFww_t)(int16_t, int16_t);
 typedef void (*vFii_t)(int32_t, int32_t);
-typedef void (*vFiI_t)(int32_t, int64_t);
 typedef void (*vFiW_t)(int32_t, uint16_t);
 typedef void (*vFiu_t)(int32_t, uint32_t);
 typedef void (*vFiU_t)(int32_t, uint64_t);
@@ -210,6 +209,7 @@ typedef int32_t (*iFup_t)(uint32_t, void*);
 typedef int32_t (*iFUp_t)(uint64_t, void*);
 typedef int32_t (*iFli_t)(intptr_t, int32_t);
 typedef int32_t (*iFlp_t)(intptr_t, void*);
+typedef int32_t (*iFLi_t)(uintptr_t, int32_t);
 typedef int32_t (*iFLu_t)(uintptr_t, uint32_t);
 typedef int32_t (*iFLL_t)(uintptr_t, uintptr_t);
 typedef int32_t (*iFLp_t)(uintptr_t, void*);
@@ -235,6 +235,7 @@ typedef int64_t (*IFpu_t)(void*, uint32_t);
 typedef int64_t (*IFpd_t)(void*, double);
 typedef uint8_t (*CFip_t)(int32_t, void*);
 typedef uint8_t (*CFui_t)(uint32_t, int32_t);
+typedef uint8_t (*CFuW_t)(uint32_t, uint16_t);
 typedef uint8_t (*CFuu_t)(uint32_t, uint32_t);
 typedef uint8_t (*CFuL_t)(uint32_t, uintptr_t);
 typedef uint8_t (*CFpi_t)(void*, int32_t);
@@ -254,6 +255,7 @@ typedef uint32_t (*uFpi_t)(void*, int32_t);
 typedef uint32_t (*uFpu_t)(void*, uint32_t);
 typedef uint32_t (*uFpU_t)(void*, uint64_t);
 typedef uint32_t (*uFpf_t)(void*, float);
+typedef uint32_t (*uFpl_t)(void*, intptr_t);
 typedef uint32_t (*uFpL_t)(void*, uintptr_t);
 typedef uint32_t (*uFpp_t)(void*, void*);
 typedef uint64_t (*UFEp_t)(x64emu_t*, void*);
@@ -295,6 +297,7 @@ typedef uintptr_t (*LFii_t)(int32_t, int32_t);
 typedef uintptr_t (*LFuu_t)(uint32_t, uint32_t);
 typedef uintptr_t (*LFLi_t)(uintptr_t, int32_t);
 typedef uintptr_t (*LFLL_t)(uintptr_t, uintptr_t);
+typedef uintptr_t (*LFLp_t)(uintptr_t, void*);
 typedef uintptr_t (*LFpi_t)(void*, int32_t);
 typedef uintptr_t (*LFpL_t)(void*, uintptr_t);
 typedef uintptr_t (*LFpp_t)(void*, void*);
@@ -308,20 +311,20 @@ typedef void* (*pFip_t)(int32_t, void*);
 typedef void* (*pFiV_t)(int32_t, void*);
 typedef void* (*pFII_t)(int64_t, int64_t);
 typedef void* (*pFui_t)(uint32_t, int32_t);
-typedef void* (*pFuC_t)(uint32_t, uint8_t);
 typedef void* (*pFuu_t)(uint32_t, uint32_t);
 typedef void* (*pFup_t)(uint32_t, void*);
-typedef void* (*pFUi_t)(uint64_t, int32_t);
 typedef void* (*pFUU_t)(uint64_t, uint64_t);
 typedef void* (*pFdi_t)(double, int32_t);
 typedef void* (*pFdd_t)(double, double);
 typedef void* (*pFlp_t)(intptr_t, void*);
 typedef void* (*pFLi_t)(uintptr_t, int32_t);
+typedef void* (*pFLC_t)(uintptr_t, uint8_t);
 typedef void* (*pFLu_t)(uintptr_t, uint32_t);
 typedef void* (*pFLL_t)(uintptr_t, uintptr_t);
 typedef void* (*pFLp_t)(uintptr_t, void*);
 typedef void* (*pFpi_t)(void*, int32_t);
 typedef void* (*pFpC_t)(void*, uint8_t);
+typedef void* (*pFpW_t)(void*, uint16_t);
 typedef void* (*pFpu_t)(void*, uint32_t);
 typedef void* (*pFpU_t)(void*, uint64_t);
 typedef void* (*pFpd_t)(void*, double);
@@ -439,6 +442,7 @@ 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 int16_t (*wFppp_t)(void*, void*, void*);
 typedef int32_t (*iFEiw_t)(x64emu_t*, int32_t, int16_t);
 typedef int32_t (*iFEip_t)(x64emu_t*, int32_t, void*);
 typedef int32_t (*iFEWW_t)(x64emu_t*, uint16_t, uint16_t);
@@ -471,7 +475,7 @@ typedef int32_t (*iFipu_t)(int32_t, void*, uint32_t);
 typedef int32_t (*iFipL_t)(int32_t, void*, uintptr_t);
 typedef int32_t (*iFipp_t)(int32_t, void*, void*);
 typedef int32_t (*iFipO_t)(int32_t, void*, int32_t);
-typedef int32_t (*iFCiW_t)(uint8_t, int32_t, uint16_t);
+typedef int32_t (*iFCuW_t)(uint8_t, uint32_t, uint16_t);
 typedef int32_t (*iFuwp_t)(uint32_t, int16_t, void*);
 typedef int32_t (*iFuip_t)(uint32_t, int32_t, void*);
 typedef int32_t (*iFuui_t)(uint32_t, uint32_t, int32_t);
@@ -501,6 +505,7 @@ typedef int32_t (*iFpWp_t)(void*, uint16_t, void*);
 typedef int32_t (*iFpui_t)(void*, uint32_t, int32_t);
 typedef int32_t (*iFpuu_t)(void*, uint32_t, uint32_t);
 typedef int32_t (*iFpuU_t)(void*, uint32_t, uint64_t);
+typedef int32_t (*iFpul_t)(void*, uint32_t, intptr_t);
 typedef int32_t (*iFpuL_t)(void*, uint32_t, uintptr_t);
 typedef int32_t (*iFpup_t)(void*, uint32_t, void*);
 typedef int32_t (*iFpUi_t)(void*, uint64_t, int32_t);
@@ -534,11 +539,12 @@ typedef int64_t (*IFiIi_t)(int32_t, int64_t, int32_t);
 typedef int64_t (*IFpIi_t)(void*, int64_t, int32_t);
 typedef int64_t (*IFppi_t)(void*, void*, int32_t);
 typedef int64_t (*IFppI_t)(void*, void*, int64_t);
-typedef int64_t (*IFppu_t)(void*, void*, uint32_t);
 typedef int64_t (*IFSIi_t)(void*, int64_t, int32_t);
 typedef uint8_t (*CFipp_t)(int32_t, void*, void*);
 typedef uint8_t (*CFuff_t)(uint32_t, float, float);
 typedef uint8_t (*CFuLu_t)(uint32_t, uintptr_t, uint32_t);
+typedef uint8_t (*CFppp_t)(void*, void*, void*);
+typedef uint16_t (*WFppp_t)(void*, void*, void*);
 typedef uint32_t (*uFEpW_t)(x64emu_t*, void*, uint16_t);
 typedef uint32_t (*uFEpu_t)(x64emu_t*, void*, uint32_t);
 typedef uint32_t (*uFEpU_t)(x64emu_t*, void*, uint64_t);
@@ -571,7 +577,6 @@ typedef uint32_t (*uFppp_t)(void*, void*, void*);
 typedef uint64_t (*UFUUU_t)(uint64_t, uint64_t, uint64_t);
 typedef uint64_t (*UFpiU_t)(void*, int32_t, uint64_t);
 typedef uint64_t (*UFppi_t)(void*, void*, int32_t);
-typedef uint64_t (*UFppu_t)(void*, void*, uint32_t);
 typedef float (*fFuii_t)(uint32_t, int32_t, int32_t);
 typedef float (*fFfff_t)(float, float, float);
 typedef float (*fFffp_t)(float, float, void*);
@@ -594,11 +599,13 @@ typedef intptr_t (*lFpli_t)(void*, intptr_t, int32_t);
 typedef intptr_t (*lFpLu_t)(void*, uintptr_t, uint32_t);
 typedef intptr_t (*lFpLp_t)(void*, uintptr_t, void*);
 typedef intptr_t (*lFppi_t)(void*, void*, int32_t);
+typedef intptr_t (*lFppu_t)(void*, void*, uint32_t);
 typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
 typedef intptr_t (*lFppp_t)(void*, void*, void*);
 typedef intptr_t (*lFSpl_t)(void*, void*, intptr_t);
 typedef uintptr_t (*LFEpA_t)(x64emu_t*, void*, void*);
 typedef uintptr_t (*LFipL_t)(int32_t, void*, uintptr_t);
+typedef uintptr_t (*LFuui_t)(uint32_t, uint32_t, int32_t);
 typedef uintptr_t (*LFLLl_t)(uintptr_t, uintptr_t, intptr_t);
 typedef uintptr_t (*LFLpu_t)(uintptr_t, void*, uint32_t);
 typedef uintptr_t (*LFLpL_t)(uintptr_t, void*, uintptr_t);
@@ -607,6 +614,7 @@ typedef uintptr_t (*LFpup_t)(void*, uint32_t, void*);
 typedef uintptr_t (*LFpLi_t)(void*, uintptr_t, int32_t);
 typedef uintptr_t (*LFpLp_t)(void*, uintptr_t, void*);
 typedef uintptr_t (*LFppi_t)(void*, void*, int32_t);
+typedef uintptr_t (*LFppu_t)(void*, void*, uint32_t);
 typedef uintptr_t (*LFppL_t)(void*, void*, uintptr_t);
 typedef uintptr_t (*LFppp_t)(void*, void*, void*);
 typedef uintptr_t (*LFSpL_t)(void*, void*, uintptr_t);
@@ -623,18 +631,21 @@ typedef void* (*pFiii_t)(int32_t, int32_t, int32_t);
 typedef void* (*pFiiu_t)(int32_t, int32_t, uint32_t);
 typedef void* (*pFiip_t)(int32_t, int32_t, void*);
 typedef void* (*pFiIi_t)(int32_t, int64_t, int32_t);
-typedef void* (*pFiIp_t)(int32_t, int64_t, void*);
 typedef void* (*pFipi_t)(int32_t, void*, int32_t);
 typedef void* (*pFipL_t)(int32_t, void*, uintptr_t);
 typedef void* (*pFipp_t)(int32_t, void*, void*);
 typedef void* (*pFIpi_t)(int64_t, void*, int32_t);
-typedef void* (*pFCiW_t)(uint8_t, int32_t, uint16_t);
+typedef void* (*pFCuW_t)(uint8_t, uint32_t, uint16_t);
 typedef void* (*pFWWW_t)(uint16_t, uint16_t, uint16_t);
+typedef void* (*pFuip_t)(uint32_t, int32_t, void*);
 typedef void* (*pFuui_t)(uint32_t, uint32_t, int32_t);
 typedef void* (*pFuuu_t)(uint32_t, uint32_t, uint32_t);
 typedef void* (*pFulu_t)(uint32_t, intptr_t, uint32_t);
+typedef void* (*pFulp_t)(uint32_t, intptr_t, void*);
 typedef void* (*pFupi_t)(uint32_t, void*, int32_t);
+typedef void* (*pFupl_t)(uint32_t, void*, intptr_t);
 typedef void* (*pFupL_t)(uint32_t, void*, uintptr_t);
+typedef void* (*pFupp_t)(uint32_t, void*, void*);
 typedef void* (*pFUpi_t)(uint64_t, void*, int32_t);
 typedef void* (*pFdip_t)(double, int32_t, void*);
 typedef void* (*pFdUU_t)(double, uint64_t, uint64_t);
@@ -651,6 +662,7 @@ typedef void* (*pFpip_t)(void*, int32_t, void*);
 typedef void* (*pFpCC_t)(void*, uint8_t, uint8_t);
 typedef void* (*pFpCu_t)(void*, uint8_t, uint32_t);
 typedef void* (*pFpWW_t)(void*, uint16_t, uint16_t);
+typedef void* (*pFpWp_t)(void*, uint16_t, void*);
 typedef void* (*pFpui_t)(void*, uint32_t, int32_t);
 typedef void* (*pFpuu_t)(void*, uint32_t, uint32_t);
 typedef void* (*pFpuL_t)(void*, uint32_t, uintptr_t);
@@ -780,6 +792,7 @@ typedef void (*vFUUpi_t)(uint64_t, uint64_t, void*, int32_t);
 typedef void (*vFffff_t)(float, float, float, float);
 typedef void (*vFdddd_t)(double, double, double, double);
 typedef void (*vFllii_t)(intptr_t, intptr_t, int32_t, int32_t);
+typedef void (*vFLuui_t)(uintptr_t, uint32_t, uint32_t, int32_t);
 typedef void (*vFpiii_t)(void*, int32_t, int32_t, int32_t);
 typedef void (*vFpiiu_t)(void*, int32_t, int32_t, uint32_t);
 typedef void (*vFpiip_t)(void*, int32_t, int32_t, void*);
@@ -792,7 +805,7 @@ typedef void (*vFpifi_t)(void*, int32_t, float, int32_t);
 typedef void (*vFpipi_t)(void*, int32_t, void*, int32_t);
 typedef void (*vFpipp_t)(void*, int32_t, void*, void*);
 typedef void (*vFpIdi_t)(void*, int64_t, double, int32_t);
-typedef void (*vFpCiW_t)(void*, uint8_t, int32_t, uint16_t);
+typedef void (*vFpCuW_t)(void*, uint8_t, uint32_t, uint16_t);
 typedef void (*vFpuip_t)(void*, uint32_t, int32_t, void*);
 typedef void (*vFpuui_t)(void*, uint32_t, uint32_t, int32_t);
 typedef void (*vFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
@@ -829,10 +842,9 @@ typedef void (*vFppdp_t)(void*, void*, double, void*);
 typedef void (*vFpplp_t)(void*, void*, intptr_t, void*);
 typedef void (*vFppLp_t)(void*, void*, uintptr_t, void*);
 typedef void (*vFpppi_t)(void*, void*, void*, int32_t);
-typedef void (*vFpppI_t)(void*, void*, void*, int64_t);
 typedef void (*vFpppu_t)(void*, void*, void*, uint32_t);
-typedef void (*vFpppU_t)(void*, void*, void*, uint64_t);
 typedef void (*vFpppd_t)(void*, void*, void*, double);
+typedef void (*vFpppl_t)(void*, void*, void*, intptr_t);
 typedef void (*vFpppL_t)(void*, void*, void*, uintptr_t);
 typedef void (*vFpppp_t)(void*, void*, void*, void*);
 typedef int8_t (*cFpiii_t)(void*, int32_t, int32_t, int32_t);
@@ -889,7 +901,6 @@ typedef int32_t (*iFippL_t)(int32_t, void*, void*, uintptr_t);
 typedef int32_t (*iFippp_t)(int32_t, void*, void*, void*);
 typedef int32_t (*iFipON_t)(int32_t, void*, int32_t, ...);
 typedef int32_t (*iFuiup_t)(uint32_t, int32_t, uint32_t, void*);
-typedef int32_t (*iFuipu_t)(uint32_t, int32_t, void*, uint32_t);
 typedef int32_t (*iFuipp_t)(uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFuupi_t)(uint32_t, uint32_t, void*, int32_t);
 typedef int32_t (*iFupLp_t)(uint32_t, void*, uintptr_t, void*);
@@ -918,7 +929,9 @@ typedef int32_t (*iFpipV_t)(void*, int32_t, void*, void*);
 typedef int32_t (*iFpIip_t)(void*, int64_t, int32_t, void*);
 typedef int32_t (*iFpCCC_t)(void*, uint8_t, uint8_t, uint8_t);
 typedef int32_t (*iFpCpi_t)(void*, uint8_t, void*, int32_t);
+typedef int32_t (*iFpCpp_t)(void*, uint8_t, void*, void*);
 typedef int32_t (*iFpWWu_t)(void*, uint16_t, uint16_t, uint32_t);
+typedef int32_t (*iFpWpp_t)(void*, uint16_t, void*, void*);
 typedef int32_t (*iFpuwp_t)(void*, uint32_t, int16_t, void*);
 typedef int32_t (*iFpuiL_t)(void*, uint32_t, int32_t, uintptr_t);
 typedef int32_t (*iFpuip_t)(void*, uint32_t, int32_t, void*);
@@ -940,6 +953,7 @@ typedef int32_t (*iFpULp_t)(void*, uint64_t, uintptr_t, void*);
 typedef int32_t (*iFpUpp_t)(void*, uint64_t, void*, void*);
 typedef int32_t (*iFplii_t)(void*, intptr_t, int32_t, int32_t);
 typedef int32_t (*iFplip_t)(void*, intptr_t, int32_t, void*);
+typedef int32_t (*iFplpp_t)(void*, intptr_t, void*, void*);
 typedef int32_t (*iFpLii_t)(void*, uintptr_t, int32_t, int32_t);
 typedef int32_t (*iFpLip_t)(void*, uintptr_t, int32_t, void*);
 typedef int32_t (*iFpLLu_t)(void*, uintptr_t, uintptr_t, uint32_t);
@@ -979,7 +993,6 @@ typedef int64_t (*IFipUp_t)(int32_t, void*, uint64_t, void*);
 typedef int64_t (*IFpIip_t)(void*, int64_t, int32_t, void*);
 typedef int64_t (*IFppii_t)(void*, void*, int32_t, int32_t);
 typedef int64_t (*IFppip_t)(void*, void*, int32_t, void*);
-typedef int64_t (*IFpppp_t)(void*, void*, void*, void*);
 typedef int64_t (*IFSIii_t)(void*, int64_t, int32_t, int32_t);
 typedef uint8_t (*CFuuff_t)(uint32_t, uint32_t, float, float);
 typedef uint8_t (*CFpupp_t)(void*, uint32_t, void*, void*);
@@ -1008,7 +1021,6 @@ typedef uint64_t (*UFpipp_t)(void*, int32_t, void*, void*);
 typedef uint64_t (*UFpUui_t)(void*, uint64_t, uint32_t, int32_t);
 typedef uint64_t (*UFppii_t)(void*, void*, int32_t, int32_t);
 typedef uint64_t (*UFppip_t)(void*, void*, int32_t, void*);
-typedef uint64_t (*UFpppp_t)(void*, void*, void*, void*);
 typedef double (*dFpppp_t)(void*, void*, void*, void*);
 typedef intptr_t (*lFEipV_t)(x64emu_t*, int32_t, void*, void*);
 typedef intptr_t (*lFEpip_t)(x64emu_t*, void*, int32_t, void*);
@@ -1028,13 +1040,17 @@ typedef intptr_t (*lFuipp_t)(uint32_t, int32_t, void*, void*);
 typedef intptr_t (*lFpili_t)(void*, int32_t, intptr_t, int32_t);
 typedef intptr_t (*lFpilp_t)(void*, int32_t, intptr_t, void*);
 typedef intptr_t (*lFpuip_t)(void*, uint32_t, int32_t, void*);
+typedef intptr_t (*lFplpp_t)(void*, intptr_t, void*, void*);
+typedef intptr_t (*lFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef intptr_t (*lFppii_t)(void*, void*, int32_t, int32_t);
 typedef intptr_t (*lFppip_t)(void*, void*, int32_t, void*);
 typedef intptr_t (*lFpppL_t)(void*, void*, void*, uintptr_t);
+typedef intptr_t (*lFpppp_t)(void*, void*, void*, void*);
 typedef uintptr_t (*LFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
 typedef uintptr_t (*LFEppp_t)(x64emu_t*, void*, void*, void*);
 typedef uintptr_t (*LFippL_t)(int32_t, void*, void*, uintptr_t);
 typedef uintptr_t (*LFippp_t)(int32_t, void*, void*, void*);
+typedef uintptr_t (*LFuipL_t)(uint32_t, int32_t, void*, uintptr_t);
 typedef uintptr_t (*LFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef uintptr_t (*LFpLCL_t)(void*, uintptr_t, uint8_t, uintptr_t);
 typedef uintptr_t (*LFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
@@ -1059,6 +1075,7 @@ typedef void* (*pFiiii_t)(int32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFiiiu_t)(int32_t, int32_t, int32_t, uint32_t);
 typedef void* (*pFiiuu_t)(int32_t, int32_t, uint32_t, uint32_t);
 typedef void* (*pFiiup_t)(int32_t, int32_t, uint32_t, void*);
+typedef void* (*pFiiLp_t)(int32_t, int32_t, uintptr_t, void*);
 typedef void* (*pFiipi_t)(int32_t, int32_t, void*, int32_t);
 typedef void* (*pFiipp_t)(int32_t, int32_t, void*, void*);
 typedef void* (*pFiIIi_t)(int32_t, int64_t, int64_t, int32_t);
@@ -1068,6 +1085,7 @@ typedef void* (*pFipip_t)(int32_t, void*, int32_t, void*);
 typedef void* (*pFippi_t)(int32_t, void*, void*, int32_t);
 typedef void* (*pFippu_t)(int32_t, void*, void*, uint32_t);
 typedef void* (*pFuuii_t)(uint32_t, uint32_t, int32_t, int32_t);
+typedef void* (*pFuuip_t)(uint32_t, uint32_t, int32_t, void*);
 typedef void* (*pFullu_t)(uint32_t, intptr_t, intptr_t, uint32_t);
 typedef void* (*pFffff_t)(float, float, float, float);
 typedef void* (*pFdipp_t)(double, int32_t, void*, void*);
@@ -1078,6 +1096,7 @@ typedef void* (*pFLiip_t)(uintptr_t, int32_t, int32_t, void*);
 typedef void* (*pFpiii_t)(void*, int32_t, int32_t, int32_t);
 typedef void* (*pFpiip_t)(void*, int32_t, int32_t, void*);
 typedef void* (*pFpiuu_t)(void*, int32_t, uint32_t, uint32_t);
+typedef void* (*pFpiLi_t)(void*, int32_t, uintptr_t, int32_t);
 typedef void* (*pFpiLL_t)(void*, int32_t, uintptr_t, uintptr_t);
 typedef void* (*pFpipi_t)(void*, int32_t, void*, int32_t);
 typedef void* (*pFpipd_t)(void*, int32_t, void*, double);
@@ -1085,6 +1104,7 @@ typedef void* (*pFpipp_t)(void*, int32_t, void*, void*);
 typedef void* (*pFpCWp_t)(void*, uint8_t, uint16_t, void*);
 typedef void* (*pFpCuW_t)(void*, uint8_t, uint32_t, uint16_t);
 typedef void* (*pFpCuu_t)(void*, uint8_t, uint32_t, uint32_t);
+typedef void* (*pFpWWW_t)(void*, uint16_t, uint16_t, uint16_t);
 typedef void* (*pFpuii_t)(void*, uint32_t, int32_t, int32_t);
 typedef void* (*pFpuip_t)(void*, uint32_t, int32_t, void*);
 typedef void* (*pFpuWp_t)(void*, uint32_t, uint16_t, void*);
@@ -1093,12 +1113,17 @@ typedef void* (*pFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpuup_t)(void*, uint32_t, uint32_t, void*);
 typedef void* (*pFpupi_t)(void*, uint32_t, void*, int32_t);
 typedef void* (*pFpupu_t)(void*, uint32_t, void*, uint32_t);
+typedef void* (*pFpupp_t)(void*, uint32_t, void*, void*);
 typedef void* (*pFpdIU_t)(void*, double, int64_t, uint64_t);
 typedef void* (*pFplpl_t)(void*, intptr_t, void*, intptr_t);
 typedef void* (*pFplpp_t)(void*, intptr_t, void*, void*);
 typedef void* (*pFpLip_t)(void*, uintptr_t, int32_t, void*);
+typedef void* (*pFpLup_t)(void*, uintptr_t, uint32_t, void*);
 typedef void* (*pFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
+typedef void* (*pFpLpi_t)(void*, uintptr_t, void*, int32_t);
+typedef void* (*pFpLpl_t)(void*, uintptr_t, void*, intptr_t);
 typedef void* (*pFpLpL_t)(void*, uintptr_t, void*, uintptr_t);
+typedef void* (*pFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef void* (*pFppii_t)(void*, void*, int32_t, int32_t);
 typedef void* (*pFppiu_t)(void*, void*, int32_t, uint32_t);
 typedef void* (*pFppiL_t)(void*, void*, int32_t, uintptr_t);
@@ -1113,6 +1138,7 @@ typedef void* (*pFppup_t)(void*, void*, uint32_t, void*);
 typedef void* (*pFppUU_t)(void*, void*, uint64_t, uint64_t);
 typedef void* (*pFppdd_t)(void*, void*, double, double);
 typedef void* (*pFppll_t)(void*, void*, intptr_t, intptr_t);
+typedef void* (*pFppLi_t)(void*, void*, uintptr_t, int32_t);
 typedef void* (*pFppLL_t)(void*, void*, uintptr_t, uintptr_t);
 typedef void* (*pFppLp_t)(void*, void*, uintptr_t, void*);
 typedef void* (*pFpppi_t)(void*, void*, void*, int32_t);
@@ -1372,11 +1398,13 @@ typedef int32_t (*iFpuuui_t)(void*, uint32_t, uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
 typedef int32_t (*iFpuuLL_t)(void*, uint32_t, uint32_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
+typedef int32_t (*iFpulpp_t)(void*, uint32_t, intptr_t, void*, void*);
 typedef int32_t (*iFpupiU_t)(void*, uint32_t, void*, int32_t, uint64_t);
 typedef int32_t (*iFpupup_t)(void*, uint32_t, void*, uint32_t, void*);
 typedef int32_t (*iFpuppp_t)(void*, uint32_t, void*, void*, void*);
 typedef int32_t (*iFpUiUi_t)(void*, uint64_t, int32_t, uint64_t, int32_t);
 typedef int32_t (*iFpUupp_t)(void*, uint64_t, uint32_t, void*, void*);
+typedef int32_t (*iFplupp_t)(void*, intptr_t, uint32_t, void*, void*);
 typedef int32_t (*iFplluu_t)(void*, intptr_t, intptr_t, uint32_t, uint32_t);
 typedef int32_t (*iFpLiLi_t)(void*, uintptr_t, int32_t, uintptr_t, int32_t);
 typedef int32_t (*iFpLlpp_t)(void*, uintptr_t, intptr_t, void*, void*);
@@ -1397,7 +1425,6 @@ typedef int32_t (*iFppupi_t)(void*, void*, uint32_t, void*, int32_t);
 typedef int32_t (*iFppupp_t)(void*, void*, uint32_t, void*, void*);
 typedef int32_t (*iFppllp_t)(void*, void*, intptr_t, intptr_t, void*);
 typedef int32_t (*iFpplpp_t)(void*, void*, intptr_t, void*, void*);
-typedef int32_t (*iFppLip_t)(void*, void*, uintptr_t, int32_t, void*);
 typedef int32_t (*iFppLup_t)(void*, void*, uintptr_t, uint32_t, void*);
 typedef int32_t (*iFppLpi_t)(void*, void*, uintptr_t, void*, int32_t);
 typedef int32_t (*iFppLpL_t)(void*, void*, uintptr_t, void*, uintptr_t);
@@ -1406,6 +1433,7 @@ typedef int32_t (*iFpppii_t)(void*, void*, void*, int32_t, int32_t);
 typedef int32_t (*iFpppiL_t)(void*, void*, void*, int32_t, uintptr_t);
 typedef int32_t (*iFpppip_t)(void*, void*, void*, int32_t, void*);
 typedef int32_t (*iFpppui_t)(void*, void*, void*, uint32_t, int32_t);
+typedef int32_t (*iFpppup_t)(void*, void*, void*, uint32_t, void*);
 typedef int32_t (*iFpppUi_t)(void*, void*, void*, uint64_t, int32_t);
 typedef int32_t (*iFpppLi_t)(void*, void*, void*, uintptr_t, int32_t);
 typedef int32_t (*iFpppLp_t)(void*, void*, void*, uintptr_t, void*);
@@ -1440,6 +1468,8 @@ typedef intptr_t (*lFipLlL_t)(int32_t, void*, uintptr_t, intptr_t, uintptr_t);
 typedef intptr_t (*lFipLLi_t)(int32_t, void*, uintptr_t, uintptr_t, int32_t);
 typedef intptr_t (*lFipLpp_t)(int32_t, void*, uintptr_t, void*, void*);
 typedef intptr_t (*lFpuipC_t)(void*, uint32_t, int32_t, void*, uint8_t);
+typedef intptr_t (*lFppupp_t)(void*, void*, uint32_t, void*, void*);
+typedef intptr_t (*lFppLpp_t)(void*, void*, uintptr_t, void*, void*);
 typedef uintptr_t (*LFELppi_t)(x64emu_t*, uintptr_t, void*, void*, int32_t);
 typedef uintptr_t (*LFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
 typedef uintptr_t (*LFuiCiu_t)(uint32_t, int32_t, uint8_t, int32_t, uint32_t);
@@ -1466,9 +1496,12 @@ typedef void* (*pFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
 typedef void* (*pFiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFiiipL_t)(int32_t, int32_t, int32_t, void*, uintptr_t);
 typedef void* (*pFipipL_t)(int32_t, void*, int32_t, void*, uintptr_t);
-typedef void* (*pFipppu_t)(int32_t, void*, void*, void*, uint32_t);
 typedef void* (*pFuiiiu_t)(uint32_t, int32_t, int32_t, int32_t, uint32_t);
 typedef void* (*pFuiupp_t)(uint32_t, int32_t, uint32_t, void*, void*);
+typedef void* (*pFupLpl_t)(uint32_t, void*, uintptr_t, void*, intptr_t);
+typedef void* (*pFupLpL_t)(uint32_t, void*, uintptr_t, void*, uintptr_t);
+typedef void* (*pFLuppp_t)(uintptr_t, uint32_t, void*, void*, void*);
+typedef void* (*pFLpppi_t)(uintptr_t, void*, void*, void*, int32_t);
 typedef void* (*pFpiiii_t)(void*, int32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFpiiip_t)(void*, int32_t, int32_t, int32_t, void*);
 typedef void* (*pFpiiuu_t)(void*, int32_t, int32_t, uint32_t, uint32_t);
@@ -1497,8 +1530,10 @@ typedef void* (*pFppiip_t)(void*, void*, int32_t, int32_t, void*);
 typedef void* (*pFppiup_t)(void*, void*, int32_t, uint32_t, void*);
 typedef void* (*pFppipi_t)(void*, void*, int32_t, void*, int32_t);
 typedef void* (*pFppipp_t)(void*, void*, int32_t, void*, void*);
+typedef void* (*pFppWpp_t)(void*, void*, uint16_t, void*, void*);
 typedef void* (*pFppuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFppuup_t)(void*, void*, uint32_t, uint32_t, void*);
+typedef void* (*pFppupp_t)(void*, void*, uint32_t, void*, void*);
 typedef void* (*pFppddi_t)(void*, void*, double, double, int32_t);
 typedef void* (*pFppLii_t)(void*, void*, uintptr_t, int32_t, int32_t);
 typedef void* (*pFppLLp_t)(void*, void*, uintptr_t, uintptr_t, void*);
@@ -1635,6 +1670,7 @@ typedef void (*vFppiiui_t)(void*, void*, int32_t, int32_t, uint32_t, int32_t);
 typedef void (*vFppiipi_t)(void*, void*, int32_t, int32_t, void*, int32_t);
 typedef void (*vFppiipp_t)(void*, void*, int32_t, int32_t, void*, void*);
 typedef void (*vFppilpp_t)(void*, void*, int32_t, intptr_t, void*, void*);
+typedef void (*vFppipLp_t)(void*, void*, int32_t, void*, uintptr_t, void*);
 typedef void (*vFppippi_t)(void*, void*, int32_t, void*, void*, int32_t);
 typedef void (*vFppippp_t)(void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFppuuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -1718,28 +1754,29 @@ typedef int32_t (*iFppiiip_t)(void*, void*, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFppiiuu_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppiipi_t)(void*, void*, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFppiipp_t)(void*, void*, int32_t, int32_t, void*, void*);
+typedef int32_t (*iFppiupp_t)(void*, void*, int32_t, uint32_t, void*, void*);
 typedef int32_t (*iFppipii_t)(void*, void*, int32_t, void*, int32_t, int32_t);
 typedef int32_t (*iFppipiL_t)(void*, void*, int32_t, void*, int32_t, uintptr_t);
 typedef int32_t (*iFppipip_t)(void*, void*, int32_t, void*, int32_t, void*);
-typedef int32_t (*iFppIipp_t)(void*, void*, int64_t, int32_t, void*, void*);
 typedef int32_t (*iFppIppp_t)(void*, void*, int64_t, void*, void*, void*);
 typedef int32_t (*iFppuiii_t)(void*, void*, uint32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppuiiL_t)(void*, void*, uint32_t, int32_t, int32_t, uintptr_t);
-typedef int32_t (*iFppuipp_t)(void*, void*, uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFppuIII_t)(void*, void*, uint32_t, int64_t, int64_t, int64_t);
 typedef int32_t (*iFppuupp_t)(void*, void*, uint32_t, uint32_t, void*, void*);
 typedef int32_t (*iFppupip_t)(void*, void*, uint32_t, void*, int32_t, void*);
 typedef int32_t (*iFppuppp_t)(void*, void*, uint32_t, void*, void*, void*);
-typedef int32_t (*iFppUipp_t)(void*, void*, uint64_t, int32_t, void*, void*);
 typedef int32_t (*iFppUUup_t)(void*, void*, uint64_t, uint64_t, uint32_t, void*);
 typedef int32_t (*iFppdidd_t)(void*, void*, double, int32_t, double, double);
+typedef int32_t (*iFpplupp_t)(void*, void*, intptr_t, uint32_t, void*, void*);
 typedef int32_t (*iFpplppi_t)(void*, void*, intptr_t, void*, void*, int32_t);
 typedef int32_t (*iFppLupp_t)(void*, void*, uintptr_t, uint32_t, void*, void*);
+typedef int32_t (*iFppLppp_t)(void*, void*, uintptr_t, void*, void*, void*);
 typedef int32_t (*iFpppiuu_t)(void*, void*, void*, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpppipi_t)(void*, void*, void*, int32_t, void*, int32_t);
 typedef int32_t (*iFpppipp_t)(void*, void*, void*, int32_t, void*, void*);
 typedef int32_t (*iFpppuii_t)(void*, void*, void*, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFpppupu_t)(void*, void*, void*, uint32_t, void*, uint32_t);
+typedef int32_t (*iFpppupp_t)(void*, void*, void*, uint32_t, void*, void*);
 typedef int32_t (*iFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFppppii_t)(void*, void*, void*, void*, int32_t, int32_t);
 typedef int32_t (*iFppppiu_t)(void*, void*, void*, void*, int32_t, uint32_t);
@@ -1769,6 +1806,8 @@ typedef intptr_t (*lFipipLu_t)(int32_t, void*, int32_t, void*, uintptr_t, uint32
 typedef intptr_t (*lFipLipu_t)(int32_t, void*, uintptr_t, int32_t, void*, uint32_t);
 typedef intptr_t (*lFipLipp_t)(int32_t, void*, uintptr_t, int32_t, void*, void*);
 typedef intptr_t (*lFipLpLL_t)(int32_t, void*, uintptr_t, void*, uintptr_t, uintptr_t);
+typedef intptr_t (*lFppLipp_t)(void*, void*, uintptr_t, int32_t, void*, void*);
+typedef intptr_t (*lFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
 typedef uintptr_t (*LFEupppp_t)(x64emu_t*, uint32_t, void*, void*, void*, void*);
 typedef uintptr_t (*LFELpppi_t)(x64emu_t*, uintptr_t, void*, void*, void*, int32_t);
 typedef uintptr_t (*LFEppppi_t)(x64emu_t*, void*, void*, void*, void*, int32_t);
@@ -1788,6 +1827,7 @@ typedef void* (*pFEppppp_t)(x64emu_t*, void*, void*, void*, void*, void*);
 typedef void* (*pFEppppV_t)(x64emu_t*, void*, void*, void*, void*, void*);
 typedef void* (*pFEppApp_t)(x64emu_t*, void*, void*, void*, void*, void*);
 typedef void* (*pFiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef void* (*pFiiiiid_t)(int32_t, int32_t, int32_t, int32_t, int32_t, double);
 typedef void* (*pFiCiiCi_t)(int32_t, uint8_t, int32_t, int32_t, uint8_t, int32_t);
 typedef void* (*pFipippp_t)(int32_t, void*, int32_t, void*, void*, void*);
 typedef void* (*pFdddddd_t)(double, double, double, double, double, double);
@@ -1804,16 +1844,19 @@ typedef void* (*pFpuuwwu_t)(void*, uint32_t, uint32_t, int16_t, int16_t, uint32_
 typedef void* (*pFpuuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpuuupu_t)(void*, uint32_t, uint32_t, uint32_t, void*, uint32_t);
 typedef void* (*pFpuuUUU_t)(void*, uint32_t, uint32_t, uint64_t, uint64_t, uint64_t);
+typedef void* (*pFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
 typedef void* (*pFplpppp_t)(void*, intptr_t, void*, void*, void*, void*);
 typedef void* (*pFppiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t);
-typedef void* (*pFppiipp_t)(void*, void*, int32_t, int32_t, void*, void*);
 typedef void* (*pFppiCCC_t)(void*, void*, int32_t, uint8_t, uint8_t, uint8_t);
+typedef void* (*pFppiupp_t)(void*, void*, int32_t, uint32_t, void*, void*);
 typedef void* (*pFppippi_t)(void*, void*, int32_t, void*, void*, int32_t);
 typedef void* (*pFppippp_t)(void*, void*, int32_t, void*, void*, void*);
-typedef void* (*pFpppiii_t)(void*, void*, void*, int32_t, int32_t, int32_t);
-typedef void* (*pFpppiui_t)(void*, void*, void*, int32_t, uint32_t, int32_t);
+typedef void* (*pFppuppp_t)(void*, void*, uint32_t, void*, void*, void*);
+typedef void* (*pFpplppp_t)(void*, void*, intptr_t, void*, void*, void*);
 typedef void* (*pFpppiup_t)(void*, void*, void*, int32_t, uint32_t, void*);
 typedef void* (*pFpppupp_t)(void*, void*, void*, uint32_t, void*, void*);
+typedef void* (*pFpppLii_t)(void*, void*, void*, uintptr_t, int32_t, int32_t);
+typedef void* (*pFpppLui_t)(void*, void*, void*, uintptr_t, uint32_t, int32_t);
 typedef void* (*pFppppii_t)(void*, void*, void*, void*, int32_t, int32_t);
 typedef void* (*pFppppWW_t)(void*, void*, void*, void*, uint16_t, uint16_t);
 typedef void* (*pFpppppi_t)(void*, void*, void*, void*, void*, int32_t);
@@ -1911,6 +1954,7 @@ typedef void (*vFppiLiLp_t)(void*, void*, int32_t, uintptr_t, int32_t, uintptr_t
 typedef void (*vFppipiip_t)(void*, void*, int32_t, void*, int32_t, int32_t, void*);
 typedef void (*vFppipipp_t)(void*, void*, int32_t, void*, int32_t, void*, void*);
 typedef void (*vFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
+typedef void (*vFppCuupp_t)(void*, void*, uint8_t, uint32_t, uint32_t, void*, void*);
 typedef void (*vFppddddi_t)(void*, void*, double, double, double, double, int32_t);
 typedef void (*vFppddpii_t)(void*, void*, double, double, void*, int32_t, int32_t);
 typedef void (*vFppLpppi_t)(void*, void*, uintptr_t, void*, void*, void*, int32_t);
@@ -1974,7 +2018,12 @@ typedef int32_t (*iFppippip_t)(void*, void*, int32_t, void*, void*, int32_t, voi
 typedef int32_t (*iFppipppi_t)(void*, void*, int32_t, void*, void*, void*, int32_t);
 typedef int32_t (*iFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFppuipiL_t)(void*, void*, uint32_t, int32_t, void*, int32_t, uintptr_t);
+typedef int32_t (*iFppuippp_t)(void*, void*, uint32_t, int32_t, void*, void*, void*);
+typedef int32_t (*iFppuuppp_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*);
+typedef int32_t (*iFppupupp_t)(void*, void*, uint32_t, void*, uint32_t, void*, void*);
+typedef int32_t (*iFppliupp_t)(void*, void*, intptr_t, int32_t, uint32_t, void*, void*);
 typedef int32_t (*iFppLiipp_t)(void*, void*, uintptr_t, int32_t, int32_t, void*, void*);
+typedef int32_t (*iFppLippp_t)(void*, void*, uintptr_t, int32_t, void*, void*, void*);
 typedef int32_t (*iFpppiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFpppiiuu_t)(void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpppiiup_t)(void*, void*, void*, int32_t, int32_t, uint32_t, void*);
@@ -1984,6 +2033,7 @@ typedef int32_t (*iFpppippi_t)(void*, void*, void*, int32_t, void*, void*, int32
 typedef int32_t (*iFpppippp_t)(void*, void*, void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFpppuiii_t)(void*, void*, void*, uint32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppppiii_t)(void*, void*, void*, void*, int32_t, int32_t, int32_t);
+typedef int32_t (*iFppppilp_t)(void*, void*, void*, void*, int32_t, intptr_t, void*);
 typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*);
 typedef int32_t (*iFppppdpi_t)(void*, void*, void*, void*, double, void*, int32_t);
 typedef int32_t (*iFpppppip_t)(void*, void*, void*, void*, void*, int32_t, void*);
@@ -2008,6 +2058,7 @@ typedef void* (*pFEpppppi_t)(x64emu_t*, void*, void*, void*, void*, void*, int32
 typedef void* (*pFifffppp_t)(int32_t, float, float, float, void*, void*, void*);
 typedef void* (*pFuupupup_t)(uint32_t, uint32_t, void*, uint32_t, void*, uint32_t, void*);
 typedef void* (*pFdiiiIiI_t)(double, int32_t, int32_t, int32_t, int64_t, int32_t, int64_t);
+typedef void* (*pFpiiiiid_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, double);
 typedef void* (*pFpiiUdii_t)(void*, int32_t, int32_t, uint64_t, double, int32_t, int32_t);
 typedef void* (*pFpipippp_t)(void*, int32_t, void*, int32_t, void*, void*, void*);
 typedef void* (*pFpCuwwWW_t)(void*, uint8_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t);
@@ -2015,26 +2066,26 @@ typedef void* (*pFpCuWCCC_t)(void*, uint8_t, uint32_t, uint16_t, uint8_t, uint8_
 typedef void* (*pFpCuuwwp_t)(void*, uint8_t, uint32_t, uint32_t, int16_t, int16_t, void*);
 typedef void* (*pFpCuuuuu_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpCpWWup_t)(void*, uint8_t, void*, uint16_t, uint16_t, uint32_t, void*);
+typedef void* (*pFpWppWpp_t)(void*, uint16_t, void*, void*, uint16_t, void*, void*);
 typedef void* (*pFpuuuwwu_t)(void*, uint32_t, uint32_t, uint32_t, int16_t, int16_t, uint32_t);
 typedef void* (*pFpuupwwC_t)(void*, uint32_t, uint32_t, void*, int16_t, int16_t, uint8_t);
 typedef void* (*pFplppppp_t)(void*, intptr_t, void*, void*, void*, void*, void*);
 typedef void* (*pFpLppiip_t)(void*, uintptr_t, void*, void*, int32_t, int32_t, void*);
 typedef void* (*pFppiiipp_t)(void*, void*, int32_t, int32_t, int32_t, void*, void*);
 typedef void* (*pFppiiCCC_t)(void*, void*, int32_t, int32_t, uint8_t, uint8_t, uint8_t);
-typedef void* (*pFppiippp_t)(void*, void*, int32_t, int32_t, void*, void*, void*);
 typedef void* (*pFppipipp_t)(void*, void*, int32_t, void*, int32_t, void*, void*);
 typedef void* (*pFppipLpp_t)(void*, void*, int32_t, void*, uintptr_t, void*, void*);
+typedef void* (*pFppuippp_t)(void*, void*, uint32_t, int32_t, void*, void*, void*);
 typedef void* (*pFppuuppp_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*);
-typedef void* (*pFppLiiip_t)(void*, void*, uintptr_t, int32_t, int32_t, int32_t, void*);
+typedef void* (*pFppliuip_t)(void*, void*, intptr_t, int32_t, uint32_t, int32_t, void*);
+typedef void* (*pFpplipup_t)(void*, void*, intptr_t, int32_t, void*, uint32_t, void*);
 typedef void* (*pFppLipip_t)(void*, void*, uintptr_t, int32_t, void*, int32_t, void*);
 typedef void* (*pFpppccci_t)(void*, void*, void*, int8_t, int8_t, int8_t, int32_t);
 typedef void* (*pFpppiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t);
-typedef void* (*pFpppiipp_t)(void*, void*, void*, int32_t, int32_t, void*, void*);
-typedef void* (*pFpppIIIi_t)(void*, void*, void*, int64_t, int64_t, int64_t, int32_t);
 typedef void* (*pFpppCCCi_t)(void*, void*, void*, uint8_t, uint8_t, uint8_t, int32_t);
+typedef void* (*pFpppuipp_t)(void*, void*, void*, uint32_t, int32_t, void*, void*);
 typedef void* (*pFpppuuui_t)(void*, void*, void*, uint32_t, uint32_t, uint32_t, int32_t);
 typedef void* (*pFpppuupp_t)(void*, void*, void*, uint32_t, uint32_t, void*, void*);
-typedef void* (*pFpppUUUi_t)(void*, void*, void*, uint64_t, uint64_t, uint64_t, int32_t);
 typedef void* (*pFpppfffi_t)(void*, void*, void*, float, float, float, int32_t);
 typedef void* (*pFpppdddi_t)(void*, void*, void*, double, double, double, int32_t);
 typedef void* (*pFpppllli_t)(void*, void*, void*, intptr_t, intptr_t, intptr_t, int32_t);
@@ -2096,7 +2147,6 @@ typedef void (*vFpUuuUUUi_t)(void*, uint64_t, uint32_t, uint32_t, uint64_t, uint
 typedef void (*vFppiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppiiipii_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t, int32_t);
 typedef void (*vFppipipii_t)(void*, void*, int32_t, void*, int32_t, void*, int32_t, int32_t);
-typedef void (*vFppippDDC_t)(void*, void*, int32_t, void*, void*, long double, long double, uint8_t);
 typedef void (*vFppipppui_t)(void*, void*, int32_t, void*, void*, void*, uint32_t, int32_t);
 typedef void (*vFppippppi_t)(void*, void*, int32_t, void*, void*, void*, void*, int32_t);
 typedef void (*vFppippppp_t)(void*, void*, int32_t, void*, void*, void*, void*, void*);
@@ -2152,6 +2202,7 @@ typedef uint32_t (*uFpupuuuCp_t)(void*, uint32_t, void*, uint32_t, uint32_t, uin
 typedef uint32_t (*uFppuuuupp_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef uint32_t (*uFppuuuppi_t)(void*, void*, uint32_t, uint32_t, uint32_t, void*, void*, int32_t);
 typedef uint32_t (*uFppuppppp_t)(void*, void*, uint32_t, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFpppppupp_t)(void*, void*, void*, void*, void*, uint32_t, void*, void*);
 typedef uintptr_t (*LFELpLpLpi_t)(x64emu_t*, uintptr_t, void*, uintptr_t, void*, uintptr_t, void*, int32_t);
 typedef uintptr_t (*LFEpiupppp_t)(x64emu_t*, void*, int32_t, uint32_t, void*, void*, void*, void*);
 typedef void* (*pFEiplllpp_t)(x64emu_t*, int32_t, void*, intptr_t, intptr_t, intptr_t, void*, void*);
@@ -2162,13 +2213,12 @@ typedef void* (*pFEpppppiV_t)(x64emu_t*, void*, void*, void*, void*, void*, int3
 typedef void* (*pFEppppppi_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, int32_t);
 typedef void* (*pFEppppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFiippipip_t)(int32_t, int32_t, void*, void*, int32_t, void*, int32_t, void*);
-typedef void* (*pFiipppppp_t)(int32_t, int32_t, void*, void*, void*, void*, void*, void*);
+typedef void* (*pFiupppppp_t)(int32_t, uint32_t, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFuiiiuuuu_t)(uint32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFuupupipp_t)(uint32_t, uint32_t, void*, uint32_t, void*, int32_t, void*, void*);
 typedef void* (*pFpiiiiiuu_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t);
 typedef void* (*pFpiUdiiUi_t)(void*, int32_t, uint64_t, double, int32_t, int32_t, uint64_t, int32_t);
 typedef void* (*pFpipiiiip_t)(void*, int32_t, void*, int32_t, int32_t, int32_t, int32_t, void*);
-typedef void* (*pFpipppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpCCuuwwC_t)(void*, uint8_t, uint8_t, uint32_t, uint32_t, int16_t, int16_t, uint8_t);
 typedef void* (*pFpCuwwWWu_t)(void*, uint8_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t, uint32_t);
 typedef void* (*pFpCuuuCup_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint8_t, uint32_t, void*);
@@ -2177,6 +2227,7 @@ typedef void* (*pFpuuWWCuu_t)(void*, uint32_t, uint32_t, uint16_t, uint16_t, uin
 typedef void* (*pFpuuuuupp_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef void* (*pFpuuuupup_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, void*, uint32_t, void*);
 typedef void* (*pFpuuupwwp_t)(void*, uint32_t, uint32_t, uint32_t, void*, int16_t, int16_t, void*);
+typedef void* (*pFpupppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpdwwWWui_t)(void*, double, int16_t, int16_t, uint16_t, uint16_t, uint32_t, int32_t);
 typedef void* (*pFplpppppp_t)(void*, intptr_t, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFppiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
@@ -2223,6 +2274,7 @@ typedef void (*vFppiiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t,
 typedef void (*vFppiiiiipi_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t);
 typedef void (*vFppiiipiii_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t, int32_t, int32_t);
 typedef void (*vFppiipiiii_t)(void*, void*, int32_t, int32_t, void*, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppippDpDC_t)(void*, void*, int32_t, void*, void*, long double, void*, long double, uint8_t);
 typedef void (*vFppipppiii_t)(void*, void*, int32_t, void*, void*, void*, int32_t, int32_t, int32_t);
 typedef void (*vFppipppiip_t)(void*, void*, int32_t, void*, void*, void*, int32_t, int32_t, void*);
 typedef void (*vFppuuiiiii_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
@@ -2246,7 +2298,7 @@ typedef int32_t (*iFpuuuuuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t,
 typedef int32_t (*iFpdiiiUiUp_t)(void*, double, int32_t, int32_t, int32_t, uint64_t, int32_t, uint64_t, void*);
 typedef int32_t (*iFppiiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppiuiippL_t)(void*, void*, int32_t, uint32_t, int32_t, int32_t, void*, void*, uintptr_t);
-typedef int32_t (*iFppLpiippp_t)(void*, void*, uintptr_t, void*, int32_t, int32_t, void*, void*, void*);
+typedef int32_t (*iFppLpiuppp_t)(void*, void*, uintptr_t, void*, int32_t, uint32_t, void*, void*, void*);
 typedef int32_t (*iFpppiiipip_t)(void*, void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*);
 typedef int32_t (*iFpppiiuuii_t)(void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFpppiipiiu_t)(void*, void*, void*, int32_t, int32_t, void*, int32_t, int32_t, uint32_t);
@@ -2256,7 +2308,10 @@ typedef int32_t (*iFppppppppp_t)(void*, void*, void*, void*, void*, void*, void*
 typedef uint32_t (*uFEipippppp_t)(x64emu_t*, int32_t, void*, int32_t, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFEpppufppp_t)(x64emu_t*, void*, void*, void*, uint32_t, float, void*, void*, void*);
 typedef uint32_t (*uFuulpiuiuf_t)(uint32_t, uint32_t, intptr_t, void*, int32_t, uint32_t, int32_t, uint32_t, float);
+typedef uint32_t (*uFppLpLuppp_t)(void*, void*, uintptr_t, void*, uintptr_t, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*);
+typedef intptr_t (*lFpppipiipp_t)(void*, void*, void*, int32_t, void*, int32_t, int32_t, void*, void*);
+typedef intptr_t (*lFpppippppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*, void*);
 typedef uintptr_t (*LFEppppppii_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, int32_t, int32_t);
 typedef void* (*pFEppiiuuLi_t)(x64emu_t*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, uintptr_t, int32_t);
 typedef void* (*pFEppuippuu_t)(x64emu_t*, void*, void*, uint32_t, int32_t, void*, void*, uint32_t, uint32_t);
@@ -2272,8 +2327,8 @@ typedef void* (*pFppiiiiiip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t,
 typedef void* (*pFppiiuuuLL_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uintptr_t, uintptr_t);
 typedef void* (*pFppipppppp_t)(void*, void*, int32_t, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpppiiiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
-typedef void* (*pFpppiipppp_t)(void*, void*, void*, int32_t, int32_t, void*, void*, void*, void*);
 typedef void* (*pFpppWWWWWp_t)(void*, void*, void*, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, void*);
+typedef void* (*pFpppuipppp_t)(void*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
 typedef void* (*pFpppppiipp_t)(void*, void*, void*, void*, void*, int32_t, int32_t, void*, void*);
 typedef void* (*pFpppppuuCC_t)(void*, void*, void*, void*, void*, uint32_t, uint32_t, uint8_t, uint8_t);
 typedef int32_t (*iWEpuuiippu_t)(x64emu_t*, void*, uint32_t, uint32_t, int32_t, int32_t, void*, void*, uint32_t);
@@ -2383,7 +2438,7 @@ typedef uint32_t (*uFppppppppppp_t)(void*, void*, void*, void*, void*, void*, vo
 typedef void* (*pFEpipppppppi_t)(x64emu_t*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*, int32_t);
 typedef void* (*pFEppiiLpppip_t)(x64emu_t*, void*, void*, int32_t, int32_t, uintptr_t, void*, void*, void*, int32_t, void*);
 typedef void* (*pFEppuiipuuii_t)(x64emu_t*, void*, void*, uint32_t, int32_t, int32_t, void*, uint32_t, uint32_t, int32_t, int32_t);
-typedef void* (*pFpppppppiipp_t)(void*, void*, void*, void*, void*, void*, void*, int32_t, int32_t, void*, void*);
+typedef void* (*pFpppppppuipp_t)(void*, void*, void*, void*, void*, void*, void*, uint32_t, int32_t, void*, void*);
 typedef void* (*pFppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iWEpuipuppppp_t)(x64emu_t*, void*, uint32_t, int32_t, void*, uint32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iWEpuuiiuippu_t)(x64emu_t*, void*, uint32_t, uint32_t, int32_t, int32_t, uint32_t, int32_t, void*, void*, uint32_t);
@@ -2435,6 +2490,7 @@ typedef uint32_t (*uFippuuuulllipp_t)(int32_t, void*, void*, uint32_t, uint32_t,
 typedef uint32_t (*uFppppuuupppppp_t)(void*, void*, void*, void*, uint32_t, uint32_t, uint32_t, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpCuuwwWWWWuup_t)(void*, uint8_t, uint32_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, void*);
 typedef void* (*pFpuupppwwwwWWC_t)(void*, uint32_t, uint32_t, void*, void*, void*, int16_t, int16_t, int16_t, int16_t, uint16_t, uint16_t, uint8_t);
+typedef void* (*pFpppppppuipppp_t)(void*, void*, void*, void*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
 typedef void* (*pFppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFippppppppppppp_t)(int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFuffiiffiiffiip_t)(uint32_t, float, float, int32_t, int32_t, float, float, int32_t, int32_t, float, float, int32_t, int32_t, void*);
@@ -2545,6 +2601,7 @@ void IFf(x64emu_t *emu, uintptr_t fcn) { IFf_t fn = (IFf_t)fcn; R_RAX=(int64_t)f
 void IFd(x64emu_t *emu, uintptr_t fcn) { IFd_t fn = (IFd_t)fcn; R_RAX=(int64_t)fn(emu->xmm[0].d[0]); }
 void IFp(x64emu_t *emu, uintptr_t fcn) { IFp_t fn = (IFp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI); }
 void CFC(x64emu_t *emu, uintptr_t fcn) { CFC_t fn = (CFC_t)fcn; R_RAX=(unsigned char)fn((uint8_t)R_RDI); }
+void CFW(x64emu_t *emu, uintptr_t fcn) { CFW_t fn = (CFW_t)fcn; R_RAX=(unsigned char)fn((uint16_t)R_RDI); }
 void CFu(x64emu_t *emu, uintptr_t fcn) { CFu_t fn = (CFu_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI); }
 void CFl(x64emu_t *emu, uintptr_t fcn) { CFl_t fn = (CFl_t)fcn; R_RAX=(unsigned char)fn((intptr_t)R_RDI); }
 void CFL(x64emu_t *emu, uintptr_t fcn) { CFL_t fn = (CFL_t)fcn; R_RAX=(unsigned char)fn((uintptr_t)R_RDI); }
@@ -2586,7 +2643,6 @@ void pFE(x64emu_t *emu, uintptr_t fcn) { pFE_t fn = (pFE_t)fcn; R_RAX=(uintptr_t
 void pFv(x64emu_t *emu, uintptr_t fcn) { pFv_t fn = (pFv_t)fcn; R_RAX=(uintptr_t)fn(); }
 void pFw(x64emu_t *emu, uintptr_t fcn) { pFw_t fn = (pFw_t)fcn; R_RAX=(uintptr_t)fn((int16_t)R_RDI); }
 void pFi(x64emu_t *emu, uintptr_t fcn) { pFi_t fn = (pFi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI); }
-void pFI(x64emu_t *emu, uintptr_t fcn) { pFI_t fn = (pFI_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI); }
 void pFC(x64emu_t *emu, uintptr_t fcn) { pFC_t fn = (pFC_t)fcn; R_RAX=(uintptr_t)fn((uint8_t)R_RDI); }
 void pFW(x64emu_t *emu, uintptr_t fcn) { pFW_t fn = (pFW_t)fcn; R_RAX=(uintptr_t)fn((uint16_t)R_RDI); }
 void pFu(x64emu_t *emu, uintptr_t fcn) { pFu_t fn = (pFu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI); }
@@ -2609,7 +2665,6 @@ void vFEp(x64emu_t *emu, uintptr_t fcn) { vFEp_t fn = (vFEp_t)fcn; fn(emu, (void
 void vFcc(x64emu_t *emu, uintptr_t fcn) { vFcc_t fn = (vFcc_t)fcn; fn((int8_t)R_RDI, (int8_t)R_RSI); }
 void vFww(x64emu_t *emu, uintptr_t fcn) { vFww_t fn = (vFww_t)fcn; fn((int16_t)R_RDI, (int16_t)R_RSI); }
 void vFii(x64emu_t *emu, uintptr_t fcn) { vFii_t fn = (vFii_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI); }
-void vFiI(x64emu_t *emu, uintptr_t fcn) { vFiI_t fn = (vFiI_t)fcn; fn((int32_t)R_RDI, (int64_t)R_RSI); }
 void vFiW(x64emu_t *emu, uintptr_t fcn) { vFiW_t fn = (vFiW_t)fcn; fn((int32_t)R_RDI, (uint16_t)R_RSI); }
 void vFiu(x64emu_t *emu, uintptr_t fcn) { vFiu_t fn = (vFiu_t)fcn; fn((int32_t)R_RDI, (uint32_t)R_RSI); }
 void vFiU(x64emu_t *emu, uintptr_t fcn) { vFiU_t fn = (vFiU_t)fcn; fn((int32_t)R_RDI, (uint64_t)R_RSI); }
@@ -2676,6 +2731,7 @@ void iFup(x64emu_t *emu, uintptr_t fcn) { iFup_t fn = (iFup_t)fcn; R_RAX=(int32_
 void iFUp(x64emu_t *emu, uintptr_t fcn) { iFUp_t fn = (iFUp_t)fcn; R_RAX=(int32_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=(int32_t)fn((intptr_t)R_RDI, (int32_t)R_RSI); }
 void iFlp(x64emu_t *emu, uintptr_t fcn) { iFlp_t fn = (iFlp_t)fcn; R_RAX=(int32_t)fn((intptr_t)R_RDI, (void*)R_RSI); }
+void iFLi(x64emu_t *emu, uintptr_t fcn) { iFLi_t fn = (iFLi_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (int32_t)R_RSI); }
 void iFLu(x64emu_t *emu, uintptr_t fcn) { iFLu_t fn = (iFLu_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (uint32_t)R_RSI); }
 void iFLL(x64emu_t *emu, uintptr_t fcn) { iFLL_t fn = (iFLL_t)fcn; R_RAX=(int32_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=(int32_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
@@ -2701,6 +2757,7 @@ void IFpu(x64emu_t *emu, uintptr_t fcn) { IFpu_t fn = (IFpu_t)fcn; R_RAX=(int64_
 void IFpd(x64emu_t *emu, uintptr_t fcn) { IFpd_t fn = (IFpd_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, emu->xmm[0].d[0]); }
 void CFip(x64emu_t *emu, uintptr_t fcn) { CFip_t fn = (CFip_t)fcn; R_RAX=(unsigned char)fn((int32_t)R_RDI, (void*)R_RSI); }
 void CFui(x64emu_t *emu, uintptr_t fcn) { CFui_t fn = (CFui_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
+void CFuW(x64emu_t *emu, uintptr_t fcn) { CFuW_t fn = (CFuW_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI, (uint16_t)R_RSI); }
 void CFuu(x64emu_t *emu, uintptr_t fcn) { CFuu_t fn = (CFuu_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
 void CFuL(x64emu_t *emu, uintptr_t fcn) { CFuL_t fn = (CFuL_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI, (uintptr_t)R_RSI); }
 void CFpi(x64emu_t *emu, uintptr_t fcn) { CFpi_t fn = (CFpi_t)fcn; R_RAX=(unsigned char)fn((void*)R_RDI, (int32_t)R_RSI); }
@@ -2720,6 +2777,7 @@ void uFpi(x64emu_t *emu, uintptr_t fcn) { uFpi_t fn = (uFpi_t)fcn; R_RAX=(uint32
 void uFpu(x64emu_t *emu, uintptr_t fcn) { uFpu_t fn = (uFpu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI); }
 void uFpU(x64emu_t *emu, uintptr_t fcn) { uFpU_t fn = (uFpU_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint64_t)R_RSI); }
 void uFpf(x64emu_t *emu, uintptr_t fcn) { uFpf_t fn = (uFpf_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, emu->xmm[0].f[0]); }
+void uFpl(x64emu_t *emu, uintptr_t fcn) { uFpl_t fn = (uFpl_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI); }
 void uFpL(x64emu_t *emu, uintptr_t fcn) { uFpL_t fn = (uFpL_t)fcn; R_RAX=(uint32_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=(uint32_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); }
@@ -2761,6 +2819,7 @@ void LFii(x64emu_t *emu, uintptr_t fcn) { LFii_t fn = (LFii_t)fcn; R_RAX=(uintpt
 void LFuu(x64emu_t *emu, uintptr_t fcn) { LFuu_t fn = (LFuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
 void LFLi(x64emu_t *emu, uintptr_t fcn) { LFLi_t fn = (LFLi_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (int32_t)R_RSI); }
 void LFLL(x64emu_t *emu, uintptr_t fcn) { LFLL_t fn = (LFLL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_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, (int32_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); }
@@ -2774,20 +2833,20 @@ void pFip(x64emu_t *emu, uintptr_t fcn) { pFip_t fn = (pFip_t)fcn; R_RAX=(uintpt
 void pFiV(x64emu_t *emu, uintptr_t fcn) { pFiV_t fn = (pFiV_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)(R_RSP + 8)); }
 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 pFui(x64emu_t *emu, uintptr_t fcn) { pFui_t fn = (pFui_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
-void pFuC(x64emu_t *emu, uintptr_t fcn) { pFuC_t fn = (pFuC_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint8_t)R_RSI); }
 void pFuu(x64emu_t *emu, uintptr_t fcn) { pFuu_t fn = (pFuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
 void pFup(x64emu_t *emu, uintptr_t fcn) { pFup_t fn = (pFup_t)fcn; R_RAX=(uintptr_t)fn((uint32_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, (int32_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); }
 void pFdi(x64emu_t *emu, uintptr_t fcn) { pFdi_t fn = (pFdi_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI); }
 void pFdd(x64emu_t *emu, uintptr_t fcn) { pFdd_t fn = (pFdd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void pFlp(x64emu_t *emu, uintptr_t fcn) { pFlp_t fn = (pFlp_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, (void*)R_RSI); }
 void pFLi(x64emu_t *emu, uintptr_t fcn) { pFLi_t fn = (pFLi_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (int32_t)R_RSI); }
+void pFLC(x64emu_t *emu, uintptr_t fcn) { pFLC_t fn = (pFLC_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint8_t)R_RSI); }
 void pFLu(x64emu_t *emu, uintptr_t fcn) { pFLu_t fn = (pFLu_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint32_t)R_RSI); }
 void pFLL(x64emu_t *emu, uintptr_t fcn) { pFLL_t fn = (pFLL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void pFLp(x64emu_t *emu, uintptr_t fcn) { pFLp_t fn = (pFLp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
 void pFpi(x64emu_t *emu, uintptr_t fcn) { pFpi_t fn = (pFpi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI); }
 void pFpC(x64emu_t *emu, uintptr_t fcn) { pFpC_t fn = (pFpC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI); }
+void pFpW(x64emu_t *emu, uintptr_t fcn) { pFpW_t fn = (pFpW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI); }
 void pFpu(x64emu_t *emu, uintptr_t fcn) { pFpu_t fn = (pFpu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI); }
 void pFpU(x64emu_t *emu, uintptr_t fcn) { pFpU_t fn = (pFpU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI); }
 void pFpd(x64emu_t *emu, uintptr_t fcn) { pFpd_t fn = (pFpd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0]); }
@@ -2905,6 +2964,7 @@ void vFppd(x64emu_t *emu, uintptr_t fcn) { vFppd_t fn = (vFppd_t)fcn; fn((void*)
 void vFppl(x64emu_t *emu, uintptr_t fcn) { vFppl_t fn = (vFppl_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (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 wFppp(x64emu_t *emu, uintptr_t fcn) { wFppp_t fn = (wFppp_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFEiw(x64emu_t *emu, uintptr_t fcn) { iFEiw_t fn = (iFEiw_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (int16_t)R_RSI); }
 void iFEip(x64emu_t *emu, uintptr_t fcn) { iFEip_t fn = (iFEip_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI); }
 void iFEWW(x64emu_t *emu, uintptr_t fcn) { iFEWW_t fn = (iFEWW_t)fcn; R_RAX=(int32_t)fn(emu, (uint16_t)R_RDI, (uint16_t)R_RSI); }
@@ -2937,7 +2997,7 @@ void iFipu(x64emu_t *emu, uintptr_t fcn) { iFipu_t fn = (iFipu_t)fcn; R_RAX=(int
 void iFipL(x64emu_t *emu, uintptr_t fcn) { iFipL_t fn = (iFipL_t)fcn; R_RAX=(int32_t)fn((int32_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=(int32_t)fn((int32_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=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, of_convert((int32_t)R_RDX)); }
-void iFCiW(x64emu_t *emu, uintptr_t fcn) { iFCiW_t fn = (iFCiW_t)fcn; R_RAX=(int32_t)fn((uint8_t)R_RDI, (int32_t)R_RSI, (uint16_t)R_RDX); }
+void iFCuW(x64emu_t *emu, uintptr_t fcn) { iFCuW_t fn = (iFCuW_t)fcn; R_RAX=(int32_t)fn((uint8_t)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX); }
 void iFuwp(x64emu_t *emu, uintptr_t fcn) { iFuwp_t fn = (iFuwp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int16_t)R_RSI, (void*)R_RDX); }
 void iFuip(x64emu_t *emu, uintptr_t fcn) { iFuip_t fn = (iFuip_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void iFuui(x64emu_t *emu, uintptr_t fcn) { iFuui_t fn = (iFuui_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
@@ -2967,6 +3027,7 @@ void iFpWp(x64emu_t *emu, uintptr_t fcn) { iFpWp_t fn = (iFpWp_t)fcn; R_RAX=(int
 void iFpui(x64emu_t *emu, uintptr_t fcn) { iFpui_t fn = (iFpui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void iFpuu(x64emu_t *emu, uintptr_t fcn) { iFpuu_t fn = (iFpuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
 void iFpuU(x64emu_t *emu, uintptr_t fcn) { iFpuU_t fn = (iFpuU_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX); }
+void iFpul(x64emu_t *emu, uintptr_t fcn) { iFpul_t fn = (iFpul_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX); }
 void iFpuL(x64emu_t *emu, uintptr_t fcn) { iFpuL_t fn = (iFpuL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX); }
 void iFpup(x64emu_t *emu, uintptr_t fcn) { iFpup_t fn = (iFpup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void iFpUi(x64emu_t *emu, uintptr_t fcn) { iFpUi_t fn = (iFpUi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX); }
@@ -3000,11 +3061,12 @@ void IFiIi(x64emu_t *emu, uintptr_t fcn) { IFiIi_t fn = (IFiIi_t)fcn; R_RAX=(int
 void IFpIi(x64emu_t *emu, uintptr_t fcn) { IFpIi_t fn = (IFpIi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
 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, (int32_t)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); }
-void IFppu(x64emu_t *emu, uintptr_t fcn) { IFppu_t fn = (IFppu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void IFSIi(x64emu_t *emu, uintptr_t fcn) { IFSIi_t fn = (IFSIi_t)fcn; R_RAX=(int64_t)fn(io_convert((void*)R_RDI), (int64_t)R_RSI, (int32_t)R_RDX); }
 void CFipp(x64emu_t *emu, uintptr_t fcn) { CFipp_t fn = (CFipp_t)fcn; R_RAX=(unsigned char)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void CFuff(x64emu_t *emu, uintptr_t fcn) { CFuff_t fn = (CFuff_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void CFuLu(x64emu_t *emu, uintptr_t fcn) { CFuLu_t fn = (CFuLu_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX); }
+void CFppp(x64emu_t *emu, uintptr_t fcn) { CFppp_t fn = (CFppp_t)fcn; R_RAX=(unsigned char)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void WFppp(x64emu_t *emu, uintptr_t fcn) { WFppp_t fn = (WFppp_t)fcn; R_RAX=(unsigned short)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void uFEpW(x64emu_t *emu, uintptr_t fcn) { uFEpW_t fn = (uFEpW_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint16_t)R_RSI); }
 void uFEpu(x64emu_t *emu, uintptr_t fcn) { uFEpu_t fn = (uFEpu_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI); }
 void uFEpU(x64emu_t *emu, uintptr_t fcn) { uFEpU_t fn = (uFEpU_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI); }
@@ -3037,7 +3099,6 @@ void uFppp(x64emu_t *emu, uintptr_t fcn) { uFppp_t fn = (uFppp_t)fcn; R_RAX=(uin
 void UFUUU(x64emu_t *emu, uintptr_t fcn) { UFUUU_t fn = (UFUUU_t)fcn; R_RAX=fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); }
 void UFpiU(x64emu_t *emu, uintptr_t fcn) { UFpiU_t fn = (UFpiU_t)fcn; R_RAX=fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)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, (int32_t)R_RDX); }
-void UFppu(x64emu_t *emu, uintptr_t fcn) { UFppu_t fn = (UFppu_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void fFuii(x64emu_t *emu, uintptr_t fcn) { fFuii_t fn = (fFuii_t)fcn; emu->xmm[0].f[0]=fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_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); }
@@ -3060,11 +3121,13 @@ void lFpli(x64emu_t *emu, uintptr_t fcn) { lFpli_t fn = (lFpli_t)fcn; R_RAX=(int
 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, (uint32_t)R_RDX); }
 void lFpLp(x64emu_t *emu, uintptr_t fcn) { lFpLp_t fn = (lFpLp_t)fcn; R_RAX=(intptr_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=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
+void lFppu(x64emu_t *emu, uintptr_t fcn) { lFppu_t fn = (lFppu_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void lFppL(x64emu_t *emu, uintptr_t fcn) { lFppL_t fn = (lFppL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void lFppp(x64emu_t *emu, uintptr_t fcn) { lFppp_t fn = (lFppp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void lFSpl(x64emu_t *emu, uintptr_t fcn) { lFSpl_t fn = (lFSpl_t)fcn; R_RAX=(intptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (intptr_t)R_RDX); }
 void LFEpA(x64emu_t *emu, uintptr_t fcn) { LFEpA_t fn = (LFEpA_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
 void LFipL(x64emu_t *emu, uintptr_t fcn) { LFipL_t fn = (LFipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
+void LFuui(x64emu_t *emu, uintptr_t fcn) { LFuui_t fn = (LFuui_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_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, (uint32_t)R_RDX); }
 void LFLpL(x64emu_t *emu, uintptr_t fcn) { LFLpL_t fn = (LFLpL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
@@ -3073,6 +3136,7 @@ void LFpup(x64emu_t *emu, uintptr_t fcn) { LFpup_t fn = (LFpup_t)fcn; R_RAX=(uin
 void LFpLi(x64emu_t *emu, uintptr_t fcn) { LFpLi_t fn = (LFpLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX); }
 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, (int32_t)R_RDX); }
+void LFppu(x64emu_t *emu, uintptr_t fcn) { LFppu_t fn = (LFppu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void LFppL(x64emu_t *emu, uintptr_t fcn) { LFppL_t fn = (LFppL_t)fcn; R_RAX=(uintptr_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=(uintptr_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=(uintptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (uintptr_t)R_RDX); }
@@ -3089,18 +3153,21 @@ void pFiii(x64emu_t *emu, uintptr_t fcn) { pFiii_t fn = (pFiii_t)fcn; R_RAX=(uin
 void pFiiu(x64emu_t *emu, uintptr_t fcn) { pFiiu_t fn = (pFiiu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX); }
 void pFiip(x64emu_t *emu, uintptr_t fcn) { pFiip_t fn = (pFiip_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void pFiIi(x64emu_t *emu, uintptr_t fcn) { pFiIi_t fn = (pFiIi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
-void pFiIp(x64emu_t *emu, uintptr_t fcn) { pFiIp_t fn = (pFiIp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
 void pFipi(x64emu_t *emu, uintptr_t fcn) { pFipi_t fn = (pFipi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void pFipL(x64emu_t *emu, uintptr_t fcn) { pFipL_t fn = (pFipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void pFipp(x64emu_t *emu, uintptr_t fcn) { pFipp_t fn = (pFipp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void pFIpi(x64emu_t *emu, uintptr_t fcn) { pFIpi_t fn = (pFIpi_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
-void pFCiW(x64emu_t *emu, uintptr_t fcn) { pFCiW_t fn = (pFCiW_t)fcn; R_RAX=(uintptr_t)fn((uint8_t)R_RDI, (int32_t)R_RSI, (uint16_t)R_RDX); }
+void pFCuW(x64emu_t *emu, uintptr_t fcn) { pFCuW_t fn = (pFCuW_t)fcn; R_RAX=(uintptr_t)fn((uint8_t)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX); }
 void pFWWW(x64emu_t *emu, uintptr_t fcn) { pFWWW_t fn = (pFWWW_t)fcn; R_RAX=(uintptr_t)fn((uint16_t)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX); }
+void pFuip(x64emu_t *emu, uintptr_t fcn) { pFuip_t fn = (pFuip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void pFuui(x64emu_t *emu, uintptr_t fcn) { pFuui_t fn = (pFuui_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void pFuuu(x64emu_t *emu, uintptr_t fcn) { pFuuu_t fn = (pFuuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
 void pFulu(x64emu_t *emu, uintptr_t fcn) { pFulu_t fn = (pFulu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX); }
+void pFulp(x64emu_t *emu, uintptr_t fcn) { pFulp_t fn = (pFulp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI, (void*)R_RDX); }
 void pFupi(x64emu_t *emu, uintptr_t fcn) { pFupi_t fn = (pFupi_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
+void pFupl(x64emu_t *emu, uintptr_t fcn) { pFupl_t fn = (pFupl_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (intptr_t)R_RDX); }
 void pFupL(x64emu_t *emu, uintptr_t fcn) { pFupL_t fn = (pFupL_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
+void pFupp(x64emu_t *emu, uintptr_t fcn) { pFupp_t fn = (pFupp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)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, (int32_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], (int32_t)R_RDI, (void*)R_RSI); }
 void pFdUU(x64emu_t *emu, uintptr_t fcn) { pFdUU_t fn = (pFdUU_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (uint64_t)R_RDI, (uint64_t)R_RSI); }
@@ -3117,6 +3184,7 @@ void pFpip(x64emu_t *emu, uintptr_t fcn) { pFpip_t fn = (pFpip_t)fcn; R_RAX=(uin
 void pFpCC(x64emu_t *emu, uintptr_t fcn) { pFpCC_t fn = (pFpCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX); }
 void pFpCu(x64emu_t *emu, uintptr_t fcn) { pFpCu_t fn = (pFpCu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX); }
 void pFpWW(x64emu_t *emu, uintptr_t fcn) { pFpWW_t fn = (pFpWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX); }
+void pFpWp(x64emu_t *emu, uintptr_t fcn) { pFpWp_t fn = (pFpWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
 void pFpui(x64emu_t *emu, uintptr_t fcn) { pFpui_t fn = (pFpui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void pFpuu(x64emu_t *emu, uintptr_t fcn) { pFpuu_t fn = (pFpuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
 void pFpuL(x64emu_t *emu, uintptr_t fcn) { pFpuL_t fn = (pFpuL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX); }
@@ -3246,6 +3314,7 @@ void vFUUpi(x64emu_t *emu, uintptr_t fcn) { vFUUpi_t fn = (vFUUpi_t)fcn; fn((uin
 void vFffff(x64emu_t *emu, uintptr_t fcn) { vFffff_t fn = (vFffff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0]); }
 void vFdddd(x64emu_t *emu, uintptr_t fcn) { vFdddd_t fn = (vFdddd_t)fcn; fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
 void vFllii(x64emu_t *emu, uintptr_t fcn) { vFllii_t fn = (vFllii_t)fcn; fn((intptr_t)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
+void vFLuui(x64emu_t *emu, uintptr_t fcn) { vFLuui_t fn = (vFLuui_t)fcn; fn((uintptr_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void vFpiii(x64emu_t *emu, uintptr_t fcn) { vFpiii_t fn = (vFpiii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFpiiu(x64emu_t *emu, uintptr_t fcn) { vFpiiu_t fn = (vFpiiu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void vFpiip(x64emu_t *emu, uintptr_t fcn) { vFpiip_t fn = (vFpiip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
@@ -3258,7 +3327,7 @@ void vFpifi(x64emu_t *emu, uintptr_t fcn) { vFpifi_t fn = (vFpifi_t)fcn; fn((voi
 void vFpipi(x64emu_t *emu, uintptr_t fcn) { vFpipi_t fn = (vFpipi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void vFpipp(x64emu_t *emu, uintptr_t fcn) { vFpipp_t fn = (vFpipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFpIdi(x64emu_t *emu, uintptr_t fcn) { vFpIdi_t fn = (vFpIdi_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX); }
-void vFpCiW(x64emu_t *emu, uintptr_t fcn) { vFpCiW_t fn = (vFpCiW_t)fcn; fn((void*)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX, (uint16_t)R_RCX); }
+void vFpCuW(x64emu_t *emu, uintptr_t fcn) { vFpCuW_t fn = (vFpCuW_t)fcn; fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX); }
 void vFpuip(x64emu_t *emu, uintptr_t fcn) { vFpuip_t fn = (vFpuip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void vFpuui(x64emu_t *emu, uintptr_t fcn) { vFpuui_t fn = (vFpuui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void vFpuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuu_t fn = (vFpuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
@@ -3295,10 +3364,9 @@ void vFppdp(x64emu_t *emu, uintptr_t fcn) { vFppdp_t fn = (vFppdp_t)fcn; fn((voi
 void vFpplp(x64emu_t *emu, uintptr_t fcn) { vFpplp_t fn = (vFpplp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
 void vFppLp(x64emu_t *emu, uintptr_t fcn) { vFppLp_t fn = (vFppLp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void vFpppi(x64emu_t *emu, uintptr_t fcn) { vFpppi_t fn = (vFpppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
-void vFpppI(x64emu_t *emu, uintptr_t fcn) { vFpppI_t fn = (vFpppI_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
 void vFpppu(x64emu_t *emu, uintptr_t fcn) { vFpppu_t fn = (vFpppu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
-void vFpppU(x64emu_t *emu, uintptr_t fcn) { vFpppU_t fn = (vFpppU_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX); }
 void vFpppd(x64emu_t *emu, uintptr_t fcn) { vFpppd_t fn = (vFpppd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].d[0]); }
+void vFpppl(x64emu_t *emu, uintptr_t fcn) { vFpppl_t fn = (vFpppl_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX); }
 void vFpppL(x64emu_t *emu, uintptr_t fcn) { vFpppL_t fn = (vFpppL_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void vFpppp(x64emu_t *emu, uintptr_t fcn) { vFpppp_t fn = (vFpppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void cFpiii(x64emu_t *emu, uintptr_t fcn) { cFpiii_t fn = (cFpiii_t)fcn; R_RAX=fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
@@ -3355,7 +3423,6 @@ void iFippL(x64emu_t *emu, uintptr_t fcn) { iFippL_t fn = (iFippL_t)fcn; R_RAX=(
 void iFippp(x64emu_t *emu, uintptr_t fcn) { iFippp_t fn = (iFippp_t)fcn; R_RAX=(int32_t)fn((int32_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=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, of_convert((int32_t)R_RDX), (void*)R_RCX); }
 void iFuiup(x64emu_t *emu, uintptr_t fcn) { iFuiup_t fn = (iFuiup_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
-void iFuipu(x64emu_t *emu, uintptr_t fcn) { iFuipu_t fn = (iFuipu_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void iFuipp(x64emu_t *emu, uintptr_t fcn) { iFuipp_t fn = (iFuipp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFuupi(x64emu_t *emu, uintptr_t fcn) { iFuupi_t fn = (iFuupi_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void iFupLp(x64emu_t *emu, uintptr_t fcn) { iFupLp_t fn = (iFupLp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
@@ -3384,7 +3451,9 @@ void iFpipV(x64emu_t *emu, uintptr_t fcn) { iFpipV_t fn = (iFpipV_t)fcn; R_RAX=(
 void iFpIip(x64emu_t *emu, uintptr_t fcn) { iFpIip_t fn = (iFpIip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFpCCC(x64emu_t *emu, uintptr_t fcn) { iFpCCC_t fn = (iFpCCC_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX); }
 void iFpCpi(x64emu_t *emu, uintptr_t fcn) { iFpCpi_t fn = (iFpCpi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
+void iFpCpp(x64emu_t *emu, uintptr_t fcn) { iFpCpp_t fn = (iFpCpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpWWu(x64emu_t *emu, uintptr_t fcn) { iFpWWu_t fn = (iFpWWu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint32_t)R_RCX); }
+void iFpWpp(x64emu_t *emu, uintptr_t fcn) { iFpWpp_t fn = (iFpWpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpuwp(x64emu_t *emu, uintptr_t fcn) { iFpuwp_t fn = (iFpuwp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_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=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpuip(x64emu_t *emu, uintptr_t fcn) { iFpuip_t fn = (iFpuip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
@@ -3406,6 +3475,7 @@ void iFpULp(x64emu_t *emu, uintptr_t fcn) { iFpULp_t fn = (iFpULp_t)fcn; R_RAX=(
 void iFpUpp(x64emu_t *emu, uintptr_t fcn) { iFpUpp_t fn = (iFpUpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFplii(x64emu_t *emu, uintptr_t fcn) { iFplii_t fn = (iFplii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFplip(x64emu_t *emu, uintptr_t fcn) { iFplip_t fn = (iFplip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void iFplpp(x64emu_t *emu, uintptr_t fcn) { iFplpp_t fn = (iFplpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpLii(x64emu_t *emu, uintptr_t fcn) { iFpLii_t fn = (iFpLii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFpLip(x64emu_t *emu, uintptr_t fcn) { iFpLip_t fn = (iFpLip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFpLLu(x64emu_t *emu, uintptr_t fcn) { iFpLLu_t fn = (iFpLLu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX); }
@@ -3445,7 +3515,6 @@ void IFipUp(x64emu_t *emu, uintptr_t fcn) { IFipUp_t fn = (IFipUp_t)fcn; R_RAX=(
 void IFpIip(x64emu_t *emu, uintptr_t fcn) { IFpIip_t fn = (IFpIip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void IFppii(x64emu_t *emu, uintptr_t fcn) { IFppii_t fn = (IFppii_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void IFppip(x64emu_t *emu, uintptr_t fcn) { IFppip_t fn = (IFppip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
-void IFpppp(x64emu_t *emu, uintptr_t fcn) { IFpppp_t fn = (IFpppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void IFSIii(x64emu_t *emu, uintptr_t fcn) { IFSIii_t fn = (IFSIii_t)fcn; R_RAX=(int64_t)fn(io_convert((void*)R_RDI), (int64_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void CFuuff(x64emu_t *emu, uintptr_t fcn) { CFuuff_t fn = (CFuuff_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void CFpupp(x64emu_t *emu, uintptr_t fcn) { CFpupp_t fn = (CFpupp_t)fcn; R_RAX=(unsigned char)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -3474,7 +3543,6 @@ void UFpipp(x64emu_t *emu, uintptr_t fcn) { UFpipp_t fn = (UFpipp_t)fcn; R_RAX=f
 void UFpUui(x64emu_t *emu, uintptr_t fcn) { UFpUui_t fn = (UFpUui_t)fcn; R_RAX=fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void UFppii(x64emu_t *emu, uintptr_t fcn) { UFppii_t fn = (UFppii_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void UFppip(x64emu_t *emu, uintptr_t fcn) { UFppip_t fn = (UFppip_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
-void UFpppp(x64emu_t *emu, uintptr_t fcn) { UFpppp_t fn = (UFpppp_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void dFpppp(x64emu_t *emu, uintptr_t fcn) { dFpppp_t fn = (dFpppp_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void lFEipV(x64emu_t *emu, uintptr_t fcn) { lFEipV_t fn = (lFEipV_t)fcn; R_RAX=(intptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); }
 void lFEpip(x64emu_t *emu, uintptr_t fcn) { lFEpip_t fn = (lFEpip_t)fcn; R_RAX=(intptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
@@ -3494,13 +3562,17 @@ void lFuipp(x64emu_t *emu, uintptr_t fcn) { lFuipp_t fn = (lFuipp_t)fcn; R_RAX=(
 void lFpili(x64emu_t *emu, uintptr_t fcn) { lFpili_t fn = (lFpili_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (int32_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, (int32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
 void lFpuip(x64emu_t *emu, uintptr_t fcn) { lFpuip_t fn = (lFpuip_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void lFplpp(x64emu_t *emu, uintptr_t fcn) { lFplpp_t fn = (lFplpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void lFpLpp(x64emu_t *emu, uintptr_t fcn) { lFpLpp_t fn = (lFpLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void lFppii(x64emu_t *emu, uintptr_t fcn) { lFppii_t fn = (lFppii_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void lFppip(x64emu_t *emu, uintptr_t fcn) { lFppip_t fn = (lFppip_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void lFpppL(x64emu_t *emu, uintptr_t fcn) { lFpppL_t fn = (lFpppL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
+void lFpppp(x64emu_t *emu, uintptr_t fcn) { lFpppp_t fn = (lFpppp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void LFEppL(x64emu_t *emu, uintptr_t fcn) { LFEppL_t fn = (LFEppL_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void LFEppp(x64emu_t *emu, uintptr_t fcn) { LFEppp_t fn = (LFEppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void LFippL(x64emu_t *emu, uintptr_t fcn) { LFippL_t fn = (LFippL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void LFippp(x64emu_t *emu, uintptr_t fcn) { LFippp_t fn = (LFippp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void LFuipL(x64emu_t *emu, uintptr_t fcn) { LFuipL_t fn = (LFuipL_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)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, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void LFpLCL(x64emu_t *emu, uintptr_t fcn) { LFpLCL_t fn = (LFpLCL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint8_t)R_RDX, (uintptr_t)R_RCX); }
 void LFpLLp(x64emu_t *emu, uintptr_t fcn) { LFpLLp_t fn = (LFpLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
@@ -3525,6 +3597,7 @@ 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((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void pFiiuu(x64emu_t *emu, uintptr_t fcn) { pFiiuu_t fn = (pFiiuu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFiiup(x64emu_t *emu, uintptr_t fcn) { pFiiup_t fn = (pFiiup_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
+void pFiiLp(x64emu_t *emu, uintptr_t fcn) { pFiiLp_t fn = (pFiiLp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void pFiipi(x64emu_t *emu, uintptr_t fcn) { pFiipi_t fn = (pFiipi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFiipp(x64emu_t *emu, uintptr_t fcn) { pFiipp_t fn = (pFiipp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFiIIi(x64emu_t *emu, uintptr_t fcn) { pFiIIi_t fn = (pFiIIi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX); }
@@ -3534,6 +3607,7 @@ void pFipip(x64emu_t *emu, uintptr_t fcn) { pFipip_t fn = (pFipip_t)fcn; R_RAX=(
 void pFippi(x64emu_t *emu, uintptr_t fcn) { pFippi_t fn = (pFippi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFippu(x64emu_t *emu, uintptr_t fcn) { pFippu_t fn = (pFippu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void pFuuii(x64emu_t *emu, uintptr_t fcn) { pFuuii_t fn = (pFuuii_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
+void pFuuip(x64emu_t *emu, uintptr_t fcn) { pFuuip_t fn = (pFuuip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFullu(x64emu_t *emu, uintptr_t fcn) { pFullu_t fn = (pFullu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX); }
 void pFffff(x64emu_t *emu, uintptr_t fcn) { pFffff_t fn = (pFffff_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0]); }
 void pFdipp(x64emu_t *emu, uintptr_t fcn) { pFdipp_t fn = (pFdipp_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
@@ -3544,6 +3618,7 @@ void pFLiip(x64emu_t *emu, uintptr_t fcn) { pFLiip_t fn = (pFLiip_t)fcn; R_RAX=(
 void pFpiii(x64emu_t *emu, uintptr_t fcn) { pFpiii_t fn = (pFpiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_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, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFpiuu(x64emu_t *emu, uintptr_t fcn) { pFpiuu_t fn = (pFpiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
+void pFpiLi(x64emu_t *emu, uintptr_t fcn) { pFpiLi_t fn = (pFpiLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
 void pFpiLL(x64emu_t *emu, uintptr_t fcn) { pFpiLL_t fn = (pFpiLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void pFpipi(x64emu_t *emu, uintptr_t fcn) { pFpipi_t fn = (pFpipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFpipd(x64emu_t *emu, uintptr_t fcn) { pFpipd_t fn = (pFpipd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, emu->xmm[0].d[0]); }
@@ -3551,6 +3626,7 @@ void pFpipp(x64emu_t *emu, uintptr_t fcn) { pFpipp_t fn = (pFpipp_t)fcn; R_RAX=(
 void pFpCWp(x64emu_t *emu, uintptr_t fcn) { pFpCWp_t fn = (pFpCWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
 void pFpCuW(x64emu_t *emu, uintptr_t fcn) { pFpCuW_t fn = (pFpCuW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX); }
 void pFpCuu(x64emu_t *emu, uintptr_t fcn) { pFpCuu_t fn = (pFpCuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
+void pFpWWW(x64emu_t *emu, uintptr_t fcn) { pFpWWW_t fn = (pFpWWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX); }
 void pFpuii(x64emu_t *emu, uintptr_t fcn) { pFpuii_t fn = (pFpuii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFpuip(x64emu_t *emu, uintptr_t fcn) { pFpuip_t fn = (pFpuip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFpuWp(x64emu_t *emu, uintptr_t fcn) { pFpuWp_t fn = (pFpuWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
@@ -3559,12 +3635,17 @@ void pFpuuu(x64emu_t *emu, uintptr_t fcn) { pFpuuu_t fn = (pFpuuu_t)fcn; R_RAX=(
 void pFpuup(x64emu_t *emu, uintptr_t fcn) { pFpuup_t fn = (pFpuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void pFpupi(x64emu_t *emu, uintptr_t fcn) { pFpupi_t fn = (pFpupi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFpupu(x64emu_t *emu, uintptr_t fcn) { pFpupu_t fn = (pFpupu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
+void pFpupp(x64emu_t *emu, uintptr_t fcn) { pFpupp_t fn = (pFpupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFpdIU(x64emu_t *emu, uintptr_t fcn) { pFpdIU_t fn = (pFpdIU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], (int64_t)R_RSI, (uint64_t)R_RDX); }
 void pFplpl(x64emu_t *emu, uintptr_t fcn) { pFplpl_t fn = (pFplpl_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX); }
 void pFplpp(x64emu_t *emu, uintptr_t fcn) { pFplpp_t fn = (pFplpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFpLip(x64emu_t *emu, uintptr_t fcn) { pFpLip_t fn = (pFpLip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void pFpLup(x64emu_t *emu, uintptr_t fcn) { pFpLup_t fn = (pFpLup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void pFpLLp(x64emu_t *emu, uintptr_t fcn) { pFpLLp_t fn = (pFpLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
+void pFpLpi(x64emu_t *emu, uintptr_t fcn) { pFpLpi_t fn = (pFpLpi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
+void pFpLpl(x64emu_t *emu, uintptr_t fcn) { pFpLpl_t fn = (pFpLpl_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX); }
 void pFpLpL(x64emu_t *emu, uintptr_t fcn) { pFpLpL_t fn = (pFpLpL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
+void pFpLpp(x64emu_t *emu, uintptr_t fcn) { pFpLpp_t fn = (pFpLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFppii(x64emu_t *emu, uintptr_t fcn) { pFppii_t fn = (pFppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFppiu(x64emu_t *emu, uintptr_t fcn) { pFppiu_t fn = (pFppiu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void pFppiL(x64emu_t *emu, uintptr_t fcn) { pFppiL_t fn = (pFppiL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
@@ -3579,6 +3660,7 @@ void pFppup(x64emu_t *emu, uintptr_t fcn) { pFppup_t fn = (pFppup_t)fcn; R_RAX=(
 void pFppUU(x64emu_t *emu, uintptr_t fcn) { pFppUU_t fn = (pFppUU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX); }
 void pFppdd(x64emu_t *emu, uintptr_t fcn) { pFppdd_t fn = (pFppdd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void pFppll(x64emu_t *emu, uintptr_t fcn) { pFppll_t fn = (pFppll_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
+void pFppLi(x64emu_t *emu, uintptr_t fcn) { pFppLi_t fn = (pFppLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
 void pFppLL(x64emu_t *emu, uintptr_t fcn) { pFppLL_t fn = (pFppLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void pFppLp(x64emu_t *emu, uintptr_t fcn) { pFppLp_t fn = (pFppLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void pFpppi(x64emu_t *emu, uintptr_t fcn) { pFpppi_t fn = (pFpppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
@@ -3838,11 +3920,13 @@ void iFpuuui(x64emu_t *emu, uintptr_t fcn) { iFpuuui_t fn = (iFpuuui_t)fcn; R_RA
 void iFpuuup(x64emu_t *emu, uintptr_t fcn) { iFpuuup_t fn = (iFpuuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpuuLL(x64emu_t *emu, uintptr_t fcn) { iFpuuLL_t fn = (iFpuuLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_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=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFpulpp(x64emu_t *emu, uintptr_t fcn) { iFpulpp_t fn = (iFpulpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpupiU(x64emu_t *emu, uintptr_t fcn) { iFpupiU_t fn = (iFpupiU_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint64_t)R_R8); }
 void iFpupup(x64emu_t *emu, uintptr_t fcn) { iFpupup_t fn = (iFpupup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpuppp(x64emu_t *emu, uintptr_t fcn) { iFpuppp_t fn = (iFpuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpUiUi(x64emu_t *emu, uintptr_t fcn) { iFpUiUi_t fn = (iFpUiUi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX, (int32_t)R_R8); }
 void iFpUupp(x64emu_t *emu, uintptr_t fcn) { iFpUupp_t fn = (iFpUupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFplupp(x64emu_t *emu, uintptr_t fcn) { iFplupp_t fn = (iFplupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_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=(int32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void iFpLiLi(x64emu_t *emu, uintptr_t fcn) { iFpLiLi_t fn = (iFpLiLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8); }
 void iFpLlpp(x64emu_t *emu, uintptr_t fcn) { iFpLlpp_t fn = (iFpLlpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -3863,7 +3947,6 @@ void iFppupi(x64emu_t *emu, uintptr_t fcn) { iFppupi_t fn = (iFppupi_t)fcn; R_RA
 void iFppupp(x64emu_t *emu, uintptr_t fcn) { iFppupp_t fn = (iFppupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_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=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8); }
 void iFpplpp(x64emu_t *emu, uintptr_t fcn) { iFpplpp_t fn = (iFpplpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void iFppLip(x64emu_t *emu, uintptr_t fcn) { iFppLip_t fn = (iFppLip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFppLup(x64emu_t *emu, uintptr_t fcn) { iFppLup_t fn = (iFppLup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFppLpi(x64emu_t *emu, uintptr_t fcn) { iFppLpi_t fn = (iFppLpi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFppLpL(x64emu_t *emu, uintptr_t fcn) { iFppLpL_t fn = (iFppLpL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
@@ -3872,6 +3955,7 @@ void iFpppii(x64emu_t *emu, uintptr_t fcn) { iFpppii_t fn = (iFpppii_t)fcn; R_RA
 void iFpppiL(x64emu_t *emu, uintptr_t fcn) { iFpppiL_t fn = (iFpppiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); }
 void iFpppip(x64emu_t *emu, uintptr_t fcn) { iFpppip_t fn = (iFpppip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFpppui(x64emu_t *emu, uintptr_t fcn) { iFpppui_t fn = (iFpppui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8); }
+void iFpppup(x64emu_t *emu, uintptr_t fcn) { iFpppup_t fn = (iFpppup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpppUi(x64emu_t *emu, uintptr_t fcn) { iFpppUi_t fn = (iFpppUi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (int32_t)R_R8); }
 void iFpppLi(x64emu_t *emu, uintptr_t fcn) { iFpppLi_t fn = (iFpppLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8); }
 void iFpppLp(x64emu_t *emu, uintptr_t fcn) { iFpppLp_t fn = (iFpppLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
@@ -3906,6 +3990,8 @@ void lFipLlL(x64emu_t *emu, uintptr_t fcn) { lFipLlL_t fn = (lFipLlL_t)fcn; R_RA
 void lFipLLi(x64emu_t *emu, uintptr_t fcn) { lFipLLi_t fn = (lFipLLi_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8); }
 void lFipLpp(x64emu_t *emu, uintptr_t fcn) { lFipLpp_t fn = (lFipLpp_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void lFpuipC(x64emu_t *emu, uintptr_t fcn) { lFpuipC_t fn = (lFpuipC_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint8_t)R_R8); }
+void lFppupp(x64emu_t *emu, uintptr_t fcn) { lFppupp_t fn = (lFppupp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void lFppLpp(x64emu_t *emu, uintptr_t fcn) { lFppLpp_t fn = (lFppLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void LFELppi(x64emu_t *emu, uintptr_t fcn) { LFELppi_t fn = (LFELppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void LFEpppp(x64emu_t *emu, uintptr_t fcn) { LFEpppp_t fn = (LFEpppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void LFuiCiu(x64emu_t *emu, uintptr_t fcn) { LFuiCiu_t fn = (LFuiCiu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (uint8_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
@@ -3932,9 +4018,12 @@ void pFEpppp(x64emu_t *emu, uintptr_t fcn) { pFEpppp_t fn = (pFEpppp_t)fcn; R_RA
 void pFiiiii(x64emu_t *emu, uintptr_t fcn) { pFiiiii_t fn = (pFiiiii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFiiipL(x64emu_t *emu, uintptr_t fcn) { pFiiipL_t fn = (pFiiipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void pFipipL(x64emu_t *emu, uintptr_t fcn) { pFipipL_t fn = (pFipipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
-void pFipppu(x64emu_t *emu, uintptr_t fcn) { pFipppu_t fn = (pFipppu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void pFuiiiu(x64emu_t *emu, uintptr_t fcn) { pFuiiiu_t fn = (pFuiiiu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
 void pFuiupp(x64emu_t *emu, uintptr_t fcn) { pFuiupp_t fn = (pFuiupp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void pFupLpl(x64emu_t *emu, uintptr_t fcn) { pFupLpl_t fn = (pFupLpl_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8); }
+void pFupLpL(x64emu_t *emu, uintptr_t fcn) { pFupLpL_t fn = (pFupLpL_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
+void pFLuppp(x64emu_t *emu, uintptr_t fcn) { pFLuppp_t fn = (pFLuppp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void pFLpppi(x64emu_t *emu, uintptr_t fcn) { pFLpppi_t fn = (pFLpppi_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void pFpiiii(x64emu_t *emu, uintptr_t fcn) { pFpiiii_t fn = (pFpiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFpiiip(x64emu_t *emu, uintptr_t fcn) { pFpiiip_t fn = (pFpiiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFpiiuu(x64emu_t *emu, uintptr_t fcn) { pFpiiuu_t fn = (pFpiiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
@@ -3963,8 +4052,10 @@ void pFppiip(x64emu_t *emu, uintptr_t fcn) { pFppiip_t fn = (pFppiip_t)fcn; R_RA
 void pFppiup(x64emu_t *emu, uintptr_t fcn) { pFppiup_t fn = (pFppiup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void pFppipi(x64emu_t *emu, uintptr_t fcn) { pFppipi_t fn = (pFppipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void pFppipp(x64emu_t *emu, uintptr_t fcn) { pFppipp_t fn = (pFppipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void pFppWpp(x64emu_t *emu, uintptr_t fcn) { pFppWpp_t fn = (pFppWpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFppuuu(x64emu_t *emu, uintptr_t fcn) { pFppuuu_t fn = (pFppuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void pFppuup(x64emu_t *emu, uintptr_t fcn) { pFppuup_t fn = (pFppuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
+void pFppupp(x64emu_t *emu, uintptr_t fcn) { pFppupp_t fn = (pFppupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFppddi(x64emu_t *emu, uintptr_t fcn) { pFppddi_t fn = (pFppddi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RDX); }
 void pFppLii(x64emu_t *emu, uintptr_t fcn) { pFppLii_t fn = (pFppLii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFppLLp(x64emu_t *emu, uintptr_t fcn) { pFppLLp_t fn = (pFppLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
@@ -4101,6 +4192,7 @@ void vFppiiui(x64emu_t *emu, uintptr_t fcn) { vFppiiui_t fn = (vFppiiui_t)fcn; f
 void vFppiipi(x64emu_t *emu, uintptr_t fcn) { vFppiipi_t fn = (vFppiipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void vFppiipp(x64emu_t *emu, uintptr_t fcn) { vFppiipp_t fn = (vFppiipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFppilpp(x64emu_t *emu, uintptr_t fcn) { vFppilpp_t fn = (vFppilpp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void vFppipLp(x64emu_t *emu, uintptr_t fcn) { vFppipLp_t fn = (vFppipLp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void vFppippi(x64emu_t *emu, uintptr_t fcn) { vFppippi_t fn = (vFppippi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void vFppippp(x64emu_t *emu, uintptr_t fcn) { vFppippp_t fn = (vFppippp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFppuuuu(x64emu_t *emu, uintptr_t fcn) { vFppuuuu_t fn = (vFppuuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
@@ -4184,28 +4276,29 @@ void iFppiiip(x64emu_t *emu, uintptr_t fcn) { iFppiiip_t fn = (iFppiiip_t)fcn; R
 void iFppiiuu(x64emu_t *emu, uintptr_t fcn) { iFppiiuu_t fn = (iFppiiuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void iFppiipi(x64emu_t *emu, uintptr_t fcn) { iFppiipi_t fn = (iFppiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void iFppiipp(x64emu_t *emu, uintptr_t fcn) { iFppiipp_t fn = (iFppiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFppiupp(x64emu_t *emu, uintptr_t fcn) { iFppiupp_t fn = (iFppiupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppipii(x64emu_t *emu, uintptr_t fcn) { iFppipii_t fn = (iFppipii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFppipiL(x64emu_t *emu, uintptr_t fcn) { iFppipiL_t fn = (iFppipiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uintptr_t)R_R9); }
 void iFppipip(x64emu_t *emu, uintptr_t fcn) { iFppipip_t fn = (iFppipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
-void iFppIipp(x64emu_t *emu, uintptr_t fcn) { iFppIipp_t fn = (iFppIipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppIppp(x64emu_t *emu, uintptr_t fcn) { iFppIppp_t fn = (iFppIppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppuiii(x64emu_t *emu, uintptr_t fcn) { iFppuiii_t fn = (iFppuiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFppuiiL(x64emu_t *emu, uintptr_t fcn) { iFppuiiL_t fn = (iFppuiiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uintptr_t)R_R9); }
-void iFppuipp(x64emu_t *emu, uintptr_t fcn) { iFppuipp_t fn = (iFppuipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppuIII(x64emu_t *emu, uintptr_t fcn) { iFppuIII_t fn = (iFppuIII_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
 void iFppuupp(x64emu_t *emu, uintptr_t fcn) { iFppuupp_t fn = (iFppuupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppupip(x64emu_t *emu, uintptr_t fcn) { iFppupip_t fn = (iFppupip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void iFppuppp(x64emu_t *emu, uintptr_t fcn) { iFppuppp_t fn = (iFppuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
-void iFppUipp(x64emu_t *emu, uintptr_t fcn) { iFppUipp_t fn = (iFppUipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppUUup(x64emu_t *emu, uintptr_t fcn) { iFppUUup_t fn = (iFppUUup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void iFppdidd(x64emu_t *emu, uintptr_t fcn) { iFppdidd_t fn = (iFppdidd_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX, emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void iFpplupp(x64emu_t *emu, uintptr_t fcn) { iFpplupp_t fn = (iFpplupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpplppi(x64emu_t *emu, uintptr_t fcn) { iFpplppi_t fn = (iFpplppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void iFppLupp(x64emu_t *emu, uintptr_t fcn) { iFppLupp_t fn = (iFppLupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFppLppp(x64emu_t *emu, uintptr_t fcn) { iFppLppp_t fn = (iFppLppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpppiuu(x64emu_t *emu, uintptr_t fcn) { iFpppiuu_t fn = (iFpppiuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void iFpppipi(x64emu_t *emu, uintptr_t fcn) { iFpppipi_t fn = (iFpppipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void iFpppipp(x64emu_t *emu, uintptr_t fcn) { iFpppipp_t fn = (iFpppipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpppuii(x64emu_t *emu, uintptr_t fcn) { iFpppuii_t fn = (iFpppuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFpppupu(x64emu_t *emu, uintptr_t fcn) { iFpppupu_t fn = (iFpppupu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
+void iFpppupp(x64emu_t *emu, uintptr_t fcn) { iFpppupp_t fn = (iFpppupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpppLpp(x64emu_t *emu, uintptr_t fcn) { iFpppLpp_t fn = (iFpppLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppppii(x64emu_t *emu, uintptr_t fcn) { iFppppii_t fn = (iFppppii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFppppiu(x64emu_t *emu, uintptr_t fcn) { iFppppiu_t fn = (iFppppiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uint32_t)R_R9); }
@@ -4235,6 +4328,8 @@ void lFipipLu(x64emu_t *emu, uintptr_t fcn) { lFipipLu_t fn = (lFipipLu_t)fcn; R
 void lFipLipu(x64emu_t *emu, uintptr_t fcn) { lFipLipu_t fn = (lFipLipu_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void lFipLipp(x64emu_t *emu, uintptr_t fcn) { lFipLipp_t fn = (lFipLipp_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_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((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); }
+void lFppLipp(x64emu_t *emu, uintptr_t fcn) { lFppLipp_t fn = (lFppLipp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void lFpppLpp(x64emu_t *emu, uintptr_t fcn) { lFpppLpp_t fn = (lFpppLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void LFEupppp(x64emu_t *emu, uintptr_t fcn) { LFEupppp_t fn = (LFEupppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void LFELpppi(x64emu_t *emu, uintptr_t fcn) { LFELpppi_t fn = (LFELpppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void LFEppppi(x64emu_t *emu, uintptr_t fcn) { LFEppppi_t fn = (LFEppppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
@@ -4254,6 +4349,7 @@ void pFEppppp(x64emu_t *emu, uintptr_t fcn) { pFEppppp_t fn = (pFEppppp_t)fcn; R
 void pFEppppV(x64emu_t *emu, uintptr_t fcn) { pFEppppV_t fn = (pFEppppV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
 void pFEppApp(x64emu_t *emu, uintptr_t fcn) { pFEppApp_t fn = (pFEppApp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFiiiiii(x64emu_t *emu, uintptr_t fcn) { pFiiiiii_t fn = (pFiiiiii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
+void pFiiiiid(x64emu_t *emu, uintptr_t fcn) { pFiiiiid_t fn = (pFiiiiid_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, emu->xmm[0].d[0]); }
 void pFiCiiCi(x64emu_t *emu, uintptr_t fcn) { pFiCiiCi_t fn = (pFiCiiCi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint8_t)R_R8, (int32_t)R_R9); }
 void pFipippp(x64emu_t *emu, uintptr_t fcn) { pFipippp_t fn = (pFipippp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFdddddd(x64emu_t *emu, uintptr_t fcn) { pFdddddd_t fn = (pFdddddd_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], emu->xmm[4].d[0], emu->xmm[5].d[0]); }
@@ -4270,16 +4366,19 @@ void pFpuuwwu(x64emu_t *emu, uintptr_t fcn) { pFpuuwwu_t fn = (pFpuuwwu_t)fcn; R
 void pFpuuuuu(x64emu_t *emu, uintptr_t fcn) { pFpuuuuu_t fn = (pFpuuuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void pFpuuupu(x64emu_t *emu, uintptr_t fcn) { pFpuuupu_t fn = (pFpuuupu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void pFpuuUUU(x64emu_t *emu, uintptr_t fcn) { pFpuuUUU_t fn = (pFpuuUUU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9); }
+void pFpupppp(x64emu_t *emu, uintptr_t fcn) { pFpupppp_t fn = (pFpupppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFplpppp(x64emu_t *emu, uintptr_t fcn) { pFplpppp_t fn = (pFplpppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFppiiii(x64emu_t *emu, uintptr_t fcn) { pFppiiii_t fn = (pFppiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
-void pFppiipp(x64emu_t *emu, uintptr_t fcn) { pFppiipp_t fn = (pFppiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFppiCCC(x64emu_t *emu, uintptr_t fcn) { pFppiCCC_t fn = (pFppiCCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9); }
+void pFppiupp(x64emu_t *emu, uintptr_t fcn) { pFppiupp_t fn = (pFppiupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFppippi(x64emu_t *emu, uintptr_t fcn) { pFppippi_t fn = (pFppippi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void pFppippp(x64emu_t *emu, uintptr_t fcn) { pFppippp_t fn = (pFppippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
-void pFpppiii(x64emu_t *emu, uintptr_t fcn) { pFpppiii_t fn = (pFpppiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
-void pFpppiui(x64emu_t *emu, uintptr_t fcn) { pFpppiui_t fn = (pFpppiui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); }
+void pFppuppp(x64emu_t *emu, uintptr_t fcn) { pFppuppp_t fn = (pFppuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void pFpplppp(x64emu_t *emu, uintptr_t fcn) { pFpplppp_t fn = (pFpplppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpppiup(x64emu_t *emu, uintptr_t fcn) { pFpppiup_t fn = (pFpppiup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void pFpppupp(x64emu_t *emu, uintptr_t fcn) { pFpppupp_t fn = (pFpppupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void pFpppLii(x64emu_t *emu, uintptr_t fcn) { pFpppLii_t fn = (pFpppLii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
+void pFpppLui(x64emu_t *emu, uintptr_t fcn) { pFpppLui_t fn = (pFpppLui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); }
 void pFppppii(x64emu_t *emu, uintptr_t fcn) { pFppppii_t fn = (pFppppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFppppWW(x64emu_t *emu, uintptr_t fcn) { pFppppWW_t fn = (pFppppWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9); }
 void pFpppppi(x64emu_t *emu, uintptr_t fcn) { pFpppppi_t fn = (pFpppppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
@@ -4377,6 +4476,7 @@ void vFppiLiLp(x64emu_t *emu, uintptr_t fcn) { vFppiLiLp_t fn = (vFppiLiLp_t)fcn
 void vFppipiip(x64emu_t *emu, uintptr_t fcn) { vFppipiip_t fn = (vFppipiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFppipipp(x64emu_t *emu, uintptr_t fcn) { vFppipipp_t fn = (vFppipipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppipppp(x64emu_t *emu, uintptr_t fcn) { vFppipppp_t fn = (vFppipppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void vFppCuupp(x64emu_t *emu, uintptr_t fcn) { vFppCuupp_t fn = (vFppCuupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppddddi(x64emu_t *emu, uintptr_t fcn) { vFppddddi_t fn = (vFppddddi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (int32_t)R_RDX); }
 void vFppddpii(x64emu_t *emu, uintptr_t fcn) { vFppddpii_t fn = (vFppddpii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFppLpppi(x64emu_t *emu, uintptr_t fcn) { vFppLpppi_t fn = (vFppLpppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
@@ -4440,7 +4540,12 @@ void iFppippip(x64emu_t *emu, uintptr_t fcn) { iFppippip_t fn = (iFppippip_t)fcn
 void iFppipppi(x64emu_t *emu, uintptr_t fcn) { iFppipppi_t fn = (iFppipppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFppipppp(x64emu_t *emu, uintptr_t fcn) { iFppipppp_t fn = (iFppipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFppuipiL(x64emu_t *emu, uintptr_t fcn) { iFppuipiL_t fn = (iFppuipiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(uintptr_t*)(R_RSP + 8)); }
+void iFppuippp(x64emu_t *emu, uintptr_t fcn) { iFppuippp_t fn = (iFppuippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void iFppuuppp(x64emu_t *emu, uintptr_t fcn) { iFppuuppp_t fn = (iFppuuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void iFppupupp(x64emu_t *emu, uintptr_t fcn) { iFppupupp_t fn = (iFppupupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void iFppliupp(x64emu_t *emu, uintptr_t fcn) { iFppliupp_t fn = (iFppliupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFppLiipp(x64emu_t *emu, uintptr_t fcn) { iFppLiipp_t fn = (iFppLiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void iFppLippp(x64emu_t *emu, uintptr_t fcn) { iFppLippp_t fn = (iFppLippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpppiiii(x64emu_t *emu, uintptr_t fcn) { iFpppiiii_t fn = (iFpppiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpppiiuu(x64emu_t *emu, uintptr_t fcn) { iFpppiiuu_t fn = (iFpppiiuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFpppiiup(x64emu_t *emu, uintptr_t fcn) { iFpppiiup_t fn = (iFpppiiup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -4450,6 +4555,7 @@ void iFpppippi(x64emu_t *emu, uintptr_t fcn) { iFpppippi_t fn = (iFpppippi_t)fcn
 void iFpppippp(x64emu_t *emu, uintptr_t fcn) { iFpppippp_t fn = (iFpppippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpppuiii(x64emu_t *emu, uintptr_t fcn) { iFpppuiii_t fn = (iFpppuiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFppppiii(x64emu_t *emu, uintptr_t fcn) { iFppppiii_t fn = (iFppppiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
+void iFppppilp(x64emu_t *emu, uintptr_t fcn) { iFppppilp_t fn = (iFppppilp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (intptr_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFppppipp(x64emu_t *emu, uintptr_t fcn) { iFppppipp_t fn = (iFppppipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFppppdpi(x64emu_t *emu, uintptr_t fcn) { iFppppdpi_t fn = (iFppppdpi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], (void*)R_R8, (int32_t)R_R9); }
 void iFpppppip(x64emu_t *emu, uintptr_t fcn) { iFpppppip_t fn = (iFpppppip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -4474,6 +4580,7 @@ void pFEpppppi(x64emu_t *emu, uintptr_t fcn) { pFEpppppi_t fn = (pFEpppppi_t)fcn
 void pFifffppp(x64emu_t *emu, uintptr_t fcn) { pFifffppp_t fn = (pFifffppp_t)fcn; R_RAX=(uintptr_t)fn((int32_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); }
 void pFuupupup(x64emu_t *emu, uintptr_t fcn) { pFuupupup_t fn = (pFuupupup_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFdiiiIiI(x64emu_t *emu, uintptr_t fcn) { pFdiiiIiI_t fn = (pFdiiiIiI_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int64_t)R_RCX, (int32_t)R_R8, (int64_t)R_R9); }
+void pFpiiiiid(x64emu_t *emu, uintptr_t fcn) { pFpiiiiid_t fn = (pFpiiiiid_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, emu->xmm[0].d[0]); }
 void pFpiiUdii(x64emu_t *emu, uintptr_t fcn) { pFpiiUdii_t fn = (pFpiiUdii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX, emu->xmm[0].d[0], (int32_t)R_R8, (int32_t)R_R9); }
 void pFpipippp(x64emu_t *emu, uintptr_t fcn) { pFpipippp_t fn = (pFpipippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpCuwwWW(x64emu_t *emu, uintptr_t fcn) { pFpCuwwWW_t fn = (pFpCuwwWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (int16_t)R_RCX, (int16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8)); }
@@ -4481,26 +4588,26 @@ void pFpCuWCCC(x64emu_t *emu, uintptr_t fcn) { pFpCuWCCC_t fn = (pFpCuWCCC_t)fcn
 void pFpCuuwwp(x64emu_t *emu, uintptr_t fcn) { pFpCuuwwp_t fn = (pFpCuuwwp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFpCuuuuu(x64emu_t *emu, uintptr_t fcn) { pFpCuuuuu_t fn = (pFpCuuuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void pFpCpWWup(x64emu_t *emu, uintptr_t fcn) { pFpCpWWup_t fn = (pFpCpWWup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
+void pFpWppWpp(x64emu_t *emu, uintptr_t fcn) { pFpWppWpp_t fn = (pFpWppWpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpuuuwwu(x64emu_t *emu, uintptr_t fcn) { pFpuuuwwu_t fn = (pFpuuuwwu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void pFpuupwwC(x64emu_t *emu, uintptr_t fcn) { pFpuupwwC_t fn = (pFpuupwwC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint8_t*)(R_RSP + 8)); }
 void pFplppppp(x64emu_t *emu, uintptr_t fcn) { pFplppppp_t fn = (pFplppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpLppiip(x64emu_t *emu, uintptr_t fcn) { pFpLppiip_t fn = (pFpLppiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFppiiipp(x64emu_t *emu, uintptr_t fcn) { pFppiiipp_t fn = (pFppiiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFppiiCCC(x64emu_t *emu, uintptr_t fcn) { pFppiiCCC_t fn = (pFppiiCCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8)); }
-void pFppiippp(x64emu_t *emu, uintptr_t fcn) { pFppiippp_t fn = (pFppiippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFppipipp(x64emu_t *emu, uintptr_t fcn) { pFppipipp_t fn = (pFppipipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFppipLpp(x64emu_t *emu, uintptr_t fcn) { pFppipLpp_t fn = (pFppipLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void pFppuippp(x64emu_t *emu, uintptr_t fcn) { pFppuippp_t fn = (pFppuippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFppuuppp(x64emu_t *emu, uintptr_t fcn) { pFppuuppp_t fn = (pFppuuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void pFppLiiip(x64emu_t *emu, uintptr_t fcn) { pFppLiiip_t fn = (pFppLiiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
+void pFppliuip(x64emu_t *emu, uintptr_t fcn) { pFppliuip_t fn = (pFppliuip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
+void pFpplipup(x64emu_t *emu, uintptr_t fcn) { pFpplipup_t fn = (pFpplipup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFppLipip(x64emu_t *emu, uintptr_t fcn) { pFppLipip_t fn = (pFppLipip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFpppccci(x64emu_t *emu, uintptr_t fcn) { pFpppccci_t fn = (pFpppccci_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int8_t)R_RCX, (int8_t)R_R8, (int8_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFpppiiii(x64emu_t *emu, uintptr_t fcn) { pFpppiiii_t fn = (pFpppiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
-void pFpppiipp(x64emu_t *emu, uintptr_t fcn) { pFpppiipp_t fn = (pFpppiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void pFpppIIIi(x64emu_t *emu, uintptr_t fcn) { pFpppIIIi_t fn = (pFpppIIIi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFpppCCCi(x64emu_t *emu, uintptr_t fcn) { pFpppCCCi_t fn = (pFpppCCCi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(int32_t*)(R_RSP + 8)); }
+void pFpppuipp(x64emu_t *emu, uintptr_t fcn) { pFpppuipp_t fn = (pFpppuipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpppuuui(x64emu_t *emu, uintptr_t fcn) { pFpppuuui_t fn = (pFpppuuui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFpppuupp(x64emu_t *emu, uintptr_t fcn) { pFpppuupp_t fn = (pFpppuupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void pFpppUUUi(x64emu_t *emu, uintptr_t fcn) { pFpppUUUi_t fn = (pFpppUUUi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFpppfffi(x64emu_t *emu, uintptr_t fcn) { pFpppfffi_t fn = (pFpppfffi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], (int32_t)R_RCX); }
 void pFpppdddi(x64emu_t *emu, uintptr_t fcn) { pFpppdddi_t fn = (pFpppdddi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], (int32_t)R_RCX); }
 void pFpppllli(x64emu_t *emu, uintptr_t fcn) { pFpppllli_t fn = (pFpppllli_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9, *(int32_t*)(R_RSP + 8)); }
@@ -4562,7 +4669,6 @@ void vFpUuuUUUi(x64emu_t *emu, uintptr_t fcn) { vFpUuuUUUi_t fn = (vFpUuuUUUi_t)
 void vFppiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiii_t fn = (vFppiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppiiipii(x64emu_t *emu, uintptr_t fcn) { vFppiiipii_t fn = (vFppiiipii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppipipii(x64emu_t *emu, uintptr_t fcn) { vFppipipii_t fn = (vFppipipii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
-void vFppippDDC(x64emu_t *emu, uintptr_t fcn) { vFppippDDC_t fn = (vFppippDDC_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, LD2localLD((void*)(R_RSP + 8)), LD2localLD((void*)(R_RSP + 24)), (uint8_t)R_R9); }
 void vFppipppui(x64emu_t *emu, uintptr_t fcn) { vFppipppui_t fn = (vFppipppui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppippppi(x64emu_t *emu, uintptr_t fcn) { vFppippppi_t fn = (vFppippppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppippppp(x64emu_t *emu, uintptr_t fcn) { vFppippppp_t fn = (vFppippppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -4618,6 +4724,7 @@ void uFpupuuuCp(x64emu_t *emu, uintptr_t fcn) { uFpupuuuCp_t fn = (uFpupuuuCp_t)
 void uFppuuuupp(x64emu_t *emu, uintptr_t fcn) { uFppuuuupp_t fn = (uFppuuuupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void uFppuuuppi(x64emu_t *emu, uintptr_t fcn) { uFppuuuppi_t fn = (uFppuuuppi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void uFppuppppp(x64emu_t *emu, uintptr_t fcn) { uFppuppppp_t fn = (uFppuppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void uFpppppupp(x64emu_t *emu, uintptr_t fcn) { uFpppppupp_t fn = (uFpppppupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void LFELpLpLpi(x64emu_t *emu, uintptr_t fcn) { LFELpLpLpi_t fn = (LFELpLpLpi_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void LFEpiupppp(x64emu_t *emu, uintptr_t fcn) { LFEpiupppp_t fn = (LFEpiupppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFEiplllpp(x64emu_t *emu, uintptr_t fcn) { pFEiplllpp_t fn = (pFEiplllpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -4628,13 +4735,12 @@ void pFEpppppiV(x64emu_t *emu, uintptr_t fcn) { pFEpppppiV_t fn = (pFEpppppiV_t)
 void pFEppppppi(x64emu_t *emu, uintptr_t fcn) { pFEppppppi_t fn = (pFEppppppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFEppppppp(x64emu_t *emu, uintptr_t fcn) { pFEppppppp_t fn = (pFEppppppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFiippipip(x64emu_t *emu, uintptr_t fcn) { pFiippipip_t fn = (pFiippipip_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void pFiipppppp(x64emu_t *emu, uintptr_t fcn) { pFiipppppp_t fn = (pFiipppppp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void pFiupppppp(x64emu_t *emu, uintptr_t fcn) { pFiupppppp_t fn = (pFiupppppp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFuiiiuuuu(x64emu_t *emu, uintptr_t fcn) { pFuiiiuuuu_t fn = (pFuiiiuuuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void pFuupupipp(x64emu_t *emu, uintptr_t fcn) { pFuupupipp_t fn = (pFuupupipp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpiiiiiuu(x64emu_t *emu, uintptr_t fcn) { pFpiiiiiuu_t fn = (pFpiiiiiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void pFpiUdiiUi(x64emu_t *emu, uintptr_t fcn) { pFpiUdiiUi_t fn = (pFpiUdiiUi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, emu->xmm[0].d[0], (int32_t)R_RCX, (int32_t)R_R8, (uint64_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFpipiiiip(x64emu_t *emu, uintptr_t fcn) { pFpipiiiip_t fn = (pFpipiiiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void pFpipppppp(x64emu_t *emu, uintptr_t fcn) { pFpipppppp_t fn = (pFpipppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpCCuuwwC(x64emu_t *emu, uintptr_t fcn) { pFpCCuuwwC_t fn = (pFpCCuuwwC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int16_t)R_R9, *(int16_t*)(R_RSP + 8), *(uint8_t*)(R_RSP + 16)); }
 void pFpCuwwWWu(x64emu_t *emu, uintptr_t fcn) { pFpCuwwWWu_t fn = (pFpCuwwWWu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (int16_t)R_RCX, (int16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void pFpCuuuCup(x64emu_t *emu, uintptr_t fcn) { pFpCuuuCup_t fn = (pFpCuuuCup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint8_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -4643,6 +4749,7 @@ void pFpuuWWCuu(x64emu_t *emu, uintptr_t fcn) { pFpuuWWCuu_t fn = (pFpuuWWCuu_t)
 void pFpuuuuupp(x64emu_t *emu, uintptr_t fcn) { pFpuuuuupp_t fn = (pFpuuuuupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpuuuupup(x64emu_t *emu, uintptr_t fcn) { pFpuuuupup_t fn = (pFpuuuupup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpuuupwwp(x64emu_t *emu, uintptr_t fcn) { pFpuuupwwp_t fn = (pFpuuupwwp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (int16_t)R_R9, *(int16_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void pFpupppppp(x64emu_t *emu, uintptr_t fcn) { pFpupppppp_t fn = (pFpupppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpdwwWWui(x64emu_t *emu, uintptr_t fcn) { pFpdwwWWui_t fn = (pFpdwwWWui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], (int16_t)R_RSI, (int16_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFplpppppp(x64emu_t *emu, uintptr_t fcn) { pFplpppppp_t fn = (pFplpppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFppiiiiii(x64emu_t *emu, uintptr_t fcn) { pFppiiiiii_t fn = (pFppiiiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
@@ -4689,6 +4796,7 @@ void vFppiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiii_t fn = (vFppiiiiiii
 void vFppiiiiipi(x64emu_t *emu, uintptr_t fcn) { vFppiiiiipi_t fn = (vFppiiiiipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppiiipiii(x64emu_t *emu, uintptr_t fcn) { vFppiiipiii_t fn = (vFppiiipiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppiipiiii(x64emu_t *emu, uintptr_t fcn) { vFppiipiiii_t fn = (vFppiipiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
+void vFppippDpDC(x64emu_t *emu, uintptr_t fcn) { vFppippDpDC_t fn = (vFppippDpDC_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, LD2localLD((void*)(R_RSP + 8)), (void*)R_R9, LD2localLD((void*)(R_RSP + 24)), *(uint8_t*)(R_RSP + 40)); }
 void vFppipppiii(x64emu_t *emu, uintptr_t fcn) { vFppipppiii_t fn = (vFppipppiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppipppiip(x64emu_t *emu, uintptr_t fcn) { vFppipppiip_t fn = (vFppipppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFppuuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuiiiii_t fn = (vFppuuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
@@ -4712,7 +4820,7 @@ void iFpuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { iFpuuuuuuuu_t fn = (iFpuuuuuuuu
 void iFpdiiiUiUp(x64emu_t *emu, uintptr_t fcn) { iFpdiiiUiUp_t fn = (iFpdiiiUiUp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, emu->xmm[0].d[0], (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint64_t)R_R8, (int32_t)R_R9, *(uint64_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppiiiiiii(x64emu_t *emu, uintptr_t fcn) { iFppiiiiiii_t fn = (iFppiiiiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void iFppiuiippL(x64emu_t *emu, uintptr_t fcn) { iFppiuiippL_t fn = (iFppiuiippL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24)); }
-void iFppLpiippp(x64emu_t *emu, uintptr_t fcn) { iFppLpiippp_t fn = (iFppLpiippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void iFppLpiuppp(x64emu_t *emu, uintptr_t fcn) { iFppLpiuppp_t fn = (iFppLpiuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFpppiiipip(x64emu_t *emu, uintptr_t fcn) { iFpppiiipip_t fn = (iFpppiiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFpppiiuuii(x64emu_t *emu, uintptr_t fcn) { iFpppiiuuii_t fn = (iFpppiiuuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void iFpppiipiiu(x64emu_t *emu, uintptr_t fcn) { iFpppiipiiu_t fn = (iFpppiipiiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
@@ -4722,7 +4830,10 @@ void iFppppppppp(x64emu_t *emu, uintptr_t fcn) { iFppppppppp_t fn = (iFppppppppp
 void uFEipippppp(x64emu_t *emu, uintptr_t fcn) { uFEipippppp_t fn = (uFEipippppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void uFEpppufppp(x64emu_t *emu, uintptr_t fcn) { uFEpppufppp_t fn = (uFEpppufppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, emu->xmm[0].f[0], (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFuulpiuiuf(x64emu_t *emu, uintptr_t fcn) { uFuulpiuiuf_t fn = (uFuulpiuiuf_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), emu->xmm[0].f[0]); }
+void uFppLpLuppp(x64emu_t *emu, uintptr_t fcn) { uFppLpLuppp_t fn = (uFppLpLuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void uFppppppppp(x64emu_t *emu, uintptr_t fcn) { uFppppppppp_t fn = (uFppppppppp_t)fcn; R_RAX=(uint32_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**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void lFpppipiipp(x64emu_t *emu, uintptr_t fcn) { lFpppipiipp_t fn = (lFpppipiipp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void lFpppippppp(x64emu_t *emu, uintptr_t fcn) { lFpppippppp_t fn = (lFpppippppp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void LFEppppppii(x64emu_t *emu, uintptr_t fcn) { LFEppppppii_t fn = (LFEppppppii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void pFEppiiuuLi(x64emu_t *emu, uintptr_t fcn) { pFEppiiuuLi_t fn = (pFEppiiuuLi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void pFEppuippuu(x64emu_t *emu, uintptr_t fcn) { pFEppuippuu_t fn = (pFEppuippuu_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
@@ -4738,8 +4849,8 @@ void pFppiiiiiip(x64emu_t *emu, uintptr_t fcn) { pFppiiiiiip_t fn = (pFppiiiiiip
 void pFppiiuuuLL(x64emu_t *emu, uintptr_t fcn) { pFppiiuuuLL_t fn = (pFppiiuuuLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24)); }
 void pFppipppppp(x64emu_t *emu, uintptr_t fcn) { pFppipppppp_t fn = (pFppipppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpppiiiiii(x64emu_t *emu, uintptr_t fcn) { pFpppiiiiii_t fn = (pFpppiiiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
-void pFpppiipppp(x64emu_t *emu, uintptr_t fcn) { pFpppiipppp_t fn = (pFpppiipppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpppWWWWWp(x64emu_t *emu, uintptr_t fcn) { pFpppWWWWWp_t fn = (pFpppWWWWWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint16_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void pFpppuipppp(x64emu_t *emu, uintptr_t fcn) { pFpppuipppp_t fn = (pFpppuipppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpppppiipp(x64emu_t *emu, uintptr_t fcn) { pFpppppiipp_t fn = (pFpppppiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpppppuuCC(x64emu_t *emu, uintptr_t fcn) { pFpppppuuCC_t fn = (pFpppppuuCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint8_t*)(R_RSP + 16), *(uint8_t*)(R_RSP + 24)); }
 void iWEpuuiippu(x64emu_t *emu, uintptr_t fcn) { iWEpuuiippu_t fn = (iWEpuuiippu_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RCX, (uint32_t)R_RDX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(uint32_t*)(R_RSP + 64)); }
@@ -4849,7 +4960,7 @@ void uFppppppppppp(x64emu_t *emu, uintptr_t fcn) { uFppppppppppp_t fn = (uFppppp
 void pFEpipppppppi(x64emu_t *emu, uintptr_t fcn) { pFEpipppppppi_t fn = (pFEpipppppppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void pFEppiiLpppip(x64emu_t *emu, uintptr_t fcn) { pFEppiiLpppip_t fn = (pFEppiiLpppip_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void pFEppuiipuuii(x64emu_t *emu, uintptr_t fcn) { pFEppuiipuuii_t fn = (pFEppuiipuuii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
-void pFpppppppiipp(x64emu_t *emu, uintptr_t fcn) { pFpppppppiipp_t fn = (pFpppppppiipp_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), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
+void pFpppppppuipp(x64emu_t *emu, uintptr_t fcn) { pFpppppppuipp_t fn = (pFpppppppuipp_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), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void pFppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFppppppppppp_t fn = (pFppppppppppp_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**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iWEpuipuppppp(x64emu_t *emu, uintptr_t fcn) { iWEpuipuppppp_t fn = (iWEpuipuppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RCX, (uint32_t)R_RDX, (int32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80)); }
 void iWEpuuiiuippu(x64emu_t *emu, uintptr_t fcn) { iWEpuuiiuippu_t fn = (iWEpuuiiuippu_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RCX, (uint32_t)R_RDX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(uint32_t*)(R_RSP + 80)); }
@@ -4901,6 +5012,7 @@ void uFippuuuulllipp(x64emu_t *emu, uintptr_t fcn) { uFippuuuulllipp_t fn = (uFi
 void uFppppuuupppppp(x64emu_t *emu, uintptr_t fcn) { uFppppuuupppppp_t fn = (uFppppuuupppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void pFpCuuwwWWWWuup(x64emu_t *emu, uintptr_t fcn) { pFpCuuwwWWWWuup_t fn = (pFpCuuwwWWWWuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint16_t*)(R_RSP + 16), *(uint16_t*)(R_RSP + 24), *(uint16_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void pFpuupppwwwwWWC(x64emu_t *emu, uintptr_t fcn) { pFpuupppwwwwWWC_t fn = (pFpuupppwwwwWWC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(int16_t*)(R_RSP + 24), *(int16_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(uint16_t*)(R_RSP + 48), *(uint8_t*)(R_RSP + 56)); }
+void pFpppppppuipppp(x64emu_t *emu, uintptr_t fcn) { pFpppppppuipppp_t fn = (pFpppppppuipppp_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), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void pFppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFppppppppppppp_t fn = (pFppppppppppppp_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**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void vFippppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFippppppppppppp_t fn = (vFippppppppppppp_t)fcn; fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64)); }
 void vFuffiiffiiffiip(x64emu_t *emu, uintptr_t fcn) { vFuffiiffiiffiip_t fn = (vFuffiiffiiffiip_t)fcn; fn((uint32_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[2].f[0], emu->xmm[3].f[0], (int32_t)R_RCX, (int32_t)R_R8, emu->xmm[4].f[0], emu->xmm[5].f[0], (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -5016,6 +5128,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &IFd) return 2;
 	if (fun == &IFp) return 1;
 	if (fun == &CFC) return 1;
+	if (fun == &CFW) return 1;
 	if (fun == &CFu) return 1;
 	if (fun == &CFl) return 1;
 	if (fun == &CFL) return 1;
@@ -5055,7 +5168,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFv) return 1;
 	if (fun == &pFw) return 1;
 	if (fun == &pFi) return 1;
-	if (fun == &pFI) return 1;
 	if (fun == &pFC) return 1;
 	if (fun == &pFW) return 1;
 	if (fun == &pFu) return 1;
@@ -5067,7 +5179,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFcc) return 1;
 	if (fun == &vFww) return 1;
 	if (fun == &vFii) return 1;
-	if (fun == &vFiI) return 1;
 	if (fun == &vFiW) return 1;
 	if (fun == &vFiu) return 1;
 	if (fun == &vFiU) return 1;
@@ -5129,6 +5240,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFUp) return 1;
 	if (fun == &iFli) return 1;
 	if (fun == &iFlp) return 1;
+	if (fun == &iFLi) return 1;
 	if (fun == &iFLu) return 1;
 	if (fun == &iFLL) return 1;
 	if (fun == &iFLp) return 1;
@@ -5151,6 +5263,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &IFpd) return 2;
 	if (fun == &CFip) return 1;
 	if (fun == &CFui) return 1;
+	if (fun == &CFuW) return 1;
 	if (fun == &CFuu) return 1;
 	if (fun == &CFuL) return 1;
 	if (fun == &CFpi) return 1;
@@ -5169,6 +5282,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpu) return 1;
 	if (fun == &uFpU) return 1;
 	if (fun == &uFpf) return 2;
+	if (fun == &uFpl) return 1;
 	if (fun == &uFpL) return 1;
 	if (fun == &uFpp) return 1;
 	if (fun == &UFuu) return 1;
@@ -5201,6 +5315,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFuu) return 1;
 	if (fun == &LFLi) return 1;
 	if (fun == &LFLL) return 1;
+	if (fun == &LFLp) return 1;
 	if (fun == &LFpi) return 1;
 	if (fun == &LFpL) return 1;
 	if (fun == &LFpp) return 1;
@@ -5210,20 +5325,20 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFip) return 1;
 	if (fun == &pFII) return 1;
 	if (fun == &pFui) return 1;
-	if (fun == &pFuC) return 1;
 	if (fun == &pFuu) return 1;
 	if (fun == &pFup) return 1;
-	if (fun == &pFUi) return 1;
 	if (fun == &pFUU) return 1;
 	if (fun == &pFdi) return 2;
 	if (fun == &pFdd) return 3;
 	if (fun == &pFlp) return 1;
 	if (fun == &pFLi) return 1;
+	if (fun == &pFLC) return 1;
 	if (fun == &pFLu) return 1;
 	if (fun == &pFLL) return 1;
 	if (fun == &pFLp) return 1;
 	if (fun == &pFpi) return 1;
 	if (fun == &pFpC) return 1;
+	if (fun == &pFpW) return 1;
 	if (fun == &pFpu) return 1;
 	if (fun == &pFpU) return 1;
 	if (fun == &pFpd) return 2;
@@ -5323,6 +5438,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppl) return 1;
 	if (fun == &vFppL) return 1;
 	if (fun == &vFppp) return 1;
+	if (fun == &wFppp) return 1;
 	if (fun == &iFwww) return 1;
 	if (fun == &iFwpp) return 1;
 	if (fun == &iFiwC) return 1;
@@ -5339,7 +5455,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFipu) return 1;
 	if (fun == &iFipL) return 1;
 	if (fun == &iFipp) return 1;
-	if (fun == &iFCiW) return 1;
+	if (fun == &iFCuW) return 1;
 	if (fun == &iFuwp) return 1;
 	if (fun == &iFuip) return 1;
 	if (fun == &iFuui) return 1;
@@ -5369,6 +5485,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpui) return 1;
 	if (fun == &iFpuu) return 1;
 	if (fun == &iFpuU) return 1;
+	if (fun == &iFpul) return 1;
 	if (fun == &iFpuL) return 1;
 	if (fun == &iFpup) return 1;
 	if (fun == &iFpUi) return 1;
@@ -5399,10 +5516,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &IFpIi) return 1;
 	if (fun == &IFppi) return 1;
 	if (fun == &IFppI) return 1;
-	if (fun == &IFppu) return 1;
 	if (fun == &CFipp) return 1;
 	if (fun == &CFuff) return 3;
 	if (fun == &CFuLu) return 1;
+	if (fun == &CFppp) return 1;
+	if (fun == &WFppp) return 1;
 	if (fun == &uFipu) return 1;
 	if (fun == &uFuip) return 1;
 	if (fun == &uFuuu) return 1;
@@ -5431,7 +5549,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &UFUUU) return 1;
 	if (fun == &UFpiU) return 1;
 	if (fun == &UFppi) return 1;
-	if (fun == &UFppu) return 1;
 	if (fun == &fFuii) return -1;
 	if (fun == &fFfff) return -4;
 	if (fun == &fFffp) return -3;
@@ -5452,9 +5569,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFpLu) return 1;
 	if (fun == &lFpLp) return 1;
 	if (fun == &lFppi) return 1;
+	if (fun == &lFppu) return 1;
 	if (fun == &lFppL) return 1;
 	if (fun == &lFppp) return 1;
 	if (fun == &LFipL) return 1;
+	if (fun == &LFuui) return 1;
 	if (fun == &LFLLl) return 1;
 	if (fun == &LFLpu) return 1;
 	if (fun == &LFLpL) return 1;
@@ -5463,24 +5582,28 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFpLi) return 1;
 	if (fun == &LFpLp) return 1;
 	if (fun == &LFppi) return 1;
+	if (fun == &LFppu) return 1;
 	if (fun == &LFppL) return 1;
 	if (fun == &LFppp) return 1;
 	if (fun == &pFiii) return 1;
 	if (fun == &pFiiu) return 1;
 	if (fun == &pFiip) return 1;
 	if (fun == &pFiIi) return 1;
-	if (fun == &pFiIp) return 1;
 	if (fun == &pFipi) return 1;
 	if (fun == &pFipL) return 1;
 	if (fun == &pFipp) return 1;
 	if (fun == &pFIpi) return 1;
-	if (fun == &pFCiW) return 1;
+	if (fun == &pFCuW) return 1;
 	if (fun == &pFWWW) return 1;
+	if (fun == &pFuip) return 1;
 	if (fun == &pFuui) return 1;
 	if (fun == &pFuuu) return 1;
 	if (fun == &pFulu) return 1;
+	if (fun == &pFulp) return 1;
 	if (fun == &pFupi) return 1;
+	if (fun == &pFupl) return 1;
 	if (fun == &pFupL) return 1;
+	if (fun == &pFupp) return 1;
 	if (fun == &pFUpi) return 1;
 	if (fun == &pFdip) return 2;
 	if (fun == &pFdUU) return 2;
@@ -5496,6 +5619,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpCC) return 1;
 	if (fun == &pFpCu) return 1;
 	if (fun == &pFpWW) return 1;
+	if (fun == &pFpWp) return 1;
 	if (fun == &pFpui) return 1;
 	if (fun == &pFpuu) return 1;
 	if (fun == &pFpuL) return 1;
@@ -5597,6 +5721,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFffff) return 5;
 	if (fun == &vFdddd) return 5;
 	if (fun == &vFllii) return 1;
+	if (fun == &vFLuui) return 1;
 	if (fun == &vFpiii) return 1;
 	if (fun == &vFpiiu) return 1;
 	if (fun == &vFpiip) return 1;
@@ -5609,7 +5734,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpipi) return 1;
 	if (fun == &vFpipp) return 1;
 	if (fun == &vFpIdi) return 2;
-	if (fun == &vFpCiW) return 1;
+	if (fun == &vFpCuW) return 1;
 	if (fun == &vFpuip) return 1;
 	if (fun == &vFpuui) return 1;
 	if (fun == &vFpuuu) return 1;
@@ -5646,10 +5771,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpplp) return 1;
 	if (fun == &vFppLp) return 1;
 	if (fun == &vFpppi) return 1;
-	if (fun == &vFpppI) return 1;
 	if (fun == &vFpppu) return 1;
-	if (fun == &vFpppU) return 1;
 	if (fun == &vFpppd) return 2;
+	if (fun == &vFpppl) return 1;
 	if (fun == &vFpppL) return 1;
 	if (fun == &vFpppp) return 1;
 	if (fun == &cFpiii) return 1;
@@ -5681,7 +5805,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFippL) return 1;
 	if (fun == &iFippp) return 1;
 	if (fun == &iFuiup) return 1;
-	if (fun == &iFuipu) return 1;
 	if (fun == &iFuipp) return 1;
 	if (fun == &iFuupi) return 1;
 	if (fun == &iFupLp) return 1;
@@ -5709,7 +5832,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpIip) return 1;
 	if (fun == &iFpCCC) return 1;
 	if (fun == &iFpCpi) return 1;
+	if (fun == &iFpCpp) return 1;
 	if (fun == &iFpWWu) return 1;
+	if (fun == &iFpWpp) return 1;
 	if (fun == &iFpuwp) return 1;
 	if (fun == &iFpuiL) return 1;
 	if (fun == &iFpuip) return 1;
@@ -5730,6 +5855,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpUpp) return 1;
 	if (fun == &iFplii) return 1;
 	if (fun == &iFplip) return 1;
+	if (fun == &iFplpp) return 1;
 	if (fun == &iFpLii) return 1;
 	if (fun == &iFpLip) return 1;
 	if (fun == &iFpLLu) return 1;
@@ -5767,7 +5893,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &IFpIip) return 1;
 	if (fun == &IFppii) return 1;
 	if (fun == &IFppip) return 1;
-	if (fun == &IFpppp) return 1;
 	if (fun == &CFuuff) return 3;
 	if (fun == &CFpupp) return 1;
 	if (fun == &CFppip) return 1;
@@ -5791,7 +5916,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &UFpUui) return 1;
 	if (fun == &UFppii) return 1;
 	if (fun == &UFppip) return 1;
-	if (fun == &UFpppp) return 1;
 	if (fun == &dFpppp) return -1;
 	if (fun == &lFiiLu) return 1;
 	if (fun == &lFiipL) return 1;
@@ -5807,11 +5931,15 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFpili) return 1;
 	if (fun == &lFpilp) return 1;
 	if (fun == &lFpuip) return 1;
+	if (fun == &lFplpp) return 1;
+	if (fun == &lFpLpp) return 1;
 	if (fun == &lFppii) return 1;
 	if (fun == &lFppip) return 1;
 	if (fun == &lFpppL) return 1;
+	if (fun == &lFpppp) return 1;
 	if (fun == &LFippL) return 1;
 	if (fun == &LFippp) return 1;
+	if (fun == &LFuipL) return 1;
 	if (fun == &LFpuuu) return 1;
 	if (fun == &LFpLCL) return 1;
 	if (fun == &LFpLLp) return 1;
@@ -5827,6 +5955,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFiiiu) return 1;
 	if (fun == &pFiiuu) return 1;
 	if (fun == &pFiiup) return 1;
+	if (fun == &pFiiLp) return 1;
 	if (fun == &pFiipi) return 1;
 	if (fun == &pFiipp) return 1;
 	if (fun == &pFiIIi) return 1;
@@ -5836,6 +5965,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFippi) return 1;
 	if (fun == &pFippu) return 1;
 	if (fun == &pFuuii) return 1;
+	if (fun == &pFuuip) return 1;
 	if (fun == &pFullu) return 1;
 	if (fun == &pFffff) return 5;
 	if (fun == &pFdipp) return 2;
@@ -5845,6 +5975,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpiii) return 1;
 	if (fun == &pFpiip) return 1;
 	if (fun == &pFpiuu) return 1;
+	if (fun == &pFpiLi) return 1;
 	if (fun == &pFpiLL) return 1;
 	if (fun == &pFpipi) return 1;
 	if (fun == &pFpipd) return 2;
@@ -5852,6 +5983,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpCWp) return 1;
 	if (fun == &pFpCuW) return 1;
 	if (fun == &pFpCuu) return 1;
+	if (fun == &pFpWWW) return 1;
 	if (fun == &pFpuii) return 1;
 	if (fun == &pFpuip) return 1;
 	if (fun == &pFpuWp) return 1;
@@ -5860,12 +5992,17 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpuup) return 1;
 	if (fun == &pFpupi) return 1;
 	if (fun == &pFpupu) return 1;
+	if (fun == &pFpupp) return 1;
 	if (fun == &pFpdIU) return 2;
 	if (fun == &pFplpl) return 1;
 	if (fun == &pFplpp) return 1;
 	if (fun == &pFpLip) return 1;
+	if (fun == &pFpLup) return 1;
 	if (fun == &pFpLLp) return 1;
+	if (fun == &pFpLpi) return 1;
+	if (fun == &pFpLpl) return 1;
 	if (fun == &pFpLpL) return 1;
+	if (fun == &pFpLpp) return 1;
 	if (fun == &pFppii) return 1;
 	if (fun == &pFppiu) return 1;
 	if (fun == &pFppiL) return 1;
@@ -5880,6 +6017,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFppUU) return 1;
 	if (fun == &pFppdd) return 3;
 	if (fun == &pFppll) return 1;
+	if (fun == &pFppLi) return 1;
 	if (fun == &pFppLL) return 1;
 	if (fun == &pFppLp) return 1;
 	if (fun == &pFpppi) return 1;
@@ -6083,11 +6221,13 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpuuup) return 1;
 	if (fun == &iFpuuLL) return 1;
 	if (fun == &iFpuupp) return 1;
+	if (fun == &iFpulpp) return 1;
 	if (fun == &iFpupiU) return 1;
 	if (fun == &iFpupup) return 1;
 	if (fun == &iFpuppp) return 1;
 	if (fun == &iFpUiUi) return 1;
 	if (fun == &iFpUupp) return 1;
+	if (fun == &iFplupp) return 1;
 	if (fun == &iFplluu) return 1;
 	if (fun == &iFpLiLi) return 1;
 	if (fun == &iFpLlpp) return 1;
@@ -6108,7 +6248,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppupp) return 1;
 	if (fun == &iFppllp) return 1;
 	if (fun == &iFpplpp) return 1;
-	if (fun == &iFppLip) return 1;
 	if (fun == &iFppLup) return 1;
 	if (fun == &iFppLpi) return 1;
 	if (fun == &iFppLpL) return 1;
@@ -6117,6 +6256,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppiL) return 1;
 	if (fun == &iFpppip) return 1;
 	if (fun == &iFpppui) return 1;
+	if (fun == &iFpppup) return 1;
 	if (fun == &iFpppUi) return 1;
 	if (fun == &iFpppLi) return 1;
 	if (fun == &iFpppLp) return 1;
@@ -6146,6 +6286,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFipLLi) return 1;
 	if (fun == &lFipLpp) return 1;
 	if (fun == &lFpuipC) return 1;
+	if (fun == &lFppupp) return 1;
+	if (fun == &lFppLpp) return 1;
 	if (fun == &LFuiCiu) return 1;
 	if (fun == &LFpuipp) return 1;
 	if (fun == &LFpuppi) return 1;
@@ -6158,9 +6300,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFiiiii) return 1;
 	if (fun == &pFiiipL) return 1;
 	if (fun == &pFipipL) return 1;
-	if (fun == &pFipppu) return 1;
 	if (fun == &pFuiiiu) return 1;
 	if (fun == &pFuiupp) return 1;
+	if (fun == &pFupLpl) return 1;
+	if (fun == &pFupLpL) return 1;
+	if (fun == &pFLuppp) return 1;
+	if (fun == &pFLpppi) return 1;
 	if (fun == &pFpiiii) return 1;
 	if (fun == &pFpiiip) return 1;
 	if (fun == &pFpiiuu) return 1;
@@ -6189,8 +6334,10 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFppiup) return 1;
 	if (fun == &pFppipi) return 1;
 	if (fun == &pFppipp) return 1;
+	if (fun == &pFppWpp) return 1;
 	if (fun == &pFppuuu) return 1;
 	if (fun == &pFppuup) return 1;
+	if (fun == &pFppupp) return 1;
 	if (fun == &pFppddi) return 3;
 	if (fun == &pFppLii) return 1;
 	if (fun == &pFppLLp) return 1;
@@ -6300,6 +6447,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppiipi) return 1;
 	if (fun == &vFppiipp) return 1;
 	if (fun == &vFppilpp) return 1;
+	if (fun == &vFppipLp) return 1;
 	if (fun == &vFppippi) return 1;
 	if (fun == &vFppippp) return 1;
 	if (fun == &vFppuuuu) return 1;
@@ -6369,28 +6517,29 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppiiuu) return 1;
 	if (fun == &iFppiipi) return 1;
 	if (fun == &iFppiipp) return 1;
+	if (fun == &iFppiupp) return 1;
 	if (fun == &iFppipii) return 1;
 	if (fun == &iFppipiL) return 1;
 	if (fun == &iFppipip) return 1;
-	if (fun == &iFppIipp) return 1;
 	if (fun == &iFppIppp) return 1;
 	if (fun == &iFppuiii) return 1;
 	if (fun == &iFppuiiL) return 1;
-	if (fun == &iFppuipp) return 1;
 	if (fun == &iFppuIII) return 1;
 	if (fun == &iFppuupp) return 1;
 	if (fun == &iFppupip) return 1;
 	if (fun == &iFppuppp) return 1;
-	if (fun == &iFppUipp) return 1;
 	if (fun == &iFppUUup) return 1;
 	if (fun == &iFppdidd) return 4;
+	if (fun == &iFpplupp) return 1;
 	if (fun == &iFpplppi) return 1;
 	if (fun == &iFppLupp) return 1;
+	if (fun == &iFppLppp) return 1;
 	if (fun == &iFpppiuu) return 1;
 	if (fun == &iFpppipi) return 1;
 	if (fun == &iFpppipp) return 1;
 	if (fun == &iFpppuii) return 1;
 	if (fun == &iFpppupu) return 1;
+	if (fun == &iFpppupp) return 1;
 	if (fun == &iFpppLpp) return 1;
 	if (fun == &iFppppii) return 1;
 	if (fun == &iFppppiu) return 1;
@@ -6415,9 +6564,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFipLipu) return 1;
 	if (fun == &lFipLipp) return 1;
 	if (fun == &lFipLpLL) return 1;
+	if (fun == &lFppLipp) return 1;
+	if (fun == &lFpppLpp) return 1;
 	if (fun == &LFpipipi) return 1;
 	if (fun == &LFpLippp) return 1;
 	if (fun == &pFiiiiii) return 1;
+	if (fun == &pFiiiiid) return 2;
 	if (fun == &pFiCiiCi) return 1;
 	if (fun == &pFipippp) return 1;
 	if (fun == &pFdddddd) return 7;
@@ -6434,16 +6586,19 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpuuuuu) return 1;
 	if (fun == &pFpuuupu) return 1;
 	if (fun == &pFpuuUUU) return 1;
+	if (fun == &pFpupppp) return 1;
 	if (fun == &pFplpppp) return 1;
 	if (fun == &pFppiiii) return 1;
-	if (fun == &pFppiipp) return 1;
 	if (fun == &pFppiCCC) return 1;
+	if (fun == &pFppiupp) return 1;
 	if (fun == &pFppippi) return 1;
 	if (fun == &pFppippp) return 1;
-	if (fun == &pFpppiii) return 1;
-	if (fun == &pFpppiui) return 1;
+	if (fun == &pFppuppp) return 1;
+	if (fun == &pFpplppp) return 1;
 	if (fun == &pFpppiup) return 1;
 	if (fun == &pFpppupp) return 1;
+	if (fun == &pFpppLii) return 1;
+	if (fun == &pFpppLui) return 1;
 	if (fun == &pFppppii) return 1;
 	if (fun == &pFppppWW) return 1;
 	if (fun == &pFpppppi) return 1;
@@ -6466,6 +6621,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppppdpi) return 2;
 	if (fun == &pFifffppp) return 4;
 	if (fun == &pFdiiiIiI) return 2;
+	if (fun == &pFpiiiiid) return 2;
 	if (fun == &pFpiiUdii) return 2;
 	if (fun == &pFpppfffi) return 4;
 	if (fun == &pFpppdddi) return 4;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 3fdbfd2b..ae116fe2 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -80,6 +80,7 @@ void IFf(x64emu_t *emu, uintptr_t fnc);
 void IFd(x64emu_t *emu, uintptr_t fnc);
 void IFp(x64emu_t *emu, uintptr_t fnc);
 void CFC(x64emu_t *emu, uintptr_t fnc);
+void CFW(x64emu_t *emu, uintptr_t fnc);
 void CFu(x64emu_t *emu, uintptr_t fnc);
 void CFl(x64emu_t *emu, uintptr_t fnc);
 void CFL(x64emu_t *emu, uintptr_t fnc);
@@ -121,7 +122,6 @@ void pFE(x64emu_t *emu, uintptr_t fnc);
 void pFv(x64emu_t *emu, uintptr_t fnc);
 void pFw(x64emu_t *emu, uintptr_t fnc);
 void pFi(x64emu_t *emu, uintptr_t fnc);
-void pFI(x64emu_t *emu, uintptr_t fnc);
 void pFC(x64emu_t *emu, uintptr_t fnc);
 void pFW(x64emu_t *emu, uintptr_t fnc);
 void pFu(x64emu_t *emu, uintptr_t fnc);
@@ -144,7 +144,6 @@ void vFEp(x64emu_t *emu, uintptr_t fnc);
 void vFcc(x64emu_t *emu, uintptr_t fnc);
 void vFww(x64emu_t *emu, uintptr_t fnc);
 void vFii(x64emu_t *emu, uintptr_t fnc);
-void vFiI(x64emu_t *emu, uintptr_t fnc);
 void vFiW(x64emu_t *emu, uintptr_t fnc);
 void vFiu(x64emu_t *emu, uintptr_t fnc);
 void vFiU(x64emu_t *emu, uintptr_t fnc);
@@ -211,6 +210,7 @@ void iFup(x64emu_t *emu, uintptr_t fnc);
 void iFUp(x64emu_t *emu, uintptr_t fnc);
 void iFli(x64emu_t *emu, uintptr_t fnc);
 void iFlp(x64emu_t *emu, uintptr_t fnc);
+void iFLi(x64emu_t *emu, uintptr_t fnc);
 void iFLu(x64emu_t *emu, uintptr_t fnc);
 void iFLL(x64emu_t *emu, uintptr_t fnc);
 void iFLp(x64emu_t *emu, uintptr_t fnc);
@@ -236,6 +236,7 @@ void IFpu(x64emu_t *emu, uintptr_t fnc);
 void IFpd(x64emu_t *emu, uintptr_t fnc);
 void CFip(x64emu_t *emu, uintptr_t fnc);
 void CFui(x64emu_t *emu, uintptr_t fnc);
+void CFuW(x64emu_t *emu, uintptr_t fnc);
 void CFuu(x64emu_t *emu, uintptr_t fnc);
 void CFuL(x64emu_t *emu, uintptr_t fnc);
 void CFpi(x64emu_t *emu, uintptr_t fnc);
@@ -255,6 +256,7 @@ void uFpi(x64emu_t *emu, uintptr_t fnc);
 void uFpu(x64emu_t *emu, uintptr_t fnc);
 void uFpU(x64emu_t *emu, uintptr_t fnc);
 void uFpf(x64emu_t *emu, uintptr_t fnc);
+void uFpl(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);
@@ -296,6 +298,7 @@ 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 LFLL(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);
@@ -309,20 +312,20 @@ void pFip(x64emu_t *emu, uintptr_t fnc);
 void pFiV(x64emu_t *emu, uintptr_t fnc);
 void pFII(x64emu_t *emu, uintptr_t fnc);
 void pFui(x64emu_t *emu, uintptr_t fnc);
-void pFuC(x64emu_t *emu, uintptr_t fnc);
 void pFuu(x64emu_t *emu, uintptr_t fnc);
 void pFup(x64emu_t *emu, uintptr_t fnc);
-void pFUi(x64emu_t *emu, uintptr_t fnc);
 void pFUU(x64emu_t *emu, uintptr_t fnc);
 void pFdi(x64emu_t *emu, uintptr_t fnc);
 void pFdd(x64emu_t *emu, uintptr_t fnc);
 void pFlp(x64emu_t *emu, uintptr_t fnc);
 void pFLi(x64emu_t *emu, uintptr_t fnc);
+void pFLC(x64emu_t *emu, uintptr_t fnc);
 void pFLu(x64emu_t *emu, uintptr_t fnc);
 void pFLL(x64emu_t *emu, uintptr_t fnc);
 void pFLp(x64emu_t *emu, uintptr_t fnc);
 void pFpi(x64emu_t *emu, uintptr_t fnc);
 void pFpC(x64emu_t *emu, uintptr_t fnc);
+void pFpW(x64emu_t *emu, uintptr_t fnc);
 void pFpu(x64emu_t *emu, uintptr_t fnc);
 void pFpU(x64emu_t *emu, uintptr_t fnc);
 void pFpd(x64emu_t *emu, uintptr_t fnc);
@@ -440,6 +443,7 @@ 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 wFppp(x64emu_t *emu, uintptr_t fnc);
 void iFEiw(x64emu_t *emu, uintptr_t fnc);
 void iFEip(x64emu_t *emu, uintptr_t fnc);
 void iFEWW(x64emu_t *emu, uintptr_t fnc);
@@ -472,7 +476,7 @@ 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 iFCiW(x64emu_t *emu, uintptr_t fnc);
+void iFCuW(x64emu_t *emu, uintptr_t fnc);
 void iFuwp(x64emu_t *emu, uintptr_t fnc);
 void iFuip(x64emu_t *emu, uintptr_t fnc);
 void iFuui(x64emu_t *emu, uintptr_t fnc);
@@ -502,6 +506,7 @@ void iFpWp(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);
+void iFpul(x64emu_t *emu, uintptr_t fnc);
 void iFpuL(x64emu_t *emu, uintptr_t fnc);
 void iFpup(x64emu_t *emu, uintptr_t fnc);
 void iFpUi(x64emu_t *emu, uintptr_t fnc);
@@ -535,11 +540,12 @@ void IFiIi(x64emu_t *emu, uintptr_t fnc);
 void IFpIi(x64emu_t *emu, uintptr_t fnc);
 void IFppi(x64emu_t *emu, uintptr_t fnc);
 void IFppI(x64emu_t *emu, uintptr_t fnc);
-void IFppu(x64emu_t *emu, uintptr_t fnc);
 void IFSIi(x64emu_t *emu, uintptr_t fnc);
 void CFipp(x64emu_t *emu, uintptr_t fnc);
 void CFuff(x64emu_t *emu, uintptr_t fnc);
 void CFuLu(x64emu_t *emu, uintptr_t fnc);
+void CFppp(x64emu_t *emu, uintptr_t fnc);
+void WFppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpW(x64emu_t *emu, uintptr_t fnc);
 void uFEpu(x64emu_t *emu, uintptr_t fnc);
 void uFEpU(x64emu_t *emu, uintptr_t fnc);
@@ -572,7 +578,6 @@ void uFppp(x64emu_t *emu, uintptr_t fnc);
 void UFUUU(x64emu_t *emu, uintptr_t fnc);
 void UFpiU(x64emu_t *emu, uintptr_t fnc);
 void UFppi(x64emu_t *emu, uintptr_t fnc);
-void UFppu(x64emu_t *emu, uintptr_t fnc);
 void fFuii(x64emu_t *emu, uintptr_t fnc);
 void fFfff(x64emu_t *emu, uintptr_t fnc);
 void fFffp(x64emu_t *emu, uintptr_t fnc);
@@ -595,11 +600,13 @@ void lFpli(x64emu_t *emu, uintptr_t fnc);
 void lFpLu(x64emu_t *emu, uintptr_t fnc);
 void lFpLp(x64emu_t *emu, uintptr_t fnc);
 void lFppi(x64emu_t *emu, uintptr_t fnc);
+void lFppu(x64emu_t *emu, uintptr_t fnc);
 void lFppL(x64emu_t *emu, uintptr_t fnc);
 void lFppp(x64emu_t *emu, uintptr_t fnc);
 void lFSpl(x64emu_t *emu, uintptr_t fnc);
 void LFEpA(x64emu_t *emu, uintptr_t fnc);
 void LFipL(x64emu_t *emu, uintptr_t fnc);
+void LFuui(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);
@@ -608,6 +615,7 @@ void LFpup(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);
+void LFppu(x64emu_t *emu, uintptr_t fnc);
 void LFppL(x64emu_t *emu, uintptr_t fnc);
 void LFppp(x64emu_t *emu, uintptr_t fnc);
 void LFSpL(x64emu_t *emu, uintptr_t fnc);
@@ -624,18 +632,21 @@ void pFiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiu(x64emu_t *emu, uintptr_t fnc);
 void pFiip(x64emu_t *emu, uintptr_t fnc);
 void pFiIi(x64emu_t *emu, uintptr_t fnc);
-void pFiIp(x64emu_t *emu, uintptr_t fnc);
 void pFipi(x64emu_t *emu, uintptr_t fnc);
 void pFipL(x64emu_t *emu, uintptr_t fnc);
 void pFipp(x64emu_t *emu, uintptr_t fnc);
 void pFIpi(x64emu_t *emu, uintptr_t fnc);
-void pFCiW(x64emu_t *emu, uintptr_t fnc);
+void pFCuW(x64emu_t *emu, uintptr_t fnc);
 void pFWWW(x64emu_t *emu, uintptr_t fnc);
+void pFuip(x64emu_t *emu, uintptr_t fnc);
 void pFuui(x64emu_t *emu, uintptr_t fnc);
 void pFuuu(x64emu_t *emu, uintptr_t fnc);
 void pFulu(x64emu_t *emu, uintptr_t fnc);
+void pFulp(x64emu_t *emu, uintptr_t fnc);
 void pFupi(x64emu_t *emu, uintptr_t fnc);
+void pFupl(x64emu_t *emu, uintptr_t fnc);
 void pFupL(x64emu_t *emu, uintptr_t fnc);
+void pFupp(x64emu_t *emu, uintptr_t fnc);
 void pFUpi(x64emu_t *emu, uintptr_t fnc);
 void pFdip(x64emu_t *emu, uintptr_t fnc);
 void pFdUU(x64emu_t *emu, uintptr_t fnc);
@@ -652,6 +663,7 @@ void pFpip(x64emu_t *emu, uintptr_t fnc);
 void pFpCC(x64emu_t *emu, uintptr_t fnc);
 void pFpCu(x64emu_t *emu, uintptr_t fnc);
 void pFpWW(x64emu_t *emu, uintptr_t fnc);
+void pFpWp(x64emu_t *emu, uintptr_t fnc);
 void pFpui(x64emu_t *emu, uintptr_t fnc);
 void pFpuu(x64emu_t *emu, uintptr_t fnc);
 void pFpuL(x64emu_t *emu, uintptr_t fnc);
@@ -781,6 +793,7 @@ void vFUUpi(x64emu_t *emu, uintptr_t fnc);
 void vFffff(x64emu_t *emu, uintptr_t fnc);
 void vFdddd(x64emu_t *emu, uintptr_t fnc);
 void vFllii(x64emu_t *emu, uintptr_t fnc);
+void vFLuui(x64emu_t *emu, uintptr_t fnc);
 void vFpiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpiip(x64emu_t *emu, uintptr_t fnc);
@@ -793,7 +806,7 @@ void vFpifi(x64emu_t *emu, uintptr_t fnc);
 void vFpipi(x64emu_t *emu, uintptr_t fnc);
 void vFpipp(x64emu_t *emu, uintptr_t fnc);
 void vFpIdi(x64emu_t *emu, uintptr_t fnc);
-void vFpCiW(x64emu_t *emu, uintptr_t fnc);
+void vFpCuW(x64emu_t *emu, uintptr_t fnc);
 void vFpuip(x64emu_t *emu, uintptr_t fnc);
 void vFpuui(x64emu_t *emu, uintptr_t fnc);
 void vFpuuu(x64emu_t *emu, uintptr_t fnc);
@@ -830,10 +843,9 @@ void vFppdp(x64emu_t *emu, uintptr_t fnc);
 void vFpplp(x64emu_t *emu, uintptr_t fnc);
 void vFppLp(x64emu_t *emu, uintptr_t fnc);
 void vFpppi(x64emu_t *emu, uintptr_t fnc);
-void vFpppI(x64emu_t *emu, uintptr_t fnc);
 void vFpppu(x64emu_t *emu, uintptr_t fnc);
-void vFpppU(x64emu_t *emu, uintptr_t fnc);
 void vFpppd(x64emu_t *emu, uintptr_t fnc);
+void vFpppl(x64emu_t *emu, uintptr_t fnc);
 void vFpppL(x64emu_t *emu, uintptr_t fnc);
 void vFpppp(x64emu_t *emu, uintptr_t fnc);
 void cFpiii(x64emu_t *emu, uintptr_t fnc);
@@ -890,7 +902,6 @@ 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 iFuiup(x64emu_t *emu, uintptr_t fnc);
-void iFuipu(x64emu_t *emu, uintptr_t fnc);
 void iFuipp(x64emu_t *emu, uintptr_t fnc);
 void iFuupi(x64emu_t *emu, uintptr_t fnc);
 void iFupLp(x64emu_t *emu, uintptr_t fnc);
@@ -919,7 +930,9 @@ void iFpipV(x64emu_t *emu, uintptr_t fnc);
 void iFpIip(x64emu_t *emu, uintptr_t fnc);
 void iFpCCC(x64emu_t *emu, uintptr_t fnc);
 void iFpCpi(x64emu_t *emu, uintptr_t fnc);
+void iFpCpp(x64emu_t *emu, uintptr_t fnc);
 void iFpWWu(x64emu_t *emu, uintptr_t fnc);
+void iFpWpp(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);
@@ -941,6 +954,7 @@ void iFpULp(x64emu_t *emu, uintptr_t fnc);
 void iFpUpp(x64emu_t *emu, uintptr_t fnc);
 void iFplii(x64emu_t *emu, uintptr_t fnc);
 void iFplip(x64emu_t *emu, uintptr_t fnc);
+void iFplpp(x64emu_t *emu, uintptr_t fnc);
 void iFpLii(x64emu_t *emu, uintptr_t fnc);
 void iFpLip(x64emu_t *emu, uintptr_t fnc);
 void iFpLLu(x64emu_t *emu, uintptr_t fnc);
@@ -980,7 +994,6 @@ void IFipUp(x64emu_t *emu, uintptr_t fnc);
 void IFpIip(x64emu_t *emu, uintptr_t fnc);
 void IFppii(x64emu_t *emu, uintptr_t fnc);
 void IFppip(x64emu_t *emu, uintptr_t fnc);
-void IFpppp(x64emu_t *emu, uintptr_t fnc);
 void IFSIii(x64emu_t *emu, uintptr_t fnc);
 void CFuuff(x64emu_t *emu, uintptr_t fnc);
 void CFpupp(x64emu_t *emu, uintptr_t fnc);
@@ -1009,7 +1022,6 @@ void UFpipp(x64emu_t *emu, uintptr_t fnc);
 void UFpUui(x64emu_t *emu, uintptr_t fnc);
 void UFppii(x64emu_t *emu, uintptr_t fnc);
 void UFppip(x64emu_t *emu, uintptr_t fnc);
-void UFpppp(x64emu_t *emu, uintptr_t fnc);
 void dFpppp(x64emu_t *emu, uintptr_t fnc);
 void lFEipV(x64emu_t *emu, uintptr_t fnc);
 void lFEpip(x64emu_t *emu, uintptr_t fnc);
@@ -1029,13 +1041,17 @@ 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 lFpuip(x64emu_t *emu, uintptr_t fnc);
+void lFplpp(x64emu_t *emu, uintptr_t fnc);
+void lFpLpp(x64emu_t *emu, uintptr_t fnc);
 void lFppii(x64emu_t *emu, uintptr_t fnc);
 void lFppip(x64emu_t *emu, uintptr_t fnc);
 void lFpppL(x64emu_t *emu, uintptr_t fnc);
+void lFpppp(x64emu_t *emu, uintptr_t fnc);
 void LFEppL(x64emu_t *emu, uintptr_t fnc);
 void LFEppp(x64emu_t *emu, uintptr_t fnc);
 void LFippL(x64emu_t *emu, uintptr_t fnc);
 void LFippp(x64emu_t *emu, uintptr_t fnc);
+void LFuipL(x64emu_t *emu, uintptr_t fnc);
 void LFpuuu(x64emu_t *emu, uintptr_t fnc);
 void LFpLCL(x64emu_t *emu, uintptr_t fnc);
 void LFpLLp(x64emu_t *emu, uintptr_t fnc);
@@ -1060,6 +1076,7 @@ void pFiiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiiu(x64emu_t *emu, uintptr_t fnc);
 void pFiiuu(x64emu_t *emu, uintptr_t fnc);
 void pFiiup(x64emu_t *emu, uintptr_t fnc);
+void pFiiLp(x64emu_t *emu, uintptr_t fnc);
 void pFiipi(x64emu_t *emu, uintptr_t fnc);
 void pFiipp(x64emu_t *emu, uintptr_t fnc);
 void pFiIIi(x64emu_t *emu, uintptr_t fnc);
@@ -1069,6 +1086,7 @@ void pFipip(x64emu_t *emu, uintptr_t fnc);
 void pFippi(x64emu_t *emu, uintptr_t fnc);
 void pFippu(x64emu_t *emu, uintptr_t fnc);
 void pFuuii(x64emu_t *emu, uintptr_t fnc);
+void pFuuip(x64emu_t *emu, uintptr_t fnc);
 void pFullu(x64emu_t *emu, uintptr_t fnc);
 void pFffff(x64emu_t *emu, uintptr_t fnc);
 void pFdipp(x64emu_t *emu, uintptr_t fnc);
@@ -1079,6 +1097,7 @@ void pFLiip(x64emu_t *emu, uintptr_t fnc);
 void pFpiii(x64emu_t *emu, uintptr_t fnc);
 void pFpiip(x64emu_t *emu, uintptr_t fnc);
 void pFpiuu(x64emu_t *emu, uintptr_t fnc);
+void pFpiLi(x64emu_t *emu, uintptr_t fnc);
 void pFpiLL(x64emu_t *emu, uintptr_t fnc);
 void pFpipi(x64emu_t *emu, uintptr_t fnc);
 void pFpipd(x64emu_t *emu, uintptr_t fnc);
@@ -1086,6 +1105,7 @@ void pFpipp(x64emu_t *emu, uintptr_t fnc);
 void pFpCWp(x64emu_t *emu, uintptr_t fnc);
 void pFpCuW(x64emu_t *emu, uintptr_t fnc);
 void pFpCuu(x64emu_t *emu, uintptr_t fnc);
+void pFpWWW(x64emu_t *emu, uintptr_t fnc);
 void pFpuii(x64emu_t *emu, uintptr_t fnc);
 void pFpuip(x64emu_t *emu, uintptr_t fnc);
 void pFpuWp(x64emu_t *emu, uintptr_t fnc);
@@ -1094,12 +1114,17 @@ void pFpuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpuup(x64emu_t *emu, uintptr_t fnc);
 void pFpupi(x64emu_t *emu, uintptr_t fnc);
 void pFpupu(x64emu_t *emu, uintptr_t fnc);
+void pFpupp(x64emu_t *emu, uintptr_t fnc);
 void pFpdIU(x64emu_t *emu, uintptr_t fnc);
 void pFplpl(x64emu_t *emu, uintptr_t fnc);
 void pFplpp(x64emu_t *emu, uintptr_t fnc);
 void pFpLip(x64emu_t *emu, uintptr_t fnc);
+void pFpLup(x64emu_t *emu, uintptr_t fnc);
 void pFpLLp(x64emu_t *emu, uintptr_t fnc);
+void pFpLpi(x64emu_t *emu, uintptr_t fnc);
+void pFpLpl(x64emu_t *emu, uintptr_t fnc);
 void pFpLpL(x64emu_t *emu, uintptr_t fnc);
+void pFpLpp(x64emu_t *emu, uintptr_t fnc);
 void pFppii(x64emu_t *emu, uintptr_t fnc);
 void pFppiu(x64emu_t *emu, uintptr_t fnc);
 void pFppiL(x64emu_t *emu, uintptr_t fnc);
@@ -1114,6 +1139,7 @@ void pFppup(x64emu_t *emu, uintptr_t fnc);
 void pFppUU(x64emu_t *emu, uintptr_t fnc);
 void pFppdd(x64emu_t *emu, uintptr_t fnc);
 void pFppll(x64emu_t *emu, uintptr_t fnc);
+void pFppLi(x64emu_t *emu, uintptr_t fnc);
 void pFppLL(x64emu_t *emu, uintptr_t fnc);
 void pFppLp(x64emu_t *emu, uintptr_t fnc);
 void pFpppi(x64emu_t *emu, uintptr_t fnc);
@@ -1373,11 +1399,13 @@ void iFpuuui(x64emu_t *emu, uintptr_t fnc);
 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 iFpulpp(x64emu_t *emu, uintptr_t fnc);
 void iFpupiU(x64emu_t *emu, uintptr_t fnc);
 void iFpupup(x64emu_t *emu, uintptr_t fnc);
 void iFpuppp(x64emu_t *emu, uintptr_t fnc);
 void iFpUiUi(x64emu_t *emu, uintptr_t fnc);
 void iFpUupp(x64emu_t *emu, uintptr_t fnc);
+void iFplupp(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);
@@ -1398,7 +1426,6 @@ 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 iFpplpp(x64emu_t *emu, uintptr_t fnc);
-void iFppLip(x64emu_t *emu, uintptr_t fnc);
 void iFppLup(x64emu_t *emu, uintptr_t fnc);
 void iFppLpi(x64emu_t *emu, uintptr_t fnc);
 void iFppLpL(x64emu_t *emu, uintptr_t fnc);
@@ -1407,6 +1434,7 @@ void iFpppii(x64emu_t *emu, uintptr_t fnc);
 void iFpppiL(x64emu_t *emu, uintptr_t fnc);
 void iFpppip(x64emu_t *emu, uintptr_t fnc);
 void iFpppui(x64emu_t *emu, uintptr_t fnc);
+void iFpppup(x64emu_t *emu, uintptr_t fnc);
 void iFpppUi(x64emu_t *emu, uintptr_t fnc);
 void iFpppLi(x64emu_t *emu, uintptr_t fnc);
 void iFpppLp(x64emu_t *emu, uintptr_t fnc);
@@ -1441,6 +1469,8 @@ void lFipLlL(x64emu_t *emu, uintptr_t fnc);
 void lFipLLi(x64emu_t *emu, uintptr_t fnc);
 void lFipLpp(x64emu_t *emu, uintptr_t fnc);
 void lFpuipC(x64emu_t *emu, uintptr_t fnc);
+void lFppupp(x64emu_t *emu, uintptr_t fnc);
+void lFppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFELppi(x64emu_t *emu, uintptr_t fnc);
 void LFEpppp(x64emu_t *emu, uintptr_t fnc);
 void LFuiCiu(x64emu_t *emu, uintptr_t fnc);
@@ -1467,9 +1497,12 @@ void pFEpppp(x64emu_t *emu, uintptr_t fnc);
 void pFiiiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiipL(x64emu_t *emu, uintptr_t fnc);
 void pFipipL(x64emu_t *emu, uintptr_t fnc);
-void pFipppu(x64emu_t *emu, uintptr_t fnc);
 void pFuiiiu(x64emu_t *emu, uintptr_t fnc);
 void pFuiupp(x64emu_t *emu, uintptr_t fnc);
+void pFupLpl(x64emu_t *emu, uintptr_t fnc);
+void pFupLpL(x64emu_t *emu, uintptr_t fnc);
+void pFLuppp(x64emu_t *emu, uintptr_t fnc);
+void pFLpppi(x64emu_t *emu, uintptr_t fnc);
 void pFpiiii(x64emu_t *emu, uintptr_t fnc);
 void pFpiiip(x64emu_t *emu, uintptr_t fnc);
 void pFpiiuu(x64emu_t *emu, uintptr_t fnc);
@@ -1498,8 +1531,10 @@ void pFppiip(x64emu_t *emu, uintptr_t fnc);
 void pFppiup(x64emu_t *emu, uintptr_t fnc);
 void pFppipi(x64emu_t *emu, uintptr_t fnc);
 void pFppipp(x64emu_t *emu, uintptr_t fnc);
+void pFppWpp(x64emu_t *emu, uintptr_t fnc);
 void pFppuuu(x64emu_t *emu, uintptr_t fnc);
 void pFppuup(x64emu_t *emu, uintptr_t fnc);
+void pFppupp(x64emu_t *emu, uintptr_t fnc);
 void pFppddi(x64emu_t *emu, uintptr_t fnc);
 void pFppLii(x64emu_t *emu, uintptr_t fnc);
 void pFppLLp(x64emu_t *emu, uintptr_t fnc);
@@ -1636,6 +1671,7 @@ void vFppiiui(x64emu_t *emu, uintptr_t fnc);
 void vFppiipi(x64emu_t *emu, uintptr_t fnc);
 void vFppiipp(x64emu_t *emu, uintptr_t fnc);
 void vFppilpp(x64emu_t *emu, uintptr_t fnc);
+void vFppipLp(x64emu_t *emu, uintptr_t fnc);
 void vFppippi(x64emu_t *emu, uintptr_t fnc);
 void vFppippp(x64emu_t *emu, uintptr_t fnc);
 void vFppuuuu(x64emu_t *emu, uintptr_t fnc);
@@ -1719,28 +1755,29 @@ void iFppiiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiiuu(x64emu_t *emu, uintptr_t fnc);
 void iFppiipi(x64emu_t *emu, uintptr_t fnc);
 void iFppiipp(x64emu_t *emu, uintptr_t fnc);
+void iFppiupp(x64emu_t *emu, uintptr_t fnc);
 void iFppipii(x64emu_t *emu, uintptr_t fnc);
 void iFppipiL(x64emu_t *emu, uintptr_t fnc);
 void iFppipip(x64emu_t *emu, uintptr_t fnc);
-void iFppIipp(x64emu_t *emu, uintptr_t fnc);
 void iFppIppp(x64emu_t *emu, uintptr_t fnc);
 void iFppuiii(x64emu_t *emu, uintptr_t fnc);
 void iFppuiiL(x64emu_t *emu, uintptr_t fnc);
-void iFppuipp(x64emu_t *emu, uintptr_t fnc);
 void iFppuIII(x64emu_t *emu, uintptr_t fnc);
 void iFppuupp(x64emu_t *emu, uintptr_t fnc);
 void iFppupip(x64emu_t *emu, uintptr_t fnc);
 void iFppuppp(x64emu_t *emu, uintptr_t fnc);
-void iFppUipp(x64emu_t *emu, uintptr_t fnc);
 void iFppUUup(x64emu_t *emu, uintptr_t fnc);
 void iFppdidd(x64emu_t *emu, uintptr_t fnc);
+void iFpplupp(x64emu_t *emu, uintptr_t fnc);
 void iFpplppi(x64emu_t *emu, uintptr_t fnc);
 void iFppLupp(x64emu_t *emu, uintptr_t fnc);
+void iFppLppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiuu(x64emu_t *emu, uintptr_t fnc);
 void iFpppipi(x64emu_t *emu, uintptr_t fnc);
 void iFpppipp(x64emu_t *emu, uintptr_t fnc);
 void iFpppuii(x64emu_t *emu, uintptr_t fnc);
 void iFpppupu(x64emu_t *emu, uintptr_t fnc);
+void iFpppupp(x64emu_t *emu, uintptr_t fnc);
 void iFpppLpp(x64emu_t *emu, uintptr_t fnc);
 void iFppppii(x64emu_t *emu, uintptr_t fnc);
 void iFppppiu(x64emu_t *emu, uintptr_t fnc);
@@ -1770,6 +1807,8 @@ 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 lFppLipp(x64emu_t *emu, uintptr_t fnc);
+void lFpppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFEupppp(x64emu_t *emu, uintptr_t fnc);
 void LFELpppi(x64emu_t *emu, uintptr_t fnc);
 void LFEppppi(x64emu_t *emu, uintptr_t fnc);
@@ -1789,6 +1828,7 @@ void pFEppppp(x64emu_t *emu, uintptr_t fnc);
 void pFEppppV(x64emu_t *emu, uintptr_t fnc);
 void pFEppApp(x64emu_t *emu, uintptr_t fnc);
 void pFiiiiii(x64emu_t *emu, uintptr_t fnc);
+void pFiiiiid(x64emu_t *emu, uintptr_t fnc);
 void pFiCiiCi(x64emu_t *emu, uintptr_t fnc);
 void pFipippp(x64emu_t *emu, uintptr_t fnc);
 void pFdddddd(x64emu_t *emu, uintptr_t fnc);
@@ -1805,16 +1845,19 @@ void pFpuuwwu(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpuuupu(x64emu_t *emu, uintptr_t fnc);
 void pFpuuUUU(x64emu_t *emu, uintptr_t fnc);
+void pFpupppp(x64emu_t *emu, uintptr_t fnc);
 void pFplpppp(x64emu_t *emu, uintptr_t fnc);
 void pFppiiii(x64emu_t *emu, uintptr_t fnc);
-void pFppiipp(x64emu_t *emu, uintptr_t fnc);
 void pFppiCCC(x64emu_t *emu, uintptr_t fnc);
+void pFppiupp(x64emu_t *emu, uintptr_t fnc);
 void pFppippi(x64emu_t *emu, uintptr_t fnc);
 void pFppippp(x64emu_t *emu, uintptr_t fnc);
-void pFpppiii(x64emu_t *emu, uintptr_t fnc);
-void pFpppiui(x64emu_t *emu, uintptr_t fnc);
+void pFppuppp(x64emu_t *emu, uintptr_t fnc);
+void pFpplppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppiup(x64emu_t *emu, uintptr_t fnc);
 void pFpppupp(x64emu_t *emu, uintptr_t fnc);
+void pFpppLii(x64emu_t *emu, uintptr_t fnc);
+void pFpppLui(x64emu_t *emu, uintptr_t fnc);
 void pFppppii(x64emu_t *emu, uintptr_t fnc);
 void pFppppWW(x64emu_t *emu, uintptr_t fnc);
 void pFpppppi(x64emu_t *emu, uintptr_t fnc);
@@ -1912,6 +1955,7 @@ void vFppiLiLp(x64emu_t *emu, uintptr_t fnc);
 void vFppipiip(x64emu_t *emu, uintptr_t fnc);
 void vFppipipp(x64emu_t *emu, uintptr_t fnc);
 void vFppipppp(x64emu_t *emu, uintptr_t fnc);
+void vFppCuupp(x64emu_t *emu, uintptr_t fnc);
 void vFppddddi(x64emu_t *emu, uintptr_t fnc);
 void vFppddpii(x64emu_t *emu, uintptr_t fnc);
 void vFppLpppi(x64emu_t *emu, uintptr_t fnc);
@@ -1975,7 +2019,12 @@ void iFppippip(x64emu_t *emu, uintptr_t fnc);
 void iFppipppi(x64emu_t *emu, uintptr_t fnc);
 void iFppipppp(x64emu_t *emu, uintptr_t fnc);
 void iFppuipiL(x64emu_t *emu, uintptr_t fnc);
+void iFppuippp(x64emu_t *emu, uintptr_t fnc);
+void iFppuuppp(x64emu_t *emu, uintptr_t fnc);
+void iFppupupp(x64emu_t *emu, uintptr_t fnc);
+void iFppliupp(x64emu_t *emu, uintptr_t fnc);
 void iFppLiipp(x64emu_t *emu, uintptr_t fnc);
+void iFppLippp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiii(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiuu(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiup(x64emu_t *emu, uintptr_t fnc);
@@ -1985,6 +2034,7 @@ void iFpppippi(x64emu_t *emu, uintptr_t fnc);
 void iFpppippp(x64emu_t *emu, uintptr_t fnc);
 void iFpppuiii(x64emu_t *emu, uintptr_t fnc);
 void iFppppiii(x64emu_t *emu, uintptr_t fnc);
+void iFppppilp(x64emu_t *emu, uintptr_t fnc);
 void iFppppipp(x64emu_t *emu, uintptr_t fnc);
 void iFppppdpi(x64emu_t *emu, uintptr_t fnc);
 void iFpppppip(x64emu_t *emu, uintptr_t fnc);
@@ -2009,6 +2059,7 @@ void pFEpppppi(x64emu_t *emu, uintptr_t fnc);
 void pFifffppp(x64emu_t *emu, uintptr_t fnc);
 void pFuupupup(x64emu_t *emu, uintptr_t fnc);
 void pFdiiiIiI(x64emu_t *emu, uintptr_t fnc);
+void pFpiiiiid(x64emu_t *emu, uintptr_t fnc);
 void pFpiiUdii(x64emu_t *emu, uintptr_t fnc);
 void pFpipippp(x64emu_t *emu, uintptr_t fnc);
 void pFpCuwwWW(x64emu_t *emu, uintptr_t fnc);
@@ -2016,26 +2067,26 @@ void pFpCuWCCC(x64emu_t *emu, uintptr_t fnc);
 void pFpCuuwwp(x64emu_t *emu, uintptr_t fnc);
 void pFpCuuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpCpWWup(x64emu_t *emu, uintptr_t fnc);
+void pFpWppWpp(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuwwu(x64emu_t *emu, uintptr_t fnc);
 void pFpuupwwC(x64emu_t *emu, uintptr_t fnc);
 void pFplppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpLppiip(x64emu_t *emu, uintptr_t fnc);
 void pFppiiipp(x64emu_t *emu, uintptr_t fnc);
 void pFppiiCCC(x64emu_t *emu, uintptr_t fnc);
-void pFppiippp(x64emu_t *emu, uintptr_t fnc);
 void pFppipipp(x64emu_t *emu, uintptr_t fnc);
 void pFppipLpp(x64emu_t *emu, uintptr_t fnc);
+void pFppuippp(x64emu_t *emu, uintptr_t fnc);
 void pFppuuppp(x64emu_t *emu, uintptr_t fnc);
-void pFppLiiip(x64emu_t *emu, uintptr_t fnc);
+void pFppliuip(x64emu_t *emu, uintptr_t fnc);
+void pFpplipup(x64emu_t *emu, uintptr_t fnc);
 void pFppLipip(x64emu_t *emu, uintptr_t fnc);
 void pFpppccci(x64emu_t *emu, uintptr_t fnc);
 void pFpppiiii(x64emu_t *emu, uintptr_t fnc);
-void pFpppiipp(x64emu_t *emu, uintptr_t fnc);
-void pFpppIIIi(x64emu_t *emu, uintptr_t fnc);
 void pFpppCCCi(x64emu_t *emu, uintptr_t fnc);
+void pFpppuipp(x64emu_t *emu, uintptr_t fnc);
 void pFpppuuui(x64emu_t *emu, uintptr_t fnc);
 void pFpppuupp(x64emu_t *emu, uintptr_t fnc);
-void pFpppUUUi(x64emu_t *emu, uintptr_t fnc);
 void pFpppfffi(x64emu_t *emu, uintptr_t fnc);
 void pFpppdddi(x64emu_t *emu, uintptr_t fnc);
 void pFpppllli(x64emu_t *emu, uintptr_t fnc);
@@ -2097,7 +2148,6 @@ void vFpUuuUUUi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiipii(x64emu_t *emu, uintptr_t fnc);
 void vFppipipii(x64emu_t *emu, uintptr_t fnc);
-void vFppippDDC(x64emu_t *emu, uintptr_t fnc);
 void vFppipppui(x64emu_t *emu, uintptr_t fnc);
 void vFppippppi(x64emu_t *emu, uintptr_t fnc);
 void vFppippppp(x64emu_t *emu, uintptr_t fnc);
@@ -2153,6 +2203,7 @@ void uFpupuuuCp(x64emu_t *emu, uintptr_t fnc);
 void uFppuuuupp(x64emu_t *emu, uintptr_t fnc);
 void uFppuuuppi(x64emu_t *emu, uintptr_t fnc);
 void uFppuppppp(x64emu_t *emu, uintptr_t fnc);
+void uFpppppupp(x64emu_t *emu, uintptr_t fnc);
 void LFELpLpLpi(x64emu_t *emu, uintptr_t fnc);
 void LFEpiupppp(x64emu_t *emu, uintptr_t fnc);
 void pFEiplllpp(x64emu_t *emu, uintptr_t fnc);
@@ -2163,13 +2214,12 @@ void pFEpppppiV(x64emu_t *emu, uintptr_t fnc);
 void pFEppppppi(x64emu_t *emu, uintptr_t fnc);
 void pFEppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFiippipip(x64emu_t *emu, uintptr_t fnc);
-void pFiipppppp(x64emu_t *emu, uintptr_t fnc);
+void pFiupppppp(x64emu_t *emu, uintptr_t fnc);
 void pFuiiiuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFuupupipp(x64emu_t *emu, uintptr_t fnc);
 void pFpiiiiiuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiUdiiUi(x64emu_t *emu, uintptr_t fnc);
 void pFpipiiiip(x64emu_t *emu, uintptr_t fnc);
-void pFpipppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpCCuuwwC(x64emu_t *emu, uintptr_t fnc);
 void pFpCuwwWWu(x64emu_t *emu, uintptr_t fnc);
 void pFpCuuuCup(x64emu_t *emu, uintptr_t fnc);
@@ -2178,6 +2228,7 @@ void pFpuuWWCuu(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuuupp(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuupup(x64emu_t *emu, uintptr_t fnc);
 void pFpuuupwwp(x64emu_t *emu, uintptr_t fnc);
+void pFpupppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpdwwWWui(x64emu_t *emu, uintptr_t fnc);
 void pFplpppppp(x64emu_t *emu, uintptr_t fnc);
 void pFppiiiiii(x64emu_t *emu, uintptr_t fnc);
@@ -2224,6 +2275,7 @@ void vFppiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiipi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiipiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiipiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppippDpDC(x64emu_t *emu, uintptr_t fnc);
 void vFppipppiii(x64emu_t *emu, uintptr_t fnc);
 void vFppipppiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuiiiii(x64emu_t *emu, uintptr_t fnc);
@@ -2247,7 +2299,7 @@ void iFpuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFpdiiiUiUp(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFppiuiippL(x64emu_t *emu, uintptr_t fnc);
-void iFppLpiippp(x64emu_t *emu, uintptr_t fnc);
+void iFppLpiuppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiipip(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiuuii(x64emu_t *emu, uintptr_t fnc);
 void iFpppiipiiu(x64emu_t *emu, uintptr_t fnc);
@@ -2257,7 +2309,10 @@ void iFppppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFEipippppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpppufppp(x64emu_t *emu, uintptr_t fnc);
 void uFuulpiuiuf(x64emu_t *emu, uintptr_t fnc);
+void uFppLpLuppp(x64emu_t *emu, uintptr_t fnc);
 void uFppppppppp(x64emu_t *emu, uintptr_t fnc);
+void lFpppipiipp(x64emu_t *emu, uintptr_t fnc);
+void lFpppippppp(x64emu_t *emu, uintptr_t fnc);
 void LFEppppppii(x64emu_t *emu, uintptr_t fnc);
 void pFEppiiuuLi(x64emu_t *emu, uintptr_t fnc);
 void pFEppuippuu(x64emu_t *emu, uintptr_t fnc);
@@ -2273,8 +2328,8 @@ void pFppiiiiiip(x64emu_t *emu, uintptr_t fnc);
 void pFppiiuuuLL(x64emu_t *emu, uintptr_t fnc);
 void pFppipppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppiiiiii(x64emu_t *emu, uintptr_t fnc);
-void pFpppiipppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppWWWWWp(x64emu_t *emu, uintptr_t fnc);
+void pFpppuipppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppuuCC(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuiippu(x64emu_t *emu, uintptr_t fnc);
@@ -2384,7 +2439,7 @@ void uFppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpipppppppi(x64emu_t *emu, uintptr_t fnc);
 void pFEppiiLpppip(x64emu_t *emu, uintptr_t fnc);
 void pFEppuiipuuii(x64emu_t *emu, uintptr_t fnc);
-void pFpppppppiipp(x64emu_t *emu, uintptr_t fnc);
+void pFpppppppuipp(x64emu_t *emu, uintptr_t fnc);
 void pFppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iWEpuipuppppp(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuiiuippu(x64emu_t *emu, uintptr_t fnc);
@@ -2436,6 +2491,7 @@ void uFippuuuulllipp(x64emu_t *emu, uintptr_t fnc);
 void uFppppuuupppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpCuuwwWWWWuup(x64emu_t *emu, uintptr_t fnc);
 void pFpuupppwwwwWWC(x64emu_t *emu, uintptr_t fnc);
+void pFpppppppuipppp(x64emu_t *emu, uintptr_t fnc);
 void pFppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFippppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFuffiiffiiffiip(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgconf2_private.h b/src/wrapped/wrappedgconf2_private.h
index acf7c1e4..b89d6844 100644
--- a/src/wrapped/wrappedgconf2_private.h
+++ b/src/wrapped/wrappedgconf2_private.h
@@ -43,7 +43,7 @@ GO(gconf_client_add_dir, vFppip)
 //GO(gconf_client_commit_change_set, 
 //GO(gconf_client_dir_exists, 
 //GO(gconf_client_error, 
-//GO(gconf_client_error_handling_mode_get_type, 
+GO(gconf_client_error_handling_mode_get_type, LFv)
 GO(gconf_client_get, pFppp)
 //GO(gconf_client_get_bool, 
 GO(gconf_client_get_default, pFv)
@@ -82,7 +82,7 @@ GO(gconf_client_remove_dir, vFppp)
 //GO(gconf_client_unset, 
 //GO(gconf_client_value_changed, 
 //GO(gconf_compose_errors, 
-//GO(gconf_concat_dir_and_key, 
+GO(gconf_concat_dir_and_key, pFpp)
 //GO(gconf_current_locale, 
 //GO(gconf_dbus_utils_append_entries, 
 //GO(gconf_dbus_utils_append_entry_values, 
@@ -90,9 +90,9 @@ GO(gconf_client_remove_dir, vFppp)
 //GO(gconf_dbus_utils_get_entries, 
 //GO(gconf_dbus_utils_get_entry_values, 
 //GO(gconf_dbus_utils_get_value, 
-//GO(gconf_debug_shutdown, 
+GO(gconf_debug_shutdown, iFv)
 //GO(gconf_double_to_string, 
-//GO(gconf_engine_all_dirs, 
+GO(gconf_engine_all_dirs, pFppp)
 //GO(gconf_engine_all_entries, 
 //GO(gconf_engine_associate_schema, 
 //GO(gconf_engine_change_set_from_current, 
@@ -100,80 +100,80 @@ GO(gconf_client_remove_dir, vFppp)
 //GO(gconf_engine_commit_change_set, 
 //GO(gconf_engine_dir_exists, 
 //GO(gconf_engine_get, 
-//GO(gconf_engine_get_bool, 
-//GO(gconf_engine_get_default, 
-//GO(gconf_engine_get_default_from_schema, 
-//GO(gconf_engine_get_entry, 
-//GO(gconf_engine_get_float, 
-//GO(gconf_engine_get_for_address, 
-//GO(gconf_engine_get_for_addresses, 
+GO(gconf_engine_get_bool, iFppp)
+GO(gconf_engine_get_default, pFv)
+GO(gconf_engine_get_default_from_schema, pFppp)
+GO(gconf_engine_get_entry, pFpppip)
+GO(gconf_engine_get_float, dFppp)
+GO(gconf_engine_get_for_address, pFpp)
+GO(gconf_engine_get_for_addresses, pFpp)
 //GO(gconf_engine_get_full, 
 //GO(gconf_engine_get_fuller, 
-//GO(gconf_engine_get_int, 
-//GO(gconf_engine_get_list, 
+GO(gconf_engine_get_int, iFppp)
+GO(gconf_engine_get_list, pFppup)
 //GO(gconf_engine_get_local, 
 //GO(gconf_engine_get_local_for_addresses, 
-//GO(gconf_engine_get_pair, 
-//GO(gconf_engine_get_schema, 
-//GO(gconf_engine_get_string, 
-//GO(gconf_engine_get_user_data, 
-//GO(gconf_engine_get_with_locale, 
+GO(gconf_engine_get_pair, iFppuuppp)
+GO(gconf_engine_get_schema, pFppp)
+GO(gconf_engine_get_string, pFppp)
+GO(gconf_engine_get_user_data, pFp)
+GO(gconf_engine_get_with_locale, pFpppp)
 //GO(gconf_engine_get_without_default, 
 //GO(gconf_engine_key_is_writable, 
 //GO(gconf_engine_notify_add, 
-//GO(gconf_engine_notify_remove, 
+GO(gconf_engine_notify_remove, vFpu)
 //GO(gconf_engine_pop_owner_usage, 
 //GO(gconf_engine_push_owner_usage, 
 //GO(gconf_engine_recursive_unset, 
-//GO(gconf_engine_ref, 
-//GO(gconf_engine_remove_dir, 
+GO(gconf_engine_ref, vFp)
+GO(gconf_engine_remove_dir, vFppp)
 //GO(gconf_engine_reverse_change_set, 
-//GO(gconf_engine_set, 
-//GO(gconf_engine_set_bool, 
-//GO(gconf_engine_set_float, 
-//GO(gconf_engine_set_int, 
-//GO(gconf_engine_set_list, 
+GO(gconf_engine_set, iFpppp)
+GO(gconf_engine_set_bool, iFppip)
+GO(gconf_engine_set_float, iFppdp)
+GO(gconf_engine_set_int, iFppip)
+GO(gconf_engine_set_list, iFppupp)
 //GO(gconf_engine_set_owner, 
-//GO(gconf_engine_set_pair, 
-//GO(gconf_engine_set_schema, 
-//GO(gconf_engine_set_string, 
+GO(gconf_engine_set_pair, iFppuuppp)
+GO(gconf_engine_set_schema, iFpppp)
+GO(gconf_engine_set_string, iFpppp)
 //GO(gconf_engine_set_user_data, 
-//GO(gconf_engine_suggest_sync, 
+GO(gconf_engine_suggest_sync, vFpp)
 //GO(gconf_engine_unref, 
 //GO(gconf_engine_unset, 
-//GO(gconf_entry_copy, 
-//GO(gconf_entry_equal, 
+GO(gconf_entry_copy, pFp)
+GO(gconf_entry_equal, iFpp)
 //GO(gconf_entry_free, 
 //GO(gconf_entry_get_is_default, 
-//GO(gconf_entry_get_is_writable, 
+GO(gconf_entry_get_is_writable, iFp)
 GO(gconf_entry_get_key, pFp)
-//GO(gconf_entry_get_schema_name, 
+GO(gconf_entry_get_schema_name, pFp)
 //GO(gconf_entry_get_type, 
 GO(gconf_entry_get_value, pFp)
-//GO(gconf_entry_new, 
-//GO(gconf_entry_new_nocopy, 
-//GO(gconf_entry_ref, 
+GO(gconf_entry_new, pFpp)
+GO(gconf_entry_new_nocopy, pFpp)
+GO(gconf_entry_ref, pFp)
 //GO(gconf_entry_set_is_default, 
-//GO(gconf_entry_set_is_writable, 
-//GO(gconf_entry_set_schema_name, 
-//GO(gconf_entry_set_value, 
-//GO(gconf_entry_set_value_nocopy, 
-//GO(gconf_entry_steal_value, 
-//GO(gconf_entry_unref, 
-//GO(gconf_enum_to_string, 
+GO(gconf_entry_set_is_writable, vFpi)
+GO(gconf_entry_set_schema_name, vFpp)
+GO(gconf_entry_set_value, vFpp)
+GO(gconf_entry_set_value_nocopy, vFpp)
+GO(gconf_entry_steal_value, pFp)
+GO(gconf_entry_unref, vFp)
+GO(gconf_enum_to_string, pFpi)
 //GO(gconf_error_get_type, 
 //GO(gconf_error_new, 
-//GO(gconf_error_quark, 
+GO(gconf_error_quark, uFv)
 //GO(gconf_escape_key, 
 //GO(gconf_get_backend, 
 //GO(gconf_get_daemon_ior, 
 //GO(gconf_in_daemon_mode, 
-//GO(gconf_init, 
+GO(gconf_init, iFipp)
 //GO(_gconf_init_i18n, 
-//GO(gconf_is_initialized, 
+GO(gconf_is_initialized, iFv)
 //GO(gconf_key_check, 
 //GO(gconf_key_directory, 
-//GO(gconf_key_is_below, 
+GO(gconf_key_is_below, iFpp)
 //GO(gconf_key_key, 
 //GO(gconf_listeners_add, 
 //GO(gconf_listeners_count, 
@@ -194,13 +194,13 @@ GO(gconf_entry_get_value, pFp)
 //GO(gconf_log, 
 //DATAB(gconf_log_debug_messages, 
 //GO(gconf_marshal_VOID__STRING_POINTER, 
-//GO(gconf_meta_info_free, 
-//GO(gconf_meta_info_get_mod_user, 
+GO(gconf_meta_info_free, vFp)
+GO(gconf_meta_info_get_mod_user, pFp)
 //GO(gconf_meta_info_get_schema, 
-//GO(gconf_meta_info_mod_time, 
-//GO(gconf_meta_info_new, 
-//GO(gconf_meta_info_set_mod_time, 
-//GO(gconf_meta_info_set_mod_user, 
+GO(gconf_meta_info_mod_time, iFp)
+GO(gconf_meta_info_new, pFv)
+GO(gconf_meta_info_set_mod_time, vFpi)
+GO(gconf_meta_info_set_mod_user, vFpp)
 //GO(gconf_meta_info_set_schema, 
 //DATAB(gconf_options, 
 //GO(gconf_persistent_name_get_address_list, 
@@ -209,28 +209,28 @@ GO(gconf_entry_get_value, pFp)
 //GO(gconf_preinit, 
 //GO(gconf_quote_string, 
 //GO(gconf_resolve_address, 
-//GO(gconf_schema_copy, 
-//GO(gconf_schema_free, 
+GO(gconf_schema_copy, pFp)
+GO(gconf_schema_free, vFp)
 //GO(gconf_schema_get_car_type, 
-//GO(gconf_schema_get_cdr_type, 
-//GO(gconf_schema_get_default_value, 
+GO(gconf_schema_get_cdr_type, uFp)
+GO(gconf_schema_get_default_value, pFp)
 //GO(gconf_schema_get_gettext_domain, 
 //GO(gconf_schema_get_list_type, 
 //GO(gconf_schema_get_locale, 
 //GO(gconf_schema_get_long_desc, 
-//GO(gconf_schema_get_owner, 
+GO(gconf_schema_get_owner, pFp)
 //GO(gconf_schema_get_short_desc, 
 //GO(gconf_schema_get_type, 
-//GO(gconf_schema_new, 
+GO(gconf_schema_new, pFv)
 //GO(gconf_schema_set_car_type, 
-//GO(gconf_schema_set_cdr_type, 
-//GO(gconf_schema_set_default_value, 
-//GO(gconf_schema_set_default_value_nocopy, 
+GO(gconf_schema_set_cdr_type, vFpu)
+GO(gconf_schema_set_default_value, vFpp)
+GO(gconf_schema_set_default_value_nocopy, vFpp)
 //GO(gconf_schema_set_gettext_domain, 
 //GO(gconf_schema_set_list_type, 
 //GO(gconf_schema_set_locale, 
 //GO(gconf_schema_set_long_desc, 
-//GO(gconf_schema_set_owner, 
+GO(gconf_schema_set_owner, vFpp)
 //GO(gconf_schema_set_short_desc, 
 //GO(gconf_schema_set_type, 
 //GO(gconf_schema_steal_default_value, 
@@ -264,57 +264,57 @@ GO(gconf_entry_get_value, pFp)
 //GO(gconf_spawn_daemon, 
 //GO(gconf_split_locale, 
 //GO(gconf_string_to_double, 
-//GO(gconf_string_to_enum, 
+GO(gconf_string_to_enum, iFppp)
 //GO(gconf_string_to_gulong, 
 //GO(gconf_synchronous_sync, 
-//GO(gconf_unescape_key, 
-//GO(gconf_unique_key, 
+GO(gconf_unescape_key, pFpi)
+GO(gconf_unique_key, pFv)
 //GO(gconf_unquote_string, 
 //GO(gconf_unquote_string_inplace, 
 //GO(gconf_unset_flags_get_type, 
 //GO(gconf_use_local_locks, 
-//GO(gconf_valid_key, 
-//GO(gconf_value_compare, 
-//GO(gconf_value_copy, 
-//GO(gconf_value_decode, 
-//GO(gconf_value_encode, 
+GO(gconf_valid_key, iFpp)
+GO(gconf_value_compare, iFpp)
+GO(gconf_value_copy, pFp)
+GO(gconf_value_decode, pFp)
+GO(gconf_value_encode, pFp)
 GO(gconf_value_free, vFp)
 GO(gconf_value_get_bool, iFp)
 //GO(gconf_value_get_car, 
 //GO(gconf_value_get_cdr, 
-//GO(gconf_value_get_float, 
-//GO(gconf_value_get_int, 
-//GO(gconf_value_get_list, 
-//GO(gconf_value_get_list_type, 
-//GO(gconf_value_get_schema, 
+GO(gconf_value_get_float, dFp)
+GO(gconf_value_get_int, iFp)
+GO(gconf_value_get_list, pFp)
+GO(gconf_value_get_list_type, uFp)
+GO(gconf_value_get_schema, pFp)
 GO(gconf_value_get_string, pFp)
 //GO(gconf_value_get_type, 
 //GO(gconf_value_list_from_primitive_list, 
 //GO(gconf_value_list_to_primitive_list_destructive, 
-//GO(gconf_value_new, 
-//GO(gconf_value_new_from_string, 
+GO(gconf_value_new, pFu)
+GO(gconf_value_new_from_string, pFupp)
 //GO(gconf_value_new_list_from_string, 
 //GO(gconf_value_new_pair_from_string, 
 //GO(gconf_value_pair_from_primitive_pair, 
 //GO(gconf_value_pair_to_primitive_pair_destructive, 
-//GO(gconf_value_set_bool, 
+GO(gconf_value_set_bool, vFpi)
 //GO(gconf_value_set_car, 
 //GO(gconf_value_set_car_nocopy, 
-//GO(gconf_value_set_cdr, 
-//GO(gconf_value_set_cdr_nocopy, 
-//GO(gconf_value_set_float, 
-//GO(gconf_value_set_int, 
-//GO(gconf_value_set_list, 
+GO(gconf_value_set_cdr, vFpp)
+GO(gconf_value_set_cdr_nocopy, vFpp)
+GO(gconf_value_set_float, vFpd)
+GO(gconf_value_set_int, vFpi)
+GO(gconf_value_set_list, vFpp)
 //GO(gconf_value_set_list_nocopy, 
-//GO(gconf_value_set_list_type, 
-//GO(gconf_value_set_schema, 
-//GO(gconf_value_set_schema_nocopy, 
-//GO(gconf_value_set_string, 
+GO(gconf_value_set_list_type, vFpu)
+GO(gconf_value_set_schema, vFpp)
+GO(gconf_value_set_schema_nocopy, vFpp)
+GO(gconf_value_set_string, vFpp)
 //GO(gconf_value_set_string_nocopy, 
 //GO(gconf_value_steal_list, 
 //GO(gconf_value_steal_schema, 
 //GO(gconf_value_steal_string, 
-//GO(gconf_value_to_string, 
+GO(gconf_value_to_string, pFp)
 //GO(gconf_value_type_from_string, 
 //GO(gconf_value_type_get_type, 
 //GO(gconf_value_type_to_string, 
diff --git a/src/wrapped/wrappedgio2_private.h b/src/wrapped/wrappedgio2_private.h
index 38010825..bb5c80eb 100755
--- a/src/wrapped/wrappedgio2_private.h
+++ b/src/wrapped/wrappedgio2_private.h
@@ -3,17 +3,17 @@
 #endif
 
 //GO(_fini, 
-//GO(g_action_activate, 
+GO(g_action_activate, vFpp)
 //GO(g_action_change_state, 
-//GO(g_action_get_enabled, 
-//GO(g_action_get_name, 
+GO(g_action_get_enabled, iFp)
+GO(g_action_get_name, pFp)
 //GO(g_action_get_parameter_type, 
-//GO(g_action_get_state, 
+GO(g_action_get_state, pFp)
 //GO(g_action_get_state_hint, 
-//GO(g_action_get_state_type, 
+GO(g_action_get_state_type, pFp)
 //GO(g_action_get_type, 
 GO(g_action_group_action_added, vFpp)
-GO(g_action_group_action_enabled_changed, vFppp)
+GO(g_action_group_action_enabled_changed, vFppi)
 GO(g_action_group_action_removed, vFpp)
 GO(g_action_group_action_state_changed, vFppp)
 GO(g_action_group_activate_action, vFppp)
@@ -31,10 +31,10 @@ GO(g_action_map_add_action, vFpp)
 GO(g_action_map_add_action_entries, vFppip)
 //GO(g_action_map_get_type, 
 GO(g_action_map_lookup_action, pFpp)
-//GO(g_action_map_remove_action, 
+GO(g_action_map_remove_action, vFpp)
 //GO(g_action_name_is_valid, 
-//GO(g_action_parse_detailed_name, 
-//GO(g_action_print_detailed_name, 
+GO(g_action_parse_detailed_name, iFpppp)
+GO(g_action_print_detailed_name, pFpp)
 GO(g_app_info_add_supports_type, iFppp)
 GO(g_app_info_can_delete, iFp)
 GO(g_app_info_can_remove_supports_type, iFp)
@@ -46,7 +46,7 @@ GO(g_app_info_equal, iFpp)
 GO(g_app_info_get_all, pFv)
 GO(g_app_info_get_all_for_type, pFp)
 GO(g_app_info_get_commandline, pFp)
-GO(g_app_info_get_default_for_type, pFpp)
+GO(g_app_info_get_default_for_type, pFpi)
 GO(g_app_info_get_default_for_uri_scheme, pFp)
 GO(g_app_info_get_description, pFp)
 GO(g_app_info_get_display_name, pFp)
@@ -61,7 +61,7 @@ GO(g_app_info_get_type, LFv)
 GO(g_app_info_launch, iFpppp)
 GO(g_app_info_launch_default_for_uri, iFppp)
 GO(g_app_info_launch_uris, iFpppp)
-//GO(g_app_info_monitor_get, 
+GO(g_app_info_monitor_get, pFv)
 GO(g_app_info_monitor_get_type, LFv)
 GO(g_app_info_remove_supports_type, iFppp)
 GO(g_app_info_reset_type_associations, vFp)
@@ -72,60 +72,60 @@ GO(g_app_info_should_show, iFp)
 GO(g_app_info_supports_files, iFp)
 GO(g_app_info_supports_uris, iFp)
 //GO(g_app_launch_context_get_display, 
-//GO(g_app_launch_context_get_environment, 
-//GO(g_app_launch_context_get_startup_notify_id, 
+GO(g_app_launch_context_get_environment, pFp)
+GO(g_app_launch_context_get_startup_notify_id, pFppp)
 GO(g_app_launch_context_get_type, LFv)
-//GO(g_app_launch_context_launch_failed, 
-//GO(g_app_launch_context_new, 
-//GO(g_app_launch_context_setenv, 
+GO(g_app_launch_context_launch_failed, vFpp)
+GO(g_app_launch_context_new, pFv)
+GO(g_app_launch_context_setenv, vFppp)
 //GO(g_app_launch_context_unsetenv, 
 GO(g_application_activate, vFp)
-//GO(g_application_add_main_option, 
+GO(g_application_add_main_option, vFppCuupp)
 GO(g_application_add_main_option_entries, vFpp)
-//GO(g_application_add_option_group, 
-//GO(g_application_command_line_create_file_for_arg, 
-//GO(g_application_command_line_get_arguments, 
-//GO(g_application_command_line_get_cwd, 
-//GO(g_application_command_line_getenv, 
-//GO(g_application_command_line_get_environ, 
-//GO(g_application_command_line_get_exit_status, 
-//GO(g_application_command_line_get_is_remote, 
-//GO(g_application_command_line_get_options_dict, 
-//GO(g_application_command_line_get_platform_data, 
-//GO(g_application_command_line_get_stdin, 
+GO(g_application_add_option_group, vFpp)
+GO(g_application_command_line_create_file_for_arg, pFpp)
+GO(g_application_command_line_get_arguments, pFpp)
+GO(g_application_command_line_get_cwd, pFp)
+GO(g_application_command_line_getenv, pFpp)
+GO(g_application_command_line_get_environ, pFp)
+GO(g_application_command_line_get_exit_status, iFp)
+GO(g_application_command_line_get_is_remote, iFp)
+GO(g_application_command_line_get_options_dict, pFp)
+GO(g_application_command_line_get_platform_data, pFp)
+GO(g_application_command_line_get_stdin, pFp)
 //GO(g_application_command_line_get_type, 
 //GO(g_application_command_line_print, 
 //GO(g_application_command_line_printerr, 
-//GO(g_application_command_line_set_exit_status, 
+GO(g_application_command_line_set_exit_status, vFpi)
 //GO(g_application_flags_get_type, 
 //GO(g_application_get_application_id, 
-//GO(g_application_get_dbus_connection, 
+GO(g_application_get_dbus_connection, pFp)
 //GO(g_application_get_dbus_object_path, 
-//GO(g_application_get_default, 
-//GO(g_application_get_flags, 
-//GO(g_application_get_inactivity_timeout, 
+GO(g_application_get_default, pFv)
+GO(g_application_get_flags, uFp)
+GO(g_application_get_inactivity_timeout, uFp)
 //GO(g_application_get_is_registered, 
 //GO(g_application_get_is_remote, 
-//GO(g_application_get_resource_base_path, 
+GO(g_application_get_resource_base_path, pFp)
 GO(g_application_get_type, LFv)
 //GO(g_application_hold, 
 //GO(g_application_id_is_valid, 
 //GO(g_application_mark_busy, 
-GO(g_application_new, pFpi)
+GO(g_application_new, pFpu)
 GO(g_application_open, vFppip)
 GO(g_application_quit, vFp)
 GO(g_application_register, iFppp)
 GO(g_application_release, vFp)
 GO(g_application_run, iFpip)
-//GO(g_application_send_notification, 
-//GO(g_application_set_action_group, 
+GO(g_application_send_notification, vFppp)
+GO(g_application_set_action_group, vFpp)
 //GO(g_application_set_application_id, 
 //GO(g_application_set_default, 
-//GO(g_application_set_flags, 
-//GO(g_application_set_inactivity_timeout, 
+GO(g_application_set_flags, vFpu)
+GO(g_application_set_inactivity_timeout, vFpu)
 //GO(g_application_set_resource_base_path, 
 //GO(g_application_unmark_busy, 
-//GO(g_application_withdraw_notification, 
+GO(g_application_withdraw_notification, vFpp)
 //GO(g_ask_password_flags_get_type, 
 GO(g_async_initable_get_type, LFv)
 GOM(g_async_initable_init_async, vFEpippp)
@@ -134,30 +134,30 @@ GOM(g_async_initable_new_async, vFEiippppV)
 GO(g_async_initable_new_finish, pFppp)
 GOM(g_async_initable_new_valist_async, vFEipAippp)
 GOM(g_async_initable_newv_async, vFEiupippp)
-//GO(g_async_result_get_source_object, 
+GO(g_async_result_get_source_object, pFp)
 //GO(g_async_result_get_type, 
-//GO(g_async_result_get_user_data, 
-//GO(g_async_result_is_tagged, 
+GO(g_async_result_get_user_data, pFp)
+GO(g_async_result_is_tagged, iFpp)
 //GO(g_async_result_legacy_propagate_error, 
-//GO(g_buffered_input_stream_fill, 
+GO(g_buffered_input_stream_fill, lFplpp)
 //GO(g_buffered_input_stream_fill_async, 
-//GO(g_buffered_input_stream_fill_finish, 
-//GO(g_buffered_input_stream_get_available, 
+GO(g_buffered_input_stream_fill_finish, lFppp)
+GO(g_buffered_input_stream_get_available, LFp)
 //GO(g_buffered_input_stream_get_buffer_size, 
 //GO(g_buffered_input_stream_get_type, 
-//GO(g_buffered_input_stream_new, 
-//GO(g_buffered_input_stream_new_sized, 
-//GO(g_buffered_input_stream_peek, 
-//GO(g_buffered_input_stream_peek_buffer, 
-//GO(g_buffered_input_stream_read_byte, 
-//GO(g_buffered_input_stream_set_buffer_size, 
-//GO(g_buffered_output_stream_get_auto_grow, 
-//GO(g_buffered_output_stream_get_buffer_size, 
+GO(g_buffered_input_stream_new, pFp)
+GO(g_buffered_input_stream_new_sized, pFpL)
+GO(g_buffered_input_stream_peek, LFppLL)
+GO(g_buffered_input_stream_peek_buffer, pFpp)
+GO(g_buffered_input_stream_read_byte, iFppp)
+GO(g_buffered_input_stream_set_buffer_size, vFpL)
+GO(g_buffered_output_stream_get_auto_grow, iFp)
+GO(g_buffered_output_stream_get_buffer_size, LFp)
 //GO(g_buffered_output_stream_get_type, 
-//GO(g_buffered_output_stream_new, 
-//GO(g_buffered_output_stream_new_sized, 
-//GO(g_buffered_output_stream_set_auto_grow, 
-//GO(g_buffered_output_stream_set_buffer_size, 
+GO(g_buffered_output_stream_new, pFp)
+GO(g_buffered_output_stream_new_sized, pFpL)
+GO(g_buffered_output_stream_set_auto_grow, vFpi)
+GO(g_buffered_output_stream_set_buffer_size, vFpL)
 GOM(g_bus_get, vFEippp)
 GO(g_bus_get_finish, pFpp)
 GO(g_bus_get_sync, pFipp)
@@ -174,9 +174,9 @@ GOM(g_bus_watch_name, uFEipipppp)
 GOM(g_bus_watch_name_on_connection, uFEppipppp)
 GO(g_bus_watch_name_on_connection_with_closures, uFppipp)   // mmm closure, wrapped or unwrapped?
 GO(g_bus_watch_name_with_closures, uFipipp)
-//GO(g_bytes_icon_get_bytes, 
+GO(g_bytes_icon_get_bytes, pFp)
 //GO(g_bytes_icon_get_type, 
-//GO(g_bytes_icon_new, 
+GO(g_bytes_icon_new, pFp)
 GO(g_cancellable_cancel, vFp)
 GOM(g_cancellable_connect, LFEpppp)
 GO(g_cancellable_disconnect, vFpL)
@@ -192,11 +192,11 @@ GO(g_cancellable_release_fd, vFp)
 GO(g_cancellable_reset, vFp)
 GO(g_cancellable_set_error_if_cancelled, iFpp)
 GO(g_cancellable_source_new, pFp)
-//GO(g_charset_converter_get_num_fallbacks, 
+GO(g_charset_converter_get_num_fallbacks, uFp)
 GO(g_charset_converter_get_type, LFv)
-//GO(g_charset_converter_get_use_fallback, 
-//GO(g_charset_converter_new, 
-//GO(g_charset_converter_set_use_fallback, 
+GO(g_charset_converter_get_use_fallback, iFp)
+GO(g_charset_converter_new, pFppp)
+GO(g_charset_converter_set_use_fallback, vFpi)
 GO(g_content_type_can_be_executable, iFp)
 GO(g_content_type_equals, iFpp)
 GO(g_content_type_from_mime_type, pFp)
@@ -210,72 +210,72 @@ GO(g_content_type_guess_for_tree, pFp)
 GO(g_content_type_is_a, iFpp)
 GO(g_content_type_is_unknown, iFp)
 GO(g_content_types_get_registered, pFv)
-//GO(g_converter_convert, 
+GO(g_converter_convert, uFppLpLuppp)
 //GO(g_converter_flags_get_type, 
 //GO(g_converter_get_type, 
-//GO(g_converter_input_stream_get_converter, 
+GO(g_converter_input_stream_get_converter, pFp)
 //GO(g_converter_input_stream_get_type, 
-//GO(g_converter_input_stream_new, 
-//GO(g_converter_output_stream_get_converter, 
+GO(g_converter_input_stream_new, pFpp)
+GO(g_converter_output_stream_get_converter, pFp)
 //GO(g_converter_output_stream_get_type, 
-//GO(g_converter_output_stream_new, 
+GO(g_converter_output_stream_new, pFpp)
 //GO(g_converter_reset, 
 //GO(g_converter_result_get_type, 
-//GO(g_credentials_get_native, 
+GO(g_credentials_get_native, pFpu)
 //GO(g_credentials_get_type, 
-//GO(g_credentials_get_unix_pid, 
-//GO(g_credentials_get_unix_user, 
-//GO(g_credentials_is_same_user, 
-//GO(g_credentials_new, 
-//GO(g_credentials_set_native, 
-//GO(g_credentials_set_unix_user, 
-//GO(g_credentials_to_string, 
+GO(g_credentials_get_unix_pid, iFpp)
+GO(g_credentials_get_unix_user, uFpp)
+GO(g_credentials_is_same_user, iFppp)
+GO(g_credentials_new, pFv)
+GO(g_credentials_set_native, vFpup)
+GO(g_credentials_set_unix_user, iFpup)
+GO(g_credentials_to_string, pFp)
 //GO(g_credentials_type_get_type, 
-//GO(g_data_input_stream_get_byte_order, 
-//GO(g_data_input_stream_get_newline_type, 
+GO(g_data_input_stream_get_byte_order, uFp)
+GO(g_data_input_stream_get_newline_type, uFp)
 //GO(g_data_input_stream_get_type, 
-//GO(g_data_input_stream_new, 
-//GO(g_data_input_stream_read_byte, 
-//GO(g_data_input_stream_read_int16, 
-//GO(g_data_input_stream_read_int32, 
-//GO(g_data_input_stream_read_int64, 
+GO(g_data_input_stream_new, pFp)
+GO(g_data_input_stream_read_byte, CFppp)
+GO(g_data_input_stream_read_int16, wFppp)
+GO(g_data_input_stream_read_int32, iFppp)
+GO(g_data_input_stream_read_int64, lFppp)
 //GO(g_data_input_stream_read_line, 
 //GO(g_data_input_stream_read_line_async, 
 //GO(g_data_input_stream_read_line_finish, 
 //GO(g_data_input_stream_read_line_finish_utf8, 
-//GO(g_data_input_stream_read_line_utf8, 
-//GO(g_data_input_stream_read_uint16, 
-//GO(g_data_input_stream_read_uint32, 
-//GO(g_data_input_stream_read_uint64, 
-//GO(g_data_input_stream_read_until, 
+GO(g_data_input_stream_read_line_utf8, pFpppp)
+GO(g_data_input_stream_read_uint16, WFppp)
+GO(g_data_input_stream_read_uint32, uFppp)
+GO(g_data_input_stream_read_uint64, LFppp)
+GO(g_data_input_stream_read_until, pFppppp)
 //GO(g_data_input_stream_read_until_async, 
 //GO(g_data_input_stream_read_until_finish, 
-//GO(g_data_input_stream_read_upto, 
+GO(g_data_input_stream_read_upto, pFpplppp)
 //GO(g_data_input_stream_read_upto_async, 
-//GO(g_data_input_stream_read_upto_finish, 
-//GO(g_data_input_stream_set_byte_order, 
-//GO(g_data_input_stream_set_newline_type, 
-//GO(g_data_output_stream_get_byte_order, 
+GO(g_data_input_stream_read_upto_finish, pFpppp)
+GO(g_data_input_stream_set_byte_order, vFpu)
+GO(g_data_input_stream_set_newline_type, vFpu)
+GO(g_data_output_stream_get_byte_order, uFp)
 //GO(g_data_output_stream_get_type, 
-//GO(g_data_output_stream_new, 
-//GO(g_data_output_stream_put_byte, 
-//GO(g_data_output_stream_put_int16, 
-//GO(g_data_output_stream_put_int32, 
-//GO(g_data_output_stream_put_int64, 
-//GO(g_data_output_stream_put_string, 
-//GO(g_data_output_stream_put_uint16, 
-//GO(g_data_output_stream_put_uint32, 
-//GO(g_data_output_stream_put_uint64, 
-//GO(g_data_output_stream_set_byte_order, 
+GO(g_data_output_stream_new, pFp)
+GO(g_data_output_stream_put_byte, iFpCpp)
+GO(g_data_output_stream_put_int16, iFpwpp)
+GO(g_data_output_stream_put_int32, iFpipp)
+GO(g_data_output_stream_put_int64, iFplpp)
+GO(g_data_output_stream_put_string, iFpppp)
+GO(g_data_output_stream_put_uint16, iFpWpp)
+GO(g_data_output_stream_put_uint32, iFpupp)
+GO(g_data_output_stream_put_uint64, iFpLpp)
+GO(g_data_output_stream_set_byte_order, vFpu)
 //GO(g_data_stream_byte_order_get_type, 
 //GO(g_data_stream_newline_type_get_type, 
-//GO(g_dbus_action_group_get, 
+GO(g_dbus_action_group_get, pFppp)
 //GO(g_dbus_action_group_get_type, 
 //GO(g_dbus_address_escape_value, 
-//GO(g_dbus_address_get_for_bus_sync, 
+GO(g_dbus_address_get_for_bus_sync, pFipp)
 //GO(g_dbus_address_get_stream, 
-//GO(g_dbus_address_get_stream_finish, 
-//GO(g_dbus_address_get_stream_sync, 
+GO(g_dbus_address_get_stream_finish, pFppp)
+GO(g_dbus_address_get_stream_sync, pFpppp)
 GO(g_dbus_annotation_info_get_type, LFv)
 GO(g_dbus_annotation_info_lookup, pFpp)
 GO(g_dbus_annotation_info_ref, pFp)
@@ -283,30 +283,30 @@ GO(g_dbus_annotation_info_unref, vFp)
 GO(g_dbus_arg_info_get_type, LFv)
 GO(g_dbus_arg_info_ref, pFp)
 GO(g_dbus_arg_info_unref, vFp)
-//GO(g_dbus_auth_observer_allow_mechanism, 
-//GO(g_dbus_auth_observer_authorize_authenticated_peer, 
+GO(g_dbus_auth_observer_allow_mechanism, iFpp)
+GO(g_dbus_auth_observer_authorize_authenticated_peer, iFppp)
 //GO(g_dbus_auth_observer_get_type, 
-//GO(g_dbus_auth_observer_new, 
+GO(g_dbus_auth_observer_new, pFv)
 GO(g_dbus_call_flags_get_type, LFv)
 GO(g_dbus_capability_flags_get_type, LFv)
 GOM(g_dbus_connection_add_filter, uFEpppp)
 GOM(g_dbus_connection_call, vFEpppppppiippp)
 GO(g_dbus_connection_call_finish, pFppp)
-GO(g_dbus_connection_call_sync, pFpppppppiipp)
+GO(g_dbus_connection_call_sync, pFpppppppuipp)
 //GO(g_dbus_connection_call_with_unix_fd_list, 
-//GO(g_dbus_connection_call_with_unix_fd_list_finish, 
-//GO(g_dbus_connection_call_with_unix_fd_list_sync, 
+GO(g_dbus_connection_call_with_unix_fd_list_finish, pFpppp)
+GO(g_dbus_connection_call_with_unix_fd_list_sync, pFpppppppuipppp)
 GOM(g_dbus_connection_close, vFEpppp)
 GO(g_dbus_connection_close_finish, iFppp)
 GO(g_dbus_connection_close_sync, iFppp)
 GO(g_dbus_connection_emit_signal, iFppppppp)
-//GO(g_dbus_connection_export_action_group, 
-//GO(g_dbus_connection_export_menu_model, 
+GO(g_dbus_connection_export_action_group, uFpppp)
+GO(g_dbus_connection_export_menu_model, uFpppp)
 GO(g_dbus_connection_flags_get_type, LFv)
 GOM(g_dbus_connection_flush, vFEpppp)
 GO(g_dbus_connection_flush_finish, iFppp)
 GO(g_dbus_connection_flush_sync, iFppp)
-GO(g_dbus_connection_get_capabilities, iFp)
+GO(g_dbus_connection_get_capabilities, uFp)
 GO(g_dbus_connection_get_exit_on_close, iFp)
 GO(g_dbus_connection_get_guid, pFp)
 GO(g_dbus_connection_get_last_serial, uFp)
@@ -319,40 +319,40 @@ GOM(g_dbus_connection_new, vFEppipppp)
 GO(g_dbus_connection_new_finish, pFpp)
 GOM(g_dbus_connection_new_for_address, vFEpipppp)
 GO(g_dbus_connection_new_for_address_finish, pFpp)
-GO(g_dbus_connection_new_for_address_sync, pFpippp)
-GO(g_dbus_connection_new_sync, pFppippp)
+GO(g_dbus_connection_new_for_address_sync, pFpuppp)
+GO(g_dbus_connection_new_sync, pFppuppp)
 GOM(g_dbus_connection_register_object, uFEppppppp)
 //GOM(g_dbus_connection_register_subtree, uFEppppppp)   // vtable need wrapping
 GO(g_dbus_connection_remove_filter, vFpu)
-GO(g_dbus_connection_send_message, iFppipp)     //TODO: there is an argument as "volatile".. does that change anything???
+GO(g_dbus_connection_send_message, iFppupp)
 GOM(g_dbus_connection_send_message_with_reply, vFEppiipppp) //TODO: same volatile argument...
 GO(g_dbus_connection_send_message_with_reply_finish, pFppp)
-GO(g_dbus_connection_send_message_with_reply_sync, pFppiippp)   //TODO: same volatile
+GO(g_dbus_connection_send_message_with_reply_sync, pFppuippp)
 GO(g_dbus_connection_set_exit_on_close, vFpi)
 GOM(g_dbus_connection_signal_subscribe, uFEppppppippp)
 GO(g_dbus_connection_signal_unsubscribe, vFpu)
 GO(g_dbus_connection_start_message_processing, vFp)
 //GO(g_dbus_connection_unexport_action_group, 
-//GO(g_dbus_connection_unexport_menu_model, 
+GO(g_dbus_connection_unexport_menu_model, vFpu)
 GO(g_dbus_connection_unregister_object, iFpu)
 GO(g_dbus_connection_unregister_subtree, iFpu)
-//GO(g_dbus_error_encode_gerror, 
+GO(g_dbus_error_encode_gerror, pFp)
 //GO(g_dbus_error_get_remote_error, 
 //GO(g_dbus_error_get_type, 
-//GO(g_dbus_error_is_remote_error, 
-//GO(g_dbus_error_new_for_dbus_error, 
+GO(g_dbus_error_is_remote_error, iFp)
+GO(g_dbus_error_new_for_dbus_error, pFpp)
 //GO(g_dbus_error_quark, 
 //GO(g_dbus_error_register_error, 
 GO(g_dbus_error_register_error_domain, vFpppu)
 //GO(g_dbus_error_set_dbus_error, 
 //GO(g_dbus_error_set_dbus_error_valist, 
-//GO(g_dbus_error_strip_remote_error, 
-//GO(g_dbus_error_unregister_error, 
+GO(g_dbus_error_strip_remote_error, iFp)
+GO(g_dbus_error_unregister_error, iFuip)
 GO(g_dbus_generate_guid, pFv)
 GO(g_dbus_gvalue_to_gvariant, pFpp)
 GO(g_dbus_gvariant_to_gvalue, vFpp)
-//GO(g_dbus_interface_dup_object, 
-//GO(g_dbus_interface_get_info, 
+GO(g_dbus_interface_dup_object, pFp)
+GO(g_dbus_interface_get_info, pFp)
 //GO(g_dbus_interface_get_object, 
 //GO(g_dbus_interface_get_type, 
 GO(g_dbus_interface_info_cache_build, vFp)
@@ -364,22 +364,22 @@ GO(g_dbus_interface_info_lookup_property, pFpp)
 GO(g_dbus_interface_info_lookup_signal, pFpp)
 GO(g_dbus_interface_info_ref, pFp)
 GO(g_dbus_interface_info_unref, vFp)
-//GO(g_dbus_interface_set_object, 
-//GO(g_dbus_interface_skeleton_export, 
+GO(g_dbus_interface_set_object, vFpp)
+GO(g_dbus_interface_skeleton_export, iFpppp)
 //GO(g_dbus_interface_skeleton_flags_get_type, 
 //GO(g_dbus_interface_skeleton_flush, 
-//GO(g_dbus_interface_skeleton_get_connection, 
-//GO(g_dbus_interface_skeleton_get_connections, 
-//GO(g_dbus_interface_skeleton_get_flags, 
-//GO(g_dbus_interface_skeleton_get_info, 
-//GO(g_dbus_interface_skeleton_get_object_path, 
-//GO(g_dbus_interface_skeleton_get_properties, 
+GO(g_dbus_interface_skeleton_get_connection, pFp)
+GO(g_dbus_interface_skeleton_get_connections, pFp)
+GO(g_dbus_interface_skeleton_get_flags, uFp)
+GO(g_dbus_interface_skeleton_get_info, pFp)
+GO(g_dbus_interface_skeleton_get_object_path, pFp)
+GO(g_dbus_interface_skeleton_get_properties, pFp)
 //GO(g_dbus_interface_skeleton_get_type, 
 //GO(g_dbus_interface_skeleton_get_vtable, 
-//GO(g_dbus_interface_skeleton_has_connection, 
-//GO(g_dbus_interface_skeleton_set_flags, 
+GO(g_dbus_interface_skeleton_has_connection, iFpp)
+GO(g_dbus_interface_skeleton_set_flags, vFpu)
 //GO(g_dbus_interface_skeleton_unexport, 
-//GO(g_dbus_interface_skeleton_unexport_from_connection, 
+GO(g_dbus_interface_skeleton_unexport_from_connection, vFpp)
 GO(g_dbus_is_address, iFp)
 GO(g_dbus_is_guid, iFp)
 GO(g_dbus_is_interface_name, iFp)
@@ -395,16 +395,16 @@ GO(g_dbus_message_copy, pFpp)
 GO(g_dbus_message_flags_get_type, LFv)
 GO(g_dbus_message_get_arg0, pFp)
 GO(g_dbus_message_get_body, pFp)
-GO(g_dbus_message_get_byte_order, iFp)
+GO(g_dbus_message_get_byte_order, uFp)
 GO(g_dbus_message_get_destination, pFp)
 GO(g_dbus_message_get_error_name, pFp)
-GO(g_dbus_message_get_flags, iFp)
-GO(g_dbus_message_get_header, pFpi)
+GO(g_dbus_message_get_flags, uFp)
+GO(g_dbus_message_get_header, pFpu)
 GO(g_dbus_message_get_header_fields, pFp)
 GO(g_dbus_message_get_interface, pFp)
 GO(g_dbus_message_get_locked, iFp)
 GO(g_dbus_message_get_member, pFp)
-GO(g_dbus_message_get_message_type, iFp)
+GO(g_dbus_message_get_message_type, uFp)
 GO(g_dbus_message_get_num_unix_fds, uFp)
 GO(g_dbus_message_get_path, pFp)
 GO(g_dbus_message_get_reply_serial, uFp)
@@ -416,7 +416,7 @@ GO(g_dbus_message_get_unix_fd_list, pFp)
 GO(g_dbus_message_header_field_get_type, LFv)
 GO(g_dbus_message_lock, vFp)
 GO(g_dbus_message_new, pFv)
-GO(g_dbus_message_new_from_blob, pFpLip)
+GO(g_dbus_message_new_from_blob, pFpLup)
 GO(g_dbus_message_new_method_call, pFpppp)
 //GO2(g_dbus_message_new_method_error, pFpppV, g_dbus_message_new_method_error_valist)
 GO(g_dbus_message_new_method_error_literal, pFppp)
@@ -425,14 +425,14 @@ GO(g_dbus_message_new_method_reply, pFp)
 GO(g_dbus_message_new_signal, pFppp)
 GO(g_dbus_message_print, pFpu)
 GO(g_dbus_message_set_body, vFpp)
-GO(g_dbus_message_set_byte_order, iFp)
+GO(g_dbus_message_set_byte_order, vFpu)
 GO(g_dbus_message_set_destination, vFpp)
 GO(g_dbus_message_set_error_name, vFpp)
-GO(g_dbus_message_set_flags, vFpi)
-GO(g_dbus_message_set_header, vFpip)
+GO(g_dbus_message_set_flags, vFpu)
+GO(g_dbus_message_set_header, vFpup)
 GO(g_dbus_message_set_interface, vFpp)
 GO(g_dbus_message_set_member, vFpp)
-GO(g_dbus_message_set_message_type, vFpi)
+GO(g_dbus_message_set_message_type, vFpu)
 GO(g_dbus_message_set_num_unix_fds, vFpu)
 GO(g_dbus_message_set_path, vFpp)
 GO(g_dbus_message_set_reply_serial, vFpu)
@@ -440,7 +440,7 @@ GO(g_dbus_message_set_sender, vFpp)
 GO(g_dbus_message_set_serial, vFpu)
 GO(g_dbus_message_set_signature, vFpp)
 GO(g_dbus_message_set_unix_fd_list, vFpp)
-GO(g_dbus_message_to_blob, pFppip)
+GO(g_dbus_message_to_blob, pFppup)
 GO(g_dbus_message_to_gerror, iFpp)
 GO(g_dbus_message_type_get_type, LFv)
 GO(g_dbus_method_info_get_type, LFv)
@@ -477,7 +477,7 @@ GO(g_dbus_object_get_object_path, pFp)
 GO(g_dbus_object_get_type, LFv)
 GO(g_dbus_object_manager_client_flags_get_type, LFv)
 GO(g_dbus_object_manager_client_get_connection, pFp)
-GO(g_dbus_object_manager_client_get_flags, iFp)
+GO(g_dbus_object_manager_client_get_flags, uFp)
 GO(g_dbus_object_manager_client_get_name, pFp)
 GO(g_dbus_object_manager_client_get_name_owner, pFp)
 GO(g_dbus_object_manager_client_get_type, LFv)
@@ -493,39 +493,39 @@ GO(g_dbus_object_manager_get_object_path, pFp)
 GO(g_dbus_object_manager_get_objects, pFp)
 //GO(g_dbus_object_manager_get_type, 
 //GO(g_dbus_object_manager_server_export, 
-//GO(g_dbus_object_manager_server_export_uniquely, 
-//GO(g_dbus_object_manager_server_get_connection, 
+GO(g_dbus_object_manager_server_export_uniquely, vFpp)
+GO(g_dbus_object_manager_server_get_connection, pFp)
 //GO(g_dbus_object_manager_server_get_type, 
-//GO(g_dbus_object_manager_server_is_exported, 
-//GO(g_dbus_object_manager_server_new, 
-//GO(g_dbus_object_manager_server_set_connection, 
-//GO(g_dbus_object_manager_server_unexport, 
-//GO(g_dbus_object_proxy_get_connection, 
+GO(g_dbus_object_manager_server_is_exported, iFpp)
+GO(g_dbus_object_manager_server_new, pFp)
+GO(g_dbus_object_manager_server_set_connection, vFpp)
+GO(g_dbus_object_manager_server_unexport, iFpp)
+GO(g_dbus_object_proxy_get_connection, pFp)
 //GO(g_dbus_object_proxy_get_type, 
-//GO(g_dbus_object_proxy_new, 
+GO(g_dbus_object_proxy_new, pFpp)
 //GO(g_dbus_object_skeleton_add_interface, 
 //GO(g_dbus_object_skeleton_flush, 
 //GO(g_dbus_object_skeleton_get_type, 
-//GO(g_dbus_object_skeleton_new, 
-//GO(g_dbus_object_skeleton_remove_interface, 
+GO(g_dbus_object_skeleton_new, pFp)
+GO(g_dbus_object_skeleton_remove_interface, vFpp)
 //GO(g_dbus_object_skeleton_remove_interface_by_name, 
-//GO(g_dbus_object_skeleton_set_object_path, 
+GO(g_dbus_object_skeleton_set_object_path, vFpp)
 //GO(g_dbus_property_info_flags_get_type, 
 GO(g_dbus_property_info_get_type, LFv)
 GO(g_dbus_property_info_ref, pFp)
 GO(g_dbus_property_info_unref, vFp)
 GOM(g_dbus_proxy_call, vFEpppiippp)
 GO(g_dbus_proxy_call_finish, pFppp)
-GO(g_dbus_proxy_call_sync, pFpppiipp)
+GO(g_dbus_proxy_call_sync, pFpppuipp)
 GOM(g_dbus_proxy_call_with_unix_fd_list, vFEpppiipppp)
 GO(g_dbus_proxy_call_with_unix_fd_list_finish, pFpppp)
-GO(g_dbus_proxy_call_with_unix_fd_list_sync, pFpppiipppp)
+GO(g_dbus_proxy_call_with_unix_fd_list_sync, pFpppuipppp)
 GO(g_dbus_proxy_flags_get_type, LFv)
 GO(g_dbus_proxy_get_cached_property, pFpp)
 GO(g_dbus_proxy_get_cached_property_names, pFp)
 GO(g_dbus_proxy_get_connection, pFp)
 GO(g_dbus_proxy_get_default_timeout, iFp)
-GO(g_dbus_proxy_get_flags, iFp)
+GO(g_dbus_proxy_get_flags, uFp)
 GO(g_dbus_proxy_get_interface_info, pFp)
 GO(g_dbus_proxy_get_interface_name, pFp)
 GO(g_dbus_proxy_get_name, pFp)
@@ -536,19 +536,19 @@ GOM(g_dbus_proxy_new, vFEpippppppp)
 GO(g_dbus_proxy_new_finish, pFpp)
 GOM(g_dbus_proxy_new_for_bus, vFEiippppppp)
 GO(g_dbus_proxy_new_for_bus_finish, pFpp)
-GO(g_dbus_proxy_new_for_bus_sync, pFiipppppp)
-GO(g_dbus_proxy_new_sync, pFpipppppp)
+GO(g_dbus_proxy_new_for_bus_sync, pFiupppppp)
+GO(g_dbus_proxy_new_sync, pFpupppppp)
 GO(g_dbus_proxy_set_cached_property, vFppp)
 GO(g_dbus_proxy_set_default_timeout, vFpi)
 GO(g_dbus_proxy_set_interface_info, vFpp)
 //GO(g_dbus_send_message_flags_get_type, 
 //GO(g_dbus_server_flags_get_type, 
 //GO(g_dbus_server_get_client_address, 
-//GO(g_dbus_server_get_flags, 
-//GO(g_dbus_server_get_guid, 
+GO(g_dbus_server_get_flags, uFp)
+GO(g_dbus_server_get_guid, pFp)
 //GO(g_dbus_server_get_type, 
-//GO(g_dbus_server_is_active, 
-//GO(g_dbus_server_new_sync, 
+GO(g_dbus_server_is_active, iFp)
+GO(g_dbus_server_new_sync, pFpupppp)
 //GO(g_dbus_server_start, 
 //GO(g_dbus_server_stop, 
 //GO(g_dbus_signal_flags_get_type, 
@@ -584,20 +584,20 @@ GO(g_desktop_app_info_set_desktop_env, vFp)
 //GO(g_drive_can_poll_for_media, 
 //GO(g_drive_can_start, 
 //GO(g_drive_can_start_degraded, 
-//GO(g_drive_can_stop, 
+GO(g_drive_can_stop, iFp)
 //GO(g_drive_eject, 
 //GO(g_drive_eject_finish, 
 //GO(g_drive_eject_with_operation, 
-//GO(g_drive_eject_with_operation_finish, 
-//GO(g_drive_enumerate_identifiers, 
+GO(g_drive_eject_with_operation_finish, iFppp)
+GO(g_drive_enumerate_identifiers, pFp)
 //GO(g_drive_get_icon, 
-//GO(g_drive_get_identifier, 
-//GO(g_drive_get_name, 
-//GO(g_drive_get_sort_key, 
-//GO(g_drive_get_start_stop_type, 
-//GO(g_drive_get_symbolic_icon, 
+GO(g_drive_get_identifier, pFpp)
+GO(g_drive_get_name, pFp)
+GO(g_drive_get_sort_key, pFp)
+GO(g_drive_get_start_stop_type, uFp)
+GO(g_drive_get_symbolic_icon, pFp)
 //GO(g_drive_get_type, 
-//GO(g_drive_get_volumes, 
+GO(g_drive_get_volumes, pFp)
 //GO(g_drive_has_media, 
 //GO(g_drive_has_volumes, 
 //GO(g_drive_is_media_check_automatic, 
@@ -610,51 +610,51 @@ GO(g_desktop_app_info_set_desktop_env, vFp)
 //GO(g_drive_start_stop_type_get_type, 
 //GO(g_drive_stop, 
 //GO(g_drive_stop_finish, 
-//GO(g_emblemed_icon_add_emblem, 
+GO(g_emblemed_icon_add_emblem, vFpp)
 //GO(g_emblemed_icon_clear_emblems, 
-//GO(g_emblemed_icon_get_emblems, 
-//GO(g_emblemed_icon_get_icon, 
+GO(g_emblemed_icon_get_emblems, pFp)
+GO(g_emblemed_icon_get_icon, pFp)
 //GO(g_emblemed_icon_get_type, 
-//GO(g_emblemed_icon_new, 
-//GO(g_emblem_get_icon, 
-//GO(g_emblem_get_origin, 
+GO(g_emblemed_icon_new, pFpp)
+GO(g_emblem_get_icon, pFp)
+GO(g_emblem_get_origin, uFp)
 //GO(g_emblem_get_type, 
-//GO(g_emblem_new, 
-//GO(g_emblem_new_with_origin, 
+GO(g_emblem_new, pFp)
+GO(g_emblem_new_with_origin, pFpu)
 //GO(g_emblem_origin_get_type, 
 GO(g_file_append_to, pFpipp)
 //GOM(g_file_append_to_async, vFEpiipBp)
 GO(g_file_append_to_finish, pFppp)
 //GO(g_file_attribute_info_flags_get_type, 
-//GO(g_file_attribute_info_list_add, 
-//GO(g_file_attribute_info_list_dup, 
+GO(g_file_attribute_info_list_add, vFppuu)
+GO(g_file_attribute_info_list_dup, pFp)
 //GO(g_file_attribute_info_list_get_type, 
-//GO(g_file_attribute_info_list_lookup, 
-//GO(g_file_attribute_info_list_new, 
+GO(g_file_attribute_info_list_lookup, pFpp)
+GO(g_file_attribute_info_list_new, pFv)
 //GO(g_file_attribute_info_list_ref, 
 //GO(g_file_attribute_info_list_unref, 
-//GO(g_file_attribute_matcher_enumerate_namespace, 
-//GO(g_file_attribute_matcher_enumerate_next, 
+GO(g_file_attribute_matcher_enumerate_namespace, iFpp)
+GO(g_file_attribute_matcher_enumerate_next, pFp)
 //GO(g_file_attribute_matcher_get_type, 
 //GO(g_file_attribute_matcher_matches, 
 //GO(g_file_attribute_matcher_matches_only, 
-//GO(g_file_attribute_matcher_new, 
-//GO(g_file_attribute_matcher_ref, 
-//GO(g_file_attribute_matcher_subtract, 
-//GO(g_file_attribute_matcher_to_string, 
-//GO(g_file_attribute_matcher_unref, 
+GO(g_file_attribute_matcher_new, pFp)
+GO(g_file_attribute_matcher_ref, pFp)
+GO(g_file_attribute_matcher_subtract, pFpp)
+GO(g_file_attribute_matcher_to_string, pFp)
+GO(g_file_attribute_matcher_unref, vFp)
 //GO(g_file_attribute_status_get_type, 
 //GO(g_file_attribute_type_get_type, 
 //GOM(g_file_copy, iFEppipBpp)
 //GOM(g_file_copy_async, vFEppiipBpBp)
-GO(g_file_copy_attributes, iFppipp)
+GO(g_file_copy_attributes, iFppupp)
 GO(g_file_copy_finish, iFppp)
 GO(g_file_copy_flags_get_type, LFv)
-GO(g_file_create, pFpipp)
+GO(g_file_create, pFpupp)
 //GOM(g_file_create_async, vFEpiipBp)
 GO(g_file_create_finish, pFppp)
 GO(g_file_create_flags_get_type, LFv)
-GO(g_file_create_readwrite, pFpipp)
+GO(g_file_create_readwrite, pFpupp)
 //GOM(g_file_create_readwrite_async, vFEpiipBp)
 GO(g_file_create_readwrite_finish, pFppp)
 GO(g_file_delete, iFppp)
@@ -667,21 +667,21 @@ GO(g_file_dup, pFp)
 GO(g_file_eject_mountable_finish, iFppp)
 //GOM(g_file_eject_mountable_with_operation, vFpippBp)
 GO(g_file_eject_mountable_with_operation_finish, iFppp)
-GO(g_file_enumerate_children, pFppipp)
+GO(g_file_enumerate_children, pFppupp)
 //GOM(g_file_enumerate_children_async, vFppiipBp)
 GO(g_file_enumerate_children_finish, pFppp)
-//GO(g_file_enumerator_close, 
+GO(g_file_enumerator_close, iFppp)
 //GO(g_file_enumerator_close_async, 
-//GO(g_file_enumerator_close_finish, 
-//GO(g_file_enumerator_get_child, 
-//GO(g_file_enumerator_get_container, 
+GO(g_file_enumerator_close_finish, iFppp)
+GO(g_file_enumerator_get_child, pFpp)
+GO(g_file_enumerator_get_container, pFp)
 //GO(g_file_enumerator_get_type, 
-//GO(g_file_enumerator_has_pending, 
+GO(g_file_enumerator_has_pending, iFp)
 //GO(g_file_enumerator_is_closed, 
-//GO(g_file_enumerator_next_file, 
+GO(g_file_enumerator_next_file, pFppp)
 //GO(g_file_enumerator_next_files_async, 
-//GO(g_file_enumerator_next_files_finish, 
-//GO(g_file_enumerator_set_pending, 
+GO(g_file_enumerator_next_files_finish, pFppp)
+GO(g_file_enumerator_set_pending, vFpi)
 GO(g_file_equal, iFpp)
 GO(g_file_find_enclosing_mount, pFppp)
 //GOM(g_file_find_enclosing_mount_async, vFEpipBp)
@@ -704,78 +704,78 @@ GO(g_file_icon_get_file, pFp)
 GO(g_file_icon_get_type, LFv)
 GO(g_file_icon_new, pFp)
 //GO(g_file_info_clear_status, 
-//GO(g_file_info_copy_into, 
-//GO(g_file_info_dup, 
-//GO(g_file_info_get_attribute_as_string, 
-//GO(g_file_info_get_attribute_boolean, 
-//GO(g_file_info_get_attribute_byte_string, 
-//GO(g_file_info_get_attribute_data, 
-//GO(g_file_info_get_attribute_int32, 
-//GO(g_file_info_get_attribute_int64, 
-//GO(g_file_info_get_attribute_object, 
-//GO(g_file_info_get_attribute_status, 
+GO(g_file_info_copy_into, vFpp)
+GO(g_file_info_dup, pFp)
+GO(g_file_info_get_attribute_as_string, pFpp)
+GO(g_file_info_get_attribute_boolean, iFpp)
+GO(g_file_info_get_attribute_byte_string, pFpp)
+GO(g_file_info_get_attribute_data, iFppppp)
+GO(g_file_info_get_attribute_int32, iFpp)
+GO(g_file_info_get_attribute_int64, lFpp)
+GO(g_file_info_get_attribute_object, pFpp)
+GO(g_file_info_get_attribute_status, uFpp)
 //GO(g_file_info_get_attribute_string, 
-//GO(g_file_info_get_attribute_stringv, 
-//GO(g_file_info_get_attribute_type, 
-//GO(g_file_info_get_attribute_uint32, 
-//GO(g_file_info_get_attribute_uint64, 
+GO(g_file_info_get_attribute_stringv, pFpp)
+GO(g_file_info_get_attribute_type, uFpp)
+GO(g_file_info_get_attribute_uint32, uFpp)
+GO(g_file_info_get_attribute_uint64, LFpp)
 //GO(g_file_info_get_content_type, 
 //GO(g_file_info_get_deletion_date, 
 //GO(g_file_info_get_display_name, 
 //GO(g_file_info_get_edit_name, 
-//GO(g_file_info_get_etag, 
-//GO(g_file_info_get_file_type, 
+GO(g_file_info_get_etag, pFp)
+GO(g_file_info_get_file_type, uFp)
 //GO(g_file_info_get_icon, 
 //GO(g_file_info_get_is_backup, 
 //GO(g_file_info_get_is_hidden, 
-//GO(g_file_info_get_is_symlink, 
+GO(g_file_info_get_is_symlink, iFp)
 //GO(g_file_info_get_modification_time, 
 //GO(g_file_info_get_name, 
-//GO(g_file_info_get_size, 
-//GO(g_file_info_get_sort_order, 
-//GO(g_file_info_get_symbolic_icon, 
+GO(g_file_info_get_size, lFp)
+GO(g_file_info_get_sort_order, iFp)
+GO(g_file_info_get_symbolic_icon, pFp)
 //GO(g_file_info_get_symlink_target, 
 //GO(g_file_info_get_type, 
 //GO(g_file_info_has_attribute, 
 //GO(g_file_info_has_namespace, 
 //GO(g_file_info_list_attributes, 
-//GO(g_file_info_new, 
+GO(g_file_info_new, pFv)
 //GO(g_file_info_remove_attribute, 
-//GO(g_file_info_set_attribute, 
-//GO(g_file_info_set_attribute_boolean, 
-//GO(g_file_info_set_attribute_byte_string, 
-//GO(g_file_info_set_attribute_int32, 
-//GO(g_file_info_set_attribute_int64, 
-//GO(g_file_info_set_attribute_mask, 
-//GO(g_file_info_set_attribute_object, 
-//GO(g_file_info_set_attribute_status, 
+GO(g_file_info_set_attribute, vFppup)
+GO(g_file_info_set_attribute_boolean, vFppi)
+GO(g_file_info_set_attribute_byte_string, vFppp)
+GO(g_file_info_set_attribute_int32, vFppi)
+GO(g_file_info_set_attribute_int64, vFppl)
+GO(g_file_info_set_attribute_mask, vFpp)
+GO(g_file_info_set_attribute_object, vFppp)
+GO(g_file_info_set_attribute_status, iFppu)
 //GO(g_file_info_set_attribute_string, 
-//GO(g_file_info_set_attribute_stringv, 
-//GO(g_file_info_set_attribute_uint32, 
-//GO(g_file_info_set_attribute_uint64, 
+GO(g_file_info_set_attribute_stringv, vFppp)
+GO(g_file_info_set_attribute_uint32, vFppu)
+GO(g_file_info_set_attribute_uint64, vFppL)
 //GO(g_file_info_set_content_type, 
 //GO(g_file_info_set_display_name, 
 //GO(g_file_info_set_edit_name, 
-//GO(g_file_info_set_file_type, 
+GO(g_file_info_set_file_type, vFpu)
 //GO(g_file_info_set_icon, 
 //GO(g_file_info_set_is_hidden, 
-//GO(g_file_info_set_is_symlink, 
-//GO(g_file_info_set_modification_time, 
+GO(g_file_info_set_is_symlink, vFpi)
+GO(g_file_info_set_modification_time, vFpp)
 //GO(g_file_info_set_name, 
-//GO(g_file_info_set_size, 
-//GO(g_file_info_set_sort_order, 
-//GO(g_file_info_set_symbolic_icon, 
-//GO(g_file_info_set_symlink_target, 
+GO(g_file_info_set_size, vFpl)
+GO(g_file_info_set_sort_order, vFpi)
+GO(g_file_info_set_symbolic_icon, vFpp)
+GO(g_file_info_set_symlink_target, vFpp)
 //GO(g_file_info_unset_attribute_mask, 
 //GO(g_file_input_stream_get_type, 
-//GO(g_file_input_stream_query_info, 
+GO(g_file_input_stream_query_info, pFpppp)
 //GO(g_file_input_stream_query_info_async, 
-//GO(g_file_input_stream_query_info_finish, 
-//GO(g_file_io_stream_get_etag, 
+GO(g_file_input_stream_query_info_finish, pFppp)
+GO(g_file_io_stream_get_etag, pFp)
 //GO(g_file_io_stream_get_type, 
-//GO(g_file_io_stream_query_info, 
+GO(g_file_io_stream_query_info, pFpppp)
 //GO(g_file_io_stream_query_info_async, 
-//GO(g_file_io_stream_query_info_finish, 
+GO(g_file_io_stream_query_info_finish, pFppp)
 GO(g_file_is_native, iFpp)
 GO(g_file_load_bytes, pFpppp)   //sice 2.56+
 //GOM(g_file_load_bytes_async, vFEppBp) //since 2.56+
@@ -794,26 +794,26 @@ GO(g_file_make_symbolic_link, iFpppp)
 //GOM(g_file_measure_disk_usage_async, vFEpiipBpBp)
 GO(g_file_measure_disk_usage_finish, iFpppppp)
 //GO(g_file_measure_flags_get_type, 
-GO(g_file_monitor, pFpipp)
+GO(g_file_monitor, pFpupp)
 //GO(g_file_monitor_cancel, 
 GO(g_file_monitor_directory, pFpipp)
-//GO(g_file_monitor_emit_event, 
+GO(g_file_monitor_emit_event, vFpppu)
 //GO(g_file_monitor_event_get_type, 
 GO(g_file_monitor_file, pFpipp)
 //GO(g_file_monitor_flags_get_type, 
 //GO(g_file_monitor_get_type, 
-//GO(g_file_monitor_is_cancelled, 
-//GO(g_file_monitor_set_rate_limit, 
+GO(g_file_monitor_is_cancelled, iFp)
+GO(g_file_monitor_set_rate_limit, vFpi)
 //GOM(g_file_mount_enclosing_volume, vFEpippBp)
 GO(g_file_mount_enclosing_volume_finish, iFppp)
 //GOM(g_file_mount_mountable, vFEpippBp)
 GO(g_file_mount_mountable_finish, pFppp)
 //GOM(g_file_move, iFEppipBpp)
 GO(g_filename_completer_get_completions, pFpp)
-//GO(g_filename_completer_get_completion_suffix, 
+GO(g_filename_completer_get_completion_suffix, pFpp)
 //GO(g_filename_completer_get_type, 
-//GO(g_filename_completer_new, 
-//GO(g_filename_completer_set_dirs_only, 
+GO(g_filename_completer_new, pFv)
+GO(g_filename_completer_set_dirs_only, vFpi)
 GO(g_file_new_build_filename, pFppppppppppp)    // vaarg, since v2.56+
 GO(g_file_new_for_commandline_arg, pFp)
 GO(g_file_new_for_commandline_arg_and_cwd, pFpp)
@@ -823,11 +823,11 @@ GO(g_file_new_tmp, pFppp)
 GO(g_file_open_readwrite, pFppp)
 //GOM(g_file_open_readwrite_async, vFEpipBp)
 GO(g_file_open_readwrite_finish, pFppp)
-//GO(g_file_output_stream_get_etag, 
+GO(g_file_output_stream_get_etag, pFp)
 //GO(g_file_output_stream_get_type, 
-//GO(g_file_output_stream_query_info, 
+GO(g_file_output_stream_query_info, pFpppp)
 //GO(g_file_output_stream_query_info_async, 
-//GO(g_file_output_stream_query_info_finish, 
+GO(g_file_output_stream_query_info_finish, pFppp)
 GO(g_file_parse_name, pFp)
 GO(g_file_peek_path , pFp)  // sice 2.56+
 //GOM(g_file_poll_mountable, vFEppBp)
@@ -839,8 +839,8 @@ GO(g_file_query_exists, iFpp)
 GO(g_file_query_filesystem_info, pFpppp)
 //GOM(g_file_query_filesystem_info_async, vFEppipBp)
 GO(g_file_query_filesystem_info_finish, pFppp)
-GO(g_file_query_file_type, iFpip)
-GO(g_file_query_info, pFppipp)
+GO(g_file_query_file_type, uFpup)
+GO(g_file_query_info, pFppupp)
 //GOM(g_file_query_info_async, vFEppiipBp)
 GO(g_file_query_info_finish, pFppp)
 //GO(g_file_query_info_flags_get_type, 
@@ -849,27 +849,27 @@ GO(g_file_query_writable_namespaces, pFppp)
 GO(g_file_read, pFppp)
 //GOM(g_file_read_async, vFEpipBp)
 GO(g_file_read_finish, pFppp)
-GO(g_file_replace, pFppiipp)
+GO(g_file_replace, pFppiupp)
 //GOM(g_file_replace_async, vFEppiiipBp)
-GO(g_file_replace_contents, iFppLpiippp)
+GO(g_file_replace_contents, iFppLpiuppp)
 //GOM(g_file_replace_contents_async, vFEppLpuupBp)
 //GOM(g_file_replace_contents_bytes_async, vFEpppiipBp)
 GO(g_file_replace_contents_finish, iFpppp)
-//GO(g_file_replace_finish, 
-GO(g_file_replace_readwrite, pFppiipp)
+GO(g_file_replace_finish, pFppp)
+GO(g_file_replace_readwrite, pFppiupp)
 //GOM(g_file_replace_readwrite_async, vFEppiiipBp)
 GO(g_file_replace_readwrite_finish, pFppp)
 GO(g_file_resolve_relative_path, pFpp)
-GO(g_file_set_attribute, iFppipipp)
-GO(g_file_set_attribute_byte_string, iFpppipp)
-GO(g_file_set_attribute_int32, iFppiipp)
-GO(g_file_set_attribute_int64, iFppIipp)
+GO(g_file_set_attribute, iFppupupp)
+GO(g_file_set_attribute_byte_string, iFpppupp)
+GO(g_file_set_attribute_int32, iFppiupp)
+GO(g_file_set_attribute_int64, iFpplupp)
 //GOM(g_file_set_attributes_async, vFEppiipBp)
 GO(g_file_set_attributes_finish, iFpppp)
-GO(g_file_set_attributes_from_info, iFppipp)
+GO(g_file_set_attributes_from_info, iFppupp)
 GO(g_file_set_attribute_string, iFpppipp)
-GO(g_file_set_attribute_uint32, iFppuipp)
-GO(g_file_set_attribute_uint64, iFppUipp)
+GO(g_file_set_attribute_uint32, iFppuupp)
+GO(g_file_set_attribute_uint64, iFppLupp)
 GO(g_file_set_display_name, pFpppp)
 //GOM(g_file_set_display_name_async, vFEppipBp)
 GO(g_file_set_display_name_finish, pFppp)
@@ -887,14 +887,14 @@ GO(g_file_type_get_type, LFv)
 GO(g_file_unmount_mountable_finish, iFppp)
 //GOM(g_file_unmount_mountable_with_operation, vFEpippBp)
 GO(g_file_unmount_mountable_with_operation_finish, iFppp)
-//GO(g_filter_input_stream_get_base_stream, 
-//GO(g_filter_input_stream_get_close_base_stream, 
+GO(g_filter_input_stream_get_base_stream, pFp)
+GO(g_filter_input_stream_get_close_base_stream, iFp)
 //GO(g_filter_input_stream_get_type, 
-//GO(g_filter_input_stream_set_close_base_stream, 
-//GO(g_filter_output_stream_get_base_stream, 
-//GO(g_filter_output_stream_get_close_base_stream, 
+GO(g_filter_input_stream_set_close_base_stream, vFpi)
+GO(g_filter_output_stream_get_base_stream, pFp)
+GO(g_filter_output_stream_get_close_base_stream, iFp)
 //GO(g_filter_output_stream_get_type, 
-//GO(g_filter_output_stream_set_close_base_stream, 
+GO(g_filter_output_stream_set_close_base_stream, vFpi)
 GO(g_icon_deserialize, pFp)
 GO(g_icon_equal, iFpp)
 //GO(g_icon_get_type, 
@@ -902,8 +902,8 @@ GO(g_icon_hash, uFp)
 GO(g_icon_new_for_string, pFpp)
 GO(g_icon_serialize, pFp)
 GO(g_icon_to_string, pFp)
-//GO(g_inet_address_equal, 
-//GO(g_inet_address_get_family, 
+GO(g_inet_address_equal, iFpp)
+GO(g_inet_address_get_family, uFp)
 //GO(g_inet_address_get_is_any, 
 //GO(g_inet_address_get_is_link_local, 
 //GO(g_inet_address_get_is_loopback, 
@@ -911,212 +911,212 @@ GO(g_icon_to_string, pFp)
 //GO(g_inet_address_get_is_mc_link_local, 
 //GO(g_inet_address_get_is_mc_node_local, 
 //GO(g_inet_address_get_is_mc_org_local, 
-//GO(g_inet_address_get_is_mc_site_local, 
+GO(g_inet_address_get_is_mc_site_local, iFp)
 //GO(g_inet_address_get_is_multicast, 
 //GO(g_inet_address_get_is_site_local, 
-//GO(g_inet_address_get_native_size, 
+GO(g_inet_address_get_native_size, LFp)
 //GO(g_inet_address_get_type, 
-//GO(g_inet_address_mask_equal, 
-//GO(g_inet_address_mask_get_address, 
-//GO(g_inet_address_mask_get_family, 
-//GO(g_inet_address_mask_get_length, 
+GO(g_inet_address_mask_equal, iFpp)
+GO(g_inet_address_mask_get_address, pFp)
+GO(g_inet_address_mask_get_family, uFp)
+GO(g_inet_address_mask_get_length, uFp)
 //GO(g_inet_address_mask_get_type, 
-//GO(g_inet_address_mask_matches, 
-//GO(g_inet_address_mask_new, 
-//GO(g_inet_address_mask_new_from_string, 
-//GO(g_inet_address_mask_to_string, 
-//GO(g_inet_address_new_any, 
-//GO(g_inet_address_new_from_bytes, 
-//GO(g_inet_address_new_from_string, 
+GO(g_inet_address_mask_matches, iFpp)
+GO(g_inet_address_mask_new, pFpup)
+GO(g_inet_address_mask_new_from_string, pFpp)
+GO(g_inet_address_mask_to_string, pFp)
+GO(g_inet_address_new_any, pFu)
+GO(g_inet_address_new_from_bytes, pFpu)
+GO(g_inet_address_new_from_string, pFp)
 //GO(g_inet_address_new_loopback, 
-//GO(g_inet_address_to_bytes, 
-//GO(g_inet_address_to_string, 
-//GO(g_inet_socket_address_get_address, 
+GO(g_inet_address_to_bytes, pFp)
+GO(g_inet_address_to_string, pFp)
+GO(g_inet_socket_address_get_address, pFp)
 //GO(g_inet_socket_address_get_flowinfo, 
-//GO(g_inet_socket_address_get_port, 
-//GO(g_inet_socket_address_get_scope_id, 
+GO(g_inet_socket_address_get_port, WFp)
+GO(g_inet_socket_address_get_scope_id, uFp)
 //GO(g_inet_socket_address_get_type, 
-//GO(g_inet_socket_address_new, 
-//GO(g_inet_socket_address_new_from_string, 
+GO(g_inet_socket_address_new, pFpW)
+GO(g_inet_socket_address_new_from_string, pFpu)
 GO(g_initable_get_type, LFv)
 GO(g_initable_init, iFppp)
 GOM(g_initable_new, pFEppppV)
-GO(g_initable_newv, pFpuppp)
+GO(g_initable_newv, pFLuppp)
 GOM(g_initable_new_valist, pFEppApp)
 //GO(g_input_stream_clear_pending, 
-//GO(g_input_stream_close, 
+GO(g_input_stream_close, iFppp)
 //GO(g_input_stream_close_async, 
-//GO(g_input_stream_close_finish, 
+GO(g_input_stream_close_finish, iFppp)
 //GO(g_input_stream_get_type, 
-//GO(g_input_stream_has_pending, 
+GO(g_input_stream_has_pending, iFp)
 //GO(g_input_stream_is_closed, 
-//GO(g_input_stream_read, 
-//GO(g_input_stream_read_all, 
+GO(g_input_stream_read, lFppLpp)
+GO(g_input_stream_read_all, iFppLppp)
 //GO(g_input_stream_read_async, 
-//GO(g_input_stream_read_bytes, 
+GO(g_input_stream_read_bytes, pFpLpp)
 //GO(g_input_stream_read_bytes_async, 
-//GO(g_input_stream_read_bytes_finish, 
+GO(g_input_stream_read_bytes_finish, pFppp)
 //GO(g_input_stream_read_finish, 
-//GO(g_input_stream_set_pending, 
-//GO(g_input_stream_skip, 
+GO(g_input_stream_set_pending, iFpp)
+GO(g_input_stream_skip, lFpLpp)
 //GO(g_input_stream_skip_async, 
-//GO(g_input_stream_skip_finish, 
+GO(g_input_stream_skip_finish, lFppp)
 //GO(g_io_error_enum_get_type, 
-//GO(g_io_error_from_errno, 
+GO(g_io_error_from_errno, uFi)
 GO(g_io_error_quark, uFv)
-//GO(g_io_extension_get_name, 
-//GO(g_io_extension_get_priority, 
-//GO(g_io_extension_get_type, 
-//GO(g_io_extension_point_get_extension_by_name, 
-//GO(g_io_extension_point_get_extensions, 
-//GO(g_io_extension_point_get_required_type, 
-//GO(g_io_extension_point_implement, 
-//GO(g_io_extension_point_lookup, 
+GO(g_io_extension_get_name, pFp)
+GO(g_io_extension_get_priority, iFp)
+GO(g_io_extension_get_type, LFp)
+GO(g_io_extension_point_get_extension_by_name, pFpp)
+GO(g_io_extension_point_get_extensions, pFp)
+GO(g_io_extension_point_get_required_type, LFp)
+GO(g_io_extension_point_implement, pFpLpi)
+GO(g_io_extension_point_lookup, pFp)
 //GO(g_io_extension_point_register, 
-//GO(g_io_extension_point_set_required_type, 
-//GO(g_io_extension_ref_class, 
+GO(g_io_extension_point_set_required_type, vFpL)
+GO(g_io_extension_ref_class, pFp)
 //GO(g_io_module_get_type, 
-//GO(g_io_module_new, 
-//GO(g_io_module_scope_block, 
+GO(g_io_module_new, pFp)
+GO(g_io_module_scope_block, vFpp)
 //GO(g_io_module_scope_flags_get_type, 
-//GO(g_io_module_scope_free, 
-//GO(g_io_module_scope_new, 
-//GO(g_io_modules_load_all_in_directory, 
-//GO(g_io_modules_load_all_in_directory_with_scope, 
-//GO(g_io_modules_scan_all_in_directory, 
-//GO(g_io_modules_scan_all_in_directory_with_scope, 
+GO(g_io_module_scope_free, vFp)
+GO(g_io_module_scope_new, pFu)
+GO(g_io_modules_load_all_in_directory, pFp)
+GO(g_io_modules_load_all_in_directory_with_scope, pFpp)
+GO(g_io_modules_scan_all_in_directory, vFp)
+GO(g_io_modules_scan_all_in_directory_with_scope, vFpp)
 //GO(g_io_scheduler_cancel_all_jobs, 
 //GO(g_io_scheduler_job_send_to_mainloop, 
 //GO(g_io_scheduler_job_send_to_mainloop_async, 
 //GO(g_io_scheduler_push_job, 
 //GO(g_io_stream_clear_pending, 
-//GO(g_io_stream_close, 
+GO(g_io_stream_close, iFppp)
 //GO(g_io_stream_close_async, 
-//GO(g_io_stream_close_finish, 
-//GO(g_io_stream_get_input_stream, 
-//GO(g_io_stream_get_output_stream, 
+GO(g_io_stream_close_finish, iFppp)
+GO(g_io_stream_get_input_stream, pFp)
+GO(g_io_stream_get_output_stream, pFp)
 //GO(g_io_stream_get_type, 
-//GO(g_io_stream_has_pending, 
+GO(g_io_stream_has_pending, iFp)
 //GO(g_io_stream_is_closed, 
-//GO(g_io_stream_set_pending, 
+GO(g_io_stream_set_pending, iFpp)
 //GO(g_io_stream_splice_async, 
-//GO(g_io_stream_splice_finish, 
+GO(g_io_stream_splice_finish, iFpp)
 //GO(g_io_stream_splice_flags_get_type, 
 //GO(g_keyfile_settings_backend_new, 
 GO(g_list_model_get_item, pFpu)
 GO(g_list_model_get_n_items, uFp)
 GO(g_list_model_get_object, pFpu)
 //GO(g_loadable_icon_get_type, 
-//GO(g_loadable_icon_load, 
+GO(g_loadable_icon_load, pFpippp)
 //GO(g_loadable_icon_load_async, 
-//GO(g_loadable_icon_load_finish, 
+GO(g_loadable_icon_load_finish, pFpppp)
 //GO(g_local_directory_monitor_get_type, 
 //GO(g_local_file_monitor_get_type, 
-//GO(g_memory_input_stream_add_bytes, 
+GO(g_memory_input_stream_add_bytes, vFpp)
 //GO(g_memory_input_stream_add_data, 
 //GO(g_memory_input_stream_get_type, 
-//GO(g_memory_input_stream_new, 
-//GO(g_memory_input_stream_new_from_bytes, 
+GO(g_memory_input_stream_new, pFv)
+GO(g_memory_input_stream_new_from_bytes, pFp)
 //GO(g_memory_input_stream_new_from_data, 
 //GO(g_memory_output_stream_get_data, 
-//GO(g_memory_output_stream_get_data_size, 
+GO(g_memory_output_stream_get_data_size, LFp)
 //GO(g_memory_output_stream_get_size, 
 //GO(g_memory_output_stream_get_type, 
 //GO(g_memory_output_stream_new, 
 GO(g_memory_output_stream_new_resizable, pFv)
-//GO(g_memory_output_stream_steal_as_bytes, 
-//GO(g_memory_output_stream_steal_data, 
+GO(g_memory_output_stream_steal_as_bytes, pFp)
+GO(g_memory_output_stream_steal_data, pFp)
 //GO(g_memory_settings_backend_new, 
 GO(g_menu_append, vFppp)
-//GO(g_menu_append_item, 
+GO(g_menu_append_item, vFpp)
 GO(g_menu_append_section, vFppp)
-//GO(g_menu_append_submenu, 
-//GO(g_menu_attribute_iter_get_name, 
-//GO(g_menu_attribute_iter_get_next, 
+GO(g_menu_append_submenu, vFppp)
+GO(g_menu_attribute_iter_get_name, pFp)
+GO(g_menu_attribute_iter_get_next, iFppp)
 //GO(g_menu_attribute_iter_get_type, 
-//GO(g_menu_attribute_iter_get_value, 
-//GO(g_menu_attribute_iter_next, 
+GO(g_menu_attribute_iter_get_value, pFp)
+GO(g_menu_attribute_iter_next, iFp)
 //GO(g_menu_freeze, 
 //GO(g_menu_get_type, 
-//GO(g_menu_insert, 
-//GO(g_menu_insert_item, 
+GO(g_menu_insert, vFpipp)
+GO(g_menu_insert_item, vFpip)
 //GO(g_menu_insert_section, 
-//GO(g_menu_insert_submenu, 
+GO(g_menu_insert_submenu, vFpipp)
 //GO(g_menu_item_get_attribute, 
-//GO(g_menu_item_get_attribute_value, 
-//GO(g_menu_item_get_link, 
+GO(g_menu_item_get_attribute_value, pFppp)
+GO(g_menu_item_get_link, pFpp)
 //GO(g_menu_item_get_type, 
-//GO(g_menu_item_new, 
-//GO(g_menu_item_new_from_model, 
-//GO(g_menu_item_new_section, 
+GO(g_menu_item_new, pFpp)
+GO(g_menu_item_new_from_model, pFpi)
+GO(g_menu_item_new_section, pFpp)
 //GO(g_menu_item_new_submenu, 
 //GO(g_menu_item_set_action_and_target, 
-//GO(g_menu_item_set_action_and_target_value, 
+GO(g_menu_item_set_action_and_target_value, vFppp)
 //GO(g_menu_item_set_attribute, 
 //GO(g_menu_item_set_attribute_value, 
-//GO(g_menu_item_set_detailed_action, 
-//GO(g_menu_item_set_icon, 
+GO(g_menu_item_set_detailed_action, vFpp)
+GO(g_menu_item_set_icon, vFpp)
 //GO(g_menu_item_set_label, 
-//GO(g_menu_item_set_link, 
-//GO(g_menu_item_set_section, 
+GO(g_menu_item_set_link, vFppp)
+GO(g_menu_item_set_section, vFpp)
 //GO(g_menu_item_set_submenu, 
-//GO(g_menu_link_iter_get_name, 
-//GO(g_menu_link_iter_get_next, 
+GO(g_menu_link_iter_get_name, pFp)
+GO(g_menu_link_iter_get_next, iFppp)
 //GO(g_menu_link_iter_get_type, 
-//GO(g_menu_link_iter_get_value, 
-//GO(g_menu_link_iter_next, 
+GO(g_menu_link_iter_get_value, pFp)
+GO(g_menu_link_iter_next, iFp)
 //GO(g_menu_model_get_item_attribute, 
-//GO(g_menu_model_get_item_attribute_value, 
-//GO(g_menu_model_get_item_link, 
-//GO(g_menu_model_get_n_items, 
+GO(g_menu_model_get_item_attribute_value, pFpipp)
+GO(g_menu_model_get_item_link, pFpip)
+GO(g_menu_model_get_n_items, iFp)
 //GO(g_menu_model_get_type, 
-//GO(g_menu_model_is_mutable, 
-//GO(g_menu_model_items_changed, 
-//GO(g_menu_model_iterate_item_attributes, 
-//GO(g_menu_model_iterate_item_links, 
+GO(g_menu_model_is_mutable, iFp)
+GO(g_menu_model_items_changed, vFpiii)
+GO(g_menu_model_iterate_item_attributes, pFpi)
+GO(g_menu_model_iterate_item_links, pFpi)
 GO(g_menu_new, pFv)
 //GO(g_menu_prepend, 
 //GO(g_menu_prepend_item, 
 //GO(g_menu_prepend_section, 
 //GO(g_menu_prepend_submenu, 
-//GO(g_menu_remove, 
+GO(g_menu_remove, vFpi)
 //GO(g_menu_remove_all, 
 //GO(g_mount_can_eject, 
 //GO(g_mount_can_unmount, 
 //GO(g_mount_eject, 
 //GO(g_mount_eject_finish, 
 //GO(g_mount_eject_with_operation, 
-//GO(g_mount_eject_with_operation_finish, 
-//GO(g_mount_get_default_location, 
-//GO(g_mount_get_drive, 
+GO(g_mount_eject_with_operation_finish, iFppp)
+GO(g_mount_get_default_location, pFp)
+GO(g_mount_get_drive, pFp)
 //GO(g_mount_get_icon, 
 //GO(g_mount_get_name, 
 //GO(g_mount_get_root, 
-//GO(g_mount_get_sort_key, 
-//GO(g_mount_get_symbolic_icon, 
+GO(g_mount_get_sort_key, pFp)
+GO(g_mount_get_symbolic_icon, pFp)
 //GO(g_mount_get_type, 
-//GO(g_mount_get_uuid, 
+GO(g_mount_get_uuid, pFp)
 //GO(g_mount_get_volume, 
 //GO(g_mount_guess_content_type, 
-//GO(g_mount_guess_content_type_finish, 
-//GO(g_mount_guess_content_type_sync, 
-//GO(g_mount_is_shadowed, 
+GO(g_mount_guess_content_type_finish, pFppp)
+GO(g_mount_guess_content_type_sync, pFpipp)
+GO(g_mount_is_shadowed, iFp)
 //GO(g_mount_mount_flags_get_type, 
 //GO(g_mount_operation_get_anonymous, 
-//GO(g_mount_operation_get_choice, 
-//GO(g_mount_operation_get_domain, 
+GO(g_mount_operation_get_choice, iFp)
+GO(g_mount_operation_get_domain, pFp)
 //GO(g_mount_operation_get_password, 
-//GO(g_mount_operation_get_password_save, 
+GO(g_mount_operation_get_password_save, uFp)
 //GO(g_mount_operation_get_type, 
 //GO(g_mount_operation_get_username, 
-//GO(g_mount_operation_new, 
-//GO(g_mount_operation_reply, 
+GO(g_mount_operation_new, pFv)
+GO(g_mount_operation_reply, vFpu)
 //GO(g_mount_operation_result_get_type, 
 //GO(g_mount_operation_set_anonymous, 
-//GO(g_mount_operation_set_choice, 
-//GO(g_mount_operation_set_domain, 
+GO(g_mount_operation_set_choice, vFpi)
+GO(g_mount_operation_set_domain, vFpp)
 //GO(g_mount_operation_set_password, 
-//GO(g_mount_operation_set_password_save, 
+GO(g_mount_operation_set_password_save, vFpu)
 //GO(g_mount_operation_set_username, 
 //GO(g_mount_remount, 
 //GO(g_mount_remount_finish, 
@@ -1129,67 +1129,67 @@ GO(g_menu_new, pFv)
 //GO(g_mount_unshadow, 
 //GO(g_native_volume_monitor_get_type, 
 //GO(g_network_address_get_hostname, 
-//GO(g_network_address_get_port, 
-//GO(g_network_address_get_scheme, 
+GO(g_network_address_get_port, WFp)
+GO(g_network_address_get_scheme, pFp)
 //GO(g_network_address_get_type, 
-//GO(g_network_address_new, 
+GO(g_network_address_new, pFpW)
 //GO(g_network_address_parse, 
-//GO(g_network_address_parse_uri, 
+GO(g_network_address_parse_uri, pFpWp)
 //GO(g_networking_init, 
 //GO(g_network_monitor_base_add_network, 
 //GO(g_network_monitor_base_get_type, 
 //GO(g_network_monitor_base_remove_network, 
 //GO(g_network_monitor_base_set_networks, 
-//GO(g_network_monitor_can_reach, 
+GO(g_network_monitor_can_reach, iFpppp)
 //GO(g_network_monitor_can_reach_async, 
-//GO(g_network_monitor_can_reach_finish, 
-//GO(g_network_monitor_get_default, 
+GO(g_network_monitor_can_reach_finish, iFppp)
+GO(g_network_monitor_get_default, pFv)
 //GO(g_network_monitor_get_network_available, 
 //GO(g_network_monitor_get_type, 
 //GO(g_network_service_get_domain, 
 //GO(g_network_service_get_protocol, 
-//GO(g_network_service_get_scheme, 
+GO(g_network_service_get_scheme, pFp)
 //GO(g_network_service_get_service, 
 //GO(g_network_service_get_type, 
-//GO(g_network_service_new, 
-//GO(g_network_service_set_scheme, 
-//GO(g_notification_add_button, 
+GO(g_network_service_new, pFppp)
+GO(g_network_service_set_scheme, vFpp)
+GO(g_notification_add_button, vFppp)
 //GO(g_notification_add_button_with_target, 
-//GO(g_notification_add_button_with_target_value, 
+GO(g_notification_add_button_with_target_value, vFpppp)
 //GO(g_notification_get_type, 
-//GO(g_notification_new, 
+GO(g_notification_new, pFp)
 //GO(g_notification_priority_get_type, 
 //GO(g_notification_set_body, 
-//GO(g_notification_set_default_action, 
+GO(g_notification_set_default_action, vFpp)
 //GO(g_notification_set_default_action_and_target, 
-//GO(g_notification_set_default_action_and_target_value, 
-//GO(g_notification_set_icon, 
-//GO(g_notification_set_priority, 
+GO(g_notification_set_default_action_and_target_value, vFppp)
+GO(g_notification_set_icon, vFpp)
+GO(g_notification_set_priority, vFpu)
 //GO(g_notification_set_title, 
-//GO(g_notification_set_urgent, 
+GO(g_notification_set_urgent, vFpi)
 //GO(g_null_settings_backend_new, 
 //GO(g_output_stream_clear_pending, 
-//GO(g_output_stream_close, 
+GO(g_output_stream_close, iFppp)
 //GO(g_output_stream_close_async, 
-//GO(g_output_stream_close_finish, 
+GO(g_output_stream_close_finish, iFppp)
 //GO(g_output_stream_flush, 
 //GO(g_output_stream_flush_async, 
 //GO(g_output_stream_flush_finish, 
 //GO(g_output_stream_get_type, 
-//GO(g_output_stream_has_pending, 
+GO(g_output_stream_has_pending, iFp)
 //GO(g_output_stream_is_closed, 
 //GO(g_output_stream_is_closing, 
 //GO(g_output_stream_printf, 
-//GO(g_output_stream_set_pending, 
-//GO(g_output_stream_splice, 
+GO(g_output_stream_set_pending, iFpp)
+GO(g_output_stream_splice, lFppupp)
 //GO(g_output_stream_splice_async, 
-//GO(g_output_stream_splice_finish, 
+GO(g_output_stream_splice_finish, lFppp)
 //GO(g_output_stream_splice_flags_get_type, 
 //GO(g_output_stream_vprintf, 
-//GO(g_output_stream_write, 
-//GO(g_output_stream_write_all, 
+GO(g_output_stream_write, lFppLpp)
+GO(g_output_stream_write_all, iFppLppp)
 //GO(g_output_stream_write_async, 
-//GO(g_output_stream_write_bytes, 
+GO(g_output_stream_write_bytes, lFpppp)
 //GO(g_output_stream_write_bytes_async, 
 //GO(g_output_stream_write_bytes_finish, 
 //GO(g_output_stream_write_finish, 
@@ -1199,99 +1199,99 @@ GO(g_menu_new, pFv)
 //GO(g_permission_acquire_finish, 
 //GO(g_permission_get_allowed, 
 //GO(g_permission_get_can_acquire, 
-//GO(g_permission_get_can_release, 
+GO(g_permission_get_can_release, iFp)
 //GO(g_permission_get_type, 
-//GO(g_permission_impl_update, 
-//GO(g_permission_release, 
+GO(g_permission_impl_update, vFpiii)
+GO(g_permission_release, iFppp)
 //GO(g_permission_release_async, 
-//GO(g_permission_release_finish, 
+GO(g_permission_release_finish, iFppp)
 //GO(g_pollable_input_stream_can_poll, 
 //GO(g_pollable_input_stream_create_source, 
 //GO(g_pollable_input_stream_get_type, 
-//GO(g_pollable_input_stream_is_readable, 
-//GO(g_pollable_input_stream_read_nonblocking, 
+GO(g_pollable_input_stream_is_readable, iFp)
+GO(g_pollable_input_stream_read_nonblocking, lFppLpp)
 //GO(g_pollable_output_stream_can_poll, 
 //GO(g_pollable_output_stream_create_source, 
 //GO(g_pollable_output_stream_get_type, 
-//GO(g_pollable_output_stream_is_writable, 
-//GO(g_pollable_output_stream_write_nonblocking, 
+GO(g_pollable_output_stream_is_writable, iFp)
+GO(g_pollable_output_stream_write_nonblocking, lFppLpp)
 //GO(g_pollable_source_new, 
 //GO(g_pollable_source_new_full, 
-//GO(g_pollable_stream_read, 
-//GO(g_pollable_stream_write, 
-//GO(g_pollable_stream_write_all, 
+GO(g_pollable_stream_read, lFppLipp)
+GO(g_pollable_stream_write, lFppLipp)
+GO(g_pollable_stream_write_all, iFppLippp)
 //GO(g_property_action_get_type, 
-//GO(g_property_action_new, 
+GO(g_property_action_new, pFppp)
 //GO(g_proxy_address_enumerator_get_type, 
 //GO(g_proxy_address_get_destination_hostname, 
-//GO(g_proxy_address_get_destination_port, 
+GO(g_proxy_address_get_destination_port, WFp)
 //GO(g_proxy_address_get_destination_protocol, 
 //GO(g_proxy_address_get_password, 
 //GO(g_proxy_address_get_protocol, 
 //GO(g_proxy_address_get_type, 
-//GO(g_proxy_address_get_uri, 
+GO(g_proxy_address_get_uri, pFp)
 //GO(g_proxy_address_get_username, 
-//GO(g_proxy_address_new, 
-//GO(g_proxy_connect, 
+GO(g_proxy_address_new, pFpWppWpp)
+GO(g_proxy_connect, pFppppp)
 //GO(g_proxy_connect_async, 
-//GO(g_proxy_connect_finish, 
-//GO(g_proxy_get_default_for_protocol, 
+GO(g_proxy_connect_finish, pFppp)
+GO(g_proxy_get_default_for_protocol, pFp)
 //GO(g_proxy_get_type, 
-//GO(g_proxy_resolver_get_default, 
+GO(g_proxy_resolver_get_default, pFv)
 //GO(g_proxy_resolver_get_type, 
-//GO(g_proxy_resolver_is_supported, 
-//GO(g_proxy_resolver_lookup, 
+GO(g_proxy_resolver_is_supported, iFp)
+GO(g_proxy_resolver_lookup, pFpppp)
 //GO(g_proxy_resolver_lookup_async, 
-//GO(g_proxy_resolver_lookup_finish, 
-//GO(g_proxy_supports_hostname, 
+GO(g_proxy_resolver_lookup_finish, pFppp)
+GO(g_proxy_supports_hostname, iFp)
 //GO(g_remote_action_group_activate_action_full, 
-//GO(g_remote_action_group_change_action_state_full, 
+GO(g_remote_action_group_change_action_state_full, vFpppp)
 //GO(g_remote_action_group_get_type, 
 //GO(g_resolver_error_get_type, 
 //GO(g_resolver_error_quark, 
 //GO(g_resolver_free_addresses, 
-//GO(g_resolver_free_targets, 
-//GO(g_resolver_get_default, 
+GO(g_resolver_free_targets, vFp)
+GO(g_resolver_get_default, pFv)
 //GO(g_resolver_get_type, 
-//GO(g_resolver_lookup_by_address, 
+GO(g_resolver_lookup_by_address, pFpppp)
 //GO(g_resolver_lookup_by_address_async, 
-//GO(g_resolver_lookup_by_address_finish, 
-//GO(g_resolver_lookup_by_name, 
+GO(g_resolver_lookup_by_address_finish, pFppp)
+GO(g_resolver_lookup_by_name, pFpppp)
 //GO(g_resolver_lookup_by_name_async, 
 //GO(g_resolver_lookup_by_name_finish, 
-//GO(g_resolver_lookup_records, 
+GO(g_resolver_lookup_records, pFppupp)
 //GO(g_resolver_lookup_records_async, 
-//GO(g_resolver_lookup_records_finish, 
-//GO(g_resolver_lookup_service, 
+GO(g_resolver_lookup_records_finish, pFppp)
+GO(g_resolver_lookup_service, pFpppppp)
 //GO(g_resolver_lookup_service_async, 
 //GO(g_resolver_lookup_service_finish, 
 //GO(g_resolver_record_type_get_type, 
 //GO(g_resolver_set_default, 
-//GO(g_resource_enumerate_children, 
+GO(g_resource_enumerate_children, pFppup)
 //GO(g_resource_error_get_type, 
 //GO(g_resource_error_quark, 
 //GO(g_resource_flags_get_type, 
-//GO(g_resource_get_info, 
+GO(g_resource_get_info, iFppuppp)
 //GO(g_resource_get_type, 
-//GO(g_resource_load, 
-//GO(g_resource_lookup_data, 
+GO(g_resource_load, pFpp)
+GO(g_resource_lookup_data, pFppup)
 //GO(g_resource_lookup_flags_get_type, 
-//GO(g_resource_new_from_data, 
-//GO(g_resource_open_stream, 
-//GO(g_resource_ref, 
-//GO(g_resources_enumerate_children, 
-//GO(g_resources_get_info, 
-//GO(g_resources_lookup_data, 
-//GO(g_resources_open_stream, 
+GO(g_resource_new_from_data, pFpp)
+GO(g_resource_open_stream, pFppup)
+GO(g_resource_ref, pFp)
+GO(g_resources_enumerate_children, pFpup)
+GO(g_resources_get_info, iFpuppp)
+GO(g_resources_lookup_data, pFpup)
+GO(g_resources_open_stream, pFpup)
 //GO(g_resources_register, 
 //GO(g_resources_unregister, 
 //GO(g_resource_unref, 
 //GO(g_seekable_can_seek, 
-//GO(g_seekable_can_truncate, 
+GO(g_seekable_can_truncate, iFp)
 //GO(g_seekable_get_type, 
-//GO(g_seekable_seek, 
-//GO(g_seekable_tell, 
-//GO(g_seekable_truncate, 
+GO(g_seekable_seek, iFplupp)
+GO(g_seekable_tell, lFp)
+GO(g_seekable_truncate, iFplpp)
 GO(g_settings_apply, vFp)
 //GO(g_settings_backend_changed, 
 //GO(g_settings_backend_changed_tree, 
@@ -1302,19 +1302,19 @@ GO(g_settings_apply, vFp)
 //GO(g_settings_backend_path_changed, 
 //GO(g_settings_backend_path_writable_changed, 
 //GO(g_settings_backend_writable_changed, 
-//GO(g_settings_bind, 
+GO(g_settings_bind, vFppppu)
 //GO(g_settings_bind_flags_get_type, 
 //GO(g_settings_bind_with_mapping, 
-//GO(g_settings_bind_writable, 
+GO(g_settings_bind_writable, vFppppi)
 GO(g_settings_create_action, pFpp)
 GO(g_settings_delay, vFp)
 //GO(g_settings_get, 
 GO(g_settings_get_boolean, iFpp)
 GO(g_settings_get_child, pFpp)
 GO(g_settings_get_default_value, pFpp)
-//GO(g_settings_get_double, 
-//GO(g_settings_get_enum, 
-//GO(g_settings_get_flags, 
+GO(g_settings_get_double, dFpp)
+GO(g_settings_get_enum, iFpp)
+GO(g_settings_get_flags, uFpp)
 GO(g_settings_get_has_unapplied, iFp)
 GO(g_settings_get_int, iFpp)
 //GO(g_settings_get_mapped, 
@@ -1328,60 +1328,60 @@ GO(g_settings_get_value, pFpp)
 GO(g_settings_is_writable, iFpp)
 //GO(g_settings_list_children, 
 GO(g_settings_list_keys, pFp)
-//GO(g_settings_list_relocatable_schemas, 
+GO(g_settings_list_relocatable_schemas, pFv)
 //GO(g_settings_list_schemas, 
 GO(g_settings_new, pFp)
-//GO(g_settings_new_full, 
-//GO(g_settings_new_with_backend, 
-//GO(g_settings_new_with_backend_and_path, 
+GO(g_settings_new_full, pFppp)
+GO(g_settings_new_with_backend, pFpp)
+GO(g_settings_new_with_backend_and_path, pFppp)
 GO(g_settings_new_with_path, pFpp)
 //GO(g_settings_range_check, 
 GO(g_settings_reset, vFpp)
 //GO(g_settings_revert, 
 //GO(g_settings_schema_get_id, 
-//GO(g_settings_schema_get_key, 
-//GO(g_settings_schema_get_path, 
+GO(g_settings_schema_get_key, pFpp)
+GO(g_settings_schema_get_path, pFp)
 //GO(g_settings_schema_get_type, 
 GO(g_settings_schema_has_key, iFpp)
 //GO(g_settings_schema_key_get_default_value, 
-//GO(g_settings_schema_key_get_description, 
-//GO(g_settings_schema_key_get_range, 
+GO(g_settings_schema_key_get_description, pFp)
+GO(g_settings_schema_key_get_range, pFp)
 //GO(g_settings_schema_key_get_summary, 
 //GO(g_settings_schema_key_get_type, 
-//GO(g_settings_schema_key_get_value_type, 
-//GO(g_settings_schema_key_range_check, 
-//GO(g_settings_schema_key_ref, 
+GO(g_settings_schema_key_get_value_type, pFp)
+GO(g_settings_schema_key_range_check, iFpp)
+GO(g_settings_schema_key_ref, pFp)
 //GO(g_settings_schema_key_unref, 
-//GO(g_settings_schema_ref, 
+GO(g_settings_schema_ref, pFp)
 GO(g_settings_schema_source_get_default, pFv)
 GO(g_settings_schema_source_get_type, LFv)
-//GO(g_settings_schema_source_list_schemas, 
+GO(g_settings_schema_source_list_schemas, vFpipp)
 GO(g_settings_schema_source_lookup, pFppi)
-//GO(g_settings_schema_source_new_from_directory, 
+GO(g_settings_schema_source_new_from_directory, pFppip)
 GO(g_settings_schema_source_ref, pFp)
 GO(g_settings_schema_source_unref, vFp)
 GO(g_settings_schema_unref, vFp)
 //GO(g_settings_set, 
 GO(g_settings_set_boolean, iFppi)
-//GO(g_settings_set_double, 
-//GO(g_settings_set_enum, 
-//GO(g_settings_set_flags, 
+GO(g_settings_set_double, iFppd)
+GO(g_settings_set_enum, iFppi)
+GO(g_settings_set_flags, iFppu)
 GO(g_settings_set_int, iFppi)
 GO(g_settings_set_string, iFppp)
-//GO(g_settings_set_strv, 
+GO(g_settings_set_strv, iFppp)
 //GO(g_settings_set_uint, 
 GO(g_settings_set_value, iFppp)
 GO(g_settings_sync, vFv)
-//GO(g_settings_unbind, 
+GO(g_settings_unbind, vFpp)
 GO(g_simple_action_get_type, LFv)
 //GO(g_simple_action_group_add_entries, 
 //GO(g_simple_action_group_get_type, 
-//GO(g_simple_action_group_insert, 
-//GO(g_simple_action_group_lookup, 
-//GO(g_simple_action_group_new, 
-//GO(g_simple_action_group_remove, 
-//GO(g_simple_action_new, 
-//GO(g_simple_action_new_stateful, 
+GO(g_simple_action_group_insert, vFpp)
+GO(g_simple_action_group_lookup, pFpp)
+GO(g_simple_action_group_new, pFv)
+GO(g_simple_action_group_remove, vFpp)
+GO(g_simple_action_new, pFpp)
+GO(g_simple_action_new_stateful, pFppp)
 GO(g_simple_action_set_enabled, vFpi)
 //GO(g_simple_action_set_state, 
 GOM(g_simple_async_report_error_in_idle, vFEpppuipV)
@@ -1411,255 +1411,255 @@ GOM(g_simple_async_result_set_op_res_gpointer, vFEppp)
 GO(g_simple_async_result_set_op_res_gssize, vFpl)
 GO(g_simple_async_result_take_error, vFpp)
 GO(g_simple_permission_get_type, LFv)
-//GO(g_simple_permission_new, 
+GO(g_simple_permission_new, pFi)
 GO(g_simple_proxy_resolver_get_type, LFv)
-//GO(g_simple_proxy_resolver_new, 
-//GO(g_simple_proxy_resolver_set_default_proxy, 
-//GO(g_simple_proxy_resolver_set_ignore_hosts, 
-//GO(g_simple_proxy_resolver_set_uri_proxy, 
-//GO(g_socket_accept, 
+GO(g_simple_proxy_resolver_new, pFpp)
+GO(g_simple_proxy_resolver_set_default_proxy, vFpp)
+GO(g_simple_proxy_resolver_set_ignore_hosts, vFpp)
+GO(g_simple_proxy_resolver_set_uri_proxy, vFppp)
+GO(g_socket_accept, pFppp)
 //GO(g_socket_address_enumerator_get_type, 
-//GO(g_socket_address_enumerator_next, 
+GO(g_socket_address_enumerator_next, pFppp)
 //GO(g_socket_address_enumerator_next_async, 
-//GO(g_socket_address_enumerator_next_finish, 
-//GO(g_socket_address_get_family, 
-//GO(g_socket_address_get_native_size, 
+GO(g_socket_address_enumerator_next_finish, pFppp)
+GO(g_socket_address_get_family, uFp)
+GO(g_socket_address_get_native_size, lFp)
 //GO(g_socket_address_get_type, 
 //GO(g_socket_address_new_from_native, 
-//GO(g_socket_address_to_native, 
-//GO(g_socket_bind, 
+GO(g_socket_address_to_native, iFppLp)
+GO(g_socket_bind, iFppip)
 //GO(g_socket_check_connect_result, 
-//GO(g_socket_client_add_application_proxy, 
-//GO(g_socket_client_connect, 
+GO(g_socket_client_add_application_proxy, vFpp)
+GO(g_socket_client_connect, pFpppp)
 //GO(g_socket_client_connect_async, 
 //GO(g_socket_client_connect_finish, 
 //GO(g_socket_client_connect_to_host, 
 //GO(g_socket_client_connect_to_host_async, 
 //GO(g_socket_client_connect_to_host_finish, 
-//GO(g_socket_client_connect_to_service, 
+GO(g_socket_client_connect_to_service, pFppppp)
 //GO(g_socket_client_connect_to_service_async, 
 //GO(g_socket_client_connect_to_service_finish, 
-//GO(g_socket_client_connect_to_uri, 
+GO(g_socket_client_connect_to_uri, pFppWpp)
 //GO(g_socket_client_connect_to_uri_async, 
-//GO(g_socket_client_connect_to_uri_finish, 
+GO(g_socket_client_connect_to_uri_finish, pFppp)
 //GO(g_socket_client_event_get_type, 
 //GO(g_socket_client_get_enable_proxy, 
-//GO(g_socket_client_get_family, 
-//GO(g_socket_client_get_local_address, 
-//GO(g_socket_client_get_protocol, 
-//GO(g_socket_client_get_proxy_resolver, 
-//GO(g_socket_client_get_socket_type, 
-//GO(g_socket_client_get_timeout, 
-//GO(g_socket_client_get_tls, 
-//GO(g_socket_client_get_tls_validation_flags, 
+GO(g_socket_client_get_family, uFp)
+GO(g_socket_client_get_local_address, pFp)
+GO(g_socket_client_get_protocol, iFp)
+GO(g_socket_client_get_proxy_resolver, pFp)
+GO(g_socket_client_get_socket_type, uFp)
+GO(g_socket_client_get_timeout, uFp)
+GO(g_socket_client_get_tls, iFp)
+GO(g_socket_client_get_tls_validation_flags, uFp)
 //GO(g_socket_client_get_type, 
-//GO(g_socket_client_new, 
+GO(g_socket_client_new, pFv)
 //GO(g_socket_client_set_enable_proxy, 
-//GO(g_socket_client_set_family, 
-//GO(g_socket_client_set_local_address, 
-//GO(g_socket_client_set_protocol, 
-//GO(g_socket_client_set_proxy_resolver, 
-//GO(g_socket_client_set_socket_type, 
-//GO(g_socket_client_set_timeout, 
-//GO(g_socket_client_set_tls, 
-//GO(g_socket_client_set_tls_validation_flags, 
-//GO(g_socket_close, 
-//GO(g_socket_condition_check, 
-//GO(g_socket_condition_timed_wait, 
-//GO(g_socket_condition_wait, 
-//GO(g_socket_connect, 
+GO(g_socket_client_set_family, vFpu)
+GO(g_socket_client_set_local_address, vFpp)
+GO(g_socket_client_set_protocol, vFpi)
+GO(g_socket_client_set_proxy_resolver, vFpp)
+GO(g_socket_client_set_socket_type, vFpu)
+GO(g_socket_client_set_timeout, vFpu)
+GO(g_socket_client_set_tls, vFpi)
+GO(g_socket_client_set_tls_validation_flags, vFpu)
+GO(g_socket_close, iFpp)
+GO(g_socket_condition_check, uFpu)
+GO(g_socket_condition_timed_wait, iFpulpp)
+GO(g_socket_condition_wait, iFpupp)
+GO(g_socket_connect, iFpppp)
 //GO(g_socket_connectable_enumerate, 
 //GO(g_socket_connectable_get_type, 
-//GO(g_socket_connectable_proxy_enumerate, 
-//GO(g_socket_connection_connect, 
+GO(g_socket_connectable_proxy_enumerate, pFp)
+GO(g_socket_connection_connect, iFpppp)
 //GO(g_socket_connection_connect_async, 
-//GO(g_socket_connection_connect_finish, 
-//GO(g_socket_connection_factory_create_connection, 
-//GO(g_socket_connection_factory_lookup_type, 
-//GO(g_socket_connection_factory_register_type, 
+GO(g_socket_connection_connect_finish, iFppp)
+GO(g_socket_connection_factory_create_connection, pFp)
+GO(g_socket_connection_factory_lookup_type, LFuui)
+GO(g_socket_connection_factory_register_type, vFLuui)
 //GO(g_socket_connection_get_local_address, 
-//GO(g_socket_connection_get_remote_address, 
-//GO(g_socket_connection_get_socket, 
+GO(g_socket_connection_get_remote_address, pFpp)
+GO(g_socket_connection_get_socket, pFp)
 //GO(g_socket_connection_get_type, 
-//GO(g_socket_connection_is_connected, 
-//GO(g_socket_control_message_deserialize, 
+GO(g_socket_connection_is_connected, iFp)
+GO(g_socket_control_message_deserialize, pFiiLp)
 //GO(g_socket_control_message_get_level, 
-//GO(g_socket_control_message_get_msg_type, 
-//GO(g_socket_control_message_get_size, 
+GO(g_socket_control_message_get_msg_type, iFp)
+GO(g_socket_control_message_get_size, LFp)
 //GO(g_socket_control_message_get_type, 
-//GO(g_socket_control_message_serialize, 
+GO(g_socket_control_message_serialize, vFpp)
 //GO(g_socket_create_source, 
 //GO(g_socket_family_get_type, 
-//GO(g_socket_get_available_bytes, 
+GO(g_socket_get_available_bytes, lFp)
 //GO(g_socket_get_blocking, 
 //GO(g_socket_get_broadcast, 
-//GO(g_socket_get_credentials, 
-//GO(g_socket_get_family, 
-//GO(g_socket_get_fd, 
+GO(g_socket_get_credentials, pFpp)
+GO(g_socket_get_family, uFp)
+GO(g_socket_get_fd, iFp)
 //GO(g_socket_get_keepalive, 
-//GO(g_socket_get_listen_backlog, 
+GO(g_socket_get_listen_backlog, iFp)
 //GO(g_socket_get_local_address, 
 //GO(g_socket_get_multicast_loopback, 
-//GO(g_socket_get_multicast_ttl, 
-//GO(g_socket_get_option, 
-//GO(g_socket_get_protocol, 
-//GO(g_socket_get_remote_address, 
-//GO(g_socket_get_socket_type, 
+GO(g_socket_get_multicast_ttl, uFp)
+GO(g_socket_get_option, iFpiipp)
+GO(g_socket_get_protocol, iFp)
+GO(g_socket_get_remote_address, pFpp)
+GO(g_socket_get_socket_type, uFp)
 //GO(g_socket_get_timeout, 
 //GO(g_socket_get_ttl, 
 //GO(g_socket_get_type, 
 //GO(g_socket_is_closed, 
 //GO(g_socket_is_connected, 
 //GO(g_socket_join_multicast_group, 
-//GO(g_socket_leave_multicast_group, 
+GO(g_socket_leave_multicast_group, iFppipp)
 //GO(g_socket_listen, 
-//GO(g_socket_listener_accept, 
+GO(g_socket_listener_accept, pFpppp)
 //GO(g_socket_listener_accept_async, 
-//GO(g_socket_listener_accept_finish, 
-//GO(g_socket_listener_accept_socket, 
+GO(g_socket_listener_accept_finish, pFpppp)
+GO(g_socket_listener_accept_socket, pFpppp)
 //GO(g_socket_listener_accept_socket_async, 
-//GO(g_socket_listener_accept_socket_finish, 
-//GO(g_socket_listener_add_address, 
-//GO(g_socket_listener_add_any_inet_port, 
-//GO(g_socket_listener_add_inet_port, 
-//GO(g_socket_listener_add_socket, 
+GO(g_socket_listener_accept_socket_finish, pFpppp)
+GO(g_socket_listener_add_address, iFppuippp)
+GO(g_socket_listener_add_any_inet_port, WFppp)
+GO(g_socket_listener_add_inet_port, iFpWpp)
+GO(g_socket_listener_add_socket, iFpppp)
 //GO(g_socket_listener_close, 
 //GO(g_socket_listener_get_type, 
-//GO(g_socket_listener_new, 
-//GO(g_socket_listener_set_backlog, 
+GO(g_socket_listener_new, pFv)
+GO(g_socket_listener_set_backlog, vFpi)
 //GO(g_socket_msg_flags_get_type, 
-//GO(g_socket_new, 
-//GO(g_socket_new_from_fd, 
+GO(g_socket_new, pFuuip)
+GO(g_socket_new_from_fd, pFip)
 //GO(g_socket_protocol_get_type, 
-//GO(g_socket_receive, 
-//GO(g_socket_receive_from, 
-//GO(g_socket_receive_message, 
-//GO(g_socket_receive_with_blocking, 
-//GO(g_socket_send, 
-//GO(g_socket_send_message, 
-//GO(g_socket_send_to, 
-//GO(g_socket_send_with_blocking, 
+GO(g_socket_receive, lFppLpp)
+GO(g_socket_receive_from, lFpppLpp)
+GO(g_socket_receive_message, lFpppippppp)
+GO(g_socket_receive_with_blocking, lFppLipp)
+GO(g_socket_send, lFppLpp)
+GO(g_socket_send_message, lFpppipiipp)
+GO(g_socket_send_to, lFpppLpp)
+GO(g_socket_send_with_blocking, lFppLipp)
 //GO(g_socket_service_get_type, 
-//GO(g_socket_service_is_active, 
-//GO(g_socket_service_new, 
+GO(g_socket_service_is_active, iFp)
+GO(g_socket_service_new, pFv)
 //GO(g_socket_service_start, 
 //GO(g_socket_service_stop, 
 //GO(g_socket_set_blocking, 
 //GO(g_socket_set_broadcast, 
 //GO(g_socket_set_keepalive, 
-//GO(g_socket_set_listen_backlog, 
-//GO(g_socket_set_multicast_loopback, 
-//GO(g_socket_set_multicast_ttl, 
-//GO(g_socket_set_option, 
+GO(g_socket_set_listen_backlog, vFpi)
+GO(g_socket_set_multicast_loopback, vFpi)
+GO(g_socket_set_multicast_ttl, vFpu)
+GO(g_socket_set_option, iFpiiip)
 //GO(g_socket_set_timeout, 
 //GO(g_socket_set_ttl, 
-//GO(g_socket_shutdown, 
-//GO(g_socket_speaks_ipv4, 
+GO(g_socket_shutdown, iFpiip)
+GO(g_socket_speaks_ipv4, iFp)
 //GO(g_socket_type_get_type, 
-//GO(g_srv_target_copy, 
-//GO(g_srv_target_free, 
-//GO(g_srv_target_get_hostname, 
+GO(g_srv_target_copy, pFp)
+GO(g_srv_target_free, vFp)
+GO(g_srv_target_get_hostname, pFp)
 //GO(g_srv_target_get_port, 
 //GO(g_srv_target_get_priority, 
 //GO(g_srv_target_get_type, 
-//GO(g_srv_target_get_weight, 
-//GO(g_srv_target_list_sort, 
-//GO(g_srv_target_new, 
+GO(g_srv_target_get_weight, WFp)
+GO(g_srv_target_list_sort, pFp)
+GO(g_srv_target_new, pFpWWW)
 GO(g_static_resource_fini, vFp)
-//GO(g_static_resource_get_resource, 
+GO(g_static_resource_get_resource, pFp)
 GO(g_static_resource_init, vFp)
-//GO(g_subprocess_communicate, 
+GO(g_subprocess_communicate, iFpppppp)
 //GO(g_subprocess_communicate_async, 
-//GO(g_subprocess_communicate_finish, 
-//GO(g_subprocess_communicate_utf8, 
+GO(g_subprocess_communicate_finish, iFppppp)
+GO(g_subprocess_communicate_utf8, iFpppppp)
 //GO(g_subprocess_communicate_utf8_async, 
-//GO(g_subprocess_communicate_utf8_finish, 
+GO(g_subprocess_communicate_utf8_finish, iFppppp)
 //GO(g_subprocess_flags_get_type, 
 //GO(g_subprocess_force_exit, 
 //GO(g_subprocess_get_exit_status, 
-//GO(g_subprocess_get_identifier, 
+GO(g_subprocess_get_identifier, pFp)
 //GO(g_subprocess_get_if_exited, 
-//GO(g_subprocess_get_if_signaled, 
+GO(g_subprocess_get_if_signaled, iFp)
 //GO(g_subprocess_get_status, 
-//GO(g_subprocess_get_stderr_pipe, 
-//GO(g_subprocess_get_stdin_pipe, 
+GO(g_subprocess_get_stderr_pipe, pFp)
+GO(g_subprocess_get_stdin_pipe, pFp)
 //GO(g_subprocess_get_stdout_pipe, 
 //GO(g_subprocess_get_successful, 
-//GO(g_subprocess_get_term_sig, 
+GO(g_subprocess_get_term_sig, iFp)
 //GO(g_subprocess_get_type, 
-//GO(g_subprocess_launcher_getenv, 
+GO(g_subprocess_launcher_getenv, pFpp)
 //GO(g_subprocess_launcher_get_type, 
-//GO(g_subprocess_launcher_new, 
+GO(g_subprocess_launcher_new, pFu)
 //GO(g_subprocess_launcher_set_child_setup, 
 //GO(g_subprocess_launcher_set_cwd, 
-//GO(g_subprocess_launcher_setenv, 
-//GO(g_subprocess_launcher_set_environ, 
-//GO(g_subprocess_launcher_set_flags, 
-//GO(g_subprocess_launcher_set_stderr_file_path, 
+GO(g_subprocess_launcher_setenv, vFpppi)
+GO(g_subprocess_launcher_set_environ, vFpp)
+GO(g_subprocess_launcher_set_flags, vFpu)
+GO(g_subprocess_launcher_set_stderr_file_path, vFpp)
 //GO(g_subprocess_launcher_set_stdin_file_path, 
 //GO(g_subprocess_launcher_set_stdout_file_path, 
 //GO(g_subprocess_launcher_spawn, 
-//GO(g_subprocess_launcher_spawnv, 
-//GO(g_subprocess_launcher_take_fd, 
-//GO(g_subprocess_launcher_take_stderr_fd, 
+GO(g_subprocess_launcher_spawnv, pFppp)
+GO(g_subprocess_launcher_take_fd, vFpii)
+GO(g_subprocess_launcher_take_stderr_fd, vFpi)
 //GO(g_subprocess_launcher_take_stdin_fd, 
 //GO(g_subprocess_launcher_take_stdout_fd, 
 //GO(g_subprocess_launcher_unsetenv, 
 //GO(g_subprocess_new, 
-//GO(g_subprocess_newv, 
-//GO(g_subprocess_send_signal, 
+GO(g_subprocess_newv, pFpup)
+GO(g_subprocess_send_signal, vFpi)
 //GO(g_subprocess_wait, 
 //GO(g_subprocess_wait_async, 
-//GO(g_subprocess_wait_check, 
+GO(g_subprocess_wait_check, iFppp)
 //GO(g_subprocess_wait_check_async, 
-//GO(g_subprocess_wait_check_finish, 
+GO(g_subprocess_wait_check_finish, iFppp)
 //GO(g_subprocess_wait_finish, 
 //GO(g_task_attach_source, 
-//GO(g_task_get_cancellable, 
+GO(g_task_get_cancellable, pFp)
 //GO(g_task_get_check_cancellable, 
-//GO(g_task_get_context, 
-//GO(g_task_get_priority, 
+GO(g_task_get_context, pFp)
+GO(g_task_get_priority, iFp)
 //GO(g_task_get_return_on_cancel, 
 //GO(g_task_get_source_object, 
-//GO(g_task_get_source_tag, 
+GO(g_task_get_source_tag, pFp)
 //GO(g_task_get_task_data, 
 //GO(g_task_get_type, 
 //GO(g_task_had_error, 
-//GO(g_task_is_valid, 
+GO(g_task_is_valid, iFpp)
 //GO(g_task_new, 
-//GO(g_task_propagate_boolean, 
-//GO(g_task_propagate_int, 
-//GO(g_task_propagate_pointer, 
+GO(g_task_propagate_boolean, iFpp)
+GO(g_task_propagate_int, lFpp)
+GO(g_task_propagate_pointer, pFpp)
 //GO(g_task_report_error, 
 //GO(g_task_report_new_error, 
-//GO(g_task_return_boolean, 
-//GO(g_task_return_error, 
+GO(g_task_return_boolean, vFpi)
+GO(g_task_return_error, vFpp)
 //GO(g_task_return_error_if_cancelled, 
-//GO(g_task_return_int, 
+GO(g_task_return_int, vFpl)
 //GO(g_task_return_new_error, 
 //GO(g_task_return_pointer, 
 //GO(g_task_run_in_thread, 
 //GO(g_task_run_in_thread_sync, 
 //GO(g_task_set_check_cancellable, 
-//GO(g_task_set_priority, 
-//GO(g_task_set_return_on_cancel, 
-//GO(g_task_set_source_tag, 
+GO(g_task_set_priority, vFpi)
+GO(g_task_set_return_on_cancel, iFpi)
+GO(g_task_set_source_tag, vFpp)
 //GO(g_task_set_task_data, 
-//GO(g_tcp_connection_get_graceful_disconnect, 
+GO(g_tcp_connection_get_graceful_disconnect, iFp)
 //GO(g_tcp_connection_get_type, 
-//GO(g_tcp_connection_set_graceful_disconnect, 
-//GO(g_tcp_wrapper_connection_get_base_io_stream, 
+GO(g_tcp_connection_set_graceful_disconnect, vFpi)
+GO(g_tcp_wrapper_connection_get_base_io_stream, pFp)
 //GO(g_tcp_wrapper_connection_get_type, 
-//GO(g_tcp_wrapper_connection_new, 
-//GO(g_test_dbus_add_service_dir, 
+GO(g_tcp_wrapper_connection_new, pFpp)
+GO(g_test_dbus_add_service_dir, vFpp)
 //GO(g_test_dbus_down, 
 //GO(g_test_dbus_flags_get_type, 
-//GO(g_test_dbus_get_bus_address, 
-//GO(g_test_dbus_get_flags, 
+GO(g_test_dbus_get_bus_address, pFp)
+GO(g_test_dbus_get_flags, uFp)
 //GO(g_test_dbus_get_type, 
-//GO(g_test_dbus_new, 
+GO(g_test_dbus_new, pFu)
 //GO(g_test_dbus_stop, 
-//GO(g_test_dbus_unset, 
+GO(g_test_dbus_unset, vFv)
 //GO(g_test_dbus_up, 
 GO(g_themed_icon_append_name, vFpp)
 GO(g_themed_icon_get_names, pFp)
@@ -1670,121 +1670,121 @@ GO(g_themed_icon_new_with_default_fallbacks, pFp)
 GO(g_themed_icon_prepend_name, vFpp)
 //GO(g_threaded_resolver_get_type, 
 //GO(g_threaded_socket_service_get_type, 
-//GO(g_threaded_socket_service_new, 
+GO(g_threaded_socket_service_new, pFi)
 //GO(g_tls_authentication_mode_get_type, 
 //GO(g_tls_backend_get_certificate_type, 
 //GO(g_tls_backend_get_client_connection_type, 
-//GO(g_tls_backend_get_default, 
-//GO(g_tls_backend_get_default_database, 
+GO(g_tls_backend_get_default, pFv)
+GO(g_tls_backend_get_default_database, pFp)
 //GO(g_tls_backend_get_file_database_type, 
 //GO(g_tls_backend_get_server_connection_type, 
 //GO(g_tls_backend_get_type, 
 //GO(g_tls_backend_supports_tls, 
 //GO(g_tls_certificate_flags_get_type, 
-//GO(g_tls_certificate_get_issuer, 
+GO(g_tls_certificate_get_issuer, pFp)
 //GO(g_tls_certificate_get_type, 
-//GO(g_tls_certificate_is_same, 
-//GO(g_tls_certificate_list_new_from_file, 
-//GO(g_tls_certificate_new_from_file, 
+GO(g_tls_certificate_is_same, iFpp)
+GO(g_tls_certificate_list_new_from_file, pFpp)
+GO(g_tls_certificate_new_from_file, pFpp)
 //GO(g_tls_certificate_new_from_files, 
-//GO(g_tls_certificate_new_from_pem, 
+GO(g_tls_certificate_new_from_pem, pFplp)
 //GO(g_tls_certificate_request_flags_get_type, 
-//GO(g_tls_certificate_verify, 
-//GO(g_tls_client_connection_get_accepted_cas, 
-//GO(g_tls_client_connection_get_server_identity, 
+GO(g_tls_certificate_verify, uFppp)
+GO(g_tls_client_connection_get_accepted_cas, pFp)
+GO(g_tls_client_connection_get_server_identity, pFp)
 //GO(g_tls_client_connection_get_type, 
-//GO(g_tls_client_connection_get_use_ssl3, 
-//GO(g_tls_client_connection_get_validation_flags, 
-//GO(g_tls_client_connection_new, 
-//GO(g_tls_client_connection_set_server_identity, 
-//GO(g_tls_client_connection_set_use_ssl3, 
-//GO(g_tls_client_connection_set_validation_flags, 
-//GO(g_tls_connection_emit_accept_certificate, 
+GO(g_tls_client_connection_get_use_ssl3, iFp)
+GO(g_tls_client_connection_get_validation_flags, uFp)
+GO(g_tls_client_connection_new, pFppp)
+GO(g_tls_client_connection_set_server_identity, vFpp)
+GO(g_tls_client_connection_set_use_ssl3, vFpi)
+GO(g_tls_client_connection_set_validation_flags, vFpu)
+GO(g_tls_connection_emit_accept_certificate, iFppu)
 //GO(g_tls_connection_get_certificate, 
-//GO(g_tls_connection_get_database, 
-//GO(g_tls_connection_get_interaction, 
-//GO(g_tls_connection_get_peer_certificate, 
-//GO(g_tls_connection_get_peer_certificate_errors, 
-//GO(g_tls_connection_get_rehandshake_mode, 
-//GO(g_tls_connection_get_require_close_notify, 
+GO(g_tls_connection_get_database, pFp)
+GO(g_tls_connection_get_interaction, pFp)
+GO(g_tls_connection_get_peer_certificate, pFp)
+GO(g_tls_connection_get_peer_certificate_errors, uFp)
+GO(g_tls_connection_get_rehandshake_mode, uFp)
+GO(g_tls_connection_get_require_close_notify, iFp)
 //GO(g_tls_connection_get_type, 
 //GO(g_tls_connection_get_use_system_certdb, 
-//GO(g_tls_connection_handshake, 
+GO(g_tls_connection_handshake, iFppp)
 //GO(g_tls_connection_handshake_async, 
-//GO(g_tls_connection_handshake_finish, 
-//GO(g_tls_connection_set_certificate, 
-//GO(g_tls_connection_set_database, 
-//GO(g_tls_connection_set_interaction, 
-//GO(g_tls_connection_set_rehandshake_mode, 
-//GO(g_tls_connection_set_require_close_notify, 
+GO(g_tls_connection_handshake_finish, iFppp)
+GO(g_tls_connection_set_certificate, vFpp)
+GO(g_tls_connection_set_database, vFpp)
+GO(g_tls_connection_set_interaction, vFpp)
+GO(g_tls_connection_set_rehandshake_mode, vFpu)
+GO(g_tls_connection_set_require_close_notify, vFpi)
 //GO(g_tls_connection_set_use_system_certdb, 
-//GO(g_tls_database_create_certificate_handle, 
+GO(g_tls_database_create_certificate_handle, pFpp)
 //GO(g_tls_database_get_type, 
-//GO(g_tls_database_lookup_certificate_for_handle, 
+GO(g_tls_database_lookup_certificate_for_handle, pFpppupp)
 //GO(g_tls_database_lookup_certificate_for_handle_async, 
 //GO(g_tls_database_lookup_certificate_for_handle_finish, 
-//GO(g_tls_database_lookup_certificate_issuer, 
+GO(g_tls_database_lookup_certificate_issuer, pFpppupp)
 //GO(g_tls_database_lookup_certificate_issuer_async, 
-//GO(g_tls_database_lookup_certificate_issuer_finish, 
-//GO(g_tls_database_lookup_certificates_issued_by, 
+GO(g_tls_database_lookup_certificate_issuer_finish, pFppp)
+GO(g_tls_database_lookup_certificates_issued_by, pFpppupp)
 //GO(g_tls_database_lookup_certificates_issued_by_async, 
-//GO(g_tls_database_lookup_certificates_issued_by_finish, 
+GO(g_tls_database_lookup_certificates_issued_by_finish, pFppp)
 //GO(g_tls_database_lookup_flags_get_type, 
-//GO(g_tls_database_verify_chain, 
+GO(g_tls_database_verify_chain, uFpppppupp)
 //GO(g_tls_database_verify_chain_async, 
-//GO(g_tls_database_verify_chain_finish, 
+GO(g_tls_database_verify_chain_finish, uFppp)
 //GO(g_tls_database_verify_flags_get_type, 
 //GO(g_tls_error_get_type, 
 //GO(g_tls_error_quark, 
 //GO(g_tls_file_database_get_type, 
-//GO(g_tls_file_database_new, 
-//GO(g_tls_interaction_ask_password, 
+GO(g_tls_file_database_new, pFpp)
+GO(g_tls_interaction_ask_password, uFpppp)
 //GO(g_tls_interaction_ask_password_async, 
 //GO(g_tls_interaction_ask_password_finish, 
 //GO(g_tls_interaction_get_type, 
 //GO(g_tls_interaction_invoke_ask_password, 
 //GO(g_tls_interaction_invoke_request_certificate, 
-//GO(g_tls_interaction_request_certificate, 
+GO(g_tls_interaction_request_certificate, uFppupp)
 //GO(g_tls_interaction_request_certificate_async, 
-//GO(g_tls_interaction_request_certificate_finish, 
+GO(g_tls_interaction_request_certificate_finish, uFppp)
 //GO(g_tls_interaction_result_get_type, 
 //GO(g_tls_password_flags_get_type, 
 //GO(g_tls_password_get_description, 
-//GO(g_tls_password_get_flags, 
+GO(g_tls_password_get_flags, uFp)
 //GO(g_tls_password_get_type, 
-//GO(g_tls_password_get_value, 
-//GO(g_tls_password_get_warning, 
-//GO(g_tls_password_new, 
+GO(g_tls_password_get_value, pFpp)
+GO(g_tls_password_get_warning, pFp)
+GO(g_tls_password_new, pFup)
 //GO(g_tls_password_set_description, 
-//GO(g_tls_password_set_flags, 
-//GO(g_tls_password_set_value, 
+GO(g_tls_password_set_flags, vFpu)
+GO(g_tls_password_set_value, vFppl)
 //GO(g_tls_password_set_value_full, 
-//GO(g_tls_password_set_warning, 
+GO(g_tls_password_set_warning, vFpp)
 //GO(g_tls_rehandshake_mode_get_type, 
 //GO(g_tls_server_connection_get_type, 
-//GO(g_tls_server_connection_new, 
+GO(g_tls_server_connection_new, pFppp)
 //GO(g_unix_connection_get_type, 
-//GO(g_unix_connection_receive_credentials, 
+GO(g_unix_connection_receive_credentials, pFppp)
 //GO(g_unix_connection_receive_credentials_async, 
-//GO(g_unix_connection_receive_credentials_finish, 
-//GO(g_unix_connection_receive_fd, 
-//GO(g_unix_connection_send_credentials, 
+GO(g_unix_connection_receive_credentials_finish, pFppp)
+GO(g_unix_connection_receive_fd, iFppp)
+GO(g_unix_connection_send_credentials, iFppp)
 //GO(g_unix_connection_send_credentials_async, 
-//GO(g_unix_connection_send_credentials_finish, 
-//GO(g_unix_connection_send_fd, 
-//GO(g_unix_credentials_message_get_credentials, 
+GO(g_unix_connection_send_credentials_finish, iFppp)
+GO(g_unix_connection_send_fd, iFpipp)
+GO(g_unix_credentials_message_get_credentials, pFp)
 //GO(g_unix_credentials_message_get_type, 
 //GO(g_unix_credentials_message_is_supported, 
-//GO(g_unix_credentials_message_new, 
-//GO(g_unix_credentials_message_new_with_credentials, 
+GO(g_unix_credentials_message_new, pFv)
+GO(g_unix_credentials_message_new_with_credentials, pFp)
 //GO(g_unix_fd_list_append, 
 GO(g_unix_fd_list_get, iFpip)
 GO(g_unix_fd_list_get_length, iFp)
 GO(g_unix_fd_list_get_type, LFv)
-//GO(g_unix_fd_list_new, 
-//GO(g_unix_fd_list_new_from_array, 
-//GO(g_unix_fd_list_peek_fds, 
-//GO(g_unix_fd_list_steal_fds, 
+GO(g_unix_fd_list_new, pFv)
+GO(g_unix_fd_list_new_from_array, pFpi)
+GO(g_unix_fd_list_peek_fds, pFpp)
+GO(g_unix_fd_list_steal_fds, pFpp)
 //GO(g_unix_fd_message_append_fd, 
 //GO(g_unix_fd_message_get_fd_list, 
 //GO(g_unix_fd_message_get_type, 
@@ -1835,58 +1835,58 @@ GO(g_unix_fd_list_get_type, LFv)
 //GO(g_unix_output_stream_get_type, 
 //GO(g_unix_output_stream_new, 
 //GO(g_unix_output_stream_set_close_fd, 
-//GO(g_unix_socket_address_abstract_names_supported, 
-//GO(g_unix_socket_address_get_address_type, 
-//GO(g_unix_socket_address_get_is_abstract, 
-//GO(g_unix_socket_address_get_path, 
-//GO(g_unix_socket_address_get_path_len, 
+GO(g_unix_socket_address_abstract_names_supported, iFv)
+GO(g_unix_socket_address_get_address_type, uFp)
+GO(g_unix_socket_address_get_is_abstract, iFp)
+GO(g_unix_socket_address_get_path, pFp)
+GO(g_unix_socket_address_get_path_len, LFp)
 //GO(g_unix_socket_address_get_type, 
-//GO(g_unix_socket_address_new, 
-//GO(g_unix_socket_address_new_abstract, 
-//GO(g_unix_socket_address_new_with_type, 
+GO(g_unix_socket_address_new, pFp)
+GO(g_unix_socket_address_new_abstract, pFpi)
+GO(g_unix_socket_address_new_with_type, pFpiu)
 //GO(g_unix_socket_address_type_get_type, 
 //GO(g_vfs_get_default, 
 //GO(g_vfs_get_file_for_path, 
 //GO(g_vfs_get_file_for_uri, 
-//GO(g_vfs_get_local, 
-//GO(g_vfs_get_supported_uri_schemes, 
+GO(g_vfs_get_local, pFv)
+GO(g_vfs_get_supported_uri_schemes, pFp)
 //GO(g_vfs_get_type, 
-//GO(g_vfs_is_active, 
-//GO(g_vfs_parse_name, 
+GO(g_vfs_is_active, iFp)
+GO(g_vfs_parse_name, pFpp)
 //GO(g_volume_can_eject, 
 //GO(g_volume_can_mount, 
 //GO(g_volume_eject, 
 //GO(g_volume_eject_finish, 
 //GO(g_volume_eject_with_operation, 
-//GO(g_volume_eject_with_operation_finish, 
-//GO(g_volume_enumerate_identifiers, 
-//GO(g_volume_get_activation_root, 
-//GO(g_volume_get_drive, 
+GO(g_volume_eject_with_operation_finish, iFppp)
+GO(g_volume_enumerate_identifiers, pFp)
+GO(g_volume_get_activation_root, pFp)
+GO(g_volume_get_drive, pFp)
 //GO(g_volume_get_icon, 
-//GO(g_volume_get_identifier, 
-//GO(g_volume_get_mount, 
+GO(g_volume_get_identifier, pFpp)
+GO(g_volume_get_mount, pFp)
 //GO(g_volume_get_name, 
-//GO(g_volume_get_sort_key, 
-//GO(g_volume_get_symbolic_icon, 
+GO(g_volume_get_sort_key, pFp)
+GO(g_volume_get_symbolic_icon, pFp)
 //GO(g_volume_get_type, 
-//GO(g_volume_get_uuid, 
-//GO(g_volume_monitor_adopt_orphan_mount, 
-//GO(g_volume_monitor_get, 
+GO(g_volume_get_uuid, pFp)
+GO(g_volume_monitor_adopt_orphan_mount, pFp)
+GO(g_volume_monitor_get, pFv)
 //GO(g_volume_monitor_get_connected_drives, 
-//GO(g_volume_monitor_get_mount_for_uuid, 
-//GO(g_volume_monitor_get_mounts, 
+GO(g_volume_monitor_get_mount_for_uuid, pFpp)
+GO(g_volume_monitor_get_mounts, pFp)
 //GO(g_volume_monitor_get_type, 
-//GO(g_volume_monitor_get_volume_for_uuid, 
+GO(g_volume_monitor_get_volume_for_uuid, pFpp)
 //GO(g_volume_monitor_get_volumes, 
 //GO(g_volume_mount, 
 //GO(g_volume_mount_finish, 
-//GO(g_volume_should_automount, 
+GO(g_volume_should_automount, iFp)
 //GO(g_zlib_compressor_format_get_type, 
-//GO(g_zlib_compressor_get_file_info, 
+GO(g_zlib_compressor_get_file_info, pFp)
 //GO(g_zlib_compressor_get_type, 
-//GO(g_zlib_compressor_new, 
-//GO(g_zlib_compressor_set_file_info, 
-//GO(g_zlib_decompressor_get_file_info, 
-//GO(g_zlib_decompressor_get_type, 
-//GO(g_zlib_decompressor_new, 
+GO(g_zlib_compressor_new, pFui)
+GO(g_zlib_compressor_set_file_info, vFpp)
+GO(g_zlib_decompressor_get_file_info, pFp)
+GO(g_zlib_decompressor_get_type, LFv)
+GO(g_zlib_decompressor_new, pFu)
 //GO(_init, 
diff --git a/src/wrapped/wrappedglib2_private.h b/src/wrapped/wrappedglib2_private.h
index c714900d..b148298e 100755
--- a/src/wrapped/wrappedglib2_private.h
+++ b/src/wrapped/wrappedglib2_private.h
@@ -29,22 +29,22 @@ GO(g_ascii_dtostr, pFpid)
 GO(g_ascii_formatd, pFpipd)
 GO(g_ascii_strcasecmp, iFpp)
 GO(g_ascii_strdown, pFpi)
-GO(g_ascii_strncasecmp, iFppu)
+GO(g_ascii_strncasecmp, iFppL)
 GO(g_ascii_strtod, dFpp)
-GO(g_ascii_strtoll, IFppu)
-GO(g_ascii_strtoull, UFppu)
-GO(g_ascii_strup, pFpi)
+GO(g_ascii_strtoll, lFppu)
+GO(g_ascii_strtoull, LFppu)
+GO(g_ascii_strup, pFpl)
 GO(g_ascii_tolower, CFC)
 GO(g_ascii_toupper, CFC)
 GO(g_ascii_xdigit_value, iFC)
 GO(g_assertion_message, vFppipp)
-GO(g_assertion_message_cmpnum, vFppippDDC)
+GO(g_assertion_message_cmpnum, vFppippDpDC)
 GO(g_assertion_message_cmpstr, vFppippppp)
 GO(g_assertion_message_error, vFppipppui)
 GO(g_assertion_message_expr, vFppipp)
 GO(g_assert_warning, vFppipp)
 GO(g_async_queue_length, iFp)
-//GO(g_async_queue_length_unlocked, 
+GO(g_async_queue_length_unlocked, iFp)
 GO(g_async_queue_lock, vFp)
 GO(g_async_queue_new, pFv)
 //GO(g_async_queue_new_full, 
@@ -54,14 +54,14 @@ GO(g_async_queue_push, vFpp)
 //GO(g_async_queue_push_sorted, 
 //GO(g_async_queue_push_sorted_unlocked, 
 GO(g_async_queue_push_unlocked, vFpp)
-GO(g_async_queue_ref, vFp)
+GO(g_async_queue_ref, pFp)
 //GO(g_async_queue_ref_unlocked, 
 //GO(g_async_queue_sort, 
 //GO(g_async_queue_sort_unlocked, 
 //GO(g_async_queue_timed_pop, 
-//GO(g_async_queue_timed_pop_unlocked, 
+GO(g_async_queue_timed_pop_unlocked, pFpp)
 GO(g_async_queue_timeout_pop, pFpU)
-GO(g_async_queue_timeout_pop_unlocked, pFpU)
+GO(g_async_queue_timeout_pop_unlocked, pFpL)
 GO(g_async_queue_try_pop, pFp)
 GO(g_async_queue_try_pop_unlocked, pFp)
 GO(g_async_queue_unlock, vFp)
@@ -70,21 +70,21 @@ GO(g_async_queue_unref_and_unlock, vFp)
 GO2(g_atexit, vFEp, my_atexit)
 //GO(g_atomic_int_add, 
 //GO(g_atomic_int_and, 
-//GO(g_atomic_int_compare_and_exchange, 
-//GO(g_atomic_int_dec_and_test, 
+GO(g_atomic_int_compare_and_exchange, iFpii)
+GO(g_atomic_int_dec_and_test, iFp)
 GO(g_atomic_int_exchange_and_add, iFpi)
-//GO(g_atomic_int_get, 
-//GO(g_atomic_int_inc, 
+GO(g_atomic_int_get, iFp)
+GO(g_atomic_int_inc, vFp)
 //GO(g_atomic_int_or, 
 //GO(g_atomic_int_set, 
-//GO(g_atomic_int_xor, 
-//GO(g_atomic_pointer_add, 
+GO(g_atomic_int_xor, uFpu)
+GO(g_atomic_pointer_add, lFpl)
 //GO(g_atomic_pointer_and, 
-//GO(g_atomic_pointer_compare_and_exchange, 
-//GO(g_atomic_pointer_get, 
+GO(g_atomic_pointer_compare_and_exchange, iFppp)
+GO(g_atomic_pointer_get, pFp)
 //GO(g_atomic_pointer_or, 
-//GO(g_atomic_pointer_set, 
-//GO(g_atomic_pointer_xor, 
+GO(g_atomic_pointer_set, vFpp)
+GO(g_atomic_pointer_xor, LFpL)
 GO(g_base64_decode, pFpp)
 GO(g_base64_decode_inplace, pFpp)
 GO(g_base64_decode_step, LFpLppp)
@@ -94,50 +94,50 @@ GO(g_base64_encode_step, LFpLippp)
 GO(g_basename, pFp)
 //GO(g_bit_lock, 
 GO(g_bit_nth_lsf, iFii)
-GO(g_bit_nth_msf, iFii)
-GO(g_bit_storage, iFi)
-//GO(g_bit_trylock, 
-//GO(g_bit_unlock, 
+GO(g_bit_nth_msf, iFLi)
+GO(g_bit_storage, uFL)
+GO(g_bit_trylock, iFpi)
+GO(g_bit_unlock, vFpi)
 //GO(g_blow_chunks, 
 //GO(g_bookmark_file_add_application, 
-//GO(g_bookmark_file_add_group, 
+GO(g_bookmark_file_add_group, vFppp)
 //GO(g_bookmark_file_error_quark, 
 //GO(g_bookmark_file_free, 
 //GO(g_bookmark_file_get_added, 
-//GO(g_bookmark_file_get_app_info, 
-//GO(g_bookmark_file_get_applications, 
+GO(g_bookmark_file_get_app_info, iFppppppp)
+GO(g_bookmark_file_get_applications, pFpppp)
 //GO(g_bookmark_file_get_description, 
 //GO(g_bookmark_file_get_groups, 
-//GO(g_bookmark_file_get_icon, 
+GO(g_bookmark_file_get_icon, iFppppp)
 //GO(g_bookmark_file_get_is_private, 
-//GO(g_bookmark_file_get_mime_type, 
+GO(g_bookmark_file_get_mime_type, pFppp)
 //GO(g_bookmark_file_get_modified, 
-//GO(g_bookmark_file_get_size, 
+GO(g_bookmark_file_get_size, iFp)
 //GO(g_bookmark_file_get_title, 
-//GO(g_bookmark_file_get_uris, 
-//GO(g_bookmark_file_get_visited, 
+GO(g_bookmark_file_get_uris, pFpp)
+GO(g_bookmark_file_get_visited, lFppp)
 //GO(g_bookmark_file_has_application, 
 //GO(g_bookmark_file_has_group, 
-//GO(g_bookmark_file_has_item, 
-//GO(g_bookmark_file_load_from_data, 
-//GO(g_bookmark_file_load_from_data_dirs, 
+GO(g_bookmark_file_has_item, iFpp)
+GO(g_bookmark_file_load_from_data, iFppLp)
+GO(g_bookmark_file_load_from_data_dirs, iFpppp)
 //GO(g_bookmark_file_load_from_file, 
-//GO(g_bookmark_file_move_item, 
-//GO(g_bookmark_file_new, 
+GO(g_bookmark_file_move_item, iFpppp)
+GO(g_bookmark_file_new, pFv)
 //GO(g_bookmark_file_remove_application, 
 //GO(g_bookmark_file_remove_group, 
-//GO(g_bookmark_file_remove_item, 
+GO(g_bookmark_file_remove_item, iFppp)
 //GO(g_bookmark_file_set_added, 
-//GO(g_bookmark_file_set_app_info, 
+GO(g_bookmark_file_set_app_info, iFppppilp)
 //GO(g_bookmark_file_set_description, 
-//GO(g_bookmark_file_set_groups, 
-//GO(g_bookmark_file_set_icon, 
-//GO(g_bookmark_file_set_is_private, 
+GO(g_bookmark_file_set_groups, vFpppL)
+GO(g_bookmark_file_set_icon, vFpppp)
+GO(g_bookmark_file_set_is_private, vFppi)
 //GO(g_bookmark_file_set_mime_type, 
 //GO(g_bookmark_file_set_modified, 
 //GO(g_bookmark_file_set_title, 
-//GO(g_bookmark_file_set_visited, 
-//GO(g_bookmark_file_to_data, 
+GO(g_bookmark_file_set_visited, vFppl)
+GO(g_bookmark_file_to_data, pFppp)
 //GO(g_bookmark_file_to_file, 
 GOM(g_build_filename, pFEpV)
 GO(g_build_filenamev, pFp)
@@ -160,7 +160,7 @@ GO(g_byte_array_sized_new, pFu)
 GO(g_byte_array_unref, vFp)
 GO(g_bytes_compare, iFpp)
 GO(g_bytes_equal, iFpp)
-GO(g_bytes_get_data, pFpL)
+GO(g_bytes_get_data, pFpp)
 GO(g_bytes_get_size, LFp)
 GO(g_bytes_hash, uFp)
 GO(g_bytes_new, pFpL)
@@ -172,21 +172,21 @@ GO(g_bytes_ref, pFp)
 GO(g_bytes_unref, vFp)
 GO(g_bytes_unref_to_array, pFp)
 GO(g_bytes_unref_to_data, pFpp)
-//GO(g_cache_destroy, 
-//GO(g_cache_insert, 
+GO(g_cache_destroy, vFp)
+GO(g_cache_insert, pFpp)
 //GO(g_cache_key_foreach, 
 //GO(g_cache_new, 
-//GO(g_cache_remove, 
+GO(g_cache_remove, vFpp)
 //GO(g_cache_value_foreach, 
 GO(g_chdir, iFp)
-//GO(g_checksum_copy, 
+GO(g_checksum_copy, pFp)
 //GO(g_checksum_free, 
-//GO(g_checksum_get_digest, 
-//GO(g_checksum_get_string, 
-//GO(g_checksum_new, 
+GO(g_checksum_get_digest, vFppp)
+GO(g_checksum_get_string, pFp)
+GO(g_checksum_new, pFu)
 //GO(g_checksum_reset, 
-//GO(g_checksum_type_get_length, 
-//GO(g_checksum_update, 
+GO(g_checksum_type_get_length, lFu)
+GO(g_checksum_update, vFppl)
 GOM(g_child_watch_add, uFEipp)
 GOM(g_child_watch_add_full, uFEiippp)
 GO(g_child_watch_source_new, pFi)
@@ -202,20 +202,20 @@ GO(g_completion_free, vFp)
 GOM(g_completion_new, pFEp)
 GO(g_completion_remove_items, vFpp)
 GOM(g_completion_set_compare, vFEpp)
-//GO(g_compute_checksum_for_bytes, 
-//GO(g_compute_checksum_for_data, 
-//GO(g_compute_checksum_for_string, 
-//GO(g_compute_hmac_for_data, 
-//GO(g_compute_hmac_for_string, 
+GO(g_compute_checksum_for_bytes, pFup)
+GO(g_compute_checksum_for_data, pFupL)
+GO(g_compute_checksum_for_string, pFupl)
+GO(g_compute_hmac_for_data, pFupLpL)
+GO(g_compute_hmac_for_string, pFupLpl)
 GO(g_cond_broadcast, vFp)
 GO(g_cond_clear, vFp)
 GO(g_cond_free, vFp)
 GO(g_cond_init, vFp)
 GO(g_cond_new, pFv)
 GO(g_cond_signal, vFp)
-//GO(g_cond_timed_wait, 
+GO(g_cond_timed_wait, iFppp)
 GO(g_cond_wait, vFpp)
-//GO(g_cond_wait_until, 
+GO(g_cond_wait_until, iFppl)
 GO(g_convert, pFplppppp)
 //GO(g_convert_error_quark, 
 GO(g_convert_with_fallback, pFplpppppp)
@@ -233,10 +233,10 @@ GOM(g_datalist_id_set_data_full, vFEpupp)
 GO(g_datalist_init, vFp)
 GO(g_datalist_set_flags, vFpu)
 GO(g_datalist_unset_flags, vFpu)
-//GO(g_dataset_destroy, 
+GO(g_dataset_destroy, vFp)
 //GO(g_dataset_foreach, 
 //GO(g_dataset_id_get_data, 
-//GO(g_dataset_id_remove_no_notify, 
+GO(g_dataset_id_remove_no_notify, pFpu)
 //GO(g_dataset_id_set_data_full, 
 GO(g_date_add_days, vFpu)
 GO(g_date_add_months, vFpu)
@@ -248,90 +248,90 @@ GO(g_date_days_between, iFpp)
 GO(g_date_free, vFp)
 GO(g_date_get_day, CFp)
 GO(g_date_get_day_of_year, uFp)
-GO(g_date_get_days_in_month, CFip)
+GO(g_date_get_days_in_month, CFuW)
 GO(g_date_get_iso8601_week_of_year, uFp)
 GO(g_date_get_julian, uFp)
 GO(g_date_get_monday_week_of_year, uFp)
 GO(g_date_get_monday_weeks_in_year, CFp)
-GO(g_date_get_month, iFp)
+GO(g_date_get_month, uFp)
 GO(g_date_get_sunday_week_of_year, uFp)
-GO(g_date_get_sunday_weeks_in_year, CFp)
-GO(g_date_get_weekday, iFp)
+GO(g_date_get_sunday_weeks_in_year, CFW)
+GO(g_date_get_weekday, uFp)
 GO(g_date_get_year, WFp)
 GO(g_date_is_first_of_month, iFp)
 GO(g_date_is_last_of_month, iFp)
-GO(g_date_is_leap_year, iFp)
+GO(g_date_is_leap_year, iFW)
 GO(g_date_new, pFv)
-GO(g_date_new_dmy, pFCiW)
+GO(g_date_new_dmy, pFCuW)
 GO(g_date_new_julian, pFu)
 GO(g_date_order, vFpp)
 GO(g_date_set_day, vFpC)
-GO(g_date_set_dmy, vFpCiW)
+GO(g_date_set_dmy, vFpCuW)
 GO(g_date_set_julian, vFpu)
-GO(g_date_set_month, vFpi)
+GO(g_date_set_month, vFpu)
 GO(g_date_set_parse, vFpp)
 GO(g_date_set_time, vFpi)
-//GO(g_date_set_time_t, 
+GO(g_date_set_time_t, vFpl)
 GO(g_date_set_time_val, vFpp)
 GO(g_date_set_year, vFpW)
 GO(g_date_strftime, LFpLpp)
 GO(g_date_subtract_days, vFpu)
 GO(g_date_subtract_months, vFpu)
 GO(g_date_subtract_years, vFpu)
-//GO(g_date_time_add, 
+GO(g_date_time_add, pFpl)
 //GO(g_date_time_add_days, 
-//GO(g_date_time_add_full, 
+GO(g_date_time_add_full, pFpiiiiid)
 //GO(g_date_time_add_hours, 
-//GO(g_date_time_add_minutes, 
+GO(g_date_time_add_minutes, pFpi)
 //GO(g_date_time_add_months, 
-//GO(g_date_time_add_seconds, 
+GO(g_date_time_add_seconds, pFpd)
 //GO(g_date_time_add_weeks, 
 //GO(g_date_time_add_years, 
 //GO(g_date_time_compare, 
-//GO(g_date_time_difference, 
+GO(g_date_time_difference, lFpp)
 //GO(g_date_time_equal, 
-//GO(g_date_time_format, 
+GO(g_date_time_format, pFpp)
 //GO(g_date_time_get_day_of_month, 
 //GO(g_date_time_get_day_of_week, 
 //GO(g_date_time_get_day_of_year, 
 //GO(g_date_time_get_hour, 
-//GO(g_date_time_get_microsecond, 
+GO(g_date_time_get_microsecond, iFp)
 //GO(g_date_time_get_minute, 
 //GO(g_date_time_get_month, 
 //GO(g_date_time_get_second, 
-//GO(g_date_time_get_seconds, 
-//GO(g_date_time_get_timezone_abbreviation, 
-//GO(g_date_time_get_utc_offset, 
+GO(g_date_time_get_seconds, dFp)
+GO(g_date_time_get_timezone_abbreviation, pFp)
+GO(g_date_time_get_utc_offset, lFp)
 //GO(g_date_time_get_week_numbering_year, 
 //GO(g_date_time_get_week_of_year, 
 //GO(g_date_time_get_year, 
-//GO(g_date_time_get_ymd, 
+GO(g_date_time_get_ymd, vFpppp)
 //GO(g_date_time_hash, 
-//GO(g_date_time_is_daylight_savings, 
-//GO(g_date_time_new, 
+GO(g_date_time_is_daylight_savings, iFp)
+GO(g_date_time_new, pFpiiiiid)
 //GO(g_date_time_new_from_timeval_local, 
-//GO(g_date_time_new_from_timeval_utc, 
+GO(g_date_time_new_from_timeval_utc, pFp)
 //GO(g_date_time_new_from_unix_local, 
-//GO(g_date_time_new_from_unix_utc, 
+GO(g_date_time_new_from_unix_utc, pFl)
 //GO(g_date_time_new_local, 
-//GO(g_date_time_new_now, 
+GO(g_date_time_new_now, pFp)
 //GO(g_date_time_new_now_local, 
-//GO(g_date_time_new_now_utc, 
-//GO(g_date_time_new_utc, 
+GO(g_date_time_new_now_utc, pFv)
+GO(g_date_time_new_utc, pFiiiiid)
 //GO(g_date_time_ref, 
 //GO(g_date_time_to_local, 
-//GO(g_date_time_to_timeval, 
-//GO(g_date_time_to_timezone, 
-//GO(g_date_time_to_unix, 
-//GO(g_date_time_to_utc, 
+GO(g_date_time_to_timeval, iFpp)
+GO(g_date_time_to_timezone, pFpp)
+GO(g_date_time_to_unix, lFp)
+GO(g_date_time_to_utc, pFp)
 //GO(g_date_time_unref, 
 GO(g_date_to_struct_tm, vFpp)
 GO(g_date_valid, iFp)
 GO(g_date_valid_day, iFC)
-GO(g_date_valid_dmy, iFCiW)
+GO(g_date_valid_dmy, iFCuW)
 GO(g_date_valid_julian, iFu)
-GO(g_date_valid_month, iFi)
-GO(g_date_valid_weekday, iFi)
+GO(g_date_valid_month, iFu)
+GO(g_date_valid_weekday, iFu)
 GO(g_date_valid_year, iFW)
 GO(g_dcgettext, pFppi)
 GO(g_dgettext, pFpp)
@@ -339,7 +339,7 @@ GO(g_dir_close, vFp)
 GO(g_direct_equal, iFpp)
 GO(g_direct_hash, uFp)
 GO(g_dir_make_tmp, pFpp)
-GO(g_dir_open, pFp)
+GO(g_dir_open, pFpup)
 GO(g_dir_read_name, pFp)
 GO(g_dir_rewind, vFp)
 GO(g_dngettext, pFpppL)
@@ -352,28 +352,28 @@ GO(g_environ_setenv, pFpppi)
 GO(g_environ_unsetenv, pFpp)
 GO(g_error_copy, pFp)
 GO(g_error_free, vFp)
-GO(g_error_matches, iFppi)
+GO(g_error_matches, iFpui)
 GOM(g_error_new, pFEpipV)
-GO(g_error_new_literal, pFpip)
+GO(g_error_new_literal, pFuip)
 GOM(g_error_new_valist, pFEpipA)
-GO(g_file_error_from_errno, iFi)
+GO(g_file_error_from_errno, uFi)
 GO(g_file_error_quark, pFv)
 GO(g_file_get_contents, iFpppp)
 GO(g_filename_display_basename, pFp)
 GO(g_filename_display_name, pFp)
 GO(g_filename_from_uri, pFppp)
-GO(g_filename_from_utf8, pFpippp)
+GO(g_filename_from_utf8, pFplppp)
 GO(g_filename_to_uri, pFppp)
 GO(g_filename_to_utf8, pFpippp)
 GO(g_file_open_tmp, iFppp)
 GO(g_file_read_link, pFpp)
-GO(g_file_set_contents, iFppip)
-GO(g_file_test, iFpi)
+GO(g_file_set_contents, iFpplp)
+GO(g_file_test, iFpu)
 GO(g_find_program_in_path, pFp) // need wrap?
 GO(g_fopen, pFpp)
-GO(g_format_size, pFU)
-GO(g_format_size_for_display, pFI)
-GO(g_format_size_full, pFUi)
+GO(g_format_size, pFL)
+GO(g_format_size_for_display, pFl)
+GO(g_format_size_full, pFLu)
 GOM(g_fprintf, iFEppV)
 GO(g_free, vFp)
 GO(g_freopen, pFppp)
@@ -393,7 +393,7 @@ GO(g_get_monotonic_time, IFv)
 //GO(g_get_num_processors, 
 GO(g_get_prgname, pFv)
 GO(g_get_real_name, pFv)
-GO(g_get_real_time, IFv)
+GO(g_get_real_time, lFv)
 GO(g_get_system_config_dirs, pFv)
 GO(g_get_system_data_dirs, pFv)
 GO(g_get_tmp_dir, pFv)
@@ -402,7 +402,7 @@ GO(g_get_user_config_dir, pFv)
 GO(g_get_user_data_dir, pFv)
 GO(g_get_user_name, pFv)
 GO(g_get_user_runtime_dir, pFv)
-GO(g_get_user_special_dir, pFi)
+GO(g_get_user_special_dir, pFu)
 GO(g_hash_table_add, iFpp)
 GO(g_hash_table_contains, iFpp)
 GO(g_hash_table_destroy, vFp)
@@ -432,13 +432,13 @@ GO(g_hash_table_size, uFp)
 GO(g_hash_table_steal, iFpp)
 GO(g_hash_table_steal_all, vFp)
 GO(g_hash_table_unref, vFp)
-//GO(g_hmac_copy, 
-//GO(g_hmac_get_digest, 
-//GO(g_hmac_get_string, 
-//GO(g_hmac_new, 
-//GO(g_hmac_ref, 
+GO(g_hmac_copy, pFp)
+GO(g_hmac_get_digest, vFppp)
+GO(g_hmac_get_string, pFp)
+GO(g_hmac_new, pFupL)
+GO(g_hmac_ref, pFp)
 //GO(g_hmac_unref, 
-//GO(g_hmac_update, 
+GO(g_hmac_update, vFppl)
 //GO(g_hook_alloc, 
 //GO(g_hook_compare_ids, 
 //GO(g_hook_destroy, 
@@ -483,7 +483,7 @@ GO(g_int_hash, uFp)
 GOM(g_io_add_watch, uFEpipp)
 GOM(g_io_add_watch_full, uFEpiippp)
 GO(g_io_channel_close, vFp)
-GO(g_io_channel_error_from_errno, iFi)
+GO(g_io_channel_error_from_errno, uFi)
 GO(g_io_channel_error_quark, pFv)
 GO(g_io_channel_flush, iFpp)
 GO(g_io_channel_get_buffer_condition, iFp)
@@ -526,7 +526,7 @@ GO(g_key_file_get_comment, pFpppp)
 GO(g_key_file_get_double, dFpppp)
 GO(g_key_file_get_double_list, pFppppp)
 GO(g_key_file_get_groups, pFpp)
-GO(g_key_file_get_int64, IFpppp)
+GO(g_key_file_get_int64, lFpppp)
 GO(g_key_file_get_integer, iFpppp)
 GO(g_key_file_get_integer_list, pFppppp)
 GO(g_key_file_get_keys, pFpppp)
@@ -535,14 +535,14 @@ GO(g_key_file_get_locale_string_list, pFpppppp)
 GO(g_key_file_get_start_group, pFp)
 GO(g_key_file_get_string, pFpppp)
 GO(g_key_file_get_string_list, pFppppp)
-GO(g_key_file_get_uint64, UFpppp)
+GO(g_key_file_get_uint64, LFpppp)
 GO(g_key_file_get_value, pFpppp)
 GO(g_key_file_has_group, iFpp)
 GO(g_key_file_has_key, iFpppp)
-GO(g_key_file_load_from_data, iFppLip)
-GO(g_key_file_load_from_data_dirs, iFpppip)
-GO(g_key_file_load_from_dirs, iFppppip)
-GO(g_key_file_load_from_file, iFppip)
+GO(g_key_file_load_from_data, iFppLup)
+GO(g_key_file_load_from_data_dirs, iFpppup)
+GO(g_key_file_load_from_dirs, iFppppup)
+GO(g_key_file_load_from_file, iFppup)
 GO(g_key_file_new, pFv)
 GO(g_key_file_ref, pFp)
 GO(g_key_file_remove_comment, iFpppp)
@@ -554,7 +554,7 @@ GO(g_key_file_set_boolean_list, vFppppL)
 GO(g_key_file_set_comment, iFppppp)
 GO(g_key_file_set_double, vFpppd)
 GO(g_key_file_set_double_list, vFppppL)
-GO(g_key_file_set_int64, vFpppI)
+GO(g_key_file_set_int64, vFpppl)
 GO(g_key_file_set_integer, vFpppi)
 GO(g_key_file_set_integer_list, vFppppL)
 GO(g_key_file_set_list_separator, vFpC)
@@ -562,7 +562,7 @@ GO(g_key_file_set_locale_string, vFppppp)
 GO(g_key_file_set_locale_string_list, vFpppppL)
 GO(g_key_file_set_string, vFpppp)
 GO(g_key_file_set_string_list, vFppppL)
-GO(g_key_file_set_uint64, vFpppU)
+GO(g_key_file_set_uint64, vFpppL)
 GO(g_key_file_set_value, vFpppp)
 GO(g_key_file_to_data, pFppp)
 GO(g_key_file_unref, vFp)
@@ -659,8 +659,8 @@ GO(g_malloc_n, pFLL)
 GO(g_mapped_file_free, vFp)
 GO(g_mapped_file_get_bytes, pFp)
 GO(g_mapped_file_get_contents, pFp)
-GO(g_mapped_file_get_length, uFp)
-GO(g_mapped_file_new, pFppp)
+GO(g_mapped_file_get_length, LFp)
+GO(g_mapped_file_new, pFpip)
 GO(g_mapped_file_new_from_fd, pFiip)
 GO(g_mapped_file_ref, pFp)
 GO(g_mapped_file_unref, vFp)
@@ -669,15 +669,15 @@ GO(g_mapped_file_unref, vFp)
 GO(g_markup_escape_text, pFpl)
 GO(g_markup_parse_context_end_parse, iFpp)
 GO(g_markup_parse_context_free, vFp)
-//GO(g_markup_parse_context_get_element, 
-//GO(g_markup_parse_context_get_element_stack, 
-//GO(g_markup_parse_context_get_position, 
-//GO(g_markup_parse_context_get_user_data, 
+GO(g_markup_parse_context_get_element, pFp)
+GO(g_markup_parse_context_get_element_stack, pFp)
+GO(g_markup_parse_context_get_position, vFppp)
+GO(g_markup_parse_context_get_user_data, pFp)
 GOM(g_markup_parse_context_new, pFEpipp)
 GO(g_markup_parse_context_parse, iFpplp)
 //GO(g_markup_parse_context_pop, 
 //GO(g_markup_parse_context_push, 
-//GO(g_markup_parse_context_ref, 
+GO(g_markup_parse_context_ref, pFp)
 //GO(g_markup_parse_context_unref, 
 GOM(g_markup_printf_escaped, pFEpV)
 GOM(g_markup_vprintf_escaped, pFEpA)
@@ -697,13 +697,13 @@ GO(g_match_info_next, iFpp)
 GO(g_match_info_ref, pFp)
 GO(g_match_info_unref, vFp)
 //GO(g_mem_chunk_alloc, 
-//GO(g_mem_chunk_alloc0, 
+GO(g_mem_chunk_alloc0, pFp)
 //GO(g_mem_chunk_clean, 
 //GO(g_mem_chunk_destroy, 
-//GO(g_mem_chunk_free, 
+GO(g_mem_chunk_free, vFpp)
 //GO(g_mem_chunk_info, 
-//GO(g_mem_chunk_new, 
-//GO(g_mem_chunk_print, 
+GO(g_mem_chunk_new, pFpiLi)
+GO(g_mem_chunk_print, vFp)
 //GO(g_mem_chunk_reset, 
 GO(g_memdup, pFpu)
 GO(g_mem_is_system_malloc, iFv)
@@ -722,38 +722,38 @@ GO(g_mutex_lock, vFp)
 GO(g_mutex_new, pFv)
 GO(g_mutex_trylock, iFp)
 GO(g_mutex_unlock, vFp)
-//GO(g_node_child_index, 
-//GO(g_node_child_position, 
+GO(g_node_child_index, iFpp)
+GO(g_node_child_position, iFpp)
 //GO(g_node_children_foreach, 
 //GO(g_node_copy, 
 GOM(g_node_copy_deep, pFEppp)
 //GO(g_node_depth, 
 GO(g_node_destroy, vFp)
-//GO(g_node_find, 
-//GO(g_node_find_child, 
+GO(g_node_find, pFpuup)
+GO(g_node_find_child, pFpup)
 //GO(g_node_first_sibling, 
 GO(g_node_get_root, pFp)
-//GO(g_node_insert, 
-//GO(g_node_insert_after, 
+GO(g_node_insert, pFpip)
+GO(g_node_insert_after, pFppp)
 GO(g_node_insert_before, pFppp)
-//GO(g_node_is_ancestor, 
+GO(g_node_is_ancestor, iFpp)
 //GO(g_node_last_child, 
-//GO(g_node_last_sibling, 
+GO(g_node_last_sibling, pFp)
 //GO(g_node_max_height, 
-//GO(g_node_n_children, 
+GO(g_node_n_children, uFp)
 GO(g_node_new, pFp)
-//GO(g_node_n_nodes, 
-//GO(g_node_nth_child, 
+GO(g_node_n_nodes, uFpu)
+GO(g_node_nth_child, pFpu)
 //GO(g_node_pop_allocator, 
-//GO(g_node_prepend, 
-//GO(g_node_push_allocator, 
+GO(g_node_prepend, pFpp)
+GO(g_node_push_allocator, vFp)
 //GO(g_node_reverse_children, 
 GOM(g_node_traverse, vFEpiiipp)
 //GO(g_node_unlink, 
 GO(g_nullify_pointer, vFp)
 //GO(g_once_impl, 
 GO(g_once_init_enter, iFp)
-//GO(g_once_init_enter_impl, 
+GO(g_once_init_enter_impl, iFp)
 GO(g_once_init_leave, vFpL)
 GO(g_on_error_query, vFp)
 GO(g_on_error_stack_trace, vFp)
@@ -789,7 +789,7 @@ GO(g_option_group_ref, pFp) // 2.44+
 //GOM(g_option_group_set_translate_func, vFEpBpB)
 GO(g_option_group_set_translation_domain, vFpp)
 GO(g_option_group_unref, vFp)   // 2.44+
-GO(g_parse_debug_string, uFppi)
+GO(g_parse_debug_string, uFppu)
 GO(g_path_get_basename, pFp)
 GO(g_path_get_dirname, pFp)
 GO(g_path_is_absolute, iFp)
@@ -801,8 +801,8 @@ GO(g_pattern_spec_equal, iFpp)
 GO(g_pattern_spec_free, vFp)
 GO(g_pattern_spec_new, pFp)
 //GO(g_pointer_bit_lock, 
-//GO(g_pointer_bit_trylock, 
-//GO(g_pointer_bit_unlock, 
+GO(g_pointer_bit_trylock, iFpi)
+GO(g_pointer_bit_unlock, vFpi)
 GO(g_poll, iFpui)
 //GO(g_prefix_error, vFpppppppppp)    //vaarg, should align?
 GOM(g_print, vFEpV)
@@ -878,22 +878,22 @@ GO(g_queue_push_nth_link, vFpip)
 GO(g_queue_push_tail, vFpp)
 GO(g_queue_push_tail_link, vFpp)
 GO(g_queue_remove, iFpp)
-GO(g_queue_remove_all, iFpp)
+GO(g_queue_remove_all, uFpp)
 GO(g_queue_reverse, pFp)
 //GOM(g_queue_sort, vFEpBp)
 GO(g_queue_unlink, vFpp)
 GO(g_rand_copy, pFp)
-GO(g_rand_double, dFv)
-GO(g_rand_double_range, dFdd)
+GO(g_rand_double, dFp)
+GO(g_rand_double_range, dFpdd)
 GO(g_rand_free, vFp)
 GO(g_rand_int, uFp)
-GO(g_rand_int_range, uFpuu)
+GO(g_rand_int_range, iFpii)
 GO(g_rand_new, pFv)
 GO(g_rand_new_with_seed, pFu)
 GO(g_rand_new_with_seed_array, pFpu)
-GO(g_random_double, dFp)
-GO(g_random_double_range, dFpdd)
-GO(g_random_int, iFii)
+GO(g_random_double, dFv)
+GO(g_random_double_range, dFdd)
+GO(g_random_int, uFv)
 GO(g_random_int_range, iFii)
 GO(g_random_set_seed, vFu)
 GO(g_rand_set_seed, vFpu)
@@ -910,36 +910,36 @@ GO(g_regex_check_replacement, iFppp)
 GO(g_regex_escape_nul, pFpi)
 GO(g_regex_escape_string, pFpi)
 GO(g_regex_get_capture_count, iFp)
-GO(g_regex_get_compile_flags, iFp)
+GO(g_regex_get_compile_flags, uFp)
 GO(g_regex_get_has_cr_or_lf, iFp)
-GO(g_regex_get_match_flags, iFp)
+GO(g_regex_get_match_flags, uFp)
 GO(g_regex_get_max_backref, iFp)
 GO(g_regex_get_max_lookbehind, iFp)
 GO(g_regex_get_pattern, pFp)
 GO(g_regex_get_string_number, iFpp)
 GO(g_regex_match, iFppip)
-GO(g_regex_match_all, iFppip)
-GO(g_regex_match_all_full, iFppLiipp)
+GO(g_regex_match_all, iFppup)
+GO(g_regex_match_all_full, iFppliupp)
 GO(g_regex_match_full, iFppLiipp)
-GO(g_regex_match_simple, iFppii)
-GO(g_regex_new, pFpiip)
+GO(g_regex_match_simple, iFppuu)
+GO(g_regex_new, pFpuup)
 GO(g_regex_ref, pFp)
 GO(g_regex_replace, pFppLipip)
 //GOM(g_regex_replace_eval, pFEppLiiBpp)
-GO(g_regex_replace_literal, pFppLipip)
-GO(g_regex_split, pFppi)
-GO(g_regex_split_full, pFppLiiip)
-GO(g_regex_split_simple, pFppii)
+GO(g_regex_replace_literal, pFpplipup)
+GO(g_regex_split, pFppu)
+GO(g_regex_split_full, pFppliuip)
+GO(g_regex_split_simple, pFppuu)
 GO(g_regex_unref, vFp)
-//GO(g_relation_count, 
+GO(g_relation_count, iFppi)
 //GO(g_relation_delete, 
 //GO(g_relation_destroy, 
 //GO(g_relation_exists, 
 //GO(g_relation_index, 
 //GO(g_relation_insert, 
-//GO(g_relation_new, 
-//GO(g_relation_print, 
-//GO(g_relation_select, 
+GO(g_relation_new, pFi)
+GO(g_relation_print, vFp)
+GO(g_relation_select, pFppi)
 //GO(g_reload_user_special_dirs_cache, 
 GO(g_remove, iFp)
 GO(g_rename, iFpp)
@@ -948,8 +948,8 @@ GO(g_rmdir, iFp)
 //GO(g_rw_lock_clear, 
 //GO(g_rw_lock_init, 
 //GO(g_rw_lock_reader_lock, 
-//GO(g_rw_lock_reader_trylock, 
-//GO(g_rw_lock_reader_unlock, 
+GO(g_rw_lock_reader_trylock, iFp)
+GO(g_rw_lock_reader_unlock, vFp)
 //GO(g_rw_lock_writer_lock, 
 //GO(g_rw_lock_writer_trylock, 
 //GO(g_rw_lock_writer_unlock, 
@@ -978,34 +978,34 @@ GO(g_rmdir, iFp)
 //GO(g_sequence_foreach, 
 //GO(g_sequence_foreach_range, 
 //GO(g_sequence_free, 
-//GO(g_sequence_get, 
+GO(g_sequence_get, pFp)
 //GO(g_sequence_get_begin_iter, 
-//GO(g_sequence_get_end_iter, 
-//GO(g_sequence_get_iter_at_pos, 
-//GO(g_sequence_get_length, 
-//GO(g_sequence_insert_before, 
+GO(g_sequence_get_end_iter, pFp)
+GO(g_sequence_get_iter_at_pos, pFpi)
+GO(g_sequence_get_length, iFp)
+GO(g_sequence_insert_before, pFpp)
 //GO(g_sequence_insert_sorted, 
 //GO(g_sequence_insert_sorted_iter, 
-//GO(g_sequence_iter_compare, 
-//GO(g_sequence_iter_get_position, 
-//GO(g_sequence_iter_get_sequence, 
+GO(g_sequence_iter_compare, iFpp)
+GO(g_sequence_iter_get_position, iFp)
+GO(g_sequence_iter_get_sequence, pFp)
 //GO(g_sequence_iter_is_begin, 
-//GO(g_sequence_iter_is_end, 
-//GO(g_sequence_iter_move, 
+GO(g_sequence_iter_is_end, iFp)
+GO(g_sequence_iter_move, pFpi)
 //GO(g_sequence_iter_next, 
-//GO(g_sequence_iter_prev, 
+GO(g_sequence_iter_prev, pFp)
 //GO(g_sequence_lookup, 
 //GO(g_sequence_lookup_iter, 
 //GO(g_sequence_move, 
-//GO(g_sequence_move_range, 
+GO(g_sequence_move_range, vFppp)
 //GO(g_sequence_new, 
-//GO(g_sequence_prepend, 
-//GO(g_sequence_range_get_midpoint, 
-//GO(g_sequence_remove, 
-//GO(g_sequence_remove_range, 
+GO(g_sequence_prepend, pFpp)
+GO(g_sequence_range_get_midpoint, pFpp)
+GO(g_sequence_remove, vFp)
+GO(g_sequence_remove_range, vFpp)
 //GO(g_sequence_search, 
 //GO(g_sequence_search_iter, 
-//GO(g_sequence_set, 
+GO(g_sequence_set, vFpp)
 //GO(g_sequence_sort, 
 //GO(g_sequence_sort_changed, 
 //GO(g_sequence_sort_changed_iter, 
@@ -1014,7 +1014,7 @@ GO(g_rmdir, iFp)
 GO(g_set_application_name, vFp)
 GO(g_setenv, iFppi)
 GOM(g_set_error, vFEppipV)
-GO(g_set_error_literal, vFppip)
+GO(g_set_error_literal, vFpuip)
 GO(g_set_prgname, vFp)
 GOM(g_set_printerr_handler, pFEp)
 GOM(g_set_print_handler, pFEp)
@@ -1027,9 +1027,9 @@ GO(g_slice_alloc0, pFL)
 GO(g_slice_copy, pFLp)
 GO(g_slice_free1, vFLp)
 GO(g_slice_free_chain_with_offset, vFLpL)
-GO(g_slice_get_config, IFi)
-GO(g_slice_get_config_state, pFiIp)
-GO(g_slice_set_config, vFiI)
+GO(g_slice_get_config, lFu)
+GO(g_slice_get_config_state, pFulp)
+GO(g_slice_set_config, vFul)
 GO(g_slist_alloc, pFv)
 GO(g_slist_append, pFpp)
 GO(g_slist_concat, pFpp)
@@ -1099,7 +1099,7 @@ GO(g_spaced_primes_closest, uFu)
 GOM(g_spawn_async, iFEpppipppp)
 GOM(g_spawn_async_with_pipes, iFEpppippppppp)
 GO(g_spawn_check_exit_status, iFip)
-GO(g_spawn_close_pid, vFp)
+GO(g_spawn_close_pid, vFi)
 GO(g_spawn_command_line_async, iFpp)
 GO(g_spawn_command_line_sync, iFppppp)
 GO(g_spawn_error_quark, pFv)
@@ -1178,8 +1178,8 @@ GO(g_string_insert_len, pFplpl)
 GO(g_string_insert_unichar, pFplu)
 GO(g_string_new, pFp)
 GO(g_string_new_len, pFpl)
-GO(g_string_overwrite, pFplp)
-GO(g_string_overwrite_len, pFplpl)
+GO(g_string_overwrite, pFpLp)
+GO(g_string_overwrite_len, pFpLpl)
 GO(g_string_prepend, pFpp)
 GO(g_string_prepend_c, pFpC)
 GO(g_string_prepend_len, pFppl)
@@ -1194,15 +1194,15 @@ GO(g_strip_context, pFpp)
 GO(g_str_is_ascii, iFp)
 GOM(g_strjoin, pFEpV)
 GOM(g_strjoinv, pFEpp)
-GO(g_strlcat, uFppu)
+GO(g_strlcat, LFppL)
 GO(g_strlcpy, uFppu)
 GO(g_str_match_string, iFppi)
 GO(g_strncasecmp, iFppu)
-GO(g_strndup, pFpu)
-GO(g_strnfill, pFuC)
+GO(g_strndup, pFpL)
+GO(g_strnfill, pFLC)
 GO(g_strreverse, pFp)
 GO(g_strrstr, pFpp)
-GO(g_strrstr_len, pFpip)
+GO(g_strrstr_len, pFplp)
 GO(g_strsignal, pFi)
 GO(g_strsplit, pFppi)
 GO(g_strsplit_set, pFppi)
@@ -1216,71 +1216,71 @@ GO(g_strv_length, uFp)
 //GO(g_test_add_data_func_full, 
 //GO(g_test_add_func, 
 //GO(g_test_add_vtable, 
-//GO(g_test_assert_expected_messages_internal, 
+GO(g_test_assert_expected_messages_internal, vFppip)
 //GO(g_test_bug, 
 //GO(g_test_bug_base, 
 //GO(g_test_build_filename, 
 //GO(g_test_create_case, 
-//GO(g_test_create_suite, 
-//GO(g_test_expect_message, 
+GO(g_test_create_suite, pFp)
+GO(g_test_expect_message, vFpip)
 //GO(g_test_fail, 
 //GO(g_test_failed, 
-//GO(g_test_get_dir, 
+GO(g_test_get_dir, pFu)
 //GO(g_test_get_filename, 
-//GO(g_test_get_root, 
+GO(g_test_get_root, pFv)
 //GO(g_test_incomplete, 
 //GO(g_test_init, 
-//GO(g_test_log_buffer_free, 
-//GO(g_test_log_buffer_new, 
-//GO(g_test_log_buffer_pop, 
-//GO(g_test_log_buffer_push, 
-//GO(g_test_log_msg_free, 
+GO(g_test_log_buffer_free, vFp)
+GO(g_test_log_buffer_new, pFv)
+GO(g_test_log_buffer_pop, pFp)
+GO(g_test_log_buffer_push, vFpup)
+GO(g_test_log_msg_free, vFp)
 //GO(g_test_log_set_fatal_handler, 
-//GO(g_test_log_type_name, 
+GO(g_test_log_type_name, pFu)
 //GO(g_test_maximized_result, 
 //GO(g_test_message, 
 //GO(g_test_minimized_result, 
 //GO(g_test_queue_destroy, 
 //GO(g_test_queue_free, 
-//GO(g_test_rand_double, 
-//GO(g_test_rand_double_range, 
-//GO(g_test_rand_int, 
-//GO(g_test_rand_int_range, 
+GO(g_test_rand_double, dFv)
+GO(g_test_rand_double_range, dFdd)
+GO(g_test_rand_int, iFv)
+GO(g_test_rand_int_range, iFii)
 //GO(g_test_run, 
-//GO(g_test_run_suite, 
+GO(g_test_run_suite, iFp)
 //GO(g_test_set_nonfatal_assertions, 
-//GO(g_test_skip, 
+GO(g_test_skip, vFp)
 //GO(g_test_subprocess, 
-//GO(g_test_suite_add, 
-//GO(g_test_suite_add_suite, 
+GO(g_test_suite_add, vFpp)
+GO(g_test_suite_add_suite, vFpp)
 //GO(g_test_timer_elapsed, 
 //GO(g_test_timer_last, 
 //GO(g_test_timer_start, 
-//GO(g_test_trap_assertions, 
-//GO(g_test_trap_fork, 
+GO(g_test_trap_assertions, vFppipLp)
+GO(g_test_trap_fork, iFLu)
 //GO(g_test_trap_has_passed, 
 //GO(g_test_trap_reached_timeout, 
-//GO(g_test_trap_subprocess, 
+GO(g_test_trap_subprocess, vFpLu)
 GOM(g_thread_create, pFEppip)
 GOM(g_thread_create_full, pFEppLiiip)
 //GO(g_thread_error_quark, 
 GO(g_thread_exit, vFp)
 GOM(g_thread_foreach, vFEpp)
-//GO(g_thread_get_initialized, 
+GO(g_thread_get_initialized, iFv)
 //GO(g_thread_init_glib, 
 GO(g_thread_join, pFp)
 //GO(g_thread_new, 
 //GO(g_thread_pool_free, 
-//GO(g_thread_pool_get_max_idle_time, 
+GO(g_thread_pool_get_max_idle_time, uFv)
 //GO(g_thread_pool_get_max_threads, 
-//GO(g_thread_pool_get_max_unused_threads, 
+GO(g_thread_pool_get_max_unused_threads, iFv)
 //GO(g_thread_pool_get_num_threads, 
 //GO(g_thread_pool_get_num_unused_threads, 
 //GO(g_thread_pool_new, 
 //GO(g_thread_pool_push, 
-//GO(g_thread_pool_set_max_idle_time, 
+GO(g_thread_pool_set_max_idle_time, vFu)
 //GO(g_thread_pool_set_max_threads, 
-//GO(g_thread_pool_set_max_unused_threads, 
+GO(g_thread_pool_set_max_unused_threads, vFi)
 //GO(g_thread_pool_set_sort_function, 
 //GO(g_thread_pool_stop_unused_threads, 
 //GO(g_thread_pool_unprocessed, 
@@ -1298,23 +1298,23 @@ GO(g_timeout_source_new, pFu)
 GO(g_timeout_source_new_seconds, pFu)
 //GO(g_timer_continue, 
 //GO(g_timer_destroy, 
-//GO(g_timer_elapsed, 
-//GO(g_timer_new, 
+GO(g_timer_elapsed, dFpp)
+GO(g_timer_new, pFv)
 //GO(g_timer_reset, 
 //GO(g_timer_start, 
 //GO(g_timer_stop, 
 GO(g_time_val_add, vFpl)
 GO(g_time_val_from_iso8601, iFpp)
 GO(g_time_val_to_iso8601, pFp)
-//GO(g_time_zone_adjust_time, 
-//GO(g_time_zone_find_interval, 
-//GO(g_time_zone_get_abbreviation, 
-//GO(g_time_zone_get_offset, 
-//GO(g_time_zone_is_dst, 
+GO(g_time_zone_adjust_time, iFpup)
+GO(g_time_zone_find_interval, iFpul)
+GO(g_time_zone_get_abbreviation, pFpi)
+GO(g_time_zone_get_offset, iFpi)
+GO(g_time_zone_is_dst, iFpi)
 //GO(g_time_zone_new, 
-//GO(g_time_zone_new_local, 
+GO(g_time_zone_new_local, pFv)
 //GO(g_time_zone_new_utc, 
-//GO(g_time_zone_ref, 
+GO(g_time_zone_ref, pFp)
 //GO(g_time_zone_unref, 
 GO(g_trash_stack_height, uFp)
 GO(g_trash_stack_peek, pFp)
@@ -1324,17 +1324,17 @@ GO(g_trash_stack_push, vFpp)
 //GO(g_tree_foreach, 
 //GO(g_tree_height, 
 //GO(g_tree_insert, 
-//GO(g_tree_lookup, 
-//GO(g_tree_lookup_extended, 
+GO(g_tree_lookup, pFpp)
+GO(g_tree_lookup_extended, iFpppp)
 //GO(g_tree_new, 
 //GO(g_tree_new_full, 
 //GO(g_tree_new_with_data, 
-//GO(g_tree_nnodes, 
-//GO(g_tree_ref, 
+GO(g_tree_nnodes, iFp)
+GO(g_tree_ref, pFp)
 //GO(g_tree_remove, 
-//GO(g_tree_replace, 
+GO(g_tree_replace, vFppp)
 //GO(g_tree_search, 
-//GO(g_tree_steal, 
+GO(g_tree_steal, iFpp)
 //GO(g_tree_traverse, 
 //GO(g_tree_unref, 
 GO(g_try_malloc, pFL)
@@ -1343,16 +1343,16 @@ GO(g_try_malloc0_n, pFLL)
 GO(g_try_malloc_n, pFLL)
 GO(g_try_realloc, pFpL)
 GO(g_try_realloc_n, pFpLL)
-//GO(g_tuples_destroy, 
-//GO(g_tuples_index, 
+GO(g_tuples_destroy, vFp)
+GO(g_tuples_index, pFpii)
 GO(g_ucs4_to_utf16, pFplppp)
 GO(g_ucs4_to_utf8, pFplppp)
-GO(g_unichar_break_type, iFu)
+GO(g_unichar_break_type, uFu)
 GO(g_unichar_combining_class, iFu)
 GO(g_unichar_compose, iFuup)
 GO(g_unichar_decompose, iFupp)
 GO(g_unichar_digit_value, iFu)
-GO(g_unichar_fully_decompose, iFuipu)
+GO(g_unichar_fully_decompose, LFuipL)
 GO(g_unichar_get_mirror_char, iFup)
 GO(g_unichar_get_script, iFu)
 GO(g_unichar_isalnum, iFu)
@@ -1376,11 +1376,11 @@ GO(g_unichar_tolower, uFu)
 GO(g_unichar_totitle, uFu)
 GO(g_unichar_toupper, uFu)
 GO(g_unichar_to_utf8, iFup)
-GO(g_unichar_type, iFu)
+GO(g_unichar_type, uFu)
 GO(g_unichar_validate, iFu)
 GO(g_unichar_xdigit_value, iFu)
 GO(g_unicode_canonical_decomposition, pFup)
-GO(g_unicode_canonical_ordering, vFpu)
+GO(g_unicode_canonical_ordering, vFpL)
 GO(g_unicode_script_from_iso15924, iFu)
 GO(g_unicode_script_to_iso15924, uFi)
 //GO(g_unix_error_quark, 
@@ -1409,16 +1409,16 @@ GO(g_utf8_collate_key_for_filename, pFpi)
 GO(g_utf8_find_next_char, pFpp)
 GO(g_utf8_find_prev_char, pFpp)
 GO(g_utf8_get_char, uFp)
-GO(g_utf8_get_char_validated, uFpi)
-GO(g_utf8_normalize, pFpii)
+GO(g_utf8_get_char_validated, uFpl)
+GO(g_utf8_normalize, pFplu)
 GO(g_utf8_offset_to_pointer, pFpl)
 GO(g_utf8_pointer_to_offset, lFpp)
 GO(g_utf8_prev_char, pFp)
 GO(g_utf8_strchr, pFpiu)
 GO(g_utf8_strdown, pFpi)
-GO(g_utf8_strlen, lFpi)
-GO(g_utf8_strncpy, pFppu)
-GO(g_utf8_strrchr, pFpiu)
+GO(g_utf8_strlen, lFpl)
+GO(g_utf8_strncpy, pFppL)
+GO(g_utf8_strrchr, pFplu)
 GO(g_utf8_strreverse, pFpi)
 GO(g_utf8_strup, pFpi)
 GO(g_utf8_substring, pFpll)
@@ -1440,7 +1440,7 @@ GO(g_variant_builder_ref, pFp)
 GO(g_variant_builder_unref, vFp)
 GO(g_variant_byteswap, pFp)
 GO(g_variant_check_format_string, iFppi)
-GO(g_variant_classify, iFp)
+GO(g_variant_classify, uFp)
 GO(g_variant_compare, iFpp)
 GO(g_variant_dict_clear, vFp)
 GO(g_variant_dict_contains, iFpp)
@@ -1468,26 +1468,26 @@ GO(g_variant_get_byte, CFp)
 GO(g_variant_get_bytestring, pFp)
 GO(g_variant_get_bytestring_array, pFpp)
 GO(g_variant_get_child, vFpuppppppppppp)    //vaarg here, only pointers so should be ok
-GO(g_variant_get_child_value, pFpu)
+GO(g_variant_get_child_value, pFpL)
 GO(g_variant_get_data, pFp)
 GO(g_variant_get_data_as_bytes, pFp)
 GO(g_variant_get_double, dFp)
-GO(g_variant_get_fixed_array, pFppu)
+GO(g_variant_get_fixed_array, pFppL)
 GO(g_variant_get_handle, iFp)
 GO(g_variant_get_int16, wFp)
 GO(g_variant_get_int32, iFp)
-GO(g_variant_get_int64, IFp)
+GO(g_variant_get_int64, lFp)
 GO(g_variant_get_maybe, pFp)
 GO(g_variant_get_normal_form, pFp)
 GO(g_variant_get_objv, pFpp)
-GO(g_variant_get_size, uFp)
+GO(g_variant_get_size, LFp)
 GO(g_variant_get_string, pFpp)
 GO(g_variant_get_strv, pFpp)
 GO(g_variant_get_type, pFp)
 GO(g_variant_get_type_string, pFp)
 GO(g_variant_get_uint16, WFp)
 GO(g_variant_get_uint32, uFp)
-GO(g_variant_get_uint64, UFp)
+GO(g_variant_get_uint64, LFp)
 GO(g_variant_get_va, vFpppp)    // no need to GOM, it's a "scanf" type of function, so using only pointer in va_list
 GO(g_variant_get_variant, pFp)
 GO(g_variant_hash, uFp)
@@ -1499,9 +1499,9 @@ GO(g_variant_is_of_type, iFpp)
 GO(g_variant_is_signature, iFp)
 GO(g_variant_iter_copy, pFp)
 GO(g_variant_iter_free, vFp)
-GO(g_variant_iter_init, uFpp)
+GO(g_variant_iter_init, LFpp)
 GO(g_variant_iter_loop, iFpppppppppppp) // vaarg
-GO(g_variant_iter_n_children, uFp)
+GO(g_variant_iter_n_children, LFp)
 GO(g_variant_iter_new, pFp)
 GO(g_variant_iter_next, iFpppppppppppp) // vaarg here, only pointers so should be ok
 GO(g_variant_iter_next_value, pFp)
@@ -1509,20 +1509,20 @@ GO(g_variant_lookup, iFpppppppppppp)    // vaarg
 GO(g_variant_lookup_value, pFppp)
 GO(g_variant_n_children, uFp)
 GOM(g_variant_new, pFEpV)
-GO(g_variant_new_array, pFppu)
+GO(g_variant_new_array, pFppL)
 GO(g_variant_new_boolean, pFi)
 GO(g_variant_new_byte, pFC)
 GO(g_variant_new_bytestring, pFp)
-GO(g_variant_new_bytestring_array, pFpi)
+GO(g_variant_new_bytestring_array, pFpl)
 GO(g_variant_new_dict_entry, pFpp)
 GO(g_variant_new_double, pFd)
-GO(g_variant_new_fixed_array, pFppuu)
+GO(g_variant_new_fixed_array, pFppLL)
 GO(g_variant_new_from_bytes, pFppi)
 GOM(g_variant_new_from_data, pFEppuipp)
 GO(g_variant_new_handle, pFi)
 GO(g_variant_new_int16, pFw)
 GO(g_variant_new_int32, pFi)
-GO(g_variant_new_int64, pFI)
+GO(g_variant_new_int64, pFl)
 GO(g_variant_new_maybe, pFpp)
 GO(g_variant_new_object_path, pFp)
 GO(g_variant_new_objv, pFpi)
@@ -1533,10 +1533,10 @@ GO(g_variant_new_signature, pFp)
 GO(g_variant_new_string, pFp)
 GO(g_variant_new_strv, pFpi)
 GO(g_variant_new_take_string, pFp)
-GO(g_variant_new_tuple, pFpu)
+GO(g_variant_new_tuple, pFpL)
 GO(g_variant_new_uint16, pFW)
 GO(g_variant_new_uint32, pFu)
-GO(g_variant_new_uint64, pFU)
+GO(g_variant_new_uint64, pFL)
 GOM(g_variant_new_va, pFEppp)
 GO(g_variant_new_variant, pFp)
 GO(g_variant_parse, pFppppp)
@@ -1556,7 +1556,7 @@ GO(g_variant_ref_sink, pFp)
 //GO(g_variant_serialiser_is_string, 
 //GO(g_variant_serialiser_needed_size, 
 //GO(g_variant_serialiser_serialise, 
-GO(g_variant_store, vFp)
+GO(g_variant_store, vFpp)
 GO(g_variant_take_ref, pFp)
 GO(g_variant_type_checked_, pFp)
 GO(g_variant_type_copy, pFp)
@@ -1593,7 +1593,7 @@ GO(g_variant_type_new_dict_entry, pFpp)
 GO(g_variant_type_new_maybe, pFp)
 GO(g_variant_type_new_tuple, pFpi)
 GO(g_variant_type_next, pFp)
-GO(g_variant_type_n_items, iFp)
+GO(g_variant_type_n_items, LFp)
 GO(g_variant_type_peek_string, pFp)
 GO(g_variant_type_string_is_valid, iFp)
 GO(g_variant_type_string_scan, iFppp)
diff --git a/src/wrapped/wrappedgmodule2_private.h b/src/wrapped/wrappedgmodule2_private.h
index 45beba45..9aed4516 100755
--- a/src/wrapped/wrappedgmodule2_private.h
+++ b/src/wrapped/wrappedgmodule2_private.h
@@ -8,7 +8,7 @@ GO(g_module_close, iFp)
 GO(g_module_error, pFv)
 GO(g_module_make_resident, vFp)
 GO(g_module_name, pFp)
-GO(g_module_open, pFpi)
+GO(g_module_open, pFpu)
 GO(g_module_supported, iFv)
 GO(g_module_symbol, iFppp)
 //GO(_init, 
diff --git a/src/wrapped/wrappedgobject2_private.h b/src/wrapped/wrappedgobject2_private.h
index 0fb5bb02..76f0b2f6 100755
--- a/src/wrapped/wrappedgobject2_private.h
+++ b/src/wrapped/wrappedgobject2_private.h
@@ -8,15 +8,15 @@
 //GO(_fini, 
 GO(g_array_get_type, LFv)
 GO(g_binding_flags_get_type, LFv)
-//GO(g_binding_get_flags, 
+GO(g_binding_get_flags, uFp)
 //GO(g_binding_get_source, 
 //GO(g_binding_get_source_property, 
 //GO(g_binding_get_target, 
-//GO(g_binding_get_target_property, 
+GO(g_binding_get_target_property, pFp)
 GO(g_binding_get_type, LFv)
-//GO(g_binding_unbind, 
-GO(g_boxed_copy, pFip)
-GO(g_boxed_free, vFip)
+GO(g_binding_unbind, vFp)
+GO(g_boxed_copy, pFLp)
+GO(g_boxed_free, vFLp)
 GOM(g_boxed_type_register_static, LFEppp)
 GO(g_byte_array_get_type, LFv)
 GO(g_bytes_get_type, LFv)
@@ -96,10 +96,10 @@ GO(g_enum_get_value_by_nick, pFpp)
 GO(g_enum_register_static, LFpp)
 GO(g_error_get_type, LFv)
 GO(g_flags_complete_type_info, vFipp)
-GO(g_flags_get_first_value, pFpi)
+GO(g_flags_get_first_value, pFpu)
 GO(g_flags_get_value_by_name, pFpp)
 GO(g_flags_get_value_by_nick, pFpp)
-GO(g_flags_register_static, iFpp)
+GO(g_flags_register_static, LFpp)
 GO(g_gstring_get_type, LFv)
 GO(g_gtype_get_type, LFv)
 GO(g_hash_table_get_type, LFv)
@@ -114,7 +114,7 @@ GO(g_markup_parse_context_get_type, LFv)
 GO(g_match_info_get_type, LFv)
 //GOM(g_object_add_toggle_ref, vFEpBp)
 GO(g_object_add_weak_pointer, vFpp)
-//GO(g_object_bind_property, 
+GO(g_object_bind_property, pFppppu)
 //GO(g_object_bind_property_full, 
 //GO(g_object_bind_property_with_closures, 
 GO(g_object_class_find_property, pFpp)
@@ -122,7 +122,7 @@ GOM(g_object_class_install_properties, vFEpup)
 GO(g_object_class_install_property, vFpup)
 GO(g_object_class_list_properties, pFpp)
 GO(g_object_class_override_property, vFpup)
-//GO(g_object_compat_control, 
+GO(g_object_compat_control, LFLp)
 GOM(g_object_connect, pFEppV)
 GO(g_object_disconnect, vFpppppppppppppppp)   // caarg
 //GOM(g_object_dup_data, pFEppBp)
@@ -155,11 +155,11 @@ GOM(g_object_set, vFEppV)
 GO(g_object_set_data, vFppp)
 GOM(g_object_set_data_full, vFEpppp)
 GO(g_object_set_property, vFppp)
-GO(g_object_set_qdata, vFppp)
+GO(g_object_set_qdata, vFpup)
 GOM(g_object_set_qdata_full, vFEpppp)
 GOM(g_object_set_valist, vFEppA)
 GO(g_object_steal_data, pFpp)
-GO(g_object_steal_qdata, pFpp)
+GO(g_object_steal_qdata, pFpu)
 GO(g_object_thaw_notify, vFp)
 GO(g_object_unref, vFp)
 GO(g_object_watch_closure, vFpp)
@@ -169,8 +169,8 @@ GO(g_param_spec_boolean, pFpppii)
 GO(g_param_spec_boxed, pFpppLi)
 GO(g_param_spec_char, pFpppccci)
 GO(g_param_spec_double, pFpppdddi)
-GO(g_param_spec_enum, pFpppiii)
-GO(g_param_spec_flags, pFpppiui)
+GO(g_param_spec_enum, pFpppLii)
+GO(g_param_spec_flags, pFpppLui)
 GO(g_param_spec_float, pFpppfffi)
 GO(g_param_spec_get_blurb, pFp)
 GO(g_param_spec_get_default_value, pFp)
@@ -178,19 +178,19 @@ GO(g_param_spec_get_name, pFp)
 GO(g_param_spec_get_nick, pFp)
 GO(g_param_spec_get_qdata, pFpu)
 GO(g_param_spec_get_redirect_target, pFp)
-GO(g_param_spec_gtype, pFpppii)
+GO(g_param_spec_gtype, pFpppLi)
 GO(g_param_spec_int, pFpppiiii)
-GO(g_param_spec_int64, pFpppIIIi)
-GO(g_param_spec_internal, pFipppu)
+GO(g_param_spec_int64, pFpppllli)
+GO(g_param_spec_internal, pFLpppi)
 GO(g_param_spec_long, pFpppllli)
 GO(g_param_spec_object, pFpppii)
 GO(g_param_spec_override, pFpp)
 GO(g_param_spec_param, pFpppii)
 GO(g_param_spec_pointer, pFpppi)
-GO(g_param_spec_pool_insert, vFppi)
-GO(g_param_spec_pool_list, pFpip)
-GO(g_param_spec_pool_list_owned, pFpi)
-GO(g_param_spec_pool_lookup, pFppii)
+GO(g_param_spec_pool_insert, vFppL)
+GO(g_param_spec_pool_list, pFpLp)
+GO(g_param_spec_pool_list_owned, pFpL)
+GO(g_param_spec_pool_lookup, pFppLi)
 GO(g_param_spec_pool_new, pFi)
 GO(g_param_spec_pool_remove, vFpp)
 GO(g_param_spec_ref, pFp)
@@ -203,7 +203,7 @@ GO(g_param_spec_string, pFppppi)
 DATA(g_param_spec_types, sizeof(void*))
 GO(g_param_spec_uchar, pFpppCCCi)
 GO(g_param_spec_uint, pFpppuuui)
-GO(g_param_spec_uint64, pFpppUUUi)
+GO(g_param_spec_uint64, pFpppLLLi)
 GO(g_param_spec_ulong, pFpppLLLi)
 GO(g_param_spec_unichar, pFpppui)
 GO(g_param_spec_unref, vFp)
@@ -215,7 +215,7 @@ GO(g_param_value_defaults, iFpp)
 GO(g_param_values_cmp, iFppp)
 GO(g_param_value_set_default, vFpp)
 GO(g_param_value_validate, iFpp)
-//GO(g_pointer_type_register_static, 
+GO(g_pointer_type_register_static, LFp)
 //GO(g_pollfd_get_type, 
 //GO(g_ptr_array_get_type, 
 //GO(g_regex_get_type, 
@@ -242,9 +242,9 @@ GOM(g_signal_handlers_block_matched, uFEpiupppp)
 GOM(g_signal_handlers_disconnect_matched, uFEpiupppp)
 GOM(g_signal_handlers_unblock_matched, uFEpiupppp)
 GO(g_signal_handler_unblock, vFpL)
-GO(g_signal_has_handler_pending, iFpupi)
-GO(g_signal_list_ids, pFip)
-GO(g_signal_lookup, uFpi)
+GO(g_signal_has_handler_pending, iFpuui)
+GO(g_signal_list_ids, pFLp)
+GO(g_signal_lookup, uFpL)
 GO(g_signal_name, pFu)
 GOM(g_signal_new, uFEpLiupppLuV)
 //GOM(g_signal_new_class_handler, uFEpLupppppnV)
@@ -254,9 +254,9 @@ GO(g_signal_override_class_closure, vFuLp)
 GOM(g_signal_override_class_handler, vFEppp)
 GO(g_signal_parse_name, iFpLppi)
 GO(g_signal_query, vFup)
-GO(g_signal_remove_emission_hook, vFpL)
+GO(g_signal_remove_emission_hook, vFuL)
 //GOM(g_signal_set_va_marshaller, vFEuiB)
-GO(g_signal_stop_emission, vFpup)
+GO(g_signal_stop_emission, vFpuu)
 GO(g_signal_stop_emission_by_name, vFpp)
 GO(g_signal_type_cclosure_new, pFLu)    //should wrap?
 GO(g_source_get_type, LFv)
@@ -267,46 +267,46 @@ GO(g_strv_get_type, LFv)
 GO(g_thread_get_type, LFv)
 GO(g_time_zone_get_type, LFv)
 //GOM(g_type_add_class_cache_func, vFEpB)
-GO(g_type_add_class_private, vFpLu)
-GO(g_type_add_instance_private, pFpi)
+GO(g_type_add_class_private, vFLL)
+GO(g_type_add_instance_private, iFLL)
 //GOM(g_type_add_interface_check, vFEpB)
 //GOM(g_type_add_interface_dynamic, vFEiip)
 GOM(g_type_add_interface_static, vFELLp)
 GO(g_type_check_class_cast, pFpL)
-GO(g_type_check_class_is_a, LFpL)
-GO(g_type_check_instance, LFp)
+GO(g_type_check_class_is_a, iFpL)
+GO(g_type_check_instance, iFp)
 GO(g_type_check_instance_cast, pFpL)
 GO(g_type_check_instance_is_a, LFpL)
-GO(g_type_check_instance_is_fundamentally_a, LFpL)
-GO(g_type_check_is_value_type, LFp)
+GO(g_type_check_instance_is_fundamentally_a, iFpL)
+GO(g_type_check_is_value_type, iFL)
 GO(g_type_check_value, LFp)
-GO(g_type_check_value_holds, LFpL)
+GO(g_type_check_value_holds, iFpL)
 GO(g_type_children, pFip)
-GO(g_type_class_add_private, vFpu)
+GO(g_type_class_add_private, vFpL)
 GO(g_type_class_adjust_private_offset, vFpp)
 GO(g_type_class_get_instance_private_offset, iFp)
-GO(g_type_class_get_private, pFpi)
+GO(g_type_class_get_private, pFpL)
 GO(g_type_class_peek, pFi)
 GOM(g_type_class_peek_parent, pFEp)
 GO(g_type_class_peek_static, pFi)
 GO(g_type_class_ref, pFp)
 GO(g_type_class_unref, vFp)
 GO(g_type_class_unref_uncached, vFp)
-GO(g_type_create_instance, pFi)
-GO(g_type_default_interface_peek, pFi)
+GO(g_type_create_instance, pFL)
+GO(g_type_default_interface_peek, pFL)
 GO(g_type_default_interface_ref, pFi)
 GO(g_type_default_interface_unref, vFp)
-GO(g_type_depth, uFi)
+GO(g_type_depth, uFL)
 GO(g_type_ensure, vFi)
 GO(g_type_free_instance, vFp)
 GO(g_type_from_name, iFp)
-GO(g_type_fundamental, iFi)
+GO(g_type_fundamental, LFL)
 GO(g_type_fundamental_next, iFv)
 //GOM(g_type_get_plugin, pFEi)      // GTypePugin is a stuct with callback
-GO(g_type_get_qdata, pFip)
+GO(g_type_get_qdata, pFLu)
 GO(g_type_get_type_registration_serial, uFv)
 GO(g_type_init, vFv)
-GO(g_type_init_with_debug_flags, vFi)
+GO(g_type_init_with_debug_flags, vFu)
 GO(g_type_instance_get_private, pFpL)
 GO(g_type_interface_add_prerequisite, vFLL)
 //GOM(g_type_interface_get_plugin, pFEii) // return GTypePlugin*
@@ -317,23 +317,23 @@ GO(g_type_interfaces, pFLp)
 GO(g_type_is_a, iFLL)
 //GO(g_type_module_add_interface, 
 //GO(g_type_module_get_type, 
-//GO(g_type_module_register_enum, 
-//GO(g_type_module_register_flags, 
+GO(g_type_module_register_enum, LFppp)
+GO(g_type_module_register_flags, LFppp)
 //GO(g_type_module_register_type, 
-//GO(g_type_module_set_name, 
-//GO(g_type_module_unuse, 
-//GO(g_type_module_use, 
+GO(g_type_module_set_name, vFpp)
+GO(g_type_module_unuse, vFp)
+GO(g_type_module_use, iFp)
 GO(g_type_name, pFL)
-//GO(g_type_name_from_class, 
-//GO(g_type_name_from_instance, 
+GO(g_type_name_from_class, pFp)
+GO(g_type_name_from_instance, pFp)
 GO(g_type_next_base, LFLL)
 GO(g_type_parent, LFL)
 //GO(g_type_plugin_complete_interface_info, 
 //GO(g_type_plugin_complete_type_info, 
 //GO(g_type_plugin_get_type, 
-//GO(g_type_plugin_unuse, 
+GO(g_type_plugin_unuse, vFp)
 //GO(g_type_plugin_use, 
-GO(g_type_qname, pFL)
+GO(g_type_qname, uFL)
 GO(g_type_query, vFLp)
 //GOM(type_register_dynamic, iFEpippi)
 GOM(g_type_register_fundamental, LFELpppi)
@@ -341,7 +341,7 @@ GOM(g_type_register_static, LFELppi)
 GOM(g_type_register_static_simple, LFELpLpLpi)
 //GOM(g_type_remove_class_cache_func, vFEpB)
 //GOM(g_type_remove_interface_check, vFEpB)
-GO(g_type_set_qdata, vFLpp)
+GO(g_type_set_qdata, vFLup)
 GO(g_type_test_flags, iFLu)
 GOM(g_type_value_table_peek, pFEL)    //need to bridge GTypeValueTable
 GO(g_value_array_append, pFpp)  //TODO: does GValueArray needs alignement?
@@ -369,9 +369,9 @@ GO(g_value_get_double, dFp)
 GO(g_value_get_enum, iFp)
 GO(g_value_get_flags, uFp)
 GO(g_value_get_float, fFp)
-GO(g_value_get_gtype, iFp)
+GO(g_value_get_gtype, LFp)
 GO(g_value_get_int, iFp)
-GO(g_value_get_int64, IFp)
+GO(g_value_get_int64, lFp)
 GO(g_value_get_long, lFp)
 GO(g_value_get_object, pFp)
 GO(g_value_get_param, pFp)
@@ -381,10 +381,10 @@ GO(g_value_get_string, pFp)
 GO(g_value_get_type, LFv)
 GO(g_value_get_uchar, CFp)
 GO(g_value_get_uint, uFp)
-GO(g_value_get_uint64, UFp)
+GO(g_value_get_uint64, LFp)
 GO(g_value_get_ulong, LFp)
 GO(g_value_get_variant, pFp)
-GO(g_value_init, pFpi)
+GO(g_value_init, pFpL)
 GO(g_value_init_from_instance, vFpp)
 GO(g_value_peek_pointer, pFp)
 GOM(g_value_register_transform_func, vFEiip)
@@ -397,10 +397,10 @@ GO(g_value_set_double, vFpd)
 GO(g_value_set_enum, vFpi)
 GO(g_value_set_flags, vFpu)
 GO(g_value_set_float, vFpf)
-GO(g_value_set_gtype, vFpi)
+GO(g_value_set_gtype, vFpL)
 GO(g_value_set_instance, vFpp)
 GO(g_value_set_int, vFpi)
-GO(g_value_set_int64, vFpI)
+GO(g_value_set_int64, vFpl)
 GO(g_value_set_long, vFpl)
 GO(g_value_set_object, vFpp)
 GO(g_value_set_object_take_ownership, vFpp)
@@ -414,7 +414,7 @@ GO(g_value_set_string, vFpp)
 GO(g_value_set_string_take_ownership, vFpp)
 GO(g_value_set_uchar, vFpC)
 GO(g_value_set_uint, vFpu)
-GO(g_value_set_uint64, vFpU)
+GO(g_value_set_uint64, vFpL)
 GO(g_value_set_ulong, vFpL)
 GO(g_value_set_variant, vFpp)
 GO(g_value_take_boxed, vFpp)
@@ -424,7 +424,7 @@ GO(g_value_take_string, vFpp)
 GO(g_value_take_variant, vFpp)
 GO(g_value_transform, iFpp)
 GO(g_value_type_compatible, iFii)
-GO(g_value_type_transformable, iFii)
+GO(g_value_type_transformable, iFLL)
 GO(g_value_unset, vFp)
 //GO(g_variant_builder_get_type, 
 //GO(g_variant_dict_get_type,