[WRAPPER] Reworked libgnutls wrapping with new wrapperhelper

4 files changed, 1074 insertions, 938 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index d13b148c..6cf07d8b 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -1042,6 +1042,7 @@
 #() iFuWWp
 #() iFuuuu
 #() iFuupi
+#() iFuupu
 #() iFuupp
 #() iFupup
 #() iFupLp
@@ -1142,6 +1143,8 @@
 #() iFpplL
 #() iFpplp
 #() iFppLi
+#() iFppLu
+#() iFppLl
 #() iFppLL
 #() iFppLp
 #() iFpppi
@@ -1227,6 +1230,7 @@
 #() lFppip
 #() lFppiS
 #() lFpplp
+#() lFppLp
 #() lFpppL
 #() lFpppp
 #() LFEppL
@@ -1637,6 +1641,7 @@
 #() iFpipip
 #() iFpippi
 #() iFpippW
+#() iFpippL
 #() iFpippp
 #() iFpCCCC
 #() iFpCupp
@@ -1658,6 +1663,8 @@
 #() iFpupuu
 #() iFpupuU
 #() iFpupup
+#() iFpupLu
+#() iFpuppu
 #() iFpuppL
 #() iFpuppp
 #() iFpUiUi
@@ -1714,6 +1721,7 @@
 #() iFpppup
 #() iFpppUi
 #() iFpppLi
+#() iFpppLu
 #() iFpppLL
 #() iFpppLp
 #() iFppppi
@@ -1771,6 +1779,7 @@
 #() LFELppu
 #() LFEppLL
 #() LFEpppp
+#() LFuuuuu
 #() LFLpppL
 #() LFpuipp
 #() LFpuupi
@@ -2088,6 +2097,8 @@
 #() iFipppLp
 #() iFippppp
 #() iFuiiuup
+#() iFupupLp
+#() iFupLpLp
 #() iFdipppL
 #() iFDipppL
 #() iFlpippp
@@ -2130,8 +2141,10 @@
 #() iFpuuppp
 #() iFpuLuLu
 #() iFpuLLpp
+#() iFpupupp
 #() iFpupLpL
 #() iFpupLpp
+#() iFpupppp
 #() iFpUiipp
 #() iFpUuuLp
 #() iFpUUUup
@@ -2175,6 +2188,7 @@
 #() iFppulll
 #() iFppuLpp
 #() iFppupip
+#() iFppuppu
 #() iFppuppp
 #() iFppdidd
 #() iFpplupp
@@ -2190,6 +2204,7 @@
 #() iFpppipu
 #() iFpppipp
 #() iFpppuii
+#() iFpppuuu
 #() iFpppuup
 #() iFpppupu
 #() iFpppupp
@@ -2197,6 +2212,7 @@
 #() iFppppiu
 #() iFppppip
 #() iFppppui
+#() iFppppuu
 #() iFppppup
 #() iFppppLp
 #() iFpppppi
@@ -2277,6 +2293,7 @@
 #() pFuuppuu
 #() pFuppppp
 #() pFdddddd
+#() pFLppppp
 #() pFpiiiiu
 #() pFpiiipp
 #() pFpiiCCC
@@ -2505,6 +2522,7 @@
 #() iFpLpiipi
 #() iFpLpLuLi
 #() iFpLpLpip
+#() iFpLpLpLp
 #() iFpLppiii
 #() iFppiiiip
 #() iFppiiuup
@@ -2521,6 +2539,7 @@
 #() iFppuippp
 #() iFppuuppp
 #() iFppupupp
+#() iFppupppp
 #() iFppliupp
 #() iFppLiipp
 #() iFppLiWwL
@@ -2532,11 +2551,13 @@
 #() iFpppippi
 #() iFpppippp
 #() iFpppuiii
+#() iFpppuupu
 #() iFpppulup
 #() iFpppLppp
 #() iFppppilp
 #() iFppppipp
 #() iFppppIip
+#() iFppppupu
 #() iFppppdpu
 #() iFpppppip
 #() iFpppppLp
@@ -2740,12 +2761,14 @@
 #() iFpuuppiip
 #() iFpuuppppp
 #() iFpuLLLppL
+#() iFpupupuup
 #() iFpupppppp
 #() iFpUuuLpUu
 #() iFpduuulul
 #() iFpLLiippp
 #() iFpLLLiipi
 #() iFpLLppppp
+#() iFpLpiLpLp
 #() iFpLpipppp
 #() iFpLpLpLpp
 #() iFpLppLpip
@@ -2763,8 +2786,10 @@
 #() iFpppipipi
 #() iFppppiiup
 #() iFppppippp
+#() iFppppuplu
 #() iFpppppupp
 #() iFppppppii
+#() iFppppppuu
 #() iFpppppppi
 #() iFpppppppp
 #() iFbWWipppp
@@ -2899,14 +2924,17 @@
 #() iFipiipippi
 #() iFuiiuuiiip
 #() iFuiiupiiup
+#() iFuuppuuppu
 #() iFdddpppppp
 #() iFpiLiiipip
 #() iFpiLLLiiip
 #() iFpipippppi
 #() iFpuuuuuuuu
+#() iFpuuuuuupp
 #() iFpuuuuduup
 #() iFpuuuLiiip
 #() iFpuuuLpppp
+#() iFpuuppupuu
 #() iFpduuuLuLp
 #() iFpLiuiiLLL
 #() iFpLLiiuuii
@@ -3014,6 +3042,7 @@
 #() iFpLpLUUUUpL
 #() iFppuuiiuuuu
 #() iFppLLiiLWpi
+#() iFppLpLLpLpp
 #() iFppLpLpLLpp
 #() iFpppiiipipi
 #() iFpppLLipppp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 5d4c3e49..38318b97 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -1073,6 +1073,7 @@ typedef int32_t (*iFuipp_t)(uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFuWWp_t)(uint32_t, uint16_t, uint16_t, void*);
 typedef int32_t (*iFuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFuupi_t)(uint32_t, uint32_t, void*, int32_t);
+typedef int32_t (*iFuupu_t)(uint32_t, uint32_t, void*, uint32_t);
 typedef int32_t (*iFuupp_t)(uint32_t, uint32_t, void*, void*);
 typedef int32_t (*iFupup_t)(uint32_t, void*, uint32_t, void*);
 typedef int32_t (*iFupLp_t)(uint32_t, void*, uintptr_t, void*);
@@ -1172,6 +1173,8 @@ typedef int32_t (*iFppll_t)(void*, void*, intptr_t, intptr_t);
 typedef int32_t (*iFpplL_t)(void*, void*, intptr_t, uintptr_t);
 typedef int32_t (*iFpplp_t)(void*, void*, intptr_t, void*);
 typedef int32_t (*iFppLi_t)(void*, void*, uintptr_t, int32_t);
+typedef int32_t (*iFppLu_t)(void*, void*, uintptr_t, uint32_t);
+typedef int32_t (*iFppLl_t)(void*, void*, uintptr_t, intptr_t);
 typedef int32_t (*iFppLL_t)(void*, void*, uintptr_t, uintptr_t);
 typedef int32_t (*iFppLp_t)(void*, void*, uintptr_t, void*);
 typedef int32_t (*iFpppi_t)(void*, void*, void*, int32_t);
@@ -1257,6 +1260,7 @@ typedef intptr_t (*lFppii_t)(void*, void*, int32_t, int32_t);
 typedef intptr_t (*lFppip_t)(void*, void*, int32_t, void*);
 typedef intptr_t (*lFppiS_t)(void*, void*, int32_t, void*);
 typedef intptr_t (*lFpplp_t)(void*, void*, intptr_t, void*);
+typedef intptr_t (*lFppLp_t)(void*, void*, uintptr_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);
@@ -1666,6 +1670,7 @@ typedef int32_t (*iFpipiL_t)(void*, int32_t, void*, int32_t, uintptr_t);
 typedef int32_t (*iFpipip_t)(void*, int32_t, void*, int32_t, void*);
 typedef int32_t (*iFpippi_t)(void*, int32_t, void*, void*, int32_t);
 typedef int32_t (*iFpippW_t)(void*, int32_t, void*, void*, uint16_t);
+typedef int32_t (*iFpippL_t)(void*, int32_t, void*, void*, uintptr_t);
 typedef int32_t (*iFpippp_t)(void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFpCCCC_t)(void*, uint8_t, uint8_t, uint8_t, uint8_t);
 typedef int32_t (*iFpCupp_t)(void*, uint8_t, uint32_t, void*, void*);
@@ -1687,6 +1692,8 @@ typedef int32_t (*iFpupui_t)(void*, uint32_t, void*, uint32_t, int32_t);
 typedef int32_t (*iFpupuu_t)(void*, uint32_t, void*, uint32_t, uint32_t);
 typedef int32_t (*iFpupuU_t)(void*, uint32_t, void*, uint32_t, uint64_t);
 typedef int32_t (*iFpupup_t)(void*, uint32_t, void*, uint32_t, void*);
+typedef int32_t (*iFpupLu_t)(void*, uint32_t, void*, uintptr_t, uint32_t);
+typedef int32_t (*iFpuppu_t)(void*, uint32_t, void*, void*, uint32_t);
 typedef int32_t (*iFpuppL_t)(void*, uint32_t, void*, void*, uintptr_t);
 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);
@@ -1743,6 +1750,7 @@ typedef int32_t (*iFpppuu_t)(void*, void*, void*, uint32_t, uint32_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 (*iFpppLu_t)(void*, void*, void*, uintptr_t, uint32_t);
 typedef int32_t (*iFpppLL_t)(void*, void*, void*, uintptr_t, uintptr_t);
 typedef int32_t (*iFpppLp_t)(void*, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFppppi_t)(void*, void*, void*, void*, int32_t);
@@ -1800,6 +1808,7 @@ typedef intptr_t (*lFppLpp_t)(void*, void*, uintptr_t, void*, void*);
 typedef uintptr_t (*LFELppu_t)(x64emu_t*, uintptr_t, void*, void*, uint32_t);
 typedef uintptr_t (*LFEppLL_t)(x64emu_t*, void*, void*, uintptr_t, uintptr_t);
 typedef uintptr_t (*LFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
+typedef uintptr_t (*LFuuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef uintptr_t (*LFLpppL_t)(uintptr_t, void*, void*, void*, uintptr_t);
 typedef uintptr_t (*LFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
 typedef uintptr_t (*LFpuupi_t)(void*, uint32_t, uint32_t, void*, int32_t);
@@ -2117,6 +2126,8 @@ typedef int32_t (*iFipuppp_t)(int32_t, void*, uint32_t, void*, void*, void*);
 typedef int32_t (*iFipppLp_t)(int32_t, void*, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFippppp_t)(int32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFuiiuup_t)(uint32_t, int32_t, int32_t, uint32_t, uint32_t, void*);
+typedef int32_t (*iFupupLp_t)(uint32_t, void*, uint32_t, void*, uintptr_t, void*);
+typedef int32_t (*iFupLpLp_t)(uint32_t, void*, uintptr_t, void*, uintptr_t, void*);
 typedef int32_t (*iFdipppL_t)(double, int32_t, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFlpippp_t)(intptr_t, void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFLpppii_t)(uintptr_t, void*, void*, void*, int32_t, int32_t);
@@ -2158,8 +2169,10 @@ typedef int32_t (*iFpuupuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint32
 typedef int32_t (*iFpuuppp_t)(void*, uint32_t, uint32_t, void*, void*, void*);
 typedef int32_t (*iFpuLuLu_t)(void*, uint32_t, uintptr_t, uint32_t, uintptr_t, uint32_t);
 typedef int32_t (*iFpuLLpp_t)(void*, uint32_t, uintptr_t, uintptr_t, void*, void*);
+typedef int32_t (*iFpupupp_t)(void*, uint32_t, void*, uint32_t, void*, void*);
 typedef int32_t (*iFpupLpL_t)(void*, uint32_t, void*, uintptr_t, void*, uintptr_t);
 typedef int32_t (*iFpupLpp_t)(void*, uint32_t, void*, uintptr_t, void*, void*);
+typedef int32_t (*iFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpUiipp_t)(void*, uint64_t, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFpUuuLp_t)(void*, uint64_t, uint32_t, uint32_t, uintptr_t, void*);
 typedef int32_t (*iFpUUUup_t)(void*, uint64_t, uint64_t, uint64_t, uint32_t, void*);
@@ -2203,6 +2216,7 @@ typedef int32_t (*iFppulup_t)(void*, void*, uint32_t, intptr_t, uint32_t, void*)
 typedef int32_t (*iFppulll_t)(void*, void*, uint32_t, intptr_t, intptr_t, intptr_t);
 typedef int32_t (*iFppuLpp_t)(void*, void*, uint32_t, uintptr_t, void*, void*);
 typedef int32_t (*iFppupip_t)(void*, void*, uint32_t, void*, int32_t, void*);
+typedef int32_t (*iFppuppu_t)(void*, void*, uint32_t, void*, void*, uint32_t);
 typedef int32_t (*iFppuppp_t)(void*, void*, uint32_t, void*, void*, 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*);
@@ -2218,6 +2232,7 @@ typedef int32_t (*iFpppipi_t)(void*, void*, void*, int32_t, void*, int32_t);
 typedef int32_t (*iFpppipu_t)(void*, void*, void*, int32_t, void*, uint32_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 (*iFpppuuu_t)(void*, void*, void*, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpppuup_t)(void*, void*, void*, uint32_t, uint32_t, void*);
 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*);
@@ -2225,6 +2240,7 @@ typedef int32_t (*iFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFppppiu_t)(void*, void*, void*, void*, int32_t, uint32_t);
 typedef int32_t (*iFppppip_t)(void*, void*, void*, void*, int32_t, void*);
 typedef int32_t (*iFppppui_t)(void*, void*, void*, void*, uint32_t, int32_t);
+typedef int32_t (*iFppppuu_t)(void*, void*, void*, void*, uint32_t, uint32_t);
 typedef int32_t (*iFppppup_t)(void*, void*, void*, void*, uint32_t, void*);
 typedef int32_t (*iFppppLp_t)(void*, void*, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFpppppi_t)(void*, void*, void*, void*, void*, int32_t);
@@ -2305,6 +2321,7 @@ typedef void* (*pFuuuuup_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, vo
 typedef void* (*pFuuppuu_t)(uint32_t, uint32_t, void*, void*, uint32_t, uint32_t);
 typedef void* (*pFuppppp_t)(uint32_t, void*, void*, void*, void*, void*);
 typedef void* (*pFdddddd_t)(double, double, double, double, double, double);
+typedef void* (*pFLppppp_t)(uintptr_t, void*, void*, void*, void*, void*);
 typedef void* (*pFpiiiiu_t)(void*, int32_t, int32_t, int32_t, int32_t, uint32_t);
 typedef void* (*pFpiiipp_t)(void*, int32_t, int32_t, int32_t, void*, void*);
 typedef void* (*pFpiiCCC_t)(void*, int32_t, int32_t, uint8_t, uint8_t, uint8_t);
@@ -2533,6 +2550,7 @@ typedef int32_t (*iFpLpiiuu_t)(void*, uintptr_t, void*, int32_t, int32_t, uint32
 typedef int32_t (*iFpLpiipi_t)(void*, uintptr_t, void*, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFpLpLuLi_t)(void*, uintptr_t, void*, uintptr_t, uint32_t, uintptr_t, int32_t);
 typedef int32_t (*iFpLpLpip_t)(void*, uintptr_t, void*, uintptr_t, void*, int32_t, void*);
+typedef int32_t (*iFpLpLpLp_t)(void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, void*);
 typedef int32_t (*iFpLppiii_t)(void*, uintptr_t, void*, void*, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppiiiip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFppiiuup_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t, void*);
@@ -2549,6 +2567,7 @@ typedef int32_t (*iFppuipiL_t)(void*, void*, uint32_t, int32_t, void*, int32_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 (*iFppupppp_t)(void*, void*, uint32_t, void*, void*, 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 (*iFppLiWwL_t)(void*, void*, uintptr_t, int32_t, uint16_t, int16_t, uintptr_t);
@@ -2560,11 +2579,13 @@ typedef int32_t (*iFpppiiup_t)(void*, void*, void*, int32_t, int32_t, uint32_t,
 typedef int32_t (*iFpppippi_t)(void*, void*, void*, int32_t, void*, void*, int32_t);
 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 (*iFpppuupu_t)(void*, void*, void*, uint32_t, uint32_t, void*, uint32_t);
 typedef int32_t (*iFpppulup_t)(void*, void*, void*, uint32_t, intptr_t, uint32_t, void*);
 typedef int32_t (*iFpppLppp_t)(void*, void*, void*, uintptr_t, void*, void*, void*);
 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 (*iFppppIip_t)(void*, void*, void*, void*, int64_t, int32_t, void*);
+typedef int32_t (*iFppppupu_t)(void*, void*, void*, void*, uint32_t, void*, uint32_t);
 typedef int32_t (*iFppppdpu_t)(void*, void*, void*, void*, double, void*, uint32_t);
 typedef int32_t (*iFpppppip_t)(void*, void*, void*, void*, void*, int32_t, void*);
 typedef int32_t (*iFpppppLp_t)(void*, void*, void*, void*, void*, uintptr_t, void*);
@@ -2768,12 +2789,14 @@ typedef int32_t (*iFpuupuupp_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint
 typedef int32_t (*iFpuuppiip_t)(void*, uint32_t, uint32_t, void*, void*, int32_t, int32_t, void*);
 typedef int32_t (*iFpuuppppp_t)(void*, uint32_t, uint32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpuLLLppL_t)(void*, uint32_t, uintptr_t, uintptr_t, uintptr_t, void*, void*, uintptr_t);
+typedef int32_t (*iFpupupuup_t)(void*, uint32_t, void*, uint32_t, void*, uint32_t, uint32_t, void*);
 typedef int32_t (*iFpupppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpUuuLpUu_t)(void*, uint64_t, uint32_t, uint32_t, uintptr_t, void*, uint64_t, uint32_t);
 typedef int32_t (*iFpduuulul_t)(void*, double, uint32_t, uint32_t, uint32_t, intptr_t, uint32_t, intptr_t);
 typedef int32_t (*iFpLLiippp_t)(void*, uintptr_t, uintptr_t, int32_t, int32_t, void*, void*, void*);
 typedef int32_t (*iFpLLLiipi_t)(void*, uintptr_t, uintptr_t, uintptr_t, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFpLLppppp_t)(void*, uintptr_t, uintptr_t, void*, void*, void*, void*, void*);
+typedef int32_t (*iFpLpiLpLp_t)(void*, uintptr_t, void*, int32_t, uintptr_t, void*, uintptr_t, void*);
 typedef int32_t (*iFpLpipppp_t)(void*, uintptr_t, void*, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpLpLpLpp_t)(void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFpLppLpip_t)(void*, uintptr_t, void*, void*, uintptr_t, void*, int32_t, void*);
@@ -2791,8 +2814,10 @@ typedef int32_t (*iFpppiiipp_t)(void*, void*, void*, int32_t, int32_t, int32_t,
 typedef int32_t (*iFpppipipi_t)(void*, void*, void*, int32_t, void*, int32_t, void*, int32_t);
 typedef int32_t (*iFppppiiup_t)(void*, void*, void*, void*, int32_t, int32_t, uint32_t, void*);
 typedef int32_t (*iFppppippp_t)(void*, void*, void*, void*, int32_t, void*, void*, void*);
+typedef int32_t (*iFppppuplu_t)(void*, void*, void*, void*, uint32_t, void*, intptr_t, uint32_t);
 typedef int32_t (*iFpppppupp_t)(void*, void*, void*, void*, void*, uint32_t, void*, void*);
 typedef int32_t (*iFppppppii_t)(void*, void*, void*, void*, void*, void*, int32_t, int32_t);
+typedef int32_t (*iFppppppuu_t)(void*, void*, void*, void*, void*, void*, uint32_t, uint32_t);
 typedef int32_t (*iFpppppppi_t)(void*, void*, void*, void*, void*, void*, void*, int32_t);
 typedef int32_t (*iFpppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFbWWipppp_t)(void*, uint16_t, uint16_t, int32_t, void*, void*, void*, void*);
@@ -2926,14 +2951,17 @@ typedef int32_t (*iFEppPPPPPP_t)(x64emu_t*, void*, void*, void*, void*, void*, v
 typedef int32_t (*iFipiipippi_t)(int32_t, void*, int32_t, int32_t, void*, int32_t, void*, void*, int32_t);
 typedef int32_t (*iFuiiuuiiip_t)(uint32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFuiiupiiup_t)(uint32_t, int32_t, int32_t, uint32_t, void*, int32_t, int32_t, uint32_t, void*);
+typedef int32_t (*iFuuppuuppu_t)(uint32_t, uint32_t, void*, void*, uint32_t, uint32_t, void*, void*, uint32_t);
 typedef int32_t (*iFdddpppppp_t)(double, double, double, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpiLiiipip_t)(void*, int32_t, uintptr_t, int32_t, int32_t, int32_t, void*, int32_t, void*);
 typedef int32_t (*iFpiLLLiiip_t)(void*, int32_t, uintptr_t, uintptr_t, uintptr_t, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFpipippppi_t)(void*, int32_t, void*, int32_t, void*, void*, void*, void*, int32_t);
 typedef int32_t (*iFpuuuuuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef int32_t (*iFpuuuuuupp_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef int32_t (*iFpuuuuduup_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, double, uint32_t, uint32_t, void*);
 typedef int32_t (*iFpuuuLiiip_t)(void*, uint32_t, uint32_t, uint32_t, uintptr_t, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFpuuuLpppp_t)(void*, uint32_t, uint32_t, uint32_t, uintptr_t, void*, void*, void*, void*);
+typedef int32_t (*iFpuuppupuu_t)(void*, uint32_t, uint32_t, void*, void*, uint32_t, void*, uint32_t, uint32_t);
 typedef int32_t (*iFpduuuLuLp_t)(void*, double, uint32_t, uint32_t, uint32_t, uintptr_t, uint32_t, uintptr_t, void*);
 typedef int32_t (*iFpLiuiiLLL_t)(void*, uintptr_t, int32_t, uint32_t, int32_t, int32_t, uintptr_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpLLiiuuii_t)(void*, uintptr_t, uintptr_t, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t);
@@ -3041,6 +3069,7 @@ typedef int32_t (*iFpLLpiiuuii_t)(void*, uintptr_t, uintptr_t, void*, int32_t, i
 typedef int32_t (*iFpLpLUUUUpL_t)(void*, uintptr_t, void*, uintptr_t, uint64_t, uint64_t, uint64_t, uint64_t, void*, uintptr_t);
 typedef int32_t (*iFppuuiiuuuu_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppLLiiLWpi_t)(void*, void*, uintptr_t, uintptr_t, int32_t, int32_t, uintptr_t, uint16_t, void*, int32_t);
+typedef int32_t (*iFppLpLLpLpp_t)(void*, void*, uintptr_t, void*, uintptr_t, uintptr_t, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFppLpLpLLpp_t)(void*, void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, uintptr_t, void*, void*);
 typedef int32_t (*iFpppiiipipi_t)(void*, void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*, int32_t);
 typedef int32_t (*iFpppLLipppp_t)(void*, void*, void*, uintptr_t, uintptr_t, int32_t, void*, void*, void*, void*);
@@ -4336,6 +4365,7 @@ void iFuipp(x64emu_t *emu, uintptr_t fcn) { iFuipp_t fn = (iFuipp_t)fcn; R_RAX=(
 void iFuWWp(x64emu_t *emu, uintptr_t fcn) { iFuWWp_t fn = (iFuWWp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
 void iFuuuu(x64emu_t *emu, uintptr_t fcn) { iFuuuu_t fn = (iFuuuu_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)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 iFuupu(x64emu_t *emu, uintptr_t fcn) { iFuupu_t fn = (iFuupu_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void iFuupp(x64emu_t *emu, uintptr_t fcn) { iFuupp_t fn = (iFuupp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFupup(x64emu_t *emu, uintptr_t fcn) { iFupup_t fn = (iFupup_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)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); }
@@ -4435,6 +4465,8 @@ void iFppll(x64emu_t *emu, uintptr_t fcn) { iFppll_t fn = (iFppll_t)fcn; R_RAX=(
 void iFpplL(x64emu_t *emu, uintptr_t fcn) { iFpplL_t fn = (iFpplL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpplp(x64emu_t *emu, uintptr_t fcn) { iFpplp_t fn = (iFpplp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
 void iFppLi(x64emu_t *emu, uintptr_t fcn) { iFppLi_t fn = (iFppLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
+void iFppLu(x64emu_t *emu, uintptr_t fcn) { iFppLu_t fn = (iFppLu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX); }
+void iFppLl(x64emu_t *emu, uintptr_t fcn) { iFppLl_t fn = (iFppLl_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX); }
 void iFppLL(x64emu_t *emu, uintptr_t fcn) { iFppLL_t fn = (iFppLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void iFppLp(x64emu_t *emu, uintptr_t fcn) { iFppLp_t fn = (iFppLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void iFpppi(x64emu_t *emu, uintptr_t fcn) { iFpppi_t fn = (iFpppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
@@ -4520,6 +4552,7 @@ void lFppii(x64emu_t *emu, uintptr_t fcn) { lFppii_t fn = (lFppii_t)fcn; R_RAX=(
 void lFppip(x64emu_t *emu, uintptr_t fcn) { lFppip_t fn = (lFppip_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void lFppiS(x64emu_t *emu, uintptr_t fcn) { lFppiS_t fn = (lFppiS_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, io_convert((void*)R_RCX)); }
 void lFpplp(x64emu_t *emu, uintptr_t fcn) { lFpplp_t fn = (lFpplp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
+void lFppLp(x64emu_t *emu, uintptr_t fcn) { lFppLp_t fn = (lFppLp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_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); }
@@ -4929,6 +4962,7 @@ void iFpipiL(x64emu_t *emu, uintptr_t fcn) { iFpipiL_t fn = (iFpipiL_t)fcn; R_RA
 void iFpipip(x64emu_t *emu, uintptr_t fcn) { iFpipip_t fn = (iFpipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFpippi(x64emu_t *emu, uintptr_t fcn) { iFpippi_t fn = (iFpippi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFpippW(x64emu_t *emu, uintptr_t fcn) { iFpippW_t fn = (iFpippW_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8); }
+void iFpippL(x64emu_t *emu, uintptr_t fcn) { iFpippL_t fn = (iFpippL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void iFpippp(x64emu_t *emu, uintptr_t fcn) { iFpippp_t fn = (iFpippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpCCCC(x64emu_t *emu, uintptr_t fcn) { iFpCCCC_t fn = (iFpCCCC_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8); }
 void iFpCupp(x64emu_t *emu, uintptr_t fcn) { iFpCupp_t fn = (iFpCupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -4950,6 +4984,8 @@ void iFpupui(x64emu_t *emu, uintptr_t fcn) { iFpupui_t fn = (iFpupui_t)fcn; R_RA
 void iFpupuu(x64emu_t *emu, uintptr_t fcn) { iFpupuu_t fn = (iFpupuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void iFpupuU(x64emu_t *emu, uintptr_t fcn) { iFpupuU_t fn = (iFpupuU_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_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 iFpupLu(x64emu_t *emu, uintptr_t fcn) { iFpupLu_t fn = (iFpupLu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8); }
+void iFpuppu(x64emu_t *emu, uintptr_t fcn) { iFpuppu_t fn = (iFpuppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void iFpuppL(x64emu_t *emu, uintptr_t fcn) { iFpuppL_t fn = (iFpuppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)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); }
@@ -5006,6 +5042,7 @@ void iFpppuu(x64emu_t *emu, uintptr_t fcn) { iFpppuu_t fn = (iFpppuu_t)fcn; R_RA
 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 iFpppLu(x64emu_t *emu, uintptr_t fcn) { iFpppLu_t fn = (iFpppLu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8); }
 void iFpppLL(x64emu_t *emu, uintptr_t fcn) { iFpppLL_t fn = (iFpppLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_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); }
 void iFppppi(x64emu_t *emu, uintptr_t fcn) { iFppppi_t fn = (iFppppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
@@ -5063,6 +5100,7 @@ void lFppLpp(x64emu_t *emu, uintptr_t fcn) { lFppLpp_t fn = (lFppLpp_t)fcn; R_RA
 void LFELppu(x64emu_t *emu, uintptr_t fcn) { LFELppu_t fn = (LFELppu_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void LFEppLL(x64emu_t *emu, uintptr_t fcn) { LFEppLL_t fn = (LFEppLL_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_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 LFuuuuu(x64emu_t *emu, uintptr_t fcn) { LFuuuuu_t fn = (LFuuuuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void LFLpppL(x64emu_t *emu, uintptr_t fcn) { LFLpppL_t fn = (LFLpppL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void LFpuipp(x64emu_t *emu, uintptr_t fcn) { LFpuipp_t fn = (LFpuipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void LFpuupi(x64emu_t *emu, uintptr_t fcn) { LFpuupi_t fn = (LFpuupi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
@@ -5380,6 +5418,8 @@ void iFipuppp(x64emu_t *emu, uintptr_t fcn) { iFipuppp_t fn = (iFipuppp_t)fcn; R
 void iFipppLp(x64emu_t *emu, uintptr_t fcn) { iFipppLp_t fn = (iFipppLp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void iFippppp(x64emu_t *emu, uintptr_t fcn) { iFippppp_t fn = (iFippppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFuiiuup(x64emu_t *emu, uintptr_t fcn) { iFuiiuup_t fn = (iFuiiuup_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
+void iFupupLp(x64emu_t *emu, uintptr_t fcn) { iFupupLp_t fn = (iFupupLp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
+void iFupLpLp(x64emu_t *emu, uintptr_t fcn) { iFupLpLp_t fn = (iFupLpLp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void iFdipppL(x64emu_t *emu, uintptr_t fcn) { iFdipppL_t fn = (iFdipppL_t)fcn; R_RAX=(int32_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void iFlpippp(x64emu_t *emu, uintptr_t fcn) { iFlpippp_t fn = (iFlpippp_t)fcn; R_RAX=(int32_t)fn((intptr_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFLpppii(x64emu_t *emu, uintptr_t fcn) { iFLpppii_t fn = (iFLpppii_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
@@ -5421,8 +5461,10 @@ void iFpuupuu(x64emu_t *emu, uintptr_t fcn) { iFpuupuu_t fn = (iFpuupuu_t)fcn; R
 void iFpuuppp(x64emu_t *emu, uintptr_t fcn) { iFpuuppp_t fn = (iFpuuppp_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*)R_R9); }
 void iFpuLuLu(x64emu_t *emu, uintptr_t fcn) { iFpuLuLu_t fn = (iFpuLuLu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9); }
 void iFpuLLpp(x64emu_t *emu, uintptr_t fcn) { iFpuLLpp_t fn = (iFpuLLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFpupupp(x64emu_t *emu, uintptr_t fcn) { iFpupupp_t fn = (iFpupupp_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*)R_R9); }
 void iFpupLpL(x64emu_t *emu, uintptr_t fcn) { iFpupLpL_t fn = (iFpupLpL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void iFpupLpp(x64emu_t *emu, uintptr_t fcn) { iFpupLpp_t fn = (iFpupLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFpupppp(x64emu_t *emu, uintptr_t fcn) { iFpupppp_t fn = (iFpupppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpUiipp(x64emu_t *emu, uintptr_t fcn) { iFpUiipp_t fn = (iFpUiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpUuuLp(x64emu_t *emu, uintptr_t fcn) { iFpUuuLp_t fn = (iFpUuuLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void iFpUUUup(x64emu_t *emu, uintptr_t fcn) { iFpUUUup_t fn = (iFpUUUup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
@@ -5466,6 +5508,7 @@ void iFppulup(x64emu_t *emu, uintptr_t fcn) { iFppulup_t fn = (iFppulup_t)fcn; R
 void iFppulll(x64emu_t *emu, uintptr_t fcn) { iFppulll_t fn = (iFppulll_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9); }
 void iFppuLpp(x64emu_t *emu, uintptr_t fcn) { iFppuLpp_t fn = (iFppuLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uintptr_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 iFppuppu(x64emu_t *emu, uintptr_t fcn) { iFppuppu_t fn = (iFppuppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 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 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); }
@@ -5481,6 +5524,7 @@ void iFpppipi(x64emu_t *emu, uintptr_t fcn) { iFpppipi_t fn = (iFpppipi_t)fcn; R
 void iFpppipu(x64emu_t *emu, uintptr_t fcn) { iFpppipu_t fn = (iFpppipu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_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 iFpppuuu(x64emu_t *emu, uintptr_t fcn) { iFpppuuu_t fn = (iFpppuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void iFpppuup(x64emu_t *emu, uintptr_t fcn) { iFpppuup_t fn = (iFpppuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)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); }
@@ -5488,6 +5532,7 @@ void iFpppLpp(x64emu_t *emu, uintptr_t fcn) { iFpppLpp_t fn = (iFpppLpp_t)fcn; R
 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); }
 void iFppppip(x64emu_t *emu, uintptr_t fcn) { iFppppip_t fn = (iFppppip_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 iFppppui(x64emu_t *emu, uintptr_t fcn) { iFppppui_t fn = (iFppppui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); }
+void iFppppuu(x64emu_t *emu, uintptr_t fcn) { iFppppuu_t fn = (iFppppuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void iFppppup(x64emu_t *emu, uintptr_t fcn) { iFppppup_t fn = (iFppppup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void iFppppLp(x64emu_t *emu, uintptr_t fcn) { iFppppLp_t fn = (iFppppLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void iFpppppi(x64emu_t *emu, uintptr_t fcn) { iFpppppi_t fn = (iFpppppi_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); }
@@ -5568,6 +5613,7 @@ void pFuuuuup(x64emu_t *emu, uintptr_t fcn) { pFuuuuup_t fn = (pFuuuuup_t)fcn; R
 void pFuuppuu(x64emu_t *emu, uintptr_t fcn) { pFuuppuu_t fn = (pFuuppuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void pFuppppp(x64emu_t *emu, uintptr_t fcn) { pFuppppp_t fn = (pFuppppp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)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]); }
+void pFLppppp(x64emu_t *emu, uintptr_t fcn) { pFLppppp_t fn = (pFLppppp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpiiiiu(x64emu_t *emu, uintptr_t fcn) { pFpiiiiu_t fn = (pFpiiiiu_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, (uint32_t)R_R9); }
 void pFpiiipp(x64emu_t *emu, uintptr_t fcn) { pFpiiipp_t fn = (pFpiiipp_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*)R_R9); }
 void pFpiiCCC(x64emu_t *emu, uintptr_t fcn) { pFpiiCCC_t fn = (pFpiiCCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9); }
@@ -5796,6 +5842,7 @@ void iFpLpiiuu(x64emu_t *emu, uintptr_t fcn) { iFpLpiiuu_t fn = (iFpLpiiuu_t)fcn
 void iFpLpiipi(x64emu_t *emu, uintptr_t fcn) { iFpLpiipi_t fn = (iFpLpiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpLpLuLi(x64emu_t *emu, uintptr_t fcn) { iFpLpLuLi_t fn = (iFpLpLuLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpLpLpip(x64emu_t *emu, uintptr_t fcn) { iFpLpLpip_t fn = (iFpLpLpip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
+void iFpLpLpLp(x64emu_t *emu, uintptr_t fcn) { iFpLpLpLp_t fn = (iFpLpLpLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpLppiii(x64emu_t *emu, uintptr_t fcn) { iFpLppiii_t fn = (iFpLppiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFppiiiip(x64emu_t *emu, uintptr_t fcn) { iFppiiiip_t fn = (iFppiiiip_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, *(void**)(R_RSP + 8)); }
 void iFppiiuup(x64emu_t *emu, uintptr_t fcn) { iFppiiuup_t fn = (iFppiiuup_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**)(R_RSP + 8)); }
@@ -5812,6 +5859,7 @@ void iFppuipiL(x64emu_t *emu, uintptr_t fcn) { iFppuipiL_t fn = (iFppuipiL_t)fcn
 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 iFppupppp(x64emu_t *emu, uintptr_t fcn) { iFppupppp_t fn = (iFppupppp_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**)(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 iFppLiWwL(x64emu_t *emu, uintptr_t fcn) { iFppLiWwL_t fn = (iFppLiWwL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (uint16_t)R_R8, (int16_t)R_R9, *(uintptr_t*)(R_RSP + 8)); }
@@ -5823,11 +5871,13 @@ void iFpppiiup(x64emu_t *emu, uintptr_t fcn) { iFpppiiup_t fn = (iFpppiiup_t)fcn
 void iFpppippi(x64emu_t *emu, uintptr_t fcn) { iFpppippi_t fn = (iFpppippi_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, *(int32_t*)(R_RSP + 8)); }
 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 iFpppuupu(x64emu_t *emu, uintptr_t fcn) { iFpppuupu_t fn = (iFpppuupu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFpppulup(x64emu_t *emu, uintptr_t fcn) { iFpppulup_t fn = (iFpppulup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (intptr_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpppLppp(x64emu_t *emu, uintptr_t fcn) { iFpppLppp_t fn = (iFpppLppp_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**)(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 iFppppIip(x64emu_t *emu, uintptr_t fcn) { iFppppIip_t fn = (iFppppIip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
+void iFppppupu(x64emu_t *emu, uintptr_t fcn) { iFppppupu_t fn = (iFppppupu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFppppdpu(x64emu_t *emu, uintptr_t fcn) { iFppppdpu_t fn = (iFppppdpu_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, (uint32_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)); }
 void iFpppppLp(x64emu_t *emu, uintptr_t fcn) { iFpppppLp_t fn = (iFpppppLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -6031,12 +6081,14 @@ void iFpuupuupp(x64emu_t *emu, uintptr_t fcn) { iFpuupuupp_t fn = (iFpuupuupp_t)
 void iFpuuppiip(x64emu_t *emu, uintptr_t fcn) { iFpuuppiip_t fn = (iFpuuppiip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuuppppp(x64emu_t *emu, uintptr_t fcn) { iFpuuppppp_t fn = (iFpuuppppp_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*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuLLLppL(x64emu_t *emu, uintptr_t fcn) { iFpuLLLppL_t fn = (iFpuLLLppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16)); }
+void iFpupupuup(x64emu_t *emu, uintptr_t fcn) { iFpupupuup_t fn = (iFpupupuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpupppppp(x64emu_t *emu, uintptr_t fcn) { iFpupppppp_t fn = (iFpupppppp_t)fcn; R_RAX=(int32_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 iFpUuuLpUu(x64emu_t *emu, uintptr_t fcn) { iFpUuuLpUu_t fn = (iFpUuuLpUu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uint64_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpduuulul(x64emu_t *emu, uintptr_t fcn) { iFpduuulul_t fn = (iFpduuulul_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (intptr_t)R_R8, (uint32_t)R_R9, *(intptr_t*)(R_RSP + 8)); }
 void iFpLLiippp(x64emu_t *emu, uintptr_t fcn) { iFpLLiippp_t fn = (iFpLLiippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpLLLiipi(x64emu_t *emu, uintptr_t fcn) { iFpLLLiipi_t fn = (iFpLLLiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void iFpLLppppp(x64emu_t *emu, uintptr_t fcn) { iFpLLppppp_t fn = (iFpLLppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void iFpLpiLpLp(x64emu_t *emu, uintptr_t fcn) { iFpLpiLpLp_t fn = (iFpLpiLpLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpLpipppp(x64emu_t *emu, uintptr_t fcn) { iFpLpipppp_t fn = (iFpLpipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpLpLpLpp(x64emu_t *emu, uintptr_t fcn) { iFpLpLpLpp_t fn = (iFpLpLpLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpLppLpip(x64emu_t *emu, uintptr_t fcn) { iFpLppLpip_t fn = (iFpLppLpip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -6054,8 +6106,10 @@ void iFpppiiipp(x64emu_t *emu, uintptr_t fcn) { iFpppiiipp_t fn = (iFpppiiipp_t)
 void iFpppipipi(x64emu_t *emu, uintptr_t fcn) { iFpppipipi_t fn = (iFpppipipi_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**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void iFppppiiup(x64emu_t *emu, uintptr_t fcn) { iFppppiiup_t fn = (iFppppiiup_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, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppppippp(x64emu_t *emu, uintptr_t fcn) { iFppppippp_t fn = (iFppppippp_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**)(R_RSP + 16)); }
+void iFppppuplu(x64emu_t *emu, uintptr_t fcn) { iFppppuplu_t fn = (iFppppuplu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(intptr_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpppppupp(x64emu_t *emu, uintptr_t fcn) { iFpppppupp_t fn = (iFpppppupp_t)fcn; R_RAX=(int32_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 iFppppppii(x64emu_t *emu, uintptr_t fcn) { iFppppppii_t fn = (iFppppppii_t)fcn; R_RAX=(int32_t)fn((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 iFppppppuu(x64emu_t *emu, uintptr_t fcn) { iFppppppuu_t fn = (iFppppppuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpppppppi(x64emu_t *emu, uintptr_t fcn) { iFpppppppi_t fn = (iFpppppppi_t)fcn; R_RAX=(int32_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)); }
 void iFpppppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppppp_t fn = (iFpppppppp_t)fcn; R_RAX=(int32_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 iFbWWipppp(x64emu_t *emu, uintptr_t fcn) { iFbWWipppp_t fn = (iFbWWipppp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(int32_t)fn(aligned_xcb, (uint16_t)R_RSI, (uint16_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
@@ -6189,14 +6243,17 @@ void iFEppPPPPPP(x64emu_t *emu, uintptr_t fcn) { iFEppPPPPPP_t fn = (iFEppPPPPPP
 void iFipiipippi(x64emu_t *emu, uintptr_t fcn) { iFipiipippi_t fn = (iFipiipippi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void iFuiiuuiiip(x64emu_t *emu, uintptr_t fcn) { iFuiiuuiiip_t fn = (iFuiiuuiiip_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFuiiupiiup(x64emu_t *emu, uintptr_t fcn) { iFuiiupiiup_t fn = (iFuiiupiiup_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void iFuuppuuppu(x64emu_t *emu, uintptr_t fcn) { iFuuppuuppu_t fn = (iFuuppuuppu_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
 void iFdddpppppp(x64emu_t *emu, uintptr_t fcn) { iFdddpppppp_t fn = (iFdddpppppp_t)fcn; R_RAX=(int32_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpiLiiipip(x64emu_t *emu, uintptr_t fcn) { iFpiLiiipip_t fn = (iFpiLiiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)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 iFpiLLLiiip(x64emu_t *emu, uintptr_t fcn) { iFpiLLLiiip_t fn = (iFpiLLLiiip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFpipippppi(x64emu_t *emu, uintptr_t fcn) { iFpipippppi_t fn = (iFpipippppi_t)fcn; R_RAX=(int32_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**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void iFpuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { iFpuuuuuuuu_t fn = (iFpuuuuuuuu_t)fcn; R_RAX=(int32_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, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
+void iFpuuuuuupp(x64emu_t *emu, uintptr_t fcn) { iFpuuuuuupp_t fn = (iFpuuuuuupp_t)fcn; R_RAX=(int32_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, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFpuuuuduup(x64emu_t *emu, uintptr_t fcn) { iFpuuuuduup_t fn = (iFpuuuuduup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, emu->xmm[0].d[0], (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuuuLiiip(x64emu_t *emu, uintptr_t fcn) { iFpuuuLiiip_t fn = (iFpuuuLiiip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFpuuuLpppp(x64emu_t *emu, uintptr_t fcn) { iFpuuuLpppp_t fn = (iFpuuuLpppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void iFpuuppupuu(x64emu_t *emu, uintptr_t fcn) { iFpuuppupuu_t fn = (iFpuuppupuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
 void iFpduuuLuLp(x64emu_t *emu, uintptr_t fcn) { iFpduuuLuLp_t fn = (iFpduuuLuLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpLiuiiLLL(x64emu_t *emu, uintptr_t fcn) { iFpLiuiiLLL_t fn = (iFpLiuiiLLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24)); }
 void iFpLLiiuuii(x64emu_t *emu, uintptr_t fcn) { iFpLLiiuuii_t fn = (iFpLLiiuuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
@@ -6304,6 +6361,7 @@ void iFpLLpiiuuii(x64emu_t *emu, uintptr_t fcn) { iFpLLpiiuuii_t fn = (iFpLLpiiu
 void iFpLpLUUUUpL(x64emu_t *emu, uintptr_t fcn) { iFpLpLUUUUpL_t fn = (iFpLpLUUUUpL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(uintptr_t*)(R_RSP + 32)); }
 void iFppuuiiuuuu(x64emu_t *emu, uintptr_t fcn) { iFppuuiiuuuu_t fn = (iFppuuiiuuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
 void iFppLLiiLWpi(x64emu_t *emu, uintptr_t fcn) { iFppLLiiLWpi_t fn = (iFppLLiiLWpi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uint16_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
+void iFppLpLLpLpp(x64emu_t *emu, uintptr_t fcn) { iFppLpLLpLpp_t fn = (iFppLpLLpLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFppLpLpLLpp(x64emu_t *emu, uintptr_t fcn) { iFppLpLpLLpp_t fn = (iFppLpLpLLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFpppiiipipi(x64emu_t *emu, uintptr_t fcn) { iFpppiiipipi_t fn = (iFpppiiipipi_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), *(int32_t*)(R_RSP + 32)); }
 void iFpppLLipppp(x64emu_t *emu, uintptr_t fcn) { iFpppLLipppp_t fn = (iFpppLLipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
@@ -7395,6 +7453,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFuWWp) return 1;
 	if (fun == &iFuuuu) return 1;
 	if (fun == &iFuupi) return 1;
+	if (fun == &iFuupu) return 1;
 	if (fun == &iFuupp) return 1;
 	if (fun == &iFupup) return 1;
 	if (fun == &iFupLp) return 1;
@@ -7492,6 +7551,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpplL) return 1;
 	if (fun == &iFpplp) return 1;
 	if (fun == &iFppLi) return 1;
+	if (fun == &iFppLu) return 1;
+	if (fun == &iFppLl) return 1;
 	if (fun == &iFppLL) return 1;
 	if (fun == &iFppLp) return 1;
 	if (fun == &iFpppi) return 1;
@@ -7554,6 +7615,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFppii) return 1;
 	if (fun == &lFppip) return 1;
 	if (fun == &lFpplp) return 1;
+	if (fun == &lFppLp) return 1;
 	if (fun == &lFpppL) return 1;
 	if (fun == &lFpppp) return 1;
 	if (fun == &LFipLL) return 1;
@@ -7877,6 +7939,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpipip) return 1;
 	if (fun == &iFpippi) return 1;
 	if (fun == &iFpippW) return 1;
+	if (fun == &iFpippL) return 1;
 	if (fun == &iFpippp) return 1;
 	if (fun == &iFpCCCC) return 1;
 	if (fun == &iFpCupp) return 1;
@@ -7898,6 +7961,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpupuu) return 1;
 	if (fun == &iFpupuU) return 1;
 	if (fun == &iFpupup) return 1;
+	if (fun == &iFpupLu) return 1;
+	if (fun == &iFpuppu) return 1;
 	if (fun == &iFpuppL) return 1;
 	if (fun == &iFpuppp) return 1;
 	if (fun == &iFpUiUi) return 1;
@@ -7954,6 +8019,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppup) return 1;
 	if (fun == &iFpppUi) return 1;
 	if (fun == &iFpppLi) return 1;
+	if (fun == &iFpppLu) return 1;
 	if (fun == &iFpppLL) return 1;
 	if (fun == &iFpppLp) return 1;
 	if (fun == &iFppppi) return 1;
@@ -7996,6 +8062,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFppupp) return 1;
 	if (fun == &lFppLpL) return 1;
 	if (fun == &lFppLpp) return 1;
+	if (fun == &LFuuuuu) return 1;
 	if (fun == &LFLpppL) return 1;
 	if (fun == &LFpuipp) return 1;
 	if (fun == &LFpuupi) return 1;
@@ -8244,6 +8311,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFipppLp) return 1;
 	if (fun == &iFippppp) return 1;
 	if (fun == &iFuiiuup) return 1;
+	if (fun == &iFupupLp) return 1;
+	if (fun == &iFupLpLp) return 1;
 	if (fun == &iFdipppL) return 2;
 	if (fun == &iFlpippp) return 1;
 	if (fun == &iFLpppii) return 1;
@@ -8285,8 +8354,10 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpuuppp) return 1;
 	if (fun == &iFpuLuLu) return 1;
 	if (fun == &iFpuLLpp) return 1;
+	if (fun == &iFpupupp) return 1;
 	if (fun == &iFpupLpL) return 1;
 	if (fun == &iFpupLpp) return 1;
+	if (fun == &iFpupppp) return 1;
 	if (fun == &iFpUiipp) return 1;
 	if (fun == &iFpUuuLp) return 1;
 	if (fun == &iFpUUUup) return 1;
@@ -8330,6 +8401,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppulll) return 1;
 	if (fun == &iFppuLpp) return 1;
 	if (fun == &iFppupip) return 1;
+	if (fun == &iFppuppu) return 1;
 	if (fun == &iFppuppp) return 1;
 	if (fun == &iFppdidd) return 4;
 	if (fun == &iFpplupp) return 1;
@@ -8345,6 +8417,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppipu) return 1;
 	if (fun == &iFpppipp) return 1;
 	if (fun == &iFpppuii) return 1;
+	if (fun == &iFpppuuu) return 1;
 	if (fun == &iFpppuup) return 1;
 	if (fun == &iFpppupu) return 1;
 	if (fun == &iFpppupp) return 1;
@@ -8352,6 +8425,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppppiu) return 1;
 	if (fun == &iFppppip) return 1;
 	if (fun == &iFppppui) return 1;
+	if (fun == &iFppppuu) return 1;
 	if (fun == &iFppppup) return 1;
 	if (fun == &iFppppLp) return 1;
 	if (fun == &iFpppppi) return 1;
@@ -8403,6 +8477,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFuuppuu) return 1;
 	if (fun == &pFuppppp) return 1;
 	if (fun == &pFdddddd) return 7;
+	if (fun == &pFLppppp) return 1;
 	if (fun == &pFpiiiiu) return 1;
 	if (fun == &pFpiiipp) return 1;
 	if (fun == &pFpiiCCC) return 1;
@@ -8883,6 +8958,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFplpp) return 1;
 	if (fun == &lFpLpp) return 1;
 	if (fun == &lFpplp) return 1;
+	if (fun == &lFppLp) return 1;
 	if (fun == &lFpppL) return 1;
 	if (fun == &lFpppp) return 1;
 	if (fun == &LFpupL) return 1;
@@ -9007,6 +9083,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFppupp) return 1;
 	if (fun == &lFppLpL) return 1;
 	if (fun == &lFppLpp) return 1;
+	if (fun == &LFuuuuu) return 1;
 	if (fun == &LFLpppL) return 1;
 	if (fun == &LFpLuuu) return 1;
 	if (fun == &LFpLLLp) return 1;
@@ -9112,6 +9189,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFuuppuu) return 1;
 	if (fun == &pFuppppp) return 1;
 	if (fun == &pFdddddd) return 7;
+	if (fun == &pFLppppp) return 1;
 	if (fun == &pFpuuuuu) return 1;
 	if (fun == &pFpuuupu) return 1;
 	if (fun == &pFpupuup) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index eba0e621..63df0758 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -1079,6 +1079,7 @@ void iFuipp(x64emu_t *emu, uintptr_t fnc);
 void iFuWWp(x64emu_t *emu, uintptr_t fnc);
 void iFuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFuupi(x64emu_t *emu, uintptr_t fnc);
+void iFuupu(x64emu_t *emu, uintptr_t fnc);
 void iFuupp(x64emu_t *emu, uintptr_t fnc);
 void iFupup(x64emu_t *emu, uintptr_t fnc);
 void iFupLp(x64emu_t *emu, uintptr_t fnc);
@@ -1179,6 +1180,8 @@ void iFppll(x64emu_t *emu, uintptr_t fnc);
 void iFpplL(x64emu_t *emu, uintptr_t fnc);
 void iFpplp(x64emu_t *emu, uintptr_t fnc);
 void iFppLi(x64emu_t *emu, uintptr_t fnc);
+void iFppLu(x64emu_t *emu, uintptr_t fnc);
+void iFppLl(x64emu_t *emu, uintptr_t fnc);
 void iFppLL(x64emu_t *emu, uintptr_t fnc);
 void iFppLp(x64emu_t *emu, uintptr_t fnc);
 void iFpppi(x64emu_t *emu, uintptr_t fnc);
@@ -1264,6 +1267,7 @@ void lFppii(x64emu_t *emu, uintptr_t fnc);
 void lFppip(x64emu_t *emu, uintptr_t fnc);
 void lFppiS(x64emu_t *emu, uintptr_t fnc);
 void lFpplp(x64emu_t *emu, uintptr_t fnc);
+void lFppLp(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);
@@ -1674,6 +1678,7 @@ void iFpipiL(x64emu_t *emu, uintptr_t fnc);
 void iFpipip(x64emu_t *emu, uintptr_t fnc);
 void iFpippi(x64emu_t *emu, uintptr_t fnc);
 void iFpippW(x64emu_t *emu, uintptr_t fnc);
+void iFpippL(x64emu_t *emu, uintptr_t fnc);
 void iFpippp(x64emu_t *emu, uintptr_t fnc);
 void iFpCCCC(x64emu_t *emu, uintptr_t fnc);
 void iFpCupp(x64emu_t *emu, uintptr_t fnc);
@@ -1695,6 +1700,8 @@ void iFpupui(x64emu_t *emu, uintptr_t fnc);
 void iFpupuu(x64emu_t *emu, uintptr_t fnc);
 void iFpupuU(x64emu_t *emu, uintptr_t fnc);
 void iFpupup(x64emu_t *emu, uintptr_t fnc);
+void iFpupLu(x64emu_t *emu, uintptr_t fnc);
+void iFpuppu(x64emu_t *emu, uintptr_t fnc);
 void iFpuppL(x64emu_t *emu, uintptr_t fnc);
 void iFpuppp(x64emu_t *emu, uintptr_t fnc);
 void iFpUiUi(x64emu_t *emu, uintptr_t fnc);
@@ -1751,6 +1758,7 @@ void iFpppuu(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 iFpppLu(x64emu_t *emu, uintptr_t fnc);
 void iFpppLL(x64emu_t *emu, uintptr_t fnc);
 void iFpppLp(x64emu_t *emu, uintptr_t fnc);
 void iFppppi(x64emu_t *emu, uintptr_t fnc);
@@ -1808,6 +1816,7 @@ void lFppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFELppu(x64emu_t *emu, uintptr_t fnc);
 void LFEppLL(x64emu_t *emu, uintptr_t fnc);
 void LFEpppp(x64emu_t *emu, uintptr_t fnc);
+void LFuuuuu(x64emu_t *emu, uintptr_t fnc);
 void LFLpppL(x64emu_t *emu, uintptr_t fnc);
 void LFpuipp(x64emu_t *emu, uintptr_t fnc);
 void LFpuupi(x64emu_t *emu, uintptr_t fnc);
@@ -2125,6 +2134,8 @@ void iFipuppp(x64emu_t *emu, uintptr_t fnc);
 void iFipppLp(x64emu_t *emu, uintptr_t fnc);
 void iFippppp(x64emu_t *emu, uintptr_t fnc);
 void iFuiiuup(x64emu_t *emu, uintptr_t fnc);
+void iFupupLp(x64emu_t *emu, uintptr_t fnc);
+void iFupLpLp(x64emu_t *emu, uintptr_t fnc);
 void iFdipppL(x64emu_t *emu, uintptr_t fnc);
 void iFDipppL(x64emu_t *emu, uintptr_t fnc);
 void iFlpippp(x64emu_t *emu, uintptr_t fnc);
@@ -2167,8 +2178,10 @@ void iFpuupuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuuppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuLuLu(x64emu_t *emu, uintptr_t fnc);
 void iFpuLLpp(x64emu_t *emu, uintptr_t fnc);
+void iFpupupp(x64emu_t *emu, uintptr_t fnc);
 void iFpupLpL(x64emu_t *emu, uintptr_t fnc);
 void iFpupLpp(x64emu_t *emu, uintptr_t fnc);
+void iFpupppp(x64emu_t *emu, uintptr_t fnc);
 void iFpUiipp(x64emu_t *emu, uintptr_t fnc);
 void iFpUuuLp(x64emu_t *emu, uintptr_t fnc);
 void iFpUUUup(x64emu_t *emu, uintptr_t fnc);
@@ -2212,6 +2225,7 @@ void iFppulup(x64emu_t *emu, uintptr_t fnc);
 void iFppulll(x64emu_t *emu, uintptr_t fnc);
 void iFppuLpp(x64emu_t *emu, uintptr_t fnc);
 void iFppupip(x64emu_t *emu, uintptr_t fnc);
+void iFppuppu(x64emu_t *emu, uintptr_t fnc);
 void iFppuppp(x64emu_t *emu, uintptr_t fnc);
 void iFppdidd(x64emu_t *emu, uintptr_t fnc);
 void iFpplupp(x64emu_t *emu, uintptr_t fnc);
@@ -2227,6 +2241,7 @@ void iFpppipi(x64emu_t *emu, uintptr_t fnc);
 void iFpppipu(x64emu_t *emu, uintptr_t fnc);
 void iFpppipp(x64emu_t *emu, uintptr_t fnc);
 void iFpppuii(x64emu_t *emu, uintptr_t fnc);
+void iFpppuuu(x64emu_t *emu, uintptr_t fnc);
 void iFpppuup(x64emu_t *emu, uintptr_t fnc);
 void iFpppupu(x64emu_t *emu, uintptr_t fnc);
 void iFpppupp(x64emu_t *emu, uintptr_t fnc);
@@ -2234,6 +2249,7 @@ void iFpppLpp(x64emu_t *emu, uintptr_t fnc);
 void iFppppiu(x64emu_t *emu, uintptr_t fnc);
 void iFppppip(x64emu_t *emu, uintptr_t fnc);
 void iFppppui(x64emu_t *emu, uintptr_t fnc);
+void iFppppuu(x64emu_t *emu, uintptr_t fnc);
 void iFppppup(x64emu_t *emu, uintptr_t fnc);
 void iFppppLp(x64emu_t *emu, uintptr_t fnc);
 void iFpppppi(x64emu_t *emu, uintptr_t fnc);
@@ -2314,6 +2330,7 @@ void pFuuuuup(x64emu_t *emu, uintptr_t fnc);
 void pFuuppuu(x64emu_t *emu, uintptr_t fnc);
 void pFuppppp(x64emu_t *emu, uintptr_t fnc);
 void pFdddddd(x64emu_t *emu, uintptr_t fnc);
+void pFLppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpiiiiu(x64emu_t *emu, uintptr_t fnc);
 void pFpiiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpiiCCC(x64emu_t *emu, uintptr_t fnc);
@@ -2542,6 +2559,7 @@ void iFpLpiiuu(x64emu_t *emu, uintptr_t fnc);
 void iFpLpiipi(x64emu_t *emu, uintptr_t fnc);
 void iFpLpLuLi(x64emu_t *emu, uintptr_t fnc);
 void iFpLpLpip(x64emu_t *emu, uintptr_t fnc);
+void iFpLpLpLp(x64emu_t *emu, uintptr_t fnc);
 void iFpLppiii(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiiuup(x64emu_t *emu, uintptr_t fnc);
@@ -2558,6 +2576,7 @@ 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 iFppupppp(x64emu_t *emu, uintptr_t fnc);
 void iFppliupp(x64emu_t *emu, uintptr_t fnc);
 void iFppLiipp(x64emu_t *emu, uintptr_t fnc);
 void iFppLiWwL(x64emu_t *emu, uintptr_t fnc);
@@ -2569,11 +2588,13 @@ void iFpppiiup(x64emu_t *emu, uintptr_t fnc);
 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 iFpppuupu(x64emu_t *emu, uintptr_t fnc);
 void iFpppulup(x64emu_t *emu, uintptr_t fnc);
 void iFpppLppp(x64emu_t *emu, uintptr_t fnc);
 void iFppppilp(x64emu_t *emu, uintptr_t fnc);
 void iFppppipp(x64emu_t *emu, uintptr_t fnc);
 void iFppppIip(x64emu_t *emu, uintptr_t fnc);
+void iFppppupu(x64emu_t *emu, uintptr_t fnc);
 void iFppppdpu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppip(x64emu_t *emu, uintptr_t fnc);
 void iFpppppLp(x64emu_t *emu, uintptr_t fnc);
@@ -2777,12 +2798,14 @@ void iFpuupuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuppiip(x64emu_t *emu, uintptr_t fnc);
 void iFpuuppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuLLLppL(x64emu_t *emu, uintptr_t fnc);
+void iFpupupuup(x64emu_t *emu, uintptr_t fnc);
 void iFpupppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpUuuLpUu(x64emu_t *emu, uintptr_t fnc);
 void iFpduuulul(x64emu_t *emu, uintptr_t fnc);
 void iFpLLiippp(x64emu_t *emu, uintptr_t fnc);
 void iFpLLLiipi(x64emu_t *emu, uintptr_t fnc);
 void iFpLLppppp(x64emu_t *emu, uintptr_t fnc);
+void iFpLpiLpLp(x64emu_t *emu, uintptr_t fnc);
 void iFpLpipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpLpLpLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpLppLpip(x64emu_t *emu, uintptr_t fnc);
@@ -2800,8 +2823,10 @@ void iFpppiiipp(x64emu_t *emu, uintptr_t fnc);
 void iFpppipipi(x64emu_t *emu, uintptr_t fnc);
 void iFppppiiup(x64emu_t *emu, uintptr_t fnc);
 void iFppppippp(x64emu_t *emu, uintptr_t fnc);
+void iFppppuplu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppupp(x64emu_t *emu, uintptr_t fnc);
 void iFppppppii(x64emu_t *emu, uintptr_t fnc);
+void iFppppppuu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppi(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFbWWipppp(x64emu_t *emu, uintptr_t fnc);
@@ -2936,14 +2961,17 @@ void iFEppPPPPPP(x64emu_t *emu, uintptr_t fnc);
 void iFipiipippi(x64emu_t *emu, uintptr_t fnc);
 void iFuiiuuiiip(x64emu_t *emu, uintptr_t fnc);
 void iFuiiupiiup(x64emu_t *emu, uintptr_t fnc);
+void iFuuppuuppu(x64emu_t *emu, uintptr_t fnc);
 void iFdddpppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiLiiipip(x64emu_t *emu, uintptr_t fnc);
 void iFpiLLLiiip(x64emu_t *emu, uintptr_t fnc);
 void iFpipippppi(x64emu_t *emu, uintptr_t fnc);
 void iFpuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
+void iFpuuuuuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuuuduup(x64emu_t *emu, uintptr_t fnc);
 void iFpuuuLiiip(x64emu_t *emu, uintptr_t fnc);
 void iFpuuuLpppp(x64emu_t *emu, uintptr_t fnc);
+void iFpuuppupuu(x64emu_t *emu, uintptr_t fnc);
 void iFpduuuLuLp(x64emu_t *emu, uintptr_t fnc);
 void iFpLiuiiLLL(x64emu_t *emu, uintptr_t fnc);
 void iFpLLiiuuii(x64emu_t *emu, uintptr_t fnc);
@@ -3051,6 +3079,7 @@ void iFpLLpiiuuii(x64emu_t *emu, uintptr_t fnc);
 void iFpLpLUUUUpL(x64emu_t *emu, uintptr_t fnc);
 void iFppuuiiuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppLLiiLWpi(x64emu_t *emu, uintptr_t fnc);
+void iFppLpLLpLpp(x64emu_t *emu, uintptr_t fnc);
 void iFppLpLpLLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiipipi(x64emu_t *emu, uintptr_t fnc);
 void iFpppLLipppp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgnutls_private.h b/src/wrapped/wrappedgnutls_private.h
index 1d8e009f..075bdc44 100644
--- a/src/wrapped/wrappedgnutls_private.h
+++ b/src/wrapped/wrappedgnutls_private.h
@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error Meh....
+#error Meh...
 #endif
 
 //gnutls_session_t is p
@@ -10,101 +10,101 @@
 //GO(_dsa_generate_dss_pq, 
 //GO(_dsa_validate_dss_g, 
 //GO(_dsa_validate_dss_pq, 
-//GO(gnutls_aead_cipher_decrypt, 
-//GO(gnutls_aead_cipher_deinit, 
-//GO(gnutls_aead_cipher_encrypt, 
-//GO(gnutls_aead_cipher_init, 
-GO(gnutls_alert_get, pFp)
-GO(gnutls_alert_get_name, pFp)
-//GO(gnutls_alert_get_strname, 
-GO(gnutls_alert_send, iFppp)
-//GO(gnutls_alert_send_appropriate, 
+GO(gnutls_aead_cipher_decrypt, iFppLpLLpLpp)
+GO(gnutls_aead_cipher_deinit, vFp)
+GO(gnutls_aead_cipher_encrypt, iFppLpLLpLpp)
+GO(gnutls_aead_cipher_init, iFpup)
+GO(gnutls_alert_get, uFp)
+GO(gnutls_alert_get_name, pFu)
+GO(gnutls_alert_get_strname, pFu)
+GO(gnutls_alert_send, iFpuu)
+GO(gnutls_alert_send_appropriate, iFpi)
 GO(gnutls_alpn_get_selected_protocol, iFpp)
 GO(gnutls_alpn_set_protocols, iFppuu)
-//GO(gnutls_anon_allocate_client_credentials, 
-//GO(gnutls_anon_allocate_server_credentials, 
-//GO(gnutls_anon_free_client_credentials, 
-//GO(gnutls_anon_free_server_credentials, 
-//GO(gnutls_anon_set_params_function, 
-//GO(gnutls_anon_set_server_dh_params, 
-//GO(gnutls_anon_set_server_known_dh_params, 
-//GO(gnutls_anon_set_server_params_function, 
-//GO(gnutls_auth_client_get_type, 
-//GO(gnutls_auth_get_type, 
-//GO(gnutls_auth_server_get_type, 
+GO(gnutls_anon_allocate_client_credentials, iFp)
+GO(gnutls_anon_allocate_server_credentials, iFp)
+GO(gnutls_anon_free_client_credentials, vFp)
+GO(gnutls_anon_free_server_credentials, vFp)
+//GOM(gnutls_anon_set_params_function, vFEpp)
+GO(gnutls_anon_set_server_dh_params, vFpp)
+GO(gnutls_anon_set_server_known_dh_params, iFpu)
+//GOM(gnutls_anon_set_server_params_function, vFEpp)
+GO(gnutls_auth_client_get_type, uFp)
+GO(gnutls_auth_get_type, uFp)
+GO(gnutls_auth_server_get_type, uFp)
 //GO(_gnutls_bin2hex, 
-//GO(gnutls_buffer_append_data, 
+GO(gnutls_buffer_append_data, iFppL)
 //GO(_gnutls_buffer_append_str, 
 //GO(_gnutls_buffer_init, 
 //GO(_gnutls_buffer_to_datum, 
-GO(gnutls_bye, iFpi)
-//GO(gnutls_certificate_activation_time_peers, 
+GO(gnutls_bye, iFpu)
+GO(gnutls_certificate_activation_time_peers, lFp)
 GO(gnutls_certificate_allocate_credentials, iFp)
-//GO(gnutls_certificate_client_get_request_status, 
-//GO(gnutls_certificate_expiration_time_peers, 
-//GO(gnutls_certificate_free_ca_names, 
-//GO(gnutls_certificate_free_cas, 
+GO(gnutls_certificate_client_get_request_status, uFp)
+GO(gnutls_certificate_expiration_time_peers, lFp)
+GO(gnutls_certificate_free_ca_names, vFp)
+GO(gnutls_certificate_free_cas, vFp)
 GO(gnutls_certificate_free_credentials, vFp)
-//GO(gnutls_certificate_free_crls, 
-//GO(gnutls_certificate_free_keys, 
-//GO(gnutls_certificate_get_crt_raw, 
-//GO(gnutls_certificate_get_issuer, 
-//GO(gnutls_certificate_get_openpgp_crt, 
-//GO(gnutls_certificate_get_openpgp_key, 
-//GO(gnutls_certificate_get_ours, 
+GO(gnutls_certificate_free_crls, vFp)
+GO(gnutls_certificate_free_keys, vFp)
+GO(gnutls_certificate_get_crt_raw, iFpuup)
+GO(gnutls_certificate_get_issuer, iFpppu)
+GO(gnutls_certificate_get_openpgp_crt, iFpupp)
+GO(gnutls_certificate_get_openpgp_key, iFpup)
+GO(gnutls_certificate_get_ours, pFp)
 GO(gnutls_certificate_get_peers, pFpp)
-//GO(gnutls_certificate_get_peers_subkey_id, 
-//GO(gnutls_certificate_get_trust_list, 
-//GO(gnutls_certificate_get_verify_flags, 
-//GO(gnutls_certificate_get_x509_crt, 
-//GO(gnutls_certificate_get_x509_key, 
-//GO(gnutls_certificate_send_x509_rdn_sequence, 
-//GO(gnutls_certificate_server_set_request, 
-//GO(gnutls_certificate_set_dh_params, 
-//GO(gnutls_certificate_set_flags, 
-//GO(gnutls_certificate_set_key, 
-//GO(gnutls_certificate_set_known_dh_params, 
-//GO(gnutls_certificate_set_ocsp_status_request_file, 
-//GO(gnutls_certificate_set_ocsp_status_request_function, 
-//GO(gnutls_certificate_set_ocsp_status_request_function2, 
-//GO(gnutls_certificate_set_openpgp_key, 
-//GO(gnutls_certificate_set_openpgp_key_file, 
-//GO(gnutls_certificate_set_openpgp_key_file2, 
-//GO(gnutls_certificate_set_openpgp_key_mem, 
-//GO(gnutls_certificate_set_openpgp_key_mem2, 
-//GO(gnutls_certificate_set_openpgp_keyring_file, 
-//GO(gnutls_certificate_set_openpgp_keyring_mem, 
-//GO(gnutls_certificate_set_params_function, 
-//GO(gnutls_certificate_set_pin_function, 
-//GO(gnutls_certificate_set_retrieve_function, 
-//GO(gnutls_certificate_set_retrieve_function2, 
-//GO(gnutls_certificate_set_trust_list, 
+GO(gnutls_certificate_get_peers_subkey_id, iFpp)
+GO(gnutls_certificate_get_trust_list, vFpp)
+GO(gnutls_certificate_get_verify_flags, uFp)
+GO(gnutls_certificate_get_x509_crt, iFpupp)
+GO(gnutls_certificate_get_x509_key, iFpup)
+GO(gnutls_certificate_send_x509_rdn_sequence, vFpi)
+GO(gnutls_certificate_server_set_request, vFpu)
+GO(gnutls_certificate_set_dh_params, vFpp)
+GO(gnutls_certificate_set_flags, vFpu)
+GO(gnutls_certificate_set_key, iFppipip)
+GO(gnutls_certificate_set_known_dh_params, iFpu)
+GO(gnutls_certificate_set_ocsp_status_request_file, iFppu)
+//GOM(gnutls_certificate_set_ocsp_status_request_function, vFEppp)
+//GOM(gnutls_certificate_set_ocsp_status_request_function2, iFEpupp)
+GO(gnutls_certificate_set_openpgp_key, iFppp)
+GO(gnutls_certificate_set_openpgp_key_file, iFpppu)
+GO(gnutls_certificate_set_openpgp_key_file2, iFppppu)
+GO(gnutls_certificate_set_openpgp_key_mem, iFpppu)
+GO(gnutls_certificate_set_openpgp_key_mem2, iFppppu)
+GO(gnutls_certificate_set_openpgp_keyring_file, iFppu)
+GO(gnutls_certificate_set_openpgp_keyring_mem, iFppLu)
+//GOM(gnutls_certificate_set_params_function, vFEpp)
+//GOM(gnutls_certificate_set_pin_function, vFEppp)
+//GOM(gnutls_certificate_set_retrieve_function, vFEpp)
+//GOM(gnutls_certificate_set_retrieve_function2, vFEpp)
+GO(gnutls_certificate_set_trust_list, vFppu)
 GO(gnutls_certificate_set_verify_flags, vFpu)
-//GO(gnutls_certificate_set_verify_function, 
-//GO(gnutls_certificate_set_verify_limits, 
-//GO(gnutls_certificate_set_x509_crl, 
-GO(gnutls_certificate_set_x509_crl_file, iFppi)
-//GO(gnutls_certificate_set_x509_crl_mem, 
+//GOM(gnutls_certificate_set_verify_function, vFEpp)
+GO(gnutls_certificate_set_verify_limits, vFpuu)
+GO(gnutls_certificate_set_x509_crl, iFppi)
+GO(gnutls_certificate_set_x509_crl_file, iFppu)
+GO(gnutls_certificate_set_x509_crl_mem, iFppu)
 GO(gnutls_certificate_set_x509_key, iFppip)
-GO(gnutls_certificate_set_x509_key_file, iFpppi)
-GO(gnutls_certificate_set_x509_key_file2, iFpppipu)
-//GO(gnutls_certificate_set_x509_key_mem, 
-//GO(gnutls_certificate_set_x509_key_mem2, 
-//GO(gnutls_certificate_set_x509_simple_pkcs12_file, 
-//GO(gnutls_certificate_set_x509_simple_pkcs12_mem, 
+GO(gnutls_certificate_set_x509_key_file, iFpppu)
+GO(gnutls_certificate_set_x509_key_file2, iFpppupu)
+GO(gnutls_certificate_set_x509_key_mem, iFpppu)
+GO(gnutls_certificate_set_x509_key_mem2, iFpppupu)
+GO(gnutls_certificate_set_x509_simple_pkcs12_file, iFppup)
+GO(gnutls_certificate_set_x509_simple_pkcs12_mem, iFppup)
 GO(gnutls_certificate_set_x509_system_trust, iFp)
-//GO(gnutls_certificate_set_x509_trust, 
-GO(gnutls_certificate_set_x509_trust_dir, iFppi)
-GO(gnutls_certificate_set_x509_trust_file, iFppi)
-//GO(gnutls_certificate_set_x509_trust_mem, 
-//GO(gnutls_certificate_type_get, 
-//GO(gnutls_certificate_type_get_id, 
-//GO(gnutls_certificate_type_get_name, 
-//GO(gnutls_certificate_type_list, 
-//GO(gnutls_certificate_verification_status_print, 
-//GO(gnutls_certificate_verify_peers, 
+GO(gnutls_certificate_set_x509_trust, iFppi)
+GO(gnutls_certificate_set_x509_trust_dir, iFppu)
+GO(gnutls_certificate_set_x509_trust_file, iFppu)
+GO(gnutls_certificate_set_x509_trust_mem, iFppu)
+GO(gnutls_certificate_type_get, uFp)
+GO(gnutls_certificate_type_get_id, uFp)
+GO(gnutls_certificate_type_get_name, pFu)
+GO(gnutls_certificate_type_list, pFv)
+GO(gnutls_certificate_verification_status_print, iFuupu)
+GO(gnutls_certificate_verify_peers, iFppup)
 GO(gnutls_certificate_verify_peers2, iFpp)
-//GO(gnutls_certificate_verify_peers3, 
+GO(gnutls_certificate_verify_peers3, iFppp)
 GO(gnutls_check_version, pFp)
 //GO(_gnutls_cidr_to_string, 
 GO(gnutls_cipher_add_auth, iFppL)
@@ -113,668 +113,668 @@ GO(gnutls_cipher_decrypt2, iFppLpL)
 GO(gnutls_cipher_deinit, vFp)
 GO(gnutls_cipher_encrypt, iFppL)
 GO(gnutls_cipher_encrypt2, iFppLpL)
-GO(gnutls_cipher_get, pFp)
-GO(gnutls_cipher_get_block_size, uFp)
-//GO(gnutls_cipher_get_id, 
-//GO(gnutls_cipher_get_iv_size, 
-GO(gnutls_cipher_get_key_size, LFp)
-//GO(gnutls_cipher_get_name, 
-//GO(gnutls_cipher_get_tag_size, 
-GO(gnutls_cipher_init, iFpppp)
-//GO(gnutls_cipher_list, 
-//GO(gnutls_cipher_set_iv, 
-GO(gnutls_cipher_suite_get_name, pFiii)
-//GO(gnutls_cipher_suite_info, 
+GO(gnutls_cipher_get, uFp)
+GO(gnutls_cipher_get_block_size, uFu)
+GO(gnutls_cipher_get_id, uFp)
+GO(gnutls_cipher_get_iv_size, uFu)
+GO(gnutls_cipher_get_key_size, LFu)
+GO(gnutls_cipher_get_name, pFu)
+GO(gnutls_cipher_get_tag_size, uFu)
+GO(gnutls_cipher_init, iFpupp)
+GO(gnutls_cipher_list, pFv)
+GO(gnutls_cipher_set_iv, vFppL)
+GO(gnutls_cipher_suite_get_name, pFuuu)
+GO(gnutls_cipher_suite_info, pFLppppp)
 GO(gnutls_cipher_tag, iFppL)
-//GO(gnutls_compression_get, 
-//GO(gnutls_compression_get_id, 
-//GO(gnutls_compression_get_name, 
-//GO(gnutls_compression_list, 
-//GO(gnutls_credentials_clear, 
-//GO(gnutls_credentials_get, 
-GO(gnutls_credentials_set, iFppp)
-//GO(gnutls_crypto_register_aead_cipher, 
-//GO(gnutls_crypto_register_cipher, 
-//GO(gnutls_crypto_register_digest, 
-//GO(gnutls_crypto_register_mac, 
+GO(gnutls_compression_get, uFp)
+GO(gnutls_compression_get_id, uFp)
+GO(gnutls_compression_get_name, pFu)
+GO(gnutls_compression_list, pFv)
+GO(gnutls_credentials_clear, vFp)
+GO(gnutls_credentials_get, iFpup)
+GO(gnutls_credentials_set, iFpup)
+//GOM(gnutls_crypto_register_aead_cipher, iFEuippppp)
+//GOM(gnutls_crypto_register_cipher, iFEuipppppp)
+//GOM(gnutls_crypto_register_digest, iFEuippppp)
+//GOM(gnutls_crypto_register_mac, iFEuippppppp)
 //GO(gnutls_db_check_entry, 
-//GO(gnutls_db_check_entry_time, 
-//GO(gnutls_db_get_default_cache_expiration, 
-//GO(gnutls_db_get_ptr, 
-//GO(gnutls_db_remove_session, 
-//GO(gnutls_db_set_cache_expiration, 
-//GO(gnutls_db_set_ptr, 
-//GO(gnutls_db_set_remove_function, 
-//GO(gnutls_db_set_retrieve_function, 
-//GO(gnutls_db_set_store_function, 
-GO(gnutls_decode_rs_value, iFppp)   // not always present
-//GO(gnutls_decode_ber_digest_info, 
+GO(gnutls_db_check_entry_time, lFp)
+GO(gnutls_db_get_default_cache_expiration, uFv)
+GO(gnutls_db_get_ptr, pFp)
+GO(gnutls_db_remove_session, vFp)
+GO(gnutls_db_set_cache_expiration, vFpi)
+GO(gnutls_db_set_ptr, vFpp)
+//GOM(gnutls_db_set_remove_function, vFEpp)
+//GOM(gnutls_db_set_retrieve_function, vFEpp)
+//GOM(gnutls_db_set_store_function, vFEpp)
+GO(gnutls_decode_rs_value, iFppp)
+GO(gnutls_decode_ber_digest_info, iFpppp)
 //GO(_gnutls_decode_ber_rs_raw, 
 GO(gnutls_deinit, vFp)
-//GO(gnutls_dh_get_group, 
-//GO(gnutls_dh_get_peers_public_bits, 
-//GO(gnutls_dh_get_prime_bits, 
-//GO(gnutls_dh_get_pubkey, 
-//GO(gnutls_dh_get_secret_bits, 
-//GO(gnutls_dh_params_cpy, 
+GO(gnutls_dh_get_group, iFppp)
+GO(gnutls_dh_get_peers_public_bits, iFp)
+GO(gnutls_dh_get_prime_bits, iFp)
+GO(gnutls_dh_get_pubkey, iFpp)
+GO(gnutls_dh_get_secret_bits, iFp)
+GO(gnutls_dh_params_cpy, iFpp)
 GO(gnutls_dh_params_deinit, vFp)
-//GO(gnutls_dh_params_export2_pkcs3, 
-//GO(gnutls_dh_params_export_pkcs3, 
+GO(gnutls_dh_params_export2_pkcs3, iFpup)
+GO(gnutls_dh_params_export_pkcs3, iFpupp)
 GO(gnutls_dh_params_export_raw, iFpppp)
 GO(gnutls_dh_params_generate2, iFpu)
-//GO(gnutls_dh_params_import_dsa, 
-//GO(gnutls_dh_params_import_pkcs3, 
+GO(gnutls_dh_params_import_dsa, iFpp)
+GO(gnutls_dh_params_import_pkcs3, iFppu)
 GO(gnutls_dh_params_import_raw, iFppp)
 GO(gnutls_dh_params_import_raw2, iFpppu)
 GO(gnutls_dh_params_init, iFp)
-//GO(gnutls_dh_set_prime_bits, 
+GO(gnutls_dh_set_prime_bits, vFpu)
 //GO(_gnutls_digest_exists, 
-//GO(gnutls_digest_get_id, 
-//GO(gnutls_digest_get_name, 
-//GO(gnutls_digest_get_oid, 
-//GO(gnutls_digest_list, 
-//GO(gnutls_dtls_cookie_send, 
-//GO(gnutls_dtls_cookie_verify, 
-//GO(gnutls_dtls_get_data_mtu, 
-//GO(gnutls_dtls_get_mtu, 
-//GO(gnutls_dtls_get_timeout, 
-//GO(gnutls_dtls_prestate_set, 
-//GO(gnutls_dtls_set_data_mtu, 
+GO(gnutls_digest_get_id, uFp)
+GO(gnutls_digest_get_name, pFu)
+GO(gnutls_digest_get_oid, pFu)
+GO(gnutls_digest_list, pFv)
+//GOM(gnutls_dtls_cookie_send, iFEppLppp)
+GO(gnutls_dtls_cookie_verify, iFppLpLp)
+GO(gnutls_dtls_get_data_mtu, uFp)
+GO(gnutls_dtls_get_mtu, uFp)
+GO(gnutls_dtls_get_timeout, uFp)
+GO(gnutls_dtls_prestate_set, vFpp)
+GO(gnutls_dtls_set_data_mtu, iFpu)
 GO(gnutls_dtls_set_mtu, vFpu)
 GO(gnutls_dtls_set_timeouts, vFpuu)
-//GO(gnutls_ecc_curve_get, 
-//GO(gnutls_ecc_curve_get_id, 
-//GO(gnutls_ecc_curve_get_name, 
-//GO(gnutls_ecc_curve_get_oid, 
-//GO(gnutls_ecc_curve_get_pk, 
-//GO(gnutls_ecc_curve_get_size, 
-//GO(gnutls_ecc_curve_list, 
+GO(gnutls_ecc_curve_get, uFp)
+GO(gnutls_ecc_curve_get_id, uFp)
+GO(gnutls_ecc_curve_get_name, pFu)
+GO(gnutls_ecc_curve_get_oid, pFu)
+GO(gnutls_ecc_curve_get_pk, uFu)
+GO(gnutls_ecc_curve_get_size, iFu)
+GO(gnutls_ecc_curve_list, pFv)
 GO(_gnutls_ecdh_compute_key, iFipppppp)
 GO(gnutls_ecdh_compute_key, iFipppppp)
-//GO(gnutls_encode_ber_digest_info, 
+GO(gnutls_encode_ber_digest_info, iFupp)
 //GO(_gnutls_encode_ber_rs_raw, 
 GO(gnutls_error_is_fatal, iFi)
-//GO(gnutls_error_to_alert, 
-//GO(gnutls_est_record_overhead_size, 
+GO(gnutls_error_to_alert, iFip)
+GO(gnutls_est_record_overhead_size, LFuuuuu)
 GO(gnutls_privkey_export_dh_raw, iFppppu)
-//GO(gnutls_ext_get_data, 
-//GO(gnutls_ext_get_name, 
-//GO(gnutls_ext_register, 
-//GO(gnutls_ext_set_data, 
-//GO(gnutls_fingerprint, 
-//GO(gnutls_fips140_mode_enabled, 
-GO(gnutls_free, vFp)
+GO(gnutls_ext_get_data, iFpup)
+GO(gnutls_ext_get_name, pFu)
+//GOM(gnutls_ext_register, iFEpiuppppp)
+GO(gnutls_ext_set_data, vFpup)
+GO(gnutls_fingerprint, iFuppp)
+GO(gnutls_fips140_mode_enabled, uFv)
+GO(gnutls_free, vFp)//DATAM(gnutls_free, 8)
 GO(gnutls_global_deinit, vFv)
 GO(gnutls_global_init, iFv)
-//GO(gnutls_global_set_audit_log_function, 
+//GOM(gnutls_global_set_audit_log_function, vFEp)
 GOM(gnutls_global_set_log_function, vFEp)
 GO(gnutls_global_set_log_level, vFi)
-//GO(gnutls_global_set_mem_functions, 
-//GO(gnutls_global_set_mutex, 
-//GO(gnutls_global_set_time_function, 
+//GOM(gnutls_global_set_mem_functions, vFEppppp)
+//GOM(gnutls_global_set_mutex, vFEpppp)
+//GOM(gnutls_global_set_time_function, vFEp)
 GO(gnutls_handshake, iFp)
-//GO(gnutls_handshake_description_get_name, 
-//GO(gnutls_handshake_get_last_in, 
-//GO(gnutls_handshake_get_last_out, 
-//GO(gnutls_handshake_set_hook_function, 
-//GO(gnutls_handshake_set_max_packet_length, 
-//GO(gnutls_handshake_set_post_client_hello_function, 
-//GO(gnutls_handshake_set_private_extensions, 
-//GO(gnutls_handshake_set_random, 
-//GO(gnutls_handshake_set_timeout, 
-//GO(gnutls_hash, 
-//GO(gnutls_hash_deinit, 
-//GO(gnutls_hash_fast, 
-//GO(gnutls_hash_get_len, 
-//GO(gnutls_hash_init, 
-//GO(gnutls_hash_output, 
-//GO(gnutls_heartbeat_allowed, 
-//GO(gnutls_heartbeat_enable, 
-//GO(gnutls_heartbeat_get_timeout, 
-//GO(gnutls_heartbeat_ping, 
-//GO(gnutls_heartbeat_pong, 
-//GO(gnutls_heartbeat_set_timeouts, 
+GO(gnutls_handshake_description_get_name, pFu)
+GO(gnutls_handshake_get_last_in, uFp)
+GO(gnutls_handshake_get_last_out, uFp)
+//GOM(gnutls_handshake_set_hook_function, vFEpuip)
+GO(gnutls_handshake_set_max_packet_length, vFpL)
+//GOM(gnutls_handshake_set_post_client_hello_function, vFEpp)
+GO(gnutls_handshake_set_private_extensions, vFpi)
+GO(gnutls_handshake_set_random, iFpp)
+GO(gnutls_handshake_set_timeout, vFpu)
+GO(gnutls_hash, iFppL)
+GO(gnutls_hash_deinit, vFpp)
+GO(gnutls_hash_fast, iFupLp)
+GO(gnutls_hash_get_len, uFu)
+GO(gnutls_hash_init, iFpu)
+GO(gnutls_hash_output, vFpp)
+GO(gnutls_heartbeat_allowed, uFpu)
+GO(gnutls_heartbeat_enable, vFpu)
+GO(gnutls_heartbeat_get_timeout, uFp)
+GO(gnutls_heartbeat_ping, iFpLuu)
+GO(gnutls_heartbeat_pong, iFpu)
+GO(gnutls_heartbeat_set_timeouts, vFpuu)
 //GO(_gnutls_hello_set_default_version, 
-//GO(gnutls_hex2bin, 
-//GO(gnutls_hex_decode, 
-//GO(gnutls_hex_decode2, 
-//GO(gnutls_hex_encode, 
-//GO(gnutls_hex_encode2, 
-//GO(gnutls_hmac, 
-//GO(gnutls_hmac_deinit, 
-//GO(gnutls_hmac_fast, 
-//GO(gnutls_hmac_get_len, 
-//GO(gnutls_hmac_init, 
-//GO(gnutls_hmac_output, 
-//GO(gnutls_hmac_set_nonce, 
-//GO(gnutls_idna_map, 
-//GO(gnutls_idna_reverse_map, 
+GO(gnutls_hex2bin, iFpLpp)
+GO(gnutls_hex_decode, iFppp)
+GO(gnutls_hex_decode2, iFpp)
+GO(gnutls_hex_encode, iFppp)
+GO(gnutls_hex_encode2, iFpp)
+GO(gnutls_hmac, iFppL)
+GO(gnutls_hmac_deinit, vFpp)
+GO(gnutls_hmac_fast, iFupLpLp)
+GO(gnutls_hmac_get_len, uFu)
+GO(gnutls_hmac_init, iFpupL)
+GO(gnutls_hmac_output, vFpp)
+GO(gnutls_hmac_set_nonce, vFppL)
+GO(gnutls_idna_map, iFpupu)
+GO(gnutls_idna_reverse_map, iFpupu)
 GO(gnutls_init, iFpu)
 //GO(_gnutls_ip_to_string, 
-//GO(gnutls_key_generate, 
-GO(gnutls_kx_get, pFp)
-//GO(gnutls_kx_get_id, 
-//GO(gnutls_kx_get_name, 
-//GO(gnutls_kx_list, 
+GO(gnutls_key_generate, iFpu)
+GO(gnutls_kx_get, uFp)
+GO(gnutls_kx_get_id, uFp)
+GO(gnutls_kx_get_name, pFu)
+GO(gnutls_kx_list, pFv)
 //GO(_gnutls_lib_simulate_error, 
-//GO(gnutls_load_file, 
+GO(gnutls_load_file, iFpp)
 //GO(_gnutls_log, 
-GO(gnutls_mac_get, pFp)
-//GO(gnutls_mac_get_id, 
-GO(gnutls_mac_get_key_size, LFp)
-//GO(gnutls_mac_get_name, 
-//GO(gnutls_mac_get_nonce_size, 
-//GO(gnutls_mac_list, 
+GO(gnutls_mac_get, uFp)
+GO(gnutls_mac_get_id, uFp)
+GO(gnutls_mac_get_key_size, LFu)
+GO(gnutls_mac_get_name, pFu)
+GO(gnutls_mac_get_nonce_size, LFu)
+GO(gnutls_mac_list, pFv)
 //GO(_gnutls_mac_to_entry, 
-//GO(gnutls_memcmp, 
-//GO(gnutls_memset, 
+GO(gnutls_memcmp, iFppL)
+GO(gnutls_memset, vFpiL)
 //GO(_gnutls_mpi_log, 
-//GO(gnutls_ocsp_req_add_cert, 
-//GO(gnutls_ocsp_req_add_cert_id, 
-//GO(gnutls_ocsp_req_deinit, 
-//GO(gnutls_ocsp_req_export, 
-//GO(gnutls_ocsp_req_get_cert_id, 
-//GO(gnutls_ocsp_req_get_extension, 
-//GO(gnutls_ocsp_req_get_nonce, 
-//GO(gnutls_ocsp_req_get_version, 
-//GO(gnutls_ocsp_req_import, 
-//GO(gnutls_ocsp_req_init, 
-//GO(gnutls_ocsp_req_print, 
-//GO(gnutls_ocsp_req_randomize_nonce, 
-//GO(gnutls_ocsp_req_set_extension, 
-//GO(gnutls_ocsp_req_set_nonce, 
-//GO(gnutls_ocsp_resp_check_crt, 
+GO(gnutls_ocsp_req_add_cert, iFpupp)
+GO(gnutls_ocsp_req_add_cert_id, iFpuppp)
+GO(gnutls_ocsp_req_deinit, vFp)
+GO(gnutls_ocsp_req_export, iFpp)
+GO(gnutls_ocsp_req_get_cert_id, iFpupppp)
+GO(gnutls_ocsp_req_get_extension, iFpuppp)
+GO(gnutls_ocsp_req_get_nonce, iFppp)
+GO(gnutls_ocsp_req_get_version, iFp)
+GO(gnutls_ocsp_req_import, iFpp)
+GO(gnutls_ocsp_req_init, iFp)
+GO(gnutls_ocsp_req_print, iFpup)
+GO(gnutls_ocsp_req_randomize_nonce, iFp)
+GO(gnutls_ocsp_req_set_extension, iFppup)
+GO(gnutls_ocsp_req_set_nonce, iFpup)
+GO(gnutls_ocsp_resp_check_crt, iFpup)
 GO(gnutls_ocsp_resp_deinit, vFp)
-//GO(gnutls_ocsp_resp_export, 
-//GO(gnutls_ocsp_resp_get_certs, 
-//GO(gnutls_ocsp_resp_get_extension, 
-//GO(gnutls_ocsp_resp_get_nonce, 
-//GO(gnutls_ocsp_resp_get_produced, 
-//GO(gnutls_ocsp_resp_get_responder, 
-//GO(gnutls_ocsp_resp_get_responder2, 
-//GO(gnutls_ocsp_resp_get_responder_raw_id, 
-//GO(gnutls_ocsp_resp_get_response, 
-//GO(gnutls_ocsp_resp_get_signature, 
-//GO(gnutls_ocsp_resp_get_signature_algorithm, 
+GO(gnutls_ocsp_resp_export, iFpp)
+GO(gnutls_ocsp_resp_get_certs, iFppp)
+GO(gnutls_ocsp_resp_get_extension, iFpuppp)
+GO(gnutls_ocsp_resp_get_nonce, iFppp)
+GO(gnutls_ocsp_resp_get_produced, lFp)
+GO(gnutls_ocsp_resp_get_responder, iFpp)
+GO(gnutls_ocsp_resp_get_responder2, iFppu)
+GO(gnutls_ocsp_resp_get_responder_raw_id, iFpup)
+GO(gnutls_ocsp_resp_get_response, iFppp)
+GO(gnutls_ocsp_resp_get_signature, iFpp)
+GO(gnutls_ocsp_resp_get_signature_algorithm, iFp)
 GO(gnutls_ocsp_resp_get_single, iFpuppppppppp)
-//GO(gnutls_ocsp_resp_get_status, 
-//GO(gnutls_ocsp_resp_get_version, 
+GO(gnutls_ocsp_resp_get_status, iFp)
+GO(gnutls_ocsp_resp_get_version, iFp)
 GO(gnutls_ocsp_resp_import, iFpp)
 GO(gnutls_ocsp_resp_init, iFp)
-//GO(gnutls_ocsp_resp_print, 
-//GO(gnutls_ocsp_resp_verify, 
-//GO(gnutls_ocsp_resp_verify_direct, 
+GO(gnutls_ocsp_resp_print, iFpup)
+GO(gnutls_ocsp_resp_verify, iFpppu)
+GO(gnutls_ocsp_resp_verify_direct, iFpppu)
 GO(gnutls_ocsp_status_request_enable_client, iFppLp)
 GO(gnutls_ocsp_status_request_get, iFpp)
 GO(gnutls_ocsp_status_request_is_checked, uFpu)
-//GO(gnutls_oid_to_digest, 
-//GO(gnutls_oid_to_ecc_curve, 
-//GO(gnutls_oid_to_mac, 
-//GO(gnutls_oid_to_pk, 
-//GO(gnutls_oid_to_sign, 
-//GO(gnutls_openpgp_crt_check_email, 
-//GO(gnutls_openpgp_crt_check_hostname, 
-//GO(gnutls_openpgp_crt_check_hostname2, 
-//GO(gnutls_openpgp_crt_deinit, 
-//GO(gnutls_openpgp_crt_export, 
-//GO(gnutls_openpgp_crt_export2, 
-//GO(gnutls_openpgp_crt_get_auth_subkey, 
-//GO(gnutls_openpgp_crt_get_creation_time, 
-//GO(gnutls_openpgp_crt_get_expiration_time, 
-//GO(gnutls_openpgp_crt_get_fingerprint, 
-//GO(gnutls_openpgp_crt_get_key_id, 
-//GO(gnutls_openpgp_crt_get_key_usage, 
-//GO(gnutls_openpgp_crt_get_name, 
-//GO(gnutls_openpgp_crt_get_pk_algorithm, 
-//GO(gnutls_openpgp_crt_get_pk_dsa_raw, 
-//GO(gnutls_openpgp_crt_get_pk_rsa_raw, 
-//GO(gnutls_openpgp_crt_get_preferred_key_id, 
-//GO(gnutls_openpgp_crt_get_revoked_status, 
-//GO(gnutls_openpgp_crt_get_subkey_count, 
-//GO(gnutls_openpgp_crt_get_subkey_creation_time, 
-//GO(gnutls_openpgp_crt_get_subkey_expiration_time, 
-//GO(gnutls_openpgp_crt_get_subkey_fingerprint, 
-//GO(gnutls_openpgp_crt_get_subkey_id, 
-//GO(gnutls_openpgp_crt_get_subkey_idx, 
-//GO(gnutls_openpgp_crt_get_subkey_pk_algorithm, 
-//GO(gnutls_openpgp_crt_get_subkey_pk_dsa_raw, 
-//GO(gnutls_openpgp_crt_get_subkey_pk_rsa_raw, 
-//GO(gnutls_openpgp_crt_get_subkey_revoked_status, 
-//GO(gnutls_openpgp_crt_get_subkey_usage, 
-//GO(gnutls_openpgp_crt_get_version, 
-//GO(gnutls_openpgp_crt_import, 
-//GO(gnutls_openpgp_crt_init, 
-//GO(gnutls_openpgp_crt_print, 
-//GO(gnutls_openpgp_crt_set_preferred_key_id, 
-//GO(gnutls_openpgp_crt_verify_ring, 
-//GO(gnutls_openpgp_crt_verify_self, 
-//GO(gnutls_openpgp_keyring_check_id, 
-//GO(gnutls_openpgp_keyring_deinit, 
-//GO(gnutls_openpgp_keyring_get_crt, 
-//GO(gnutls_openpgp_keyring_get_crt_count, 
-//GO(gnutls_openpgp_keyring_import, 
-//GO(gnutls_openpgp_keyring_init, 
-//GO(gnutls_openpgp_privkey_deinit, 
-//GO(gnutls_openpgp_privkey_export, 
-//GO(gnutls_openpgp_privkey_export2, 
-//GO(gnutls_openpgp_privkey_export_dsa_raw, 
-//GO(gnutls_openpgp_privkey_export_rsa_raw, 
-//GO(gnutls_openpgp_privkey_export_subkey_dsa_raw, 
-//GO(gnutls_openpgp_privkey_export_subkey_rsa_raw, 
-//GO(gnutls_openpgp_privkey_get_fingerprint, 
-//GO(gnutls_openpgp_privkey_get_key_id, 
-//GO(gnutls_openpgp_privkey_get_pk_algorithm, 
-//GO(gnutls_openpgp_privkey_get_preferred_key_id, 
-//GO(gnutls_openpgp_privkey_get_revoked_status, 
-//GO(gnutls_openpgp_privkey_get_subkey_count, 
-//GO(gnutls_openpgp_privkey_get_subkey_creation_time, 
-//GO(gnutls_openpgp_privkey_get_subkey_expiration_time, 
-//GO(gnutls_openpgp_privkey_get_subkey_fingerprint, 
-//GO(gnutls_openpgp_privkey_get_subkey_id, 
-//GO(gnutls_openpgp_privkey_get_subkey_idx, 
-//GO(gnutls_openpgp_privkey_get_subkey_pk_algorithm, 
-//GO(gnutls_openpgp_privkey_get_subkey_revoked_status, 
-//GO(gnutls_openpgp_privkey_import, 
-//GO(gnutls_openpgp_privkey_init, 
-//GO(gnutls_openpgp_privkey_sec_param, 
-//GO(gnutls_openpgp_privkey_set_preferred_key_id, 
-//GO(gnutls_openpgp_privkey_sign_hash, 
-//GO(gnutls_openpgp_send_cert, 
-//GO(gnutls_openpgp_set_recv_key_function, 
-//GO(gnutls_packet_deinit, 
-//GO(gnutls_packet_get, 
-//GO(gnutls_pcert_deinit, 
-//GO(gnutls_pcert_export_openpgp, 
-//GO(gnutls_pcert_export_x509, 
-//GO(gnutls_pcert_import_openpgp, 
-//GO(gnutls_pcert_import_openpgp_raw, 
-//GO(gnutls_pcert_import_x509, 
-//GO(gnutls_pcert_import_x509_list, 
-//GO(gnutls_pcert_import_x509_raw, 
-//GO(gnutls_pcert_list_import_x509_raw, 
-//GO(gnutls_pem_base64_decode, 
-//GO(gnutls_pem_base64_decode2, 
-//GO(gnutls_pem_base64_encode, 
-//GO(gnutls_pem_base64_encode2, 
+GO(gnutls_oid_to_digest, uFp)
+GO(gnutls_oid_to_ecc_curve, uFp)
+GO(gnutls_oid_to_mac, uFp)
+GO(gnutls_oid_to_pk, uFp)
+GO(gnutls_oid_to_sign, uFp)
+GO(gnutls_openpgp_crt_check_email, iFppu)
+GO(gnutls_openpgp_crt_check_hostname, iFpp)
+GO(gnutls_openpgp_crt_check_hostname2, iFppu)
+GO(gnutls_openpgp_crt_deinit, vFp)
+GO(gnutls_openpgp_crt_export, iFpupp)
+GO(gnutls_openpgp_crt_export2, iFpup)
+GO(gnutls_openpgp_crt_get_auth_subkey, iFppu)
+GO(gnutls_openpgp_crt_get_creation_time, lFp)
+GO(gnutls_openpgp_crt_get_expiration_time, lFp)
+GO(gnutls_openpgp_crt_get_fingerprint, iFppp)
+GO(gnutls_openpgp_crt_get_key_id, iFpp)
+GO(gnutls_openpgp_crt_get_key_usage, iFpp)
+GO(gnutls_openpgp_crt_get_name, iFpipp)
+GO(gnutls_openpgp_crt_get_pk_algorithm, uFpp)
+GO(gnutls_openpgp_crt_get_pk_dsa_raw, iFppppp)
+GO(gnutls_openpgp_crt_get_pk_rsa_raw, iFppp)
+GO(gnutls_openpgp_crt_get_preferred_key_id, iFpp)
+GO(gnutls_openpgp_crt_get_revoked_status, iFp)
+GO(gnutls_openpgp_crt_get_subkey_count, iFp)
+GO(gnutls_openpgp_crt_get_subkey_creation_time, lFpu)
+GO(gnutls_openpgp_crt_get_subkey_expiration_time, lFpu)
+GO(gnutls_openpgp_crt_get_subkey_fingerprint, iFpupp)
+GO(gnutls_openpgp_crt_get_subkey_id, iFpup)
+GO(gnutls_openpgp_crt_get_subkey_idx, iFpp)
+GO(gnutls_openpgp_crt_get_subkey_pk_algorithm, uFpup)
+GO(gnutls_openpgp_crt_get_subkey_pk_dsa_raw, iFpupppp)
+GO(gnutls_openpgp_crt_get_subkey_pk_rsa_raw, iFpupp)
+GO(gnutls_openpgp_crt_get_subkey_revoked_status, iFpu)
+GO(gnutls_openpgp_crt_get_subkey_usage, iFpup)
+GO(gnutls_openpgp_crt_get_version, iFp)
+GO(gnutls_openpgp_crt_import, iFppu)
+GO(gnutls_openpgp_crt_init, iFp)
+GO(gnutls_openpgp_crt_print, iFpup)
+GO(gnutls_openpgp_crt_set_preferred_key_id, iFpp)
+GO(gnutls_openpgp_crt_verify_ring, iFppup)
+GO(gnutls_openpgp_crt_verify_self, iFpup)
+GO(gnutls_openpgp_keyring_check_id, iFppu)
+GO(gnutls_openpgp_keyring_deinit, vFp)
+GO(gnutls_openpgp_keyring_get_crt, iFpup)
+GO(gnutls_openpgp_keyring_get_crt_count, iFp)
+GO(gnutls_openpgp_keyring_import, iFppu)
+GO(gnutls_openpgp_keyring_init, iFp)
+GO(gnutls_openpgp_privkey_deinit, vFp)
+GO(gnutls_openpgp_privkey_export, iFpupupp)
+GO(gnutls_openpgp_privkey_export2, iFpupup)
+GO(gnutls_openpgp_privkey_export_dsa_raw, iFpppppp)
+GO(gnutls_openpgp_privkey_export_rsa_raw, iFppppppp)
+GO(gnutls_openpgp_privkey_export_subkey_dsa_raw, iFpuppppp)
+GO(gnutls_openpgp_privkey_export_subkey_rsa_raw, iFpupppppp)
+GO(gnutls_openpgp_privkey_get_fingerprint, iFppp)
+GO(gnutls_openpgp_privkey_get_key_id, iFpp)
+GO(gnutls_openpgp_privkey_get_pk_algorithm, uFpp)
+GO(gnutls_openpgp_privkey_get_preferred_key_id, iFpp)
+GO(gnutls_openpgp_privkey_get_revoked_status, iFp)
+GO(gnutls_openpgp_privkey_get_subkey_count, iFp)
+GO(gnutls_openpgp_privkey_get_subkey_creation_time, lFpu)
+GO(gnutls_openpgp_privkey_get_subkey_expiration_time, lFpu)
+GO(gnutls_openpgp_privkey_get_subkey_fingerprint, iFpupp)
+GO(gnutls_openpgp_privkey_get_subkey_id, iFpup)
+GO(gnutls_openpgp_privkey_get_subkey_idx, iFpp)
+GO(gnutls_openpgp_privkey_get_subkey_pk_algorithm, uFpup)
+GO(gnutls_openpgp_privkey_get_subkey_revoked_status, iFpu)
+GO(gnutls_openpgp_privkey_import, iFppupu)
+GO(gnutls_openpgp_privkey_init, iFp)
+GO(gnutls_openpgp_privkey_sec_param, uFp)
+GO(gnutls_openpgp_privkey_set_preferred_key_id, iFpp)
+GO(gnutls_openpgp_privkey_sign_hash, iFppp)
+GO(gnutls_openpgp_send_cert, vFpu)
+//GOM(gnutls_openpgp_set_recv_key_function, vFEpp)
+GO(gnutls_packet_deinit, vFp)
+GO(gnutls_packet_get, vFppp)
+GO(gnutls_pcert_deinit, vFp)
+GO(gnutls_pcert_export_openpgp, iFpp)
+GO(gnutls_pcert_export_x509, iFpp)
+GO(gnutls_pcert_import_openpgp, iFppu)
+GO(gnutls_pcert_import_openpgp_raw, iFppupu)
+GO(gnutls_pcert_import_x509, iFppu)
+GO(gnutls_pcert_import_x509_list, iFpppu)
+GO(gnutls_pcert_import_x509_raw, iFppuu)
+GO(gnutls_pcert_list_import_x509_raw, iFpppuu)
+GO(gnutls_pem_base64_decode, iFpppp)
+GO(gnutls_pem_base64_decode2, iFppp)
+GO(gnutls_pem_base64_encode, iFpppp)
+GO(gnutls_pem_base64_encode2, iFppp)
 GO(gnutls_perror, vFi)
-GO(gnutls_pk_algorithm_get_name, pFi)
-//GO(gnutls_pk_bits_to_sec_param, 
-//GO(gnutls_pkcs11_add_provider, 
-//GO(gnutls_pkcs11_copy_attached_extension, 
-//GO(gnutls_pkcs11_copy_pubkey, 
-//GO(gnutls_pkcs11_copy_secret_key, 
-//GO(gnutls_pkcs11_copy_x509_crt2, 
-//GO(gnutls_pkcs11_copy_x509_privkey2, 
-//GO(gnutls_pkcs11_crt_is_known, 
-//GO(gnutls_pkcs11_deinit, 
-//GO(gnutls_pkcs11_delete_url, 
-//GO(gnutls_pkcs11_get_pin_function, 
-//GO(gnutls_pkcs11_get_raw_issuer, 
-//GO(gnutls_pkcs11_get_raw_issuer_by_dn, 
-//GO(gnutls_pkcs11_get_raw_issuer_by_subject_key_id, 
-//GO(gnutls_pkcs11_init, 
-//GO(gnutls_pkcs11_obj_deinit, 
-//GO(gnutls_pkcs11_obj_export, 
-//GO(gnutls_pkcs11_obj_export2, 
-//GO(gnutls_pkcs11_obj_export3, 
-//GO(gnutls_pkcs11_obj_export_url, 
-//GO(gnutls_pkcs11_obj_flags_get_str, 
-//GO(gnutls_pkcs11_obj_get_exts, 
-//GO(gnutls_pkcs11_obj_get_flags, 
-//GO(gnutls_pkcs11_obj_get_info, 
-//GO(gnutls_pkcs11_obj_get_type, 
-//GO(gnutls_pkcs11_obj_import_url, 
-//GO(gnutls_pkcs11_obj_init, 
-//GO(gnutls_pkcs11_obj_list_import_url3, 
-//GO(gnutls_pkcs11_obj_list_import_url4, 
-//GO(gnutls_pkcs11_obj_set_info, 
-//GO(gnutls_pkcs11_obj_set_pin_function, 
-//GO(gnutls_pkcs11_privkey_cpy, 
-//GO(gnutls_pkcs11_privkey_deinit, 
-//GO(gnutls_pkcs11_privkey_export_pubkey, 
-//GO(gnutls_pkcs11_privkey_export_url, 
-//GO(gnutls_pkcs11_privkey_generate3, 
-//GO(gnutls_pkcs11_privkey_get_info, 
-//GO(gnutls_pkcs11_privkey_get_pk_algorithm, 
-//GO(gnutls_pkcs11_privkey_import_url, 
-//GO(gnutls_pkcs11_privkey_init, 
-//GO(gnutls_pkcs11_privkey_set_pin_function, 
-//GO(gnutls_pkcs11_privkey_status, 
-//GO(gnutls_pkcs11_reinit, 
-//GO(gnutls_pkcs11_set_pin_function, 
-//GO(gnutls_pkcs11_set_token_function, 
-//GO(gnutls_pkcs11_token_get_flags, 
-//GO(gnutls_pkcs11_token_get_info, 
-//GO(gnutls_pkcs11_token_get_mechanism, 
-//GO(gnutls_pkcs11_token_get_random, 
-//GO(gnutls_pkcs11_token_get_url, 
-//GO(gnutls_pkcs11_token_init, 
-//GO(gnutls_pkcs11_token_set_pin, 
-//GO(gnutls_pkcs11_type_get_name, 
-//GO(gnutls_pkcs12_bag_decrypt, 
-//GO(gnutls_pkcs12_bag_deinit, 
-//GO(gnutls_pkcs12_bag_enc_info, 
-//GO(gnutls_pkcs12_bag_encrypt, 
-//GO(gnutls_pkcs12_bag_get_count, 
-//GO(gnutls_pkcs12_bag_get_data, 
-//GO(gnutls_pkcs12_bag_get_friendly_name, 
-//GO(gnutls_pkcs12_bag_get_key_id, 
-//GO(gnutls_pkcs12_bag_get_type, 
-//GO(gnutls_pkcs12_bag_init, 
-//GO(gnutls_pkcs12_bag_set_crl, 
-//GO(gnutls_pkcs12_bag_set_crt, 
-//GO(gnutls_pkcs12_bag_set_data, 
-//GO(gnutls_pkcs12_bag_set_friendly_name, 
-//GO(gnutls_pkcs12_bag_set_key_id, 
-//GO(gnutls_pkcs12_bag_set_privkey, 
+GO(gnutls_pk_algorithm_get_name, pFu)
+GO(gnutls_pk_bits_to_sec_param, uFuu)
+GO(gnutls_pkcs11_add_provider, iFpp)
+GO(gnutls_pkcs11_copy_attached_extension, iFppppu)
+GO(gnutls_pkcs11_copy_pubkey, iFppppuu)
+GO(gnutls_pkcs11_copy_secret_key, iFpppuu)
+GO(gnutls_pkcs11_copy_x509_crt2, iFppppu)
+GO(gnutls_pkcs11_copy_x509_privkey2, iFppppuu)
+GO(gnutls_pkcs11_crt_is_known, uFppu)
+GO(gnutls_pkcs11_deinit, vFv)
+GO(gnutls_pkcs11_delete_url, iFpu)
+//GOM(gnutls_pkcs11_get_pin_function, pFEp)
+GO(gnutls_pkcs11_get_raw_issuer, iFpppuu)
+GO(gnutls_pkcs11_get_raw_issuer_by_dn, iFpppuu)
+GO(gnutls_pkcs11_get_raw_issuer_by_subject_key_id, iFppppuu)
+GO(gnutls_pkcs11_init, iFup)
+GO(gnutls_pkcs11_obj_deinit, vFp)
+GO(gnutls_pkcs11_obj_export, iFppp)
+GO(gnutls_pkcs11_obj_export2, iFpp)
+GO(gnutls_pkcs11_obj_export3, iFpup)
+GO(gnutls_pkcs11_obj_export_url, iFpup)
+GO(gnutls_pkcs11_obj_flags_get_str, pFu)
+GO(gnutls_pkcs11_obj_get_exts, iFpppu)
+GO(gnutls_pkcs11_obj_get_flags, iFpp)
+GO(gnutls_pkcs11_obj_get_info, iFpupp)
+GO(gnutls_pkcs11_obj_get_type, uFp)
+GO(gnutls_pkcs11_obj_import_url, iFppu)
+GO(gnutls_pkcs11_obj_init, iFp)
+GO(gnutls_pkcs11_obj_list_import_url3, iFpppu)
+GO(gnutls_pkcs11_obj_list_import_url4, iFpppu)
+GO(gnutls_pkcs11_obj_set_info, iFpupLu)
+//GOM(gnutls_pkcs11_obj_set_pin_function, vFEppp)
+GO(gnutls_pkcs11_privkey_cpy, iFpp)
+GO(gnutls_pkcs11_privkey_deinit, vFp)
+GO(gnutls_pkcs11_privkey_export_pubkey, iFpupu)
+GO(gnutls_pkcs11_privkey_export_url, iFpup)
+GO(gnutls_pkcs11_privkey_generate3, iFpuuppupuu)
+GO(gnutls_pkcs11_privkey_get_info, iFpupp)
+GO(gnutls_pkcs11_privkey_get_pk_algorithm, iFpp)
+GO(gnutls_pkcs11_privkey_import_url, iFppu)
+GO(gnutls_pkcs11_privkey_init, iFp)
+//GOM(gnutls_pkcs11_privkey_set_pin_function, vFEppp)
+GO(gnutls_pkcs11_privkey_status, uFp)
+GO(gnutls_pkcs11_reinit, iFv)
+//GOM(gnutls_pkcs11_set_pin_function, vFEpp)
+//GOM(gnutls_pkcs11_set_token_function, vFEpp)
+GO(gnutls_pkcs11_token_get_flags, iFpp)
+GO(gnutls_pkcs11_token_get_info, iFpupp)
+GO(gnutls_pkcs11_token_get_mechanism, iFpup)
+GO(gnutls_pkcs11_token_get_random, iFppL)
+GO(gnutls_pkcs11_token_get_url, iFuup)
+GO(gnutls_pkcs11_token_init, iFppp)
+GO(gnutls_pkcs11_token_set_pin, iFpppu)
+GO(gnutls_pkcs11_type_get_name, pFu)
+GO(gnutls_pkcs12_bag_decrypt, iFpp)
+GO(gnutls_pkcs12_bag_deinit, vFp)
+GO(gnutls_pkcs12_bag_enc_info, iFppppppp)
+GO(gnutls_pkcs12_bag_encrypt, iFppu)
+GO(gnutls_pkcs12_bag_get_count, iFp)
+GO(gnutls_pkcs12_bag_get_data, iFpup)
+GO(gnutls_pkcs12_bag_get_friendly_name, iFpup)
+GO(gnutls_pkcs12_bag_get_key_id, iFpup)
+GO(gnutls_pkcs12_bag_get_type, iFpu)
+GO(gnutls_pkcs12_bag_init, iFp)
+GO(gnutls_pkcs12_bag_set_crl, iFpp)
+GO(gnutls_pkcs12_bag_set_crt, iFpp)
+GO(gnutls_pkcs12_bag_set_data, iFpup)
+GO(gnutls_pkcs12_bag_set_friendly_name, iFpup)
+GO(gnutls_pkcs12_bag_set_key_id, iFpup)
+GO(gnutls_pkcs12_bag_set_privkey, iFpppu)
 GO(gnutls_pkcs12_deinit, vFp)
-//GO(gnutls_pkcs12_export, 
-//GO(gnutls_pkcs12_export2, 
-//GO(gnutls_pkcs12_generate_mac, 
-//GO(gnutls_pkcs12_generate_mac2, 
-//GO(gnutls_pkcs12_get_bag, 
-GO(gnutls_pkcs12_import, iFpppu)
+GO(gnutls_pkcs12_export, iFpupp)
+GO(gnutls_pkcs12_export2, iFpup)
+GO(gnutls_pkcs12_generate_mac, iFpp)
+GO(gnutls_pkcs12_generate_mac2, iFpup)
+GO(gnutls_pkcs12_get_bag, iFpip)
+GO(gnutls_pkcs12_import, iFppuu)
 GO(gnutls_pkcs12_init, iFp)
-//GO(gnutls_pkcs12_mac_info, 
-//GO(gnutls_pkcs12_set_bag, 
+GO(gnutls_pkcs12_mac_info, iFpppppp)
+GO(gnutls_pkcs12_set_bag, iFpp)
 GO(gnutls_pkcs12_simple_parse, iFppppppppu)
 //GO(_gnutls_pkcs12_string_to_key, 
-//GO(gnutls_pkcs12_verify_mac, 
-//GO(gnutls_pkcs7_add_attr, 
-//GO(gnutls_pkcs7_attrs_deinit, 
-//GO(gnutls_pkcs7_deinit, 
-//GO(gnutls_pkcs7_delete_crl, 
-//GO(gnutls_pkcs7_delete_crt, 
-//GO(gnutls_pkcs7_export, 
-//GO(gnutls_pkcs7_export2, 
-//GO(gnutls_pkcs7_get_attr, 
-//GO(gnutls_pkcs7_get_crl_count, 
-//GO(gnutls_pkcs7_get_crl_raw, 
-//GO(gnutls_pkcs7_get_crl_raw2, 
-//GO(gnutls_pkcs7_get_crt_count, 
-//GO(gnutls_pkcs7_get_crt_raw, 
-//GO(gnutls_pkcs7_get_crt_raw2, 
-//GO(gnutls_pkcs7_get_embedded_data, 
-//GO(gnutls_pkcs7_get_embedded_data_oid, 
-//GO(gnutls_pkcs7_get_signature_count, 
-//GO(gnutls_pkcs7_get_signature_info, 
-//GO(gnutls_pkcs7_import, 
-//GO(gnutls_pkcs7_init, 
-//GO(gnutls_pkcs7_print, 
-//GO(gnutls_pkcs7_set_crl, 
-//GO(gnutls_pkcs7_set_crl_raw, 
-//GO(gnutls_pkcs7_set_crt, 
-//GO(gnutls_pkcs7_set_crt_raw, 
-//GO(gnutls_pkcs7_sign, 
-//GO(gnutls_pkcs7_signature_info_deinit, 
-//GO(gnutls_pkcs7_verify, 
-//GO(gnutls_pkcs7_verify_direct, 
-//GO(gnutls_pkcs8_info, 
-//GO(gnutls_pkcs_schema_get_name, 
-//GO(gnutls_pkcs_schema_get_oid, 
-//GO(gnutls_pk_get_id, 
-//GO(gnutls_pk_get_name, 
-//GO(gnutls_pk_get_oid, 
-//GO(gnutls_pk_list, 
-GO(gnutls_pk_to_sign, pFpp)
-//GO(gnutls_prf, 
-//GO(gnutls_prf_raw, 
-//GO(gnutls_prf_rfc5705, 
-//GO(gnutls_priority_certificate_type_list, 
-//GO(gnutls_priority_cipher_list, 
-//GO(gnutls_priority_compression_list, 
-//GO(gnutls_priority_deinit, 
-//GO(gnutls_priority_ecc_curve_list, 
-//GO(gnutls_priority_get_cipher_suite_index, 
-//GO(gnutls_priority_init, 
-//GO(gnutls_priority_kx_list, 
-//GO(gnutls_priority_mac_list, 
-//GO(gnutls_priority_protocol_list, 
-//GO(gnutls_priority_set, 
+GO(gnutls_pkcs12_verify_mac, iFpp)
+GO(gnutls_pkcs7_add_attr, iFpppu)
+GO(gnutls_pkcs7_attrs_deinit, vFp)
+GO(gnutls_pkcs7_deinit, vFp)
+GO(gnutls_pkcs7_delete_crl, iFpi)
+GO(gnutls_pkcs7_delete_crt, iFpi)
+GO(gnutls_pkcs7_export, iFpupp)
+GO(gnutls_pkcs7_export2, iFpup)
+GO(gnutls_pkcs7_get_attr, iFpuppu)
+GO(gnutls_pkcs7_get_crl_count, iFp)
+GO(gnutls_pkcs7_get_crl_raw, iFpupp)
+GO(gnutls_pkcs7_get_crl_raw2, iFpup)
+GO(gnutls_pkcs7_get_crt_count, iFp)
+GO(gnutls_pkcs7_get_crt_raw, iFpupp)
+GO(gnutls_pkcs7_get_crt_raw2, iFpup)
+GO(gnutls_pkcs7_get_embedded_data, iFpup)
+GO(gnutls_pkcs7_get_embedded_data_oid, pFp)
+GO(gnutls_pkcs7_get_signature_count, iFp)
+GO(gnutls_pkcs7_get_signature_info, iFpup)
+GO(gnutls_pkcs7_import, iFppu)
+GO(gnutls_pkcs7_init, iFp)
+GO(gnutls_pkcs7_print, iFpup)
+GO(gnutls_pkcs7_set_crl, iFpp)
+GO(gnutls_pkcs7_set_crl_raw, iFpp)
+GO(gnutls_pkcs7_set_crt, iFpp)
+GO(gnutls_pkcs7_set_crt_raw, iFpp)
+GO(gnutls_pkcs7_sign, iFppppppuu)
+GO(gnutls_pkcs7_signature_info_deinit, vFp)
+GO(gnutls_pkcs7_verify, iFpppuupu)
+GO(gnutls_pkcs7_verify_direct, iFppupu)
+GO(gnutls_pkcs8_info, iFpupppppp)
+GO(gnutls_pkcs_schema_get_name, pFu)
+GO(gnutls_pkcs_schema_get_oid, pFu)
+GO(gnutls_pk_get_id, uFp)
+GO(gnutls_pk_get_name, pFu)
+GO(gnutls_pk_get_oid, pFu)
+GO(gnutls_pk_list, pFv)
+GO(gnutls_pk_to_sign, uFuu)
+GO(gnutls_prf, iFpLpiLpLp)
+GO(gnutls_prf_raw, iFpLpLpLp)
+GO(gnutls_prf_rfc5705, iFpLpLpLp)
+GO(gnutls_priority_certificate_type_list, iFpp)
+GO(gnutls_priority_cipher_list, iFpp)
+GO(gnutls_priority_compression_list, iFpp)
+GO(gnutls_priority_deinit, vFp)
+GO(gnutls_priority_ecc_curve_list, iFpp)
+GO(gnutls_priority_get_cipher_suite_index, iFpup)
+GO(gnutls_priority_init, iFppp)
+GO(gnutls_priority_kx_list, iFpp)
+GO(gnutls_priority_mac_list, iFpp)
+GO(gnutls_priority_protocol_list, iFpp)
+GO(gnutls_priority_set, iFpp)
 GO(gnutls_priority_set_direct, iFppp)
-//GO(gnutls_priority_sign_list, 
-//GO(gnutls_priority_string_list, 
-GO(gnutls_privkey_decrypt_data, iFpipp)
+GO(gnutls_priority_sign_list, iFpp)
+GO(gnutls_priority_string_list, pFuu)
+GO(gnutls_privkey_decrypt_data, iFpupp)
 GO(gnutls_privkey_deinit, vFp)
 GO(gnutls_privkey_derive_secret, iFppppu)
 GO(gnutls_privkey_export_dsa_raw, iFpppppp)
 GO(gnutls_privkey_export_ecc_raw, iFppppp)
-//GO(gnutls_privkey_export_openpgp, 
-//GO(gnutls_privkey_export_pkcs11, 
+GO(gnutls_privkey_export_openpgp, iFpp)
+GO(gnutls_privkey_export_pkcs11, iFpp)
 GO(gnutls_privkey_export_rsa_raw, iFppppppppp)
 GO(gnutls_privkey_export_x509, iFpp)
-GO(gnutls_privkey_generate, iFppuu)
+GO(gnutls_privkey_generate, iFpuuu)
 GO(gnutls_privkey_generate2, iFpuuupu)
-//GO(gnutls_privkey_get_pk_algorithm, 
-//GO(gnutls_privkey_get_seed, 
-//GO(gnutls_privkey_get_type, 
-GO(gnutls_privkey_import_dh_raw, iFpupp)
+GO(gnutls_privkey_get_pk_algorithm, iFpp)
+GO(gnutls_privkey_get_seed, iFpppp)
+GO(gnutls_privkey_get_type, uFp)
+GO(gnutls_privkey_import_dh_raw, iFpppp)
 GO(gnutls_privkey_import_dsa_raw, iFpppppp)
-GO(gnutls_privkey_import_ecc_raw, iFppppp)
-//GO(gnutls_privkey_import_ext, 
-//GO(gnutls_privkey_import_ext2, 
-//GO(gnutls_privkey_import_ext3, 
-//GO(gnutls_privkey_import_openpgp, 
-//GO(gnutls_privkey_import_openpgp_raw, 
-//GO(gnutls_privkey_import_pkcs11, 
+GO(gnutls_privkey_import_ecc_raw, iFpuppp)
+//GOM(gnutls_privkey_import_ext, iFEpupppu)
+//GOM(gnutls_privkey_import_ext2, iFEpuppppu)
+//GOM(gnutls_privkey_import_ext3, iFEppppppu)
+GO(gnutls_privkey_import_openpgp, iFppu)
+GO(gnutls_privkey_import_openpgp_raw, iFppupp)
+GO(gnutls_privkey_import_pkcs11, iFppu)
 GO(gnutls_privkey_import_rsa_raw, iFppppppppp)
-//GO(gnutls_privkey_import_tpm_raw, 
-//GO(gnutls_privkey_import_tpm_url, 
-//GO(gnutls_privkey_import_url, 
-//GO(gnutls_privkey_import_x509, 
-//GO(gnutls_privkey_import_x509_raw, 
+GO(gnutls_privkey_import_tpm_raw, iFppuppu)
+GO(gnutls_privkey_import_tpm_url, iFppppu)
+GO(gnutls_privkey_import_url, iFppu)
+GO(gnutls_privkey_import_x509, iFppu)
+GO(gnutls_privkey_import_x509_raw, iFppupu)
 GO(gnutls_privkey_init, iFp)
-//GO(gnutls_privkey_set_flags, 
-//GO(gnutls_privkey_set_pin_function, 
+GO(gnutls_privkey_set_flags, vFpu)
+//GOM(gnutls_privkey_set_pin_function, vFEppp)
 GO(gnutls_privkey_set_spki, iFppu)
-//GO(gnutls_privkey_sign_data, 
-GO(gnutls_privkey_sign_hash, iFppupp)
-//GO(gnutls_privkey_status, 
-//GO(gnutls_privkey_verify_params, 
-//GO(gnutls_privkey_verify_seed, 
-//GO(gnutls_protocol_get_id, 
-GO(gnutls_protocol_get_name, pFi)
-GO(gnutls_protocol_get_version, iFp)
-//GO(gnutls_protocol_list, 
-//GO(gnutls_psk_allocate_client_credentials, 
-//GO(gnutls_psk_allocate_server_credentials, 
-//GO(gnutls_psk_client_get_hint, 
-//GO(gnutls_psk_free_client_credentials, 
-//GO(gnutls_psk_free_server_credentials, 
-//GO(gnutls_psk_server_get_username, 
-//GO(gnutls_psk_set_client_credentials, 
-//GO(gnutls_psk_set_client_credentials_function, 
-//GO(gnutls_psk_set_params_function, 
-//GO(gnutls_psk_set_server_credentials_file, 
-//GO(gnutls_psk_set_server_credentials_function, 
-//GO(gnutls_psk_set_server_credentials_hint, 
-//GO(gnutls_psk_set_server_dh_params, 
-//GO(gnutls_psk_set_server_known_dh_params, 
-//GO(gnutls_psk_set_server_params_function, 
+GO(gnutls_privkey_sign_data, iFpuupp)
+GO(gnutls_privkey_sign_hash, iFpuupp)
+GO(gnutls_privkey_status, iFp)
+GO(gnutls_privkey_verify_params, iFp)
+GO(gnutls_privkey_verify_seed, iFpupL)
+GO(gnutls_protocol_get_id, uFp)
+GO(gnutls_protocol_get_name, pFu)
+GO(gnutls_protocol_get_version, uFp)
+GO(gnutls_protocol_list, pFv)
+GO(gnutls_psk_allocate_client_credentials, iFp)
+GO(gnutls_psk_allocate_server_credentials, iFp)
+GO(gnutls_psk_client_get_hint, pFp)
+GO(gnutls_psk_free_client_credentials, vFp)
+GO(gnutls_psk_free_server_credentials, vFp)
+GO(gnutls_psk_server_get_username, pFp)
+GO(gnutls_psk_set_client_credentials, iFpppu)
+//GOM(gnutls_psk_set_client_credentials_function, vFEpp)
+//GOM(gnutls_psk_set_params_function, vFEpp)
+GO(gnutls_psk_set_server_credentials_file, iFpp)
+//GOM(gnutls_psk_set_server_credentials_function, vFEpp)
+GO(gnutls_psk_set_server_credentials_hint, iFpp)
+GO(gnutls_psk_set_server_dh_params, vFpp)
+GO(gnutls_psk_set_server_known_dh_params, iFpu)
+//GOM(gnutls_psk_set_server_params_function, vFEpp)
 GO(gnutls_pubkey_deinit, vFp)
 GO(gnutls_pubkey_encrypt_data, iFpupp)
-GO(gnutls_pubkey_export, iFpipp)
-//GO(gnutls_pubkey_export2, 
+GO(gnutls_pubkey_export, iFpupp)
+GO(gnutls_pubkey_export2, iFpup)
 GO(gnutls_pubkey_export_dsa_raw, iFppppp)
-GO(gnutls_pubkey_export_dh_raw, iFpupu)
+GO(gnutls_pubkey_export_dh_raw, iFpppu)
 GO(gnutls_pubkey_export_ecc_raw, iFpppp)
-//GO(gnutls_pubkey_export_ecc_x962, 
+GO(gnutls_pubkey_export_ecc_x962, iFppp)
 GO(gnutls_pubkey_export_rsa_raw, iFppp)
-//GO(gnutls_pubkey_get_key_id, 
-//GO(gnutls_pubkey_get_key_usage, 
-//GO(gnutls_pubkey_get_openpgp_key_id, 
-//GO(gnutls_pubkey_get_pk_algorithm, 
-//GO(gnutls_pubkey_get_preferred_hash_algorithm, 
-//GO(gnutls_pubkey_import, 
-GO(gnutls_pubkey_import_dh_raw, iFpup)
+GO(gnutls_pubkey_get_key_id, iFpupp)
+GO(gnutls_pubkey_get_key_usage, iFpp)
+GO(gnutls_pubkey_get_openpgp_key_id, iFpuppp)
+GO(gnutls_pubkey_get_pk_algorithm, iFpp)
+GO(gnutls_pubkey_get_preferred_hash_algorithm, iFppp)
+GO(gnutls_pubkey_import, iFppu)
+GO(gnutls_pubkey_import_dh_raw, iFppp)
 GO(gnutls_pubkey_import_dsa_raw, iFppppp)
-GO(gnutls_pubkey_import_ecc_raw, iFpppp)
-//GO(gnutls_pubkey_import_ecc_x962, 
-//GO(gnutls_pubkey_import_openpgp, 
-//GO(gnutls_pubkey_import_openpgp_raw, 
-//GO(gnutls_pubkey_import_pkcs11, 
+GO(gnutls_pubkey_import_ecc_raw, iFpupp)
+GO(gnutls_pubkey_import_ecc_x962, iFppp)
+GO(gnutls_pubkey_import_openpgp, iFppu)
+GO(gnutls_pubkey_import_openpgp_raw, iFppupu)
+GO(gnutls_pubkey_import_pkcs11, iFppu)
 GO(gnutls_pubkey_import_privkey, iFppuu)
 GO(gnutls_pubkey_import_rsa_raw, iFppp)
-//GO(gnutls_pubkey_import_tpm_raw, 
-//GO(gnutls_pubkey_import_tpm_url, 
-//GO(gnutls_pubkey_import_url, 
+GO(gnutls_pubkey_import_tpm_raw, iFppupu)
+GO(gnutls_pubkey_import_tpm_url, iFpppu)
+GO(gnutls_pubkey_import_url, iFppu)
 GO(gnutls_pubkey_import_x509, iFppu)
-//GO(gnutls_pubkey_import_x509_crq, 
-//GO(gnutls_pubkey_import_x509_raw, 
+GO(gnutls_pubkey_import_x509_crq, iFppu)
+GO(gnutls_pubkey_import_x509_raw, iFppuu)
 GO(gnutls_pubkey_init, iFp)
-//GO(gnutls_pubkey_print, 
-//GO(gnutls_pubkey_set_key_usage, 
-//GO(gnutls_pubkey_set_pin_function, 
+GO(gnutls_pubkey_print, iFpup)
+GO(gnutls_pubkey_set_key_usage, iFpu)
+//GOM(gnutls_pubkey_set_pin_function, vFEppp)
 GO(gnutls_pubkey_set_spki, iFppu)
-//GO(gnutls_pubkey_verify_data2, 
-GO(gnutls_pubkey_verify_hash2, iFppupp)
-//GO(gnutls_pubkey_verify_params, 
-//GO(gnutls_random_art, 
-//GO(gnutls_range_split, 
-//GO(gnutls_record_can_use_length_hiding, 
-//GO(gnutls_record_check_corked, 
+GO(gnutls_pubkey_verify_data2, iFpuupp)
+GO(gnutls_pubkey_verify_hash2, iFpuupp)
+GO(gnutls_pubkey_verify_params, iFp)
+GO(gnutls_random_art, iFupupLp)
+GO(gnutls_range_split, iFpppp)
+GO(gnutls_record_can_use_length_hiding, uFp)
+GO(gnutls_record_check_corked, LFp)
 GO(gnutls_record_check_pending, LFp)
-//GO(gnutls_record_cork, 
-//GO(gnutls_record_disable_padding, 
-//GO(gnutls_record_discard_queued, 
+GO(gnutls_record_cork, vFp)
+GO(gnutls_record_disable_padding, vFp)
+GO(gnutls_record_discard_queued, LFp)
 GO(gnutls_record_get_direction, iFp)
-//GO(gnutls_record_get_discarded, 
+GO(gnutls_record_get_discarded, uFp)
 GO(gnutls_record_get_max_size, LFp)
-//GO(gnutls_record_get_state, 
-//GO(gnutls_record_overhead_size, 
+GO(gnutls_record_get_state, iFpupppp)
+GO(gnutls_record_overhead_size, LFp)
 GO(gnutls_record_recv, lFppL)
-//GO(gnutls_record_recv_packet, 
-//GO(gnutls_record_recv_seq, 
+GO(gnutls_record_recv_packet, lFpp)
+GO(gnutls_record_recv_seq, lFppLp)
 GO(gnutls_record_send, lFppL)
-//GO(gnutls_record_send_range, 
+GO(gnutls_record_send_range, lFppLp)
 //GO(_gnutls_record_set_default_version, 
-//GO(gnutls_record_set_max_size, 
-//GO(gnutls_record_set_state, 
-//GO(gnutls_record_set_timeout, 
-//GO(gnutls_record_uncork, 
+GO(gnutls_record_set_max_size, lFpL)
+GO(gnutls_record_set_state, iFpup)
+GO(gnutls_record_set_timeout, vFpu)
+GO(gnutls_record_uncork, iFpu)
 //GO(gnutls_register_custom_url, 
-//GO(gnutls_rehandshake, 
+GO(gnutls_rehandshake, iFp)
 //GO(_gnutls_resolve_priorities, 
-GO(gnutls_rnd, iFipL)
-//GO(gnutls_rnd_refresh, 
+GO(gnutls_rnd, iFupL)
+GO(gnutls_rnd_refresh, vFv)
 //GO(_gnutls_rsa_pms_set_version, 
-//GO(gnutls_safe_renegotiation_status, 
-//GO(gnutls_sec_param_get_name, 
-//GO(gnutls_sec_param_to_pk_bits, 
-//GO(gnutls_sec_param_to_symmetric_bits, 
-//GO(gnutls_server_name_get, 
-GO(gnutls_server_name_set, iFpppL)
+GO(gnutls_safe_renegotiation_status, uFp)
+GO(gnutls_sec_param_get_name, pFu)
+GO(gnutls_sec_param_to_pk_bits, uFuu)
+GO(gnutls_sec_param_to_symmetric_bits, uFu)
+GO(gnutls_server_name_get, iFppppu)
+GO(gnutls_server_name_set, iFpupL)
 //GO(_gnutls_server_name_set_raw, 
-GO(gnutls_session_channel_binding, iFpip)
-//GO(gnutls_session_enable_compatibility_mode, 
-//GO(gnutls_session_etm_status, 
-//GO(gnutls_session_ext_master_secret_status, 
-//GO(gnutls_session_ext_register, 
-//GO(gnutls_session_force_valid, 
+GO(gnutls_session_channel_binding, iFpup)
+GO(gnutls_session_enable_compatibility_mode, vFp)
+GO(gnutls_session_etm_status, uFp)
+GO(gnutls_session_ext_master_secret_status, uFp)
+//GOM(gnutls_session_ext_register, iFEppiupppppu)
+GO(gnutls_session_force_valid, vFp)
 GO(gnutls_session_get_data, iFppp)
-//GO(gnutls_session_get_data2, 
-//GO(gnutls_session_get_desc, 
-//GO(gnutls_session_get_flags, 
-//GO(gnutls_session_get_id, 
-//GO(gnutls_session_get_id2, 
-//GO(gnutls_session_get_master_secret, 
-//GO(gnutls_session_get_ptr, 
-//GO(gnutls_session_get_random, 
-//GO(gnutls_session_get_verify_cert_status, 
-//GO(gnutls_session_is_resumed, 
-//GO(gnutls_session_resumption_requested, 
+GO(gnutls_session_get_data2, iFpp)
+GO(gnutls_session_get_desc, pFp)
+GO(gnutls_session_get_flags, uFp)
+GO(gnutls_session_get_id, iFppp)
+GO(gnutls_session_get_id2, iFpp)
+GO(gnutls_session_get_master_secret, vFpp)
+GO(gnutls_session_get_ptr, pFp)
+GO(gnutls_session_get_random, vFppp)
+GO(gnutls_session_get_verify_cert_status, uFp)
+GO(gnutls_session_is_resumed, iFp)
+GO(gnutls_session_resumption_requested, iFp)
 GO(gnutls_session_set_data, iFppL)
-//GO(gnutls_session_set_id, 
-//GO(gnutls_session_set_premaster, 
-//GO(gnutls_session_set_ptr, 
-//GO(gnutls_session_set_verify_cert, 
-//GO(gnutls_session_set_verify_cert2, 
-//GO(gnutls_session_set_verify_function, 
-//GO(gnutls_session_supplemental_register, 
-//GO(gnutls_session_ticket_enable_client, 
-//GO(gnutls_session_ticket_enable_server, 
-//GO(gnutls_session_ticket_key_generate, 
+GO(gnutls_session_set_id, iFpp)
+GO(gnutls_session_set_premaster, iFpuuuuuupp)
+GO(gnutls_session_set_ptr, vFpp)
+GO(gnutls_session_set_verify_cert, vFppu)
+GO(gnutls_session_set_verify_cert2, vFppuu)
+//GOM(gnutls_session_set_verify_function, vFEpp)
+//GOM(gnutls_session_supplemental_register, iFEppuppu)
+GO(gnutls_session_ticket_enable_client, iFp)
+GO(gnutls_session_ticket_enable_server, iFpp)
+GO(gnutls_session_ticket_key_generate, iFp)
 GO(gnutls_set_default_priority, iFp)
-//GO(gnutls_sign_algorithm_get, 
-//GO(gnutls_sign_algorithm_get_client, 
-//GO(gnutls_sign_algorithm_get_requested, 
-//GO(gnutls_sign_get_hash_algorithm, 
-//GO(gnutls_sign_get_id, 
-//GO(gnutls_sign_get_name, 
-//GO(gnutls_sign_get_oid, 
-//GO(gnutls_sign_get_pk_algorithm, 
-//GO(gnutls_sign_is_secure, 
-//GO(gnutls_sign_list, 
-//GO(gnutls_srp_allocate_client_credentials, 
-//GO(gnutls_srp_allocate_server_credentials, 
-//GO(gnutls_srp_base64_decode, 
-//GO(gnutls_srp_base64_decode2, 
-//GO(gnutls_srp_base64_encode, 
-//GO(gnutls_srp_base64_encode2, 
-//GO(gnutls_srp_free_client_credentials, 
-//GO(gnutls_srp_free_server_credentials, 
-//GO(gnutls_srp_server_get_username, 
-//GO(gnutls_srp_set_client_credentials, 
-//GO(gnutls_srp_set_client_credentials_function, 
-//GO(gnutls_srp_set_prime_bits, 
-//GO(gnutls_srp_set_server_credentials_file, 
-//GO(gnutls_srp_set_server_credentials_function, 
-//GO(gnutls_srp_set_server_fake_salt_seed, 
-//GO(gnutls_srp_verifier, 
-//GO(gnutls_srtp_get_keys, 
-//GO(gnutls_srtp_get_mki, 
-//GO(gnutls_srtp_get_profile_id, 
-//GO(gnutls_srtp_get_profile_name, 
-//GO(gnutls_srtp_get_selected_profile, 
-//GO(gnutls_srtp_set_mki, 
-//GO(gnutls_srtp_set_profile, 
-//GO(gnutls_srtp_set_profile_direct, 
-//GO(gnutls_store_commitment, 
-//GO(gnutls_store_pubkey, 
+GO(gnutls_sign_algorithm_get, iFp)
+GO(gnutls_sign_algorithm_get_client, iFp)
+GO(gnutls_sign_algorithm_get_requested, iFpLp)
+GO(gnutls_sign_get_hash_algorithm, uFu)
+GO(gnutls_sign_get_id, uFp)
+GO(gnutls_sign_get_name, pFu)
+GO(gnutls_sign_get_oid, pFu)
+GO(gnutls_sign_get_pk_algorithm, uFu)
+GO(gnutls_sign_is_secure, uFu)
+GO(gnutls_sign_list, pFv)
+GO(gnutls_srp_allocate_client_credentials, iFp)
+GO(gnutls_srp_allocate_server_credentials, iFp)
+GO(gnutls_srp_base64_decode, iFppp)
+GO(gnutls_srp_base64_decode2, iFpp)
+GO(gnutls_srp_base64_encode, iFppp)
+GO(gnutls_srp_base64_encode2, iFpp)
+GO(gnutls_srp_free_client_credentials, vFp)
+GO(gnutls_srp_free_server_credentials, vFp)
+GO(gnutls_srp_server_get_username, pFp)
+GO(gnutls_srp_set_client_credentials, iFppp)
+//GOM(gnutls_srp_set_client_credentials_function, vFEpp)
+GO(gnutls_srp_set_prime_bits, vFpu)
+GO(gnutls_srp_set_server_credentials_file, iFppp)
+//GOM(gnutls_srp_set_server_credentials_function, vFEpp)
+GO(gnutls_srp_set_server_fake_salt_seed, vFppu)
+GO(gnutls_srp_verifier, iFpppppp)
+GO(gnutls_srtp_get_keys, iFppupppp)
+GO(gnutls_srtp_get_mki, iFpp)
+GO(gnutls_srtp_get_profile_id, iFpp)
+GO(gnutls_srtp_get_profile_name, pFu)
+GO(gnutls_srtp_get_selected_profile, iFpp)
+GO(gnutls_srtp_set_mki, iFpp)
+GO(gnutls_srtp_set_profile, iFpu)
+GO(gnutls_srtp_set_profile_direct, iFppp)
+GO(gnutls_store_commitment, iFppppuplu)
+GO(gnutls_store_pubkey, iFppppuplu)
 GO(gnutls_strerror, pFi)
-//GO(gnutls_strerror_name, 
+GO(gnutls_strerror_name, pFi)
 //GO(gnutls_subject_alt_names_deinit, 
 //GO(gnutls_subject_alt_names_get, 
 //GO(gnutls_subject_alt_names_init, 
 //GO(gnutls_subject_alt_names_set, 
-//GO(gnutls_supplemental_get_name, 
-//GO(gnutls_supplemental_recv, 
-//GO(gnutls_supplemental_register, 
-//GO(gnutls_supplemental_send, 
+GO(gnutls_supplemental_get_name, pFu)
+GO(gnutls_supplemental_recv, vFpu)
+//GOM(gnutls_supplemental_register, iFEpupp)
+GO(gnutls_supplemental_send, vFpu)
 //GO(gnutls_system_key_add_x509, 
 //GO(gnutls_system_key_delete, 
 //GO(gnutls_system_key_iter_deinit, 
 //GO(gnutls_system_key_iter_get_info, 
-//GO(gnutls_system_recv_timeout, 
-//GO(gnutls_tdb_deinit, 
-//GO(gnutls_tdb_init, 
-//GO(gnutls_tdb_set_store_commitment_func, 
-//GO(gnutls_tdb_set_store_func, 
-//GO(gnutls_tdb_set_verify_func, 
-//GO(gnutls_tpm_get_registered, 
-//GO(gnutls_tpm_key_list_deinit, 
-//GO(gnutls_tpm_key_list_get_url, 
-//GO(gnutls_tpm_privkey_delete, 
-//GO(gnutls_tpm_privkey_generate, 
-//GO(gnutls_transport_get_int, 
-//GO(gnutls_transport_get_int2, 
+GO(gnutls_system_recv_timeout, iFpu)
+GO(gnutls_tdb_deinit, vFp)
+GO(gnutls_tdb_init, iFp)
+//GOM(gnutls_tdb_set_store_commitment_func, vFEpp)
+//GOM(gnutls_tdb_set_store_func, vFEpp)
+//GOM(gnutls_tdb_set_verify_func, vFEpp)
+GO(gnutls_tpm_get_registered, iFp)
+GO(gnutls_tpm_key_list_deinit, vFp)
+GO(gnutls_tpm_key_list_get_url, iFpupu)
+GO(gnutls_tpm_privkey_delete, iFpp)
+GO(gnutls_tpm_privkey_generate, iFuuppuuppu)
+GO(gnutls_transport_get_int, iFp)
+GO(gnutls_transport_get_int2, vFppp)
 GO(gnutls_transport_get_ptr, pFp)
-//GO(gnutls_transport_get_ptr2, 
+GO(gnutls_transport_get_ptr2, vFppp)
 GO(gnutls_transport_set_errno, vFpi)
-//GO(gnutls_transport_set_errno_function, 
+//GOM(gnutls_transport_set_errno_function, vFEpp)
 //GO(gnutls_transport_set_fastopen, 
-//GO(gnutls_transport_set_int2, 
+GO(gnutls_transport_set_int2, vFpii)
 GO(gnutls_transport_set_ptr, vFpp)
-//GO(gnutls_transport_set_ptr2, 
+GO(gnutls_transport_set_ptr2, vFppp)
 GOM(gnutls_transport_set_pull_function, vFEpp)
 GOM(gnutls_transport_set_pull_timeout_function, vFEpp)
 GOM(gnutls_transport_set_push_function, vFEpp)
-//GO(gnutls_transport_set_vec_push_function, 
+//GOM(gnutls_transport_set_vec_push_function, vFEpp)
 //GO(_gnutls_ucs2_to_utf8, 
-//GO(gnutls_url_is_supported, 
-//GO(gnutls_utf8_password_normalize, 
+GO(gnutls_url_is_supported, uFp)
+GO(gnutls_utf8_password_normalize, iFpupu)
 //GO(_gnutls_utf8_to_ucs2, 
-//GO(gnutls_verify_stored_pubkey, 
+GO(gnutls_verify_stored_pubkey, iFppppupu)
 //GO(gnutls_x509_aia_deinit, 
 //GO(gnutls_x509_aia_get, 
 //GO(gnutls_x509_aia_init, 
@@ -785,240 +785,240 @@ GOM(gnutls_transport_set_push_function, vFEpp)
 //GO(gnutls_x509_aki_init, 
 //GO(gnutls_x509_aki_set_cert_issuer, 
 //GO(gnutls_x509_aki_set_id, 
-//GO(gnutls_x509_cidr_to_rfc5280, 
-//GO(gnutls_x509_crl_check_issuer, 
-//GO(gnutls_x509_crl_deinit, 
+GO(gnutls_x509_cidr_to_rfc5280, iFpp)
+GO(gnutls_x509_crl_check_issuer, uFpp)
+GO(gnutls_x509_crl_deinit, vFp)
 //GO(gnutls_x509_crl_dist_points_deinit, 
 //GO(gnutls_x509_crl_dist_points_get, 
 //GO(gnutls_x509_crl_dist_points_init, 
 //GO(gnutls_x509_crl_dist_points_set, 
-//GO(gnutls_x509_crl_export, 
-//GO(gnutls_x509_crl_export2, 
-//GO(gnutls_x509_crl_get_authority_key_gn_serial, 
-//GO(gnutls_x509_crl_get_authority_key_id, 
-//GO(gnutls_x509_crl_get_crt_count, 
-//GO(gnutls_x509_crl_get_crt_serial, 
-//GO(gnutls_x509_crl_get_dn_oid, 
-//GO(gnutls_x509_crl_get_extension_data, 
-//GO(gnutls_x509_crl_get_extension_data2, 
-//GO(gnutls_x509_crl_get_extension_info, 
-//GO(gnutls_x509_crl_get_extension_oid, 
-//GO(gnutls_x509_crl_get_issuer_dn, 
-//GO(gnutls_x509_crl_get_issuer_dn2, 
-//GO(gnutls_x509_crl_get_issuer_dn3, 
-//GO(gnutls_x509_crl_get_issuer_dn_by_oid, 
-//GO(gnutls_x509_crl_get_next_update, 
-//GO(gnutls_x509_crl_get_number, 
-//GO(gnutls_x509_crl_get_raw_issuer_dn, 
-//GO(gnutls_x509_crl_get_signature, 
-//GO(gnutls_x509_crl_get_signature_algorithm, 
-//GO(gnutls_x509_crl_get_signature_oid, 
-//GO(gnutls_x509_crl_get_this_update, 
-//GO(gnutls_x509_crl_get_version, 
-//GO(gnutls_x509_crl_import, 
-//GO(gnutls_x509_crl_init, 
-//GO(gnutls_x509_crl_iter_crt_serial, 
-//GO(gnutls_x509_crl_iter_deinit, 
-//GO(gnutls_x509_crl_list_import, 
-//GO(gnutls_x509_crl_list_import2, 
-//GO(gnutls_x509_crl_print, 
-//GO(gnutls_x509_crl_privkey_sign, 
-//GO(gnutls_x509_crl_set_authority_key_id, 
-//GO(gnutls_x509_crl_set_crt, 
-//GO(gnutls_x509_crl_set_crt_serial, 
-//GO(gnutls_x509_crl_set_next_update, 
-//GO(gnutls_x509_crl_set_number, 
-//GO(gnutls_x509_crl_set_this_update, 
-//GO(gnutls_x509_crl_set_version, 
-//GO(gnutls_x509_crl_sign, 
-//GO(gnutls_x509_crl_sign2, 
-//GO(gnutls_x509_crl_verify, 
-//GO(gnutls_x509_crq_deinit, 
-//GO(gnutls_x509_crq_export, 
-//GO(gnutls_x509_crq_export2, 
-//GO(gnutls_x509_crq_get_attribute_by_oid, 
-//GO(gnutls_x509_crq_get_attribute_data, 
-//GO(gnutls_x509_crq_get_attribute_info, 
-//GO(gnutls_x509_crq_get_basic_constraints, 
-//GO(gnutls_x509_crq_get_challenge_password, 
-//GO(gnutls_x509_crq_get_dn, 
-//GO(gnutls_x509_crq_get_dn2, 
-//GO(gnutls_x509_crq_get_dn3, 
-//GO(gnutls_x509_crq_get_dn_by_oid, 
-//GO(gnutls_x509_crq_get_dn_oid, 
-//GO(gnutls_x509_crq_get_extension_by_oid, 
-//GO(gnutls_x509_crq_get_extension_by_oid2, 
-//GO(gnutls_x509_crq_get_extension_data, 
-//GO(gnutls_x509_crq_get_extension_data2, 
-//GO(gnutls_x509_crq_get_extension_info, 
-//GO(gnutls_x509_crq_get_key_id, 
-//GO(gnutls_x509_crq_get_key_purpose_oid, 
-//GO(gnutls_x509_crq_get_key_rsa_raw, 
-//GO(gnutls_x509_crq_get_key_usage, 
-//GO(gnutls_x509_crq_get_pk_algorithm, 
-//GO(gnutls_x509_crq_get_pk_oid, 
-//GO(gnutls_x509_crq_get_private_key_usage_period, 
-//GO(gnutls_x509_crq_get_signature_algorithm, 
-//GO(gnutls_x509_crq_get_signature_oid, 
-//GO(gnutls_x509_crq_get_subject_alt_name, 
-//GO(gnutls_x509_crq_get_subject_alt_othername_oid, 
-//GO(gnutls_x509_crq_get_tlsfeatures, 
-//GO(gnutls_x509_crq_get_version, 
-//GO(gnutls_x509_crq_import, 
-//GO(gnutls_x509_crq_init, 
-//GO(gnutls_x509_crq_print, 
-//GO(gnutls_x509_crq_privkey_sign, 
-//GO(gnutls_x509_crq_set_attribute_by_oid, 
-//GO(gnutls_x509_crq_set_basic_constraints, 
-//GO(gnutls_x509_crq_set_challenge_password, 
-//GO(gnutls_x509_crq_set_dn, 
-//GO(gnutls_x509_crq_set_dn_by_oid, 
-//GO(gnutls_x509_crq_set_extension_by_oid, 
-//GO(gnutls_x509_crq_set_key, 
-//GO(gnutls_x509_crq_set_key_purpose_oid, 
-//GO(gnutls_x509_crq_set_key_rsa_raw, 
-//GO(gnutls_x509_crq_set_key_usage, 
-//GO(gnutls_x509_crq_set_private_key_usage_period, 
-//GO(gnutls_x509_crq_set_pubkey, 
-//GO(gnutls_x509_crq_set_subject_alt_name, 
-//GO(gnutls_x509_crq_set_subject_alt_othername, 
-//GO(gnutls_x509_crq_set_tlsfeatures, 
-//GO(gnutls_x509_crq_set_version, 
-//GO(gnutls_x509_crq_sign, 
-//GO(gnutls_x509_crq_sign2, 
-//GO(gnutls_x509_crq_verify, 
-//GO(gnutls_x509_crt_check_email, 
+GO(gnutls_x509_crl_export, iFpupp)
+GO(gnutls_x509_crl_export2, iFpup)
+GO(gnutls_x509_crl_get_authority_key_gn_serial, iFpupppppp)
+GO(gnutls_x509_crl_get_authority_key_id, iFpppp)
+GO(gnutls_x509_crl_get_crt_count, iFp)
+GO(gnutls_x509_crl_get_crt_serial, iFpuppp)
+GO(gnutls_x509_crl_get_dn_oid, iFpupp)
+GO(gnutls_x509_crl_get_extension_data, iFpupp)
+GO(gnutls_x509_crl_get_extension_data2, iFpup)
+GO(gnutls_x509_crl_get_extension_info, iFpuppp)
+GO(gnutls_x509_crl_get_extension_oid, iFpupp)
+GO(gnutls_x509_crl_get_issuer_dn, iFppp)
+GO(gnutls_x509_crl_get_issuer_dn2, iFpp)
+GO(gnutls_x509_crl_get_issuer_dn3, iFppu)
+GO(gnutls_x509_crl_get_issuer_dn_by_oid, iFppuupp)
+GO(gnutls_x509_crl_get_next_update, lFp)
+GO(gnutls_x509_crl_get_number, iFpppp)
+GO(gnutls_x509_crl_get_raw_issuer_dn, iFpp)
+GO(gnutls_x509_crl_get_signature, iFppp)
+GO(gnutls_x509_crl_get_signature_algorithm, iFp)
+GO(gnutls_x509_crl_get_signature_oid, iFppp)
+GO(gnutls_x509_crl_get_this_update, lFp)
+GO(gnutls_x509_crl_get_version, iFp)
+GO(gnutls_x509_crl_import, iFppu)
+GO(gnutls_x509_crl_init, iFp)
+GO(gnutls_x509_crl_iter_crt_serial, iFppppp)
+GO(gnutls_x509_crl_iter_deinit, vFp)
+GO(gnutls_x509_crl_list_import, iFpppuu)
+GO(gnutls_x509_crl_list_import2, iFpppuu)
+GO(gnutls_x509_crl_print, iFpup)
+GO(gnutls_x509_crl_privkey_sign, iFpppuu)
+GO(gnutls_x509_crl_set_authority_key_id, iFppL)
+GO(gnutls_x509_crl_set_crt, iFppl)
+GO(gnutls_x509_crl_set_crt_serial, iFppLl)
+GO(gnutls_x509_crl_set_next_update, iFpl)
+GO(gnutls_x509_crl_set_number, iFppL)
+GO(gnutls_x509_crl_set_this_update, iFpl)
+GO(gnutls_x509_crl_set_version, iFpu)
+GO(gnutls_x509_crl_sign, iFppp)
+GO(gnutls_x509_crl_sign2, iFpppuu)
+GO(gnutls_x509_crl_verify, iFppuup)
+GO(gnutls_x509_crq_deinit, vFp)
+GO(gnutls_x509_crq_export, iFpupp)
+GO(gnutls_x509_crq_export2, iFpup)
+GO(gnutls_x509_crq_get_attribute_by_oid, iFppupp)
+GO(gnutls_x509_crq_get_attribute_data, iFpupp)
+GO(gnutls_x509_crq_get_attribute_info, iFpupp)
+GO(gnutls_x509_crq_get_basic_constraints, iFpppp)
+GO(gnutls_x509_crq_get_challenge_password, iFppp)
+GO(gnutls_x509_crq_get_dn, iFppp)
+GO(gnutls_x509_crq_get_dn2, iFpp)
+GO(gnutls_x509_crq_get_dn3, iFppu)
+GO(gnutls_x509_crq_get_dn_by_oid, iFppuupp)
+GO(gnutls_x509_crq_get_dn_oid, iFpupp)
+GO(gnutls_x509_crq_get_extension_by_oid, iFppuppp)
+GO(gnutls_x509_crq_get_extension_by_oid2, iFppupp)
+GO(gnutls_x509_crq_get_extension_data, iFpupp)
+GO(gnutls_x509_crq_get_extension_data2, iFpup)
+GO(gnutls_x509_crq_get_extension_info, iFpuppp)
+GO(gnutls_x509_crq_get_key_id, iFpupp)
+GO(gnutls_x509_crq_get_key_purpose_oid, iFpuppp)
+GO(gnutls_x509_crq_get_key_rsa_raw, iFppp)
+GO(gnutls_x509_crq_get_key_usage, iFppp)
+GO(gnutls_x509_crq_get_pk_algorithm, iFpp)
+GO(gnutls_x509_crq_get_pk_oid, iFppp)
+GO(gnutls_x509_crq_get_private_key_usage_period, iFpppp)
+GO(gnutls_x509_crq_get_signature_algorithm, iFp)
+GO(gnutls_x509_crq_get_signature_oid, iFppp)
+GO(gnutls_x509_crq_get_subject_alt_name, iFpupppp)
+GO(gnutls_x509_crq_get_subject_alt_othername_oid, iFpupp)
+GO(gnutls_x509_crq_get_tlsfeatures, iFppup)
+GO(gnutls_x509_crq_get_version, iFp)
+GO(gnutls_x509_crq_import, iFppu)
+GO(gnutls_x509_crq_init, iFp)
+GO(gnutls_x509_crq_print, iFpup)
+GO(gnutls_x509_crq_privkey_sign, iFppuu)
+GO(gnutls_x509_crq_set_attribute_by_oid, iFpppL)
+GO(gnutls_x509_crq_set_basic_constraints, iFpui)
+GO(gnutls_x509_crq_set_challenge_password, iFpp)
+GO(gnutls_x509_crq_set_dn, iFppp)
+GO(gnutls_x509_crq_set_dn_by_oid, iFppupu)
+GO(gnutls_x509_crq_set_extension_by_oid, iFpppLu)
+GO(gnutls_x509_crq_set_key, iFpp)
+GO(gnutls_x509_crq_set_key_purpose_oid, iFppu)
+GO(gnutls_x509_crq_set_key_rsa_raw, iFppp)
+GO(gnutls_x509_crq_set_key_usage, iFpu)
+GO(gnutls_x509_crq_set_private_key_usage_period, iFpll)
+GO(gnutls_x509_crq_set_pubkey, iFpp)
+GO(gnutls_x509_crq_set_subject_alt_name, iFpupuu)
+GO(gnutls_x509_crq_set_subject_alt_othername, iFpppuu)
+GO(gnutls_x509_crq_set_tlsfeatures, iFpp)
+GO(gnutls_x509_crq_set_version, iFpu)
+GO(gnutls_x509_crq_sign, iFpp)
+GO(gnutls_x509_crq_sign2, iFppuu)
+GO(gnutls_x509_crq_verify, iFpu)
+GO(gnutls_x509_crt_check_email, uFppu)
 GO(gnutls_x509_crt_check_hostname, uFpp)
-//GO(gnutls_x509_crt_check_hostname2, 
+GO(gnutls_x509_crt_check_hostname2, uFppu)
 GO(gnutls_x509_crt_check_issuer, uFpp)
-//GO(gnutls_x509_crt_check_key_purpose, 
-//GO(gnutls_x509_crt_check_revocation, 
-//GO(gnutls_x509_crt_cpy_crl_dist_points, 
+GO(gnutls_x509_crt_check_key_purpose, uFppu)
+GO(gnutls_x509_crt_check_revocation, iFppu)
+GO(gnutls_x509_crt_cpy_crl_dist_points, iFpp)
 GO(gnutls_x509_crt_deinit, vFp)
-//GO(gnutls_x509_crt_equals, 
-//GO(gnutls_x509_crt_equals2, 
-GO(gnutls_x509_crt_export, iFpppp)
-//GO(gnutls_x509_crt_export2, 
+GO(gnutls_x509_crt_equals, uFpp)
+GO(gnutls_x509_crt_equals2, uFpp)
+GO(gnutls_x509_crt_export, iFpupp)
+GO(gnutls_x509_crt_export2, iFpup)
 GO(gnutls_x509_crt_get_activation_time, lFp)
-//GO(gnutls_x509_crt_get_authority_info_access, 
-//GO(gnutls_x509_crt_get_authority_key_gn_serial, 
-//GO(gnutls_x509_crt_get_authority_key_id, 
-//GO(gnutls_x509_crt_get_basic_constraints, 
-//GO(gnutls_x509_crt_get_ca_status, 
-//GO(gnutls_x509_crt_get_crl_dist_points, 
-//GO(gnutls_x509_crt_get_dn, 
+GO(gnutls_x509_crt_get_authority_info_access, iFpuipp)
+GO(gnutls_x509_crt_get_authority_key_gn_serial, iFpupppppp)
+GO(gnutls_x509_crt_get_authority_key_id, iFpppp)
+GO(gnutls_x509_crt_get_basic_constraints, iFpppp)
+GO(gnutls_x509_crt_get_ca_status, iFpp)
+GO(gnutls_x509_crt_get_crl_dist_points, iFpupppp)
+GO(gnutls_x509_crt_get_dn, iFppp)
 GO(gnutls_x509_crt_get_dn2, iFpp)
-//GO(gnutls_x509_crt_get_dn3, 
+GO(gnutls_x509_crt_get_dn3, iFppu)
 GO(gnutls_x509_crt_get_dn_by_oid, iFppuupp)
-//GO(gnutls_x509_crt_get_dn_oid, 
+GO(gnutls_x509_crt_get_dn_oid, iFpupp)
 GO(gnutls_x509_crt_get_expiration_time, lFp)
-//GO(gnutls_x509_crt_get_extension_by_oid, 
-//GO(gnutls_x509_crt_get_extension_by_oid2, 
-//GO(gnutls_x509_crt_get_extension_data, 
-//GO(gnutls_x509_crt_get_extension_data2, 
-//GO(gnutls_x509_crt_get_extension_info, 
-//GO(gnutls_x509_crt_get_extension_oid, 
-//GO(gnutls_x509_crt_get_fingerprint, 
-//GO(gnutls_x509_crt_get_issuer, 
-//GO(gnutls_x509_crt_get_issuer_alt_name, 
-//GO(gnutls_x509_crt_get_issuer_alt_name2, 
-//GO(gnutls_x509_crt_get_issuer_alt_othername_oid, 
-//GO(gnutls_x509_crt_get_issuer_dn, 
+GO(gnutls_x509_crt_get_extension_by_oid, iFppuppp)
+GO(gnutls_x509_crt_get_extension_by_oid2, iFppupp)
+GO(gnutls_x509_crt_get_extension_data, iFpupp)
+GO(gnutls_x509_crt_get_extension_data2, iFpup)
+GO(gnutls_x509_crt_get_extension_info, iFpuppp)
+GO(gnutls_x509_crt_get_extension_oid, iFpupp)
+GO(gnutls_x509_crt_get_fingerprint, iFpupp)
+GO(gnutls_x509_crt_get_issuer, iFpp)
+GO(gnutls_x509_crt_get_issuer_alt_name, iFpuppp)
+GO(gnutls_x509_crt_get_issuer_alt_name2, iFpupppp)
+GO(gnutls_x509_crt_get_issuer_alt_othername_oid, iFpupp)
+GO(gnutls_x509_crt_get_issuer_dn, iFppp)
 GO(gnutls_x509_crt_get_issuer_dn2, iFpp)
-//GO(gnutls_x509_crt_get_issuer_dn3, 
-//GO(gnutls_x509_crt_get_issuer_dn_by_oid, 
-//GO(gnutls_x509_crt_get_issuer_dn_oid, 
-//GO(gnutls_x509_crt_get_issuer_unique_id, 
-//GO(gnutls_x509_crt_get_key_id, 
-//GO(gnutls_x509_crt_get_key_purpose_oid, 
-//GO(gnutls_x509_crt_get_key_usage, 
-//GO(gnutls_x509_crt_get_name_constraints, 
+GO(gnutls_x509_crt_get_issuer_dn3, iFppu)
+GO(gnutls_x509_crt_get_issuer_dn_by_oid, iFppuupp)
+GO(gnutls_x509_crt_get_issuer_dn_oid, iFpupp)
+GO(gnutls_x509_crt_get_issuer_unique_id, iFppp)
+GO(gnutls_x509_crt_get_key_id, iFpupp)
+GO(gnutls_x509_crt_get_key_purpose_oid, iFpuppp)
+GO(gnutls_x509_crt_get_key_usage, iFppp)
+GO(gnutls_x509_crt_get_name_constraints, iFppup)
 GO(gnutls_x509_crt_get_pk_algorithm, iFpp)
-//GO(gnutls_x509_crt_get_pk_dsa_raw, 
-//GO(gnutls_x509_crt_get_pk_ecc_raw, 
-//GO(gnutls_x509_crt_get_pk_oid, 
-//GO(gnutls_x509_crt_get_pk_rsa_raw, 
-//GO(gnutls_x509_crt_get_policy, 
-//GO(gnutls_x509_crt_get_preferred_hash_algorithm, 
-//GO(gnutls_x509_crt_get_private_key_usage_period, 
-//GO(gnutls_x509_crt_get_proxy, 
-//GO(gnutls_x509_crt_get_raw_dn, 
-//GO(gnutls_x509_crt_get_raw_issuer_dn, 
-//GO(gnutls_x509_crt_get_serial, 
-//GO(gnutls_x509_crt_get_signature, 
-//GO(gnutls_x509_crt_get_signature_algorithm, 
-//GO(gnutls_x509_crt_get_signature_oid, 
-//GO(gnutls_x509_crt_get_subject, 
-//GO(gnutls_x509_crt_get_subject_alt_name, 
-//GO(gnutls_x509_crt_get_subject_alt_name2, 
-//GO(gnutls_x509_crt_get_subject_alt_othername_oid, 
-//GO(gnutls_x509_crt_get_subject_key_id, 
-//GO(gnutls_x509_crt_get_subject_unique_id, 
-//GO(gnutls_x509_crt_get_tlsfeatures, 
+GO(gnutls_x509_crt_get_pk_dsa_raw, iFppppp)
+GO(gnutls_x509_crt_get_pk_ecc_raw, iFpppp)
+GO(gnutls_x509_crt_get_pk_oid, iFppp)
+GO(gnutls_x509_crt_get_pk_rsa_raw, iFppp)
+GO(gnutls_x509_crt_get_policy, iFpupp)
+GO(gnutls_x509_crt_get_preferred_hash_algorithm, iFppp)
+GO(gnutls_x509_crt_get_private_key_usage_period, iFpppp)
+GO(gnutls_x509_crt_get_proxy, iFpppppp)
+GO(gnutls_x509_crt_get_raw_dn, iFpp)
+GO(gnutls_x509_crt_get_raw_issuer_dn, iFpp)
+GO(gnutls_x509_crt_get_serial, iFppp)
+GO(gnutls_x509_crt_get_signature, iFppp)
+GO(gnutls_x509_crt_get_signature_algorithm, iFp)
+GO(gnutls_x509_crt_get_signature_oid, iFppp)
+GO(gnutls_x509_crt_get_subject, iFpp)
+GO(gnutls_x509_crt_get_subject_alt_name, iFpuppp)
+GO(gnutls_x509_crt_get_subject_alt_name2, iFpupppp)
+GO(gnutls_x509_crt_get_subject_alt_othername_oid, iFpupp)
+GO(gnutls_x509_crt_get_subject_key_id, iFpppp)
+GO(gnutls_x509_crt_get_subject_unique_id, iFppp)
+GO(gnutls_x509_crt_get_tlsfeatures, iFppup)
 GO(gnutls_x509_crt_get_version, iFp)
-GO(gnutls_x509_crt_import, iFppp)
-//GO(gnutls_x509_crt_import_pkcs11, 
-//GO(gnutls_x509_crt_import_url, 
+GO(gnutls_x509_crt_import, iFppu)
+GO(gnutls_x509_crt_import_pkcs11, iFpp)
+GO(gnutls_x509_crt_import_url, iFppu)
 GO(gnutls_x509_crt_init, iFp)
-//GO(gnutls_x509_crt_list_import, 
-//GO(gnutls_x509_crt_list_import2, 
-//GO(gnutls_x509_crt_list_import_pkcs11, 
-//GO(gnutls_x509_crt_list_verify, 
-//GO(gnutls_x509_crt_print, 
-//GO(gnutls_x509_crt_privkey_sign, 
-//GO(gnutls_x509_crt_set_activation_time, 
-//GO(gnutls_x509_crt_set_authority_info_access, 
-//GO(gnutls_x509_crt_set_authority_key_id, 
-//GO(gnutls_x509_crt_set_basic_constraints, 
-//GO(gnutls_x509_crt_set_ca_status, 
-//GO(gnutls_x509_crt_set_crl_dist_points, 
-//GO(gnutls_x509_crt_set_crl_dist_points2, 
-//GO(gnutls_x509_crt_set_crq, 
-//GO(gnutls_x509_crt_set_crq_extension_by_oid, 
-//GO(gnutls_x509_crt_set_crq_extensions, 
-//GO(gnutls_x509_crt_set_dn, 
-//GO(gnutls_x509_crt_set_dn_by_oid, 
-//GO(gnutls_x509_crt_set_expiration_time, 
-//GO(gnutls_x509_crt_set_extension_by_oid, 
-//GO(gnutls_x509_crt_set_issuer_alt_name, 
-//GO(gnutls_x509_crt_set_issuer_alt_othername, 
-//GO(gnutls_x509_crt_set_issuer_dn, 
-//GO(gnutls_x509_crt_set_issuer_dn_by_oid, 
-//GO(gnutls_x509_crt_set_issuer_unique_id, 
-//GO(gnutls_x509_crt_set_key, 
-//GO(gnutls_x509_crt_set_key_purpose_oid, 
-//GO(gnutls_x509_crt_set_key_usage, 
-//GO(gnutls_x509_crt_set_name_constraints, 
-//GO(gnutls_x509_crt_set_pin_function, 
-//GO(gnutls_x509_crt_set_policy, 
-//GO(gnutls_x509_crt_set_private_key_usage_period, 
-//GO(gnutls_x509_crt_set_proxy, 
-//GO(gnutls_x509_crt_set_proxy_dn, 
-//GO(gnutls_x509_crt_set_pubkey, 
-//GO(gnutls_x509_crt_set_serial, 
-//GO(gnutls_x509_crt_set_subject_alternative_name, 
-//GO(gnutls_x509_crt_set_subject_alt_name, 
-//GO(gnutls_x509_crt_set_subject_alt_othername, 
-//GO(gnutls_x509_crt_set_subject_key_id, 
-//GO(gnutls_x509_crt_set_subject_unique_id, 
-//GO(gnutls_x509_crt_set_tlsfeatures, 
-//GO(gnutls_x509_crt_set_version, 
-//GO(gnutls_x509_crt_sign, 
-//GO(gnutls_x509_crt_sign2, 
-//GO(gnutls_x509_crt_verify, 
-//GO(gnutls_x509_crt_verify_data2, 
-//GO(gnutls_x509_dn_deinit, 
-//GO(gnutls_x509_dn_export, 
-//GO(gnutls_x509_dn_export2, 
-//GO(gnutls_x509_dn_get_rdn_ava, 
-//GO(gnutls_x509_dn_get_str, 
-//GO(gnutls_x509_dn_get_str2, 
-//GO(gnutls_x509_dn_import, 
-//GO(gnutls_x509_dn_init, 
-//GO(gnutls_x509_dn_oid_known, 
-//GO(gnutls_x509_dn_oid_name, 
-//GO(gnutls_x509_dn_set_str, 
-//GO(gnutls_x509_ext_deinit, 
+GO(gnutls_x509_crt_list_import, iFpppuu)
+GO(gnutls_x509_crt_list_import2, iFpppuu)
+GO(gnutls_x509_crt_list_import_pkcs11, iFpupu)
+GO(gnutls_x509_crt_list_verify, iFpupupuup)
+GO(gnutls_x509_crt_print, iFpup)
+GO(gnutls_x509_crt_privkey_sign, iFpppuu)
+GO(gnutls_x509_crt_set_activation_time, iFpl)
+GO(gnutls_x509_crt_set_authority_info_access, iFpip)
+GO(gnutls_x509_crt_set_authority_key_id, iFppL)
+GO(gnutls_x509_crt_set_basic_constraints, iFpui)
+GO(gnutls_x509_crt_set_ca_status, iFpu)
+GO(gnutls_x509_crt_set_crl_dist_points, iFpupu)
+GO(gnutls_x509_crt_set_crl_dist_points2, iFpupuu)
+GO(gnutls_x509_crt_set_crq, iFpp)
+GO(gnutls_x509_crt_set_crq_extension_by_oid, iFpppu)
+GO(gnutls_x509_crt_set_crq_extensions, iFpp)
+GO(gnutls_x509_crt_set_dn, iFppp)
+GO(gnutls_x509_crt_set_dn_by_oid, iFppupu)
+GO(gnutls_x509_crt_set_expiration_time, iFpl)
+GO(gnutls_x509_crt_set_extension_by_oid, iFpppLu)
+GO(gnutls_x509_crt_set_issuer_alt_name, iFpupuu)
+GO(gnutls_x509_crt_set_issuer_alt_othername, iFpppuu)
+GO(gnutls_x509_crt_set_issuer_dn, iFppp)
+GO(gnutls_x509_crt_set_issuer_dn_by_oid, iFppupu)
+GO(gnutls_x509_crt_set_issuer_unique_id, iFppL)
+GO(gnutls_x509_crt_set_key, iFpp)
+GO(gnutls_x509_crt_set_key_purpose_oid, iFppu)
+GO(gnutls_x509_crt_set_key_usage, iFpu)
+GO(gnutls_x509_crt_set_name_constraints, iFppu)
+//GOM(gnutls_x509_crt_set_pin_function, vFEppp)
+GO(gnutls_x509_crt_set_policy, iFppu)
+GO(gnutls_x509_crt_set_private_key_usage_period, iFpll)
+GO(gnutls_x509_crt_set_proxy, iFpippL)
+GO(gnutls_x509_crt_set_proxy_dn, iFppupu)
+GO(gnutls_x509_crt_set_pubkey, iFpp)
+GO(gnutls_x509_crt_set_serial, iFppL)
+GO(gnutls_x509_crt_set_subject_alternative_name, iFpup)
+GO(gnutls_x509_crt_set_subject_alt_name, iFpupuu)
+GO(gnutls_x509_crt_set_subject_alt_othername, iFpppuu)
+GO(gnutls_x509_crt_set_subject_key_id, iFppL)
+GO(gnutls_x509_crt_set_subject_unique_id, iFppL)
+GO(gnutls_x509_crt_set_tlsfeatures, iFpp)
+GO(gnutls_x509_crt_set_version, iFpu)
+GO(gnutls_x509_crt_sign, iFppp)
+GO(gnutls_x509_crt_sign2, iFpppuu)
+GO(gnutls_x509_crt_verify, iFppuup)
+GO(gnutls_x509_crt_verify_data2, iFpuupp)
+GO(gnutls_x509_dn_deinit, vFp)
+GO(gnutls_x509_dn_export, iFpupp)
+GO(gnutls_x509_dn_export2, iFpup)
+GO(gnutls_x509_dn_get_rdn_ava, iFpiip)
+GO(gnutls_x509_dn_get_str, iFpp)
+GO(gnutls_x509_dn_get_str2, iFppu)
+GO(gnutls_x509_dn_import, iFpp)
+GO(gnutls_x509_dn_init, iFp)
+GO(gnutls_x509_dn_oid_known, iFp)
+GO(gnutls_x509_dn_oid_name, pFpu)
+GO(gnutls_x509_dn_set_str, iFppp)
+GO(gnutls_x509_ext_deinit, vFp)
 //GO(gnutls_x509_ext_export_aia, 
 //GO(gnutls_x509_ext_export_authority_key_id, 
 //GO(gnutls_x509_ext_export_basic_constraints, 
@@ -1045,90 +1045,90 @@ GO(gnutls_x509_crt_init, iFp)
 //GO(gnutls_x509_ext_import_subject_alt_names, 
 //GO(gnutls_x509_ext_import_subject_key_id, 
 //GO(gnutls_x509_ext_import_tlsfeatures, 
-//GO(gnutls_x509_ext_print, 
+GO(gnutls_x509_ext_print, iFpuup)
 //GO(gnutls_x509_key_purpose_deinit, 
 //GO(gnutls_x509_key_purpose_get, 
 //GO(gnutls_x509_key_purpose_init, 
 //GO(gnutls_x509_key_purpose_set, 
-//GO(gnutls_x509_name_constraints_add_excluded, 
-//GO(gnutls_x509_name_constraints_add_permitted, 
-//GO(gnutls_x509_name_constraints_check, 
-//GO(gnutls_x509_name_constraints_check_crt, 
-//GO(gnutls_x509_name_constraints_deinit, 
-//GO(gnutls_x509_name_constraints_get_excluded, 
-//GO(gnutls_x509_name_constraints_get_permitted, 
-//GO(gnutls_x509_name_constraints_init, 
+GO(gnutls_x509_name_constraints_add_excluded, iFpup)
+GO(gnutls_x509_name_constraints_add_permitted, iFpup)
+GO(gnutls_x509_name_constraints_check, uFpup)
+GO(gnutls_x509_name_constraints_check_crt, uFpup)
+GO(gnutls_x509_name_constraints_deinit, vFp)
+GO(gnutls_x509_name_constraints_get_excluded, iFpupp)
+GO(gnutls_x509_name_constraints_get_permitted, iFpupp)
+GO(gnutls_x509_name_constraints_init, iFp)
 //GO(_gnutls_x509_name_constraints_merge, 
 //GO(gnutls_x509_othername_to_virtual, 
 //GO(gnutls_x509_policies_deinit, 
 //GO(gnutls_x509_policies_get, 
 //GO(gnutls_x509_policies_init, 
 //GO(gnutls_x509_policies_set, 
-//GO(gnutls_x509_policy_release, 
-//GO(gnutls_x509_privkey_cpy, 
+GO(gnutls_x509_policy_release, vFp)
+GO(gnutls_x509_privkey_cpy, iFpp)
 GO(gnutls_x509_privkey_deinit, vFp)
-//GO(gnutls_x509_privkey_export, 
-//GO(gnutls_x509_privkey_export2, 
-//GO(gnutls_x509_privkey_export2_pkcs8, 
-//GO(gnutls_x509_privkey_export_dsa_raw, 
-//GO(gnutls_x509_privkey_export_ecc_raw, 
-//GO(gnutls_x509_privkey_export_pkcs8, 
-//GO(gnutls_x509_privkey_export_rsa_raw, 
+GO(gnutls_x509_privkey_export, iFpupp)
+GO(gnutls_x509_privkey_export2, iFpup)
+GO(gnutls_x509_privkey_export2_pkcs8, iFpupup)
+GO(gnutls_x509_privkey_export_dsa_raw, iFpppppp)
+GO(gnutls_x509_privkey_export_ecc_raw, iFppppp)
+GO(gnutls_x509_privkey_export_pkcs8, iFpupupp)
+GO(gnutls_x509_privkey_export_rsa_raw, iFppppppp)
 GO(gnutls_x509_privkey_export_rsa_raw2, iFppppppppp)
-//GO(gnutls_x509_privkey_fix, 
-//GO(gnutls_x509_privkey_generate, 
-//GO(gnutls_x509_privkey_generate2, 
-//GO(gnutls_x509_privkey_get_key_id, 
-//GO(gnutls_x509_privkey_get_pk_algorithm, 
+GO(gnutls_x509_privkey_fix, iFp)
+GO(gnutls_x509_privkey_generate, iFpuuu)
+GO(gnutls_x509_privkey_generate2, iFpuuupu)
+GO(gnutls_x509_privkey_get_key_id, iFpupp)
+GO(gnutls_x509_privkey_get_pk_algorithm, iFp)
 GO(gnutls_x509_privkey_get_pk_algorithm2, iFpp)
-//GO(gnutls_x509_privkey_get_seed, 
-//GO(gnutls_x509_privkey_import, 
-//GO(gnutls_x509_privkey_import2, 
-//GO(gnutls_x509_privkey_import_dsa_raw, 
-//GO(gnutls_x509_privkey_import_ecc_raw, 
-//GO(gnutls_x509_privkey_import_openssl, 
-//GO(gnutls_x509_privkey_import_pkcs8, 
-//GO(gnutls_x509_privkey_import_rsa_raw, 
-//GO(gnutls_x509_privkey_import_rsa_raw2, 
-//GO(gnutls_x509_privkey_init, 
-//GO(gnutls_x509_privkey_sec_param, 
-//GO(gnutls_x509_privkey_set_flags, 
-//GO(gnutls_x509_privkey_set_pin_function, 
-//GO(gnutls_x509_privkey_sign_data, 
-//GO(gnutls_x509_privkey_sign_hash, 
-//GO(gnutls_x509_privkey_verify_params, 
-//GO(gnutls_x509_privkey_verify_seed, 
-//GO(gnutls_x509_rdn_get, 
-//GO(gnutls_x509_rdn_get2, 
-//GO(gnutls_x509_rdn_get_by_oid, 
-//GO(gnutls_x509_rdn_get_oid, 
+GO(gnutls_x509_privkey_get_seed, iFpppp)
+GO(gnutls_x509_privkey_import, iFppu)
+GO(gnutls_x509_privkey_import2, iFppupu)
+GO(gnutls_x509_privkey_import_dsa_raw, iFpppppp)
+GO(gnutls_x509_privkey_import_ecc_raw, iFpuppp)
+GO(gnutls_x509_privkey_import_openssl, iFppp)
+GO(gnutls_x509_privkey_import_pkcs8, iFppupu)
+GO(gnutls_x509_privkey_import_rsa_raw, iFppppppp)
+GO(gnutls_x509_privkey_import_rsa_raw2, iFppppppppp)
+GO(gnutls_x509_privkey_init, iFp)
+GO(gnutls_x509_privkey_sec_param, uFp)
+GO(gnutls_x509_privkey_set_flags, vFpu)
+//GOM(gnutls_x509_privkey_set_pin_function, vFEppp)
+GO(gnutls_x509_privkey_sign_data, iFpuuppp)
+GO(gnutls_x509_privkey_sign_hash, iFppp)
+GO(gnutls_x509_privkey_verify_params, iFp)
+GO(gnutls_x509_privkey_verify_seed, iFpupL)
+GO(gnutls_x509_rdn_get, iFppp)
+GO(gnutls_x509_rdn_get2, iFppu)
+GO(gnutls_x509_rdn_get_by_oid, iFppuupp)
+GO(gnutls_x509_rdn_get_oid, iFpupp)
 GO(gnutls_x509_spki_deinit, vFp)
-GO(gnutls_x509_spki_init, vFp)
+GO(gnutls_x509_spki_init, iFp)
 GO(gnutls_x509_spki_set_rsa_oaep_params, iFpup)
-GO(gnutls_x509_spki_set_rsa_pss_params, vFppu)
+GO(gnutls_x509_spki_set_rsa_pss_params, vFpuu)
 //GO(gnutls_x509_tlsfeatures_add, 
-//GO(gnutls_x509_tlsfeatures_check_crt, 
-//GO(gnutls_x509_tlsfeatures_deinit, 
-//GO(gnutls_x509_tlsfeatures_get, 
-//GO(gnutls_x509_tlsfeatures_init, 
-//GO(gnutls_x509_trust_list_add_cas, 
-//GO(gnutls_x509_trust_list_add_crls, 
-//GO(gnutls_x509_trust_list_add_named_crt, 
-//GO(gnutls_x509_trust_list_add_system_trust, 
-//GO(gnutls_x509_trust_list_add_trust_dir, 
-//GO(gnutls_x509_trust_list_add_trust_file, 
-//GO(gnutls_x509_trust_list_add_trust_mem, 
-//GO(gnutls_x509_trust_list_deinit, 
-//GO(gnutls_x509_trust_list_get_issuer, 
-//GO(gnutls_x509_trust_list_get_issuer_by_dn, 
-//GO(gnutls_x509_trust_list_get_issuer_by_subject_key_id, 
-//GO(gnutls_x509_trust_list_init, 
-//GO(gnutls_x509_trust_list_iter_deinit, 
-//GO(gnutls_x509_trust_list_iter_get_ca, 
-//GO(gnutls_x509_trust_list_remove_cas, 
-//GO(gnutls_x509_trust_list_remove_trust_file, 
-//GO(gnutls_x509_trust_list_remove_trust_mem, 
-//GO(gnutls_x509_trust_list_verify_crt, 
-//GO(gnutls_x509_trust_list_verify_crt2, 
-//GO(gnutls_x509_trust_list_verify_named_crt, 
+GO(gnutls_x509_tlsfeatures_check_crt, uFpp)
+GO(gnutls_x509_tlsfeatures_deinit, vFp)
+GO(gnutls_x509_tlsfeatures_get, iFpup)
+GO(gnutls_x509_tlsfeatures_init, iFp)
+GO(gnutls_x509_trust_list_add_cas, iFppuu)
+GO(gnutls_x509_trust_list_add_crls, iFppuuu)
+GO(gnutls_x509_trust_list_add_named_crt, iFpppLu)
+GO(gnutls_x509_trust_list_add_system_trust, iFpuu)
+GO(gnutls_x509_trust_list_add_trust_dir, iFpppuuu)
+GO(gnutls_x509_trust_list_add_trust_file, iFpppuuu)
+GO(gnutls_x509_trust_list_add_trust_mem, iFpppuuu)
+GO(gnutls_x509_trust_list_deinit, vFpu)
+GO(gnutls_x509_trust_list_get_issuer, iFpppu)
+GO(gnutls_x509_trust_list_get_issuer_by_dn, iFpppu)
+GO(gnutls_x509_trust_list_get_issuer_by_subject_key_id, iFppppu)
+GO(gnutls_x509_trust_list_init, iFpu)
+GO(gnutls_x509_trust_list_iter_deinit, vFp)
+GO(gnutls_x509_trust_list_iter_get_ca, iFppp)
+GO(gnutls_x509_trust_list_remove_cas, iFppu)
+GO(gnutls_x509_trust_list_remove_trust_file, iFppu)
+GO(gnutls_x509_trust_list_remove_trust_mem, iFppu)
+//GOM(gnutls_x509_trust_list_verify_crt, iFEppuupp)
+//GOM(gnutls_x509_trust_list_verify_crt2, iFEppupuupp)
+//GOM(gnutls_x509_trust_list_verify_named_crt, iFEpppLupp)
 //GO(_rsa_generate_fips186_4_keypair,