[WRAPPER] Reworked gst-rtp and gst-rtsp with new wrapperhelper

5 files changed, 464 insertions, 344 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 0fa3277c..c0b1c2f4 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -60,6 +60,7 @@
 #() WFp
 #() uFv
 #() uFi
+#() uFC
 #() uFu
 #() uFU
 #() uFd
@@ -199,6 +200,7 @@
 #() iFil
 #() iFip
 #() iFiS
+#() iFWW
 #() iFui
 #() iFuu
 #() iFuL
@@ -452,6 +454,7 @@
 #() vFpiL
 #() vFpip
 #() vFpiS
+#() vFpCu
 #() vFpui
 #() vFpuI
 #() vFpuC
@@ -558,6 +561,7 @@
 #() iFpip
 #() iFpCu
 #() iFpCp
+#() iFpWW
 #() iFpWu
 #() iFpWp
 #() iFpui
@@ -624,6 +628,7 @@
 #() uFipL
 #() uFuii
 #() uFuip
+#() uFuCC
 #() uFuuu
 #() uFuup
 #() uFufp
@@ -743,6 +748,7 @@
 #() pFCuW
 #() pFWWW
 #() pFuip
+#() pFuCC
 #() pFuui
 #() pFuuu
 #() pFulu
@@ -935,6 +941,7 @@
 #() vFpCuW
 #() vFpuii
 #() vFpuip
+#() vFpuCC
 #() vFpuuu
 #() vFpuup
 #() vFpufi
@@ -1074,6 +1081,7 @@
 #() iFpiid
 #() iFpiiL
 #() iFpiip
+#() iFpiCp
 #() iFpiuu
 #() iFpiuL
 #() iFpiup
@@ -1087,6 +1095,7 @@
 #() iFpipV
 #() iFpCCC
 #() iFpCpi
+#() iFpCpu
 #() iFpCpp
 #() iFpWWW
 #() iFpWWu
@@ -1109,6 +1118,7 @@
 #() iFpupC
 #() iFpupu
 #() iFpupU
+#() iFpupl
 #() iFpupL
 #() iFpupp
 #() iFpupV
@@ -1152,6 +1162,7 @@
 #() iFppuw
 #() iFppui
 #() iFppuu
+#() iFppul
 #() iFppuL
 #() iFppup
 #() iFppdd
@@ -1341,6 +1352,7 @@
 #() pFpWWW
 #() pFpuii
 #() pFpuip
+#() pFpuCC
 #() pFpuuu
 #() pFpuup
 #() pFpudd
@@ -1578,6 +1590,7 @@
 #() vFppiff
 #() vFppidd
 #() vFppipi
+#() vFppipu
 #() vFppipp
 #() vFppWui
 #() vFppuii
@@ -1683,6 +1696,7 @@
 #() iFpippL
 #() iFpippp
 #() iFpCCCC
+#() iFpCCpu
 #() iFpCupp
 #() iFpCpip
 #() iFpuiip
@@ -1704,6 +1718,7 @@
 #() iFpupuU
 #() iFpupup
 #() iFpupLu
+#() iFpupLp
 #() iFpuppu
 #() iFpuppL
 #() iFpuppp
@@ -1738,6 +1753,7 @@
 #() iFppipu
 #() iFppipl
 #() iFppipp
+#() iFppWpp
 #() iFppuwp
 #() iFppuip
 #() iFppuuu
@@ -2058,6 +2074,7 @@
 #() vFpuupuu
 #() vFpuuppp
 #() vFpudddd
+#() vFpuLuuu
 #() vFpupiUu
 #() vFpupuuu
 #() vFpupupu
@@ -2181,6 +2198,7 @@
 #() iFpCiipp
 #() iFpCpipu
 #() iFpWipip
+#() iFpWCupp
 #() iFpWpppp
 #() iFpuiCpp
 #() iFpuiLpp
@@ -2235,6 +2253,7 @@
 #() iFppippu
 #() iFppippp
 #() iFppIppp
+#() iFppCupp
 #() iFppuiii
 #() iFppuipp
 #() iFppuIII
@@ -2314,6 +2333,7 @@
 #() lFpipill
 #() lFpuuLLp
 #() lFpluuic
+#() lFppuppL
 #() lFppLipp
 #() lFpppLpp
 #() LFEuuppp
@@ -2832,6 +2852,7 @@
 #() iFpWCuWCuu
 #() iFpuiipppp
 #() iFpuippLpp
+#() iFpuCiuuuu
 #() iFpuuiiuuu
 #() iFpuuipppp
 #() iFpuuuiiii
@@ -2973,7 +2994,9 @@
 #() vFpiLLpiipi
 #() vFpiLpLiipi
 #() vFpipiuiipp
+#() vFpuuCiuuuu
 #() vFpuuuuuuuu
+#() vFpuppppppp
 #() vFpLiiipiii
 #() vFpLpLpLLpp
 #() vFpLpppippp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 5f452dee..b139982b 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -110,6 +110,7 @@ typedef uint16_t (*WFu_t)(uint32_t);
 typedef uint16_t (*WFp_t)(void*);
 typedef uint32_t (*uFv_t)(void);
 typedef uint32_t (*uFi_t)(int32_t);
+typedef uint32_t (*uFC_t)(uint8_t);
 typedef uint32_t (*uFu_t)(uint32_t);
 typedef uint32_t (*uFU_t)(uint64_t);
 typedef uint32_t (*uFd_t)(double);
@@ -245,6 +246,7 @@ typedef int32_t (*iFiU_t)(int32_t, uint64_t);
 typedef int32_t (*iFil_t)(int32_t, intptr_t);
 typedef int32_t (*iFip_t)(int32_t, void*);
 typedef int32_t (*iFiS_t)(int32_t, void*);
+typedef int32_t (*iFWW_t)(uint16_t, uint16_t);
 typedef int32_t (*iFui_t)(uint32_t, int32_t);
 typedef int32_t (*iFuu_t)(uint32_t, uint32_t);
 typedef int32_t (*iFuL_t)(uint32_t, uintptr_t);
@@ -487,6 +489,7 @@ typedef void (*vFpid_t)(void*, int32_t, double);
 typedef void (*vFpiL_t)(void*, int32_t, uintptr_t);
 typedef void (*vFpip_t)(void*, int32_t, void*);
 typedef void (*vFpiS_t)(void*, int32_t, void*);
+typedef void (*vFpCu_t)(void*, uint8_t, uint32_t);
 typedef void (*vFpui_t)(void*, uint32_t, int32_t);
 typedef void (*vFpuI_t)(void*, uint32_t, int64_t);
 typedef void (*vFpuC_t)(void*, uint32_t, uint8_t);
@@ -593,6 +596,7 @@ typedef int32_t (*iFpiL_t)(void*, int32_t, uintptr_t);
 typedef int32_t (*iFpip_t)(void*, int32_t, void*);
 typedef int32_t (*iFpCu_t)(void*, uint8_t, uint32_t);
 typedef int32_t (*iFpCp_t)(void*, uint8_t, void*);
+typedef int32_t (*iFpWW_t)(void*, uint16_t, uint16_t);
 typedef int32_t (*iFpWu_t)(void*, uint16_t, uint32_t);
 typedef int32_t (*iFpWp_t)(void*, uint16_t, void*);
 typedef int32_t (*iFpui_t)(void*, uint32_t, int32_t);
@@ -659,6 +663,7 @@ typedef uint32_t (*uFipu_t)(int32_t, void*, uint32_t);
 typedef uint32_t (*uFipL_t)(int32_t, void*, uintptr_t);
 typedef uint32_t (*uFuii_t)(uint32_t, int32_t, int32_t);
 typedef uint32_t (*uFuip_t)(uint32_t, int32_t, void*);
+typedef uint32_t (*uFuCC_t)(uint32_t, uint8_t, uint8_t);
 typedef uint32_t (*uFuuu_t)(uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFuup_t)(uint32_t, uint32_t, void*);
 typedef uint32_t (*uFufp_t)(uint32_t, float, void*);
@@ -775,6 +780,7 @@ typedef void* (*pFipp_t)(int32_t, void*, void*);
 typedef void* (*pFCuW_t)(uint8_t, uint32_t, uint16_t);
 typedef void* (*pFWWW_t)(uint16_t, uint16_t, uint16_t);
 typedef void* (*pFuip_t)(uint32_t, int32_t, void*);
+typedef void* (*pFuCC_t)(uint32_t, uint8_t, uint8_t);
 typedef void* (*pFuui_t)(uint32_t, uint32_t, int32_t);
 typedef void* (*pFuuu_t)(uint32_t, uint32_t, uint32_t);
 typedef void* (*pFulu_t)(uint32_t, intptr_t, uint32_t);
@@ -966,6 +972,7 @@ typedef void (*vFpipp_t)(void*, int32_t, void*, void*);
 typedef void (*vFpCuW_t)(void*, uint8_t, uint32_t, uint16_t);
 typedef void (*vFpuii_t)(void*, uint32_t, int32_t, int32_t);
 typedef void (*vFpuip_t)(void*, uint32_t, int32_t, void*);
+typedef void (*vFpuCC_t)(void*, uint32_t, uint8_t, uint8_t);
 typedef void (*vFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpuup_t)(void*, uint32_t, uint32_t, void*);
 typedef void (*vFpufi_t)(void*, uint32_t, float, int32_t);
@@ -1105,6 +1112,7 @@ typedef int32_t (*iFpiiu_t)(void*, int32_t, int32_t, uint32_t);
 typedef int32_t (*iFpiid_t)(void*, int32_t, int32_t, double);
 typedef int32_t (*iFpiiL_t)(void*, int32_t, int32_t, uintptr_t);
 typedef int32_t (*iFpiip_t)(void*, int32_t, int32_t, void*);
+typedef int32_t (*iFpiCp_t)(void*, int32_t, uint8_t, void*);
 typedef int32_t (*iFpiuu_t)(void*, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpiuL_t)(void*, int32_t, uint32_t, uintptr_t);
 typedef int32_t (*iFpiup_t)(void*, int32_t, uint32_t, void*);
@@ -1118,6 +1126,7 @@ typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
 typedef int32_t (*iFpipV_t)(void*, int32_t, void*, void*);
 typedef int32_t (*iFpCCC_t)(void*, uint8_t, uint8_t, uint8_t);
 typedef int32_t (*iFpCpi_t)(void*, uint8_t, void*, int32_t);
+typedef int32_t (*iFpCpu_t)(void*, uint8_t, void*, uint32_t);
 typedef int32_t (*iFpCpp_t)(void*, uint8_t, void*, void*);
 typedef int32_t (*iFpWWW_t)(void*, uint16_t, uint16_t, uint16_t);
 typedef int32_t (*iFpWWu_t)(void*, uint16_t, uint16_t, uint32_t);
@@ -1140,6 +1149,7 @@ typedef int32_t (*iFpupi_t)(void*, uint32_t, void*, int32_t);
 typedef int32_t (*iFpupC_t)(void*, uint32_t, void*, uint8_t);
 typedef int32_t (*iFpupu_t)(void*, uint32_t, void*, uint32_t);
 typedef int32_t (*iFpupU_t)(void*, uint32_t, void*, uint64_t);
+typedef int32_t (*iFpupl_t)(void*, uint32_t, void*, intptr_t);
 typedef int32_t (*iFpupL_t)(void*, uint32_t, void*, uintptr_t);
 typedef int32_t (*iFpupp_t)(void*, uint32_t, void*, void*);
 typedef int32_t (*iFpupV_t)(void*, uint32_t, void*, void*);
@@ -1182,6 +1192,7 @@ typedef int32_t (*iFppCC_t)(void*, void*, uint8_t, uint8_t);
 typedef int32_t (*iFppuw_t)(void*, void*, uint32_t, int16_t);
 typedef int32_t (*iFppui_t)(void*, void*, uint32_t, int32_t);
 typedef int32_t (*iFppuu_t)(void*, void*, uint32_t, uint32_t);
+typedef int32_t (*iFppul_t)(void*, void*, uint32_t, intptr_t);
 typedef int32_t (*iFppuL_t)(void*, void*, uint32_t, uintptr_t);
 typedef int32_t (*iFppup_t)(void*, void*, uint32_t, void*);
 typedef int32_t (*iFppdd_t)(void*, void*, double, double);
@@ -1370,6 +1381,7 @@ typedef void* (*pFpCip_t)(void*, uint8_t, int32_t, void*);
 typedef void* (*pFpWWW_t)(void*, uint16_t, uint16_t, uint16_t);
 typedef void* (*pFpuii_t)(void*, uint32_t, int32_t, int32_t);
 typedef void* (*pFpuip_t)(void*, uint32_t, int32_t, void*);
+typedef void* (*pFpuCC_t)(void*, uint32_t, uint8_t, uint8_t);
 typedef void* (*pFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpuup_t)(void*, uint32_t, uint32_t, void*);
 typedef void* (*pFpudd_t)(void*, uint32_t, double, double);
@@ -1607,6 +1619,7 @@ typedef void (*vFppiup_t)(void*, void*, int32_t, uint32_t, void*);
 typedef void (*vFppiff_t)(void*, void*, int32_t, float, float);
 typedef void (*vFppidd_t)(void*, void*, int32_t, double, double);
 typedef void (*vFppipi_t)(void*, void*, int32_t, void*, int32_t);
+typedef void (*vFppipu_t)(void*, void*, int32_t, void*, uint32_t);
 typedef void (*vFppipp_t)(void*, void*, int32_t, void*, void*);
 typedef void (*vFppWui_t)(void*, void*, uint16_t, uint32_t, int32_t);
 typedef void (*vFppuii_t)(void*, void*, uint32_t, int32_t, int32_t);
@@ -1712,6 +1725,7 @@ 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 (*iFpCCpu_t)(void*, uint8_t, uint8_t, void*, uint32_t);
 typedef int32_t (*iFpCupp_t)(void*, uint8_t, uint32_t, void*, void*);
 typedef int32_t (*iFpCpip_t)(void*, uint8_t, void*, int32_t, void*);
 typedef int32_t (*iFpuiip_t)(void*, uint32_t, int32_t, int32_t, void*);
@@ -1733,6 +1747,7 @@ 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 (*iFpupLp_t)(void*, uint32_t, void*, uintptr_t, void*);
 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*);
@@ -1767,6 +1782,7 @@ typedef int32_t (*iFppipi_t)(void*, void*, int32_t, void*, int32_t);
 typedef int32_t (*iFppipu_t)(void*, void*, int32_t, void*, uint32_t);
 typedef int32_t (*iFppipl_t)(void*, void*, int32_t, void*, intptr_t);
 typedef int32_t (*iFppipp_t)(void*, void*, int32_t, void*, void*);
+typedef int32_t (*iFppWpp_t)(void*, void*, uint16_t, void*, void*);
 typedef int32_t (*iFppuwp_t)(void*, void*, uint32_t, int16_t, void*);
 typedef int32_t (*iFppuip_t)(void*, void*, uint32_t, int32_t, void*);
 typedef int32_t (*iFppuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t);
@@ -2087,6 +2103,7 @@ typedef void (*vFpuuupp_t)(void*, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef void (*vFpuupuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint32_t);
 typedef void (*vFpuuppp_t)(void*, uint32_t, uint32_t, void*, void*, void*);
 typedef void (*vFpudddd_t)(void*, uint32_t, double, double, double, double);
+typedef void (*vFpuLuuu_t)(void*, uint32_t, uintptr_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpupiUu_t)(void*, uint32_t, void*, int32_t, uint64_t, uint32_t);
 typedef void (*vFpupuuu_t)(void*, uint32_t, void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpupupu_t)(void*, uint32_t, void*, uint32_t, void*, uint32_t);
@@ -2209,6 +2226,7 @@ typedef int32_t (*iFpipppp_t)(void*, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpCiipp_t)(void*, uint8_t, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFpCpipu_t)(void*, uint8_t, void*, int32_t, void*, uint32_t);
 typedef int32_t (*iFpWipip_t)(void*, uint16_t, int32_t, void*, int32_t, void*);
+typedef int32_t (*iFpWCupp_t)(void*, uint16_t, uint8_t, uint32_t, void*, void*);
 typedef int32_t (*iFpWpppp_t)(void*, uint16_t, void*, void*, void*, void*);
 typedef int32_t (*iFpuiCpp_t)(void*, uint32_t, int32_t, uint8_t, void*, void*);
 typedef int32_t (*iFpuiLpp_t)(void*, uint32_t, int32_t, uintptr_t, void*, void*);
@@ -2263,6 +2281,7 @@ typedef int32_t (*iFppippi_t)(void*, void*, int32_t, void*, void*, int32_t);
 typedef int32_t (*iFppippu_t)(void*, void*, int32_t, void*, void*, uint32_t);
 typedef int32_t (*iFppippp_t)(void*, void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFppIppp_t)(void*, void*, int64_t, void*, void*, void*);
+typedef int32_t (*iFppCupp_t)(void*, void*, uint8_t, uint32_t, void*, void*);
 typedef int32_t (*iFppuiii_t)(void*, void*, uint32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppuipp_t)(void*, void*, uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFppuIII_t)(void*, void*, uint32_t, int64_t, int64_t, int64_t);
@@ -2342,6 +2361,7 @@ typedef intptr_t (*lFipLpLL_t)(int32_t, void*, uintptr_t, void*, uintptr_t, uint
 typedef intptr_t (*lFpipill_t)(void*, int32_t, void*, int32_t, intptr_t, intptr_t);
 typedef intptr_t (*lFpuuLLp_t)(void*, uint32_t, uint32_t, uintptr_t, uintptr_t, void*);
 typedef intptr_t (*lFpluuic_t)(void*, intptr_t, uint32_t, uint32_t, int32_t, int8_t);
+typedef intptr_t (*lFppuppL_t)(void*, void*, uint32_t, void*, void*, uintptr_t);
 typedef intptr_t (*lFppLipp_t)(void*, void*, uintptr_t, int32_t, void*, void*);
 typedef intptr_t (*lFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
 typedef uintptr_t (*LFEuuppp_t)(x64emu_t*, uint32_t, uint32_t, void*, void*, void*);
@@ -2860,6 +2880,7 @@ typedef int32_t (*iFpCCWWpWu_t)(void*, uint8_t, uint8_t, uint16_t, uint16_t, voi
 typedef int32_t (*iFpWCuWCuu_t)(void*, uint16_t, uint8_t, uint32_t, uint16_t, uint8_t, uint32_t, uint32_t);
 typedef int32_t (*iFpuiipppp_t)(void*, uint32_t, int32_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpuippLpp_t)(void*, uint32_t, int32_t, void*, void*, uintptr_t, void*, void*);
+typedef int32_t (*iFpuCiuuuu_t)(void*, uint32_t, uint8_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpuuiiuuu_t)(void*, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpuuipppp_t)(void*, uint32_t, uint32_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpuuuiiii_t)(void*, uint32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t);
@@ -3001,7 +3022,9 @@ typedef void (*vFpiuippppi_t)(void*, int32_t, uint32_t, int32_t, void*, void*, v
 typedef void (*vFpiLLpiipi_t)(void*, int32_t, uintptr_t, uintptr_t, void*, int32_t, int32_t, void*, int32_t);
 typedef void (*vFpiLpLiipi_t)(void*, int32_t, uintptr_t, void*, uintptr_t, int32_t, int32_t, void*, int32_t);
 typedef void (*vFpipiuiipp_t)(void*, int32_t, void*, int32_t, uint32_t, int32_t, int32_t, void*, void*);
+typedef void (*vFpuuCiuuuu_t)(void*, uint32_t, uint32_t, uint8_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpuuuuuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef void (*vFpuppppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFpLiiipiii_t)(void*, uintptr_t, int32_t, int32_t, int32_t, void*, int32_t, int32_t, int32_t);
 typedef void (*vFpLpLpLLpp_t)(void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, uintptr_t, void*, void*);
 typedef void (*vFpLpppippp_t)(void*, uintptr_t, void*, void*, void*, int32_t, void*, void*, void*);
@@ -3488,6 +3511,7 @@ void WFu(x64emu_t *emu, uintptr_t fcn) { WFu_t fn = (WFu_t)fcn; R_RAX=(unsigned
 void WFp(x64emu_t *emu, uintptr_t fcn) { WFp_t fn = (WFp_t)fcn; R_RAX=(unsigned short)fn((void*)R_RDI); }
 void uFv(x64emu_t *emu, uintptr_t fcn) { uFv_t fn = (uFv_t)fcn; R_RAX=(uint32_t)fn(); }
 void uFi(x64emu_t *emu, uintptr_t fcn) { uFi_t fn = (uFi_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI); }
+void uFC(x64emu_t *emu, uintptr_t fcn) { uFC_t fn = (uFC_t)fcn; R_RAX=(uint32_t)fn((uint8_t)R_RDI); }
 void uFu(x64emu_t *emu, uintptr_t fcn) { uFu_t fn = (uFu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI); }
 void uFU(x64emu_t *emu, uintptr_t fcn) { uFU_t fn = (uFU_t)fcn; R_RAX=(uint32_t)fn((uint64_t)R_RDI); }
 void uFd(x64emu_t *emu, uintptr_t fcn) { uFd_t fn = (uFd_t)fcn; R_RAX=(uint32_t)fn(emu->xmm[0].d[0]); }
@@ -3623,6 +3647,7 @@ void iFiU(x64emu_t *emu, uintptr_t fcn) { iFiU_t fn = (iFiU_t)fcn; R_RAX=(uint32
 void iFil(x64emu_t *emu, uintptr_t fcn) { iFil_t fn = (iFil_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (intptr_t)R_RSI); }
 void iFip(x64emu_t *emu, uintptr_t fcn) { iFip_t fn = (iFip_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI); }
 void iFiS(x64emu_t *emu, uintptr_t fcn) { iFiS_t fn = (iFiS_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, io_convert((void*)R_RSI)); }
+void iFWW(x64emu_t *emu, uintptr_t fcn) { iFWW_t fn = (iFWW_t)fcn; R_RAX=(uint32_t)fn((uint16_t)R_RDI, (uint16_t)R_RSI); }
 void iFui(x64emu_t *emu, uintptr_t fcn) { iFui_t fn = (iFui_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
 void iFuu(x64emu_t *emu, uintptr_t fcn) { iFuu_t fn = (iFuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
 void iFuL(x64emu_t *emu, uintptr_t fcn) { iFuL_t fn = (iFuL_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uintptr_t)R_RSI); }
@@ -3865,6 +3890,7 @@ void vFpid(x64emu_t *emu, uintptr_t fcn) { vFpid_t fn = (vFpid_t)fcn; fn((void*)
 void vFpiL(x64emu_t *emu, uintptr_t fcn) { vFpiL_t fn = (vFpiL_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX); }
 void vFpip(x64emu_t *emu, uintptr_t fcn) { vFpip_t fn = (vFpip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void vFpiS(x64emu_t *emu, uintptr_t fcn) { vFpiS_t fn = (vFpiS_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, io_convert((void*)R_RDX)); }
+void vFpCu(x64emu_t *emu, uintptr_t fcn) { vFpCu_t fn = (vFpCu_t)fcn; fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX); }
 void vFpui(x64emu_t *emu, uintptr_t fcn) { vFpui_t fn = (vFpui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void vFpuI(x64emu_t *emu, uintptr_t fcn) { vFpuI_t fn = (vFpuI_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int64_t)R_RDX); }
 void vFpuC(x64emu_t *emu, uintptr_t fcn) { vFpuC_t fn = (vFpuC_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint8_t)R_RDX); }
@@ -3971,6 +3997,7 @@ void iFpiL(x64emu_t *emu, uintptr_t fcn) { iFpiL_t fn = (iFpiL_t)fcn; R_RAX=(uin
 void iFpip(x64emu_t *emu, uintptr_t fcn) { iFpip_t fn = (iFpip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void iFpCu(x64emu_t *emu, uintptr_t fcn) { iFpCu_t fn = (iFpCu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX); }
 void iFpCp(x64emu_t *emu, uintptr_t fcn) { iFpCp_t fn = (iFpCp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX); }
+void iFpWW(x64emu_t *emu, uintptr_t fcn) { iFpWW_t fn = (iFpWW_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX); }
 void iFpWu(x64emu_t *emu, uintptr_t fcn) { iFpWu_t fn = (iFpWu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX); }
 void iFpWp(x64emu_t *emu, uintptr_t fcn) { iFpWp_t fn = (iFpWp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
 void iFpui(x64emu_t *emu, uintptr_t fcn) { iFpui_t fn = (iFpui_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
@@ -4037,6 +4064,7 @@ void uFipu(x64emu_t *emu, uintptr_t fcn) { uFipu_t fn = (uFipu_t)fcn; R_RAX=(uin
 void uFipL(x64emu_t *emu, uintptr_t fcn) { uFipL_t fn = (uFipL_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void uFuii(x64emu_t *emu, uintptr_t fcn) { uFuii_t fn = (uFuii_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
 void uFuip(x64emu_t *emu, uintptr_t fcn) { uFuip_t fn = (uFuip_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
+void uFuCC(x64emu_t *emu, uintptr_t fcn) { uFuCC_t fn = (uFuCC_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX); }
 void uFuuu(x64emu_t *emu, uintptr_t fcn) { uFuuu_t fn = (uFuuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
 void uFuup(x64emu_t *emu, uintptr_t fcn) { uFuup_t fn = (uFuup_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void uFufp(x64emu_t *emu, uintptr_t fcn) { uFufp_t fn = (uFufp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, emu->xmm[0].f[0], (void*)R_RSI); }
@@ -4153,6 +4181,7 @@ void pFipp(x64emu_t *emu, uintptr_t fcn) { pFipp_t fn = (pFipp_t)fcn; R_RAX=(uin
 void pFCuW(x64emu_t *emu, uintptr_t fcn) { pFCuW_t fn = (pFCuW_t)fcn; R_RAX=(uintptr_t)fn((uint8_t)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX); }
 void pFWWW(x64emu_t *emu, uintptr_t fcn) { pFWWW_t fn = (pFWWW_t)fcn; R_RAX=(uintptr_t)fn((uint16_t)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX); }
 void pFuip(x64emu_t *emu, uintptr_t fcn) { pFuip_t fn = (pFuip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
+void pFuCC(x64emu_t *emu, uintptr_t fcn) { pFuCC_t fn = (pFuCC_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX); }
 void pFuui(x64emu_t *emu, uintptr_t fcn) { pFuui_t fn = (pFuui_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void pFuuu(x64emu_t *emu, uintptr_t fcn) { pFuuu_t fn = (pFuuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
 void pFulu(x64emu_t *emu, uintptr_t fcn) { pFulu_t fn = (pFulu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX); }
@@ -4344,6 +4373,7 @@ void vFpipp(x64emu_t *emu, uintptr_t fcn) { vFpipp_t fn = (vFpipp_t)fcn; fn((voi
 void vFpCuW(x64emu_t *emu, uintptr_t fcn) { vFpCuW_t fn = (vFpCuW_t)fcn; fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX); }
 void vFpuii(x64emu_t *emu, uintptr_t fcn) { vFpuii_t fn = (vFpuii_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFpuip(x64emu_t *emu, uintptr_t fcn) { vFpuip_t fn = (vFpuip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void vFpuCC(x64emu_t *emu, uintptr_t fcn) { vFpuCC_t fn = (vFpuCC_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX); }
 void vFpuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuu_t fn = (vFpuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void vFpuup(x64emu_t *emu, uintptr_t fcn) { vFpuup_t fn = (vFpuup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void vFpufi(x64emu_t *emu, uintptr_t fcn) { vFpufi_t fn = (vFpufi_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0], (int32_t)R_RDX); }
@@ -4483,6 +4513,7 @@ void iFpiiu(x64emu_t *emu, uintptr_t fcn) { iFpiiu_t fn = (iFpiiu_t)fcn; R_RAX=(
 void iFpiid(x64emu_t *emu, uintptr_t fcn) { iFpiid_t fn = (iFpiid_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[0].d[0]); }
 void iFpiiL(x64emu_t *emu, uintptr_t fcn) { iFpiiL_t fn = (iFpiiL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpiip(x64emu_t *emu, uintptr_t fcn) { iFpiip_t fn = (iFpiip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void iFpiCp(x64emu_t *emu, uintptr_t fcn) { iFpiCp_t fn = (iFpiCp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint8_t)R_RDX, (void*)R_RCX); }
 void iFpiuu(x64emu_t *emu, uintptr_t fcn) { iFpiuu_t fn = (iFpiuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void iFpiuL(x64emu_t *emu, uintptr_t fcn) { iFpiuL_t fn = (iFpiuL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpiup(x64emu_t *emu, uintptr_t fcn) { iFpiup_t fn = (iFpiup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
@@ -4496,6 +4527,7 @@ void iFpipp(x64emu_t *emu, uintptr_t fcn) { iFpipp_t fn = (iFpipp_t)fcn; R_RAX=(
 void iFpipV(x64emu_t *emu, uintptr_t fcn) { iFpipV_t fn = (iFpipV_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
 void iFpCCC(x64emu_t *emu, uintptr_t fcn) { iFpCCC_t fn = (iFpCCC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX); }
 void iFpCpi(x64emu_t *emu, uintptr_t fcn) { iFpCpi_t fn = (iFpCpi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
+void iFpCpu(x64emu_t *emu, uintptr_t fcn) { iFpCpu_t fn = (iFpCpu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void iFpCpp(x64emu_t *emu, uintptr_t fcn) { iFpCpp_t fn = (iFpCpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpWWW(x64emu_t *emu, uintptr_t fcn) { iFpWWW_t fn = (iFpWWW_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX); }
 void iFpWWu(x64emu_t *emu, uintptr_t fcn) { iFpWWu_t fn = (iFpWWu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint32_t)R_RCX); }
@@ -4518,6 +4550,7 @@ void iFpupi(x64emu_t *emu, uintptr_t fcn) { iFpupi_t fn = (iFpupi_t)fcn; R_RAX=(
 void iFpupC(x64emu_t *emu, uintptr_t fcn) { iFpupC_t fn = (iFpupC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint8_t)R_RCX); }
 void iFpupu(x64emu_t *emu, uintptr_t fcn) { iFpupu_t fn = (iFpupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void iFpupU(x64emu_t *emu, uintptr_t fcn) { iFpupU_t fn = (iFpupU_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX); }
+void iFpupl(x64emu_t *emu, uintptr_t fcn) { iFpupl_t fn = (iFpupl_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX); }
 void iFpupL(x64emu_t *emu, uintptr_t fcn) { iFpupL_t fn = (iFpupL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFpupp(x64emu_t *emu, uintptr_t fcn) { iFpupp_t fn = (iFpupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpupV(x64emu_t *emu, uintptr_t fcn) { iFpupV_t fn = (iFpupV_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
@@ -4560,6 +4593,7 @@ void iFppCC(x64emu_t *emu, uintptr_t fcn) { iFppCC_t fn = (iFppCC_t)fcn; R_RAX=(
 void iFppuw(x64emu_t *emu, uintptr_t fcn) { iFppuw_t fn = (iFppuw_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int16_t)R_RCX); }
 void iFppui(x64emu_t *emu, uintptr_t fcn) { iFppui_t fn = (iFppui_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void iFppuu(x64emu_t *emu, uintptr_t fcn) { iFppuu_t fn = (iFppuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
+void iFppul(x64emu_t *emu, uintptr_t fcn) { iFppul_t fn = (iFppul_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (intptr_t)R_RCX); }
 void iFppuL(x64emu_t *emu, uintptr_t fcn) { iFppuL_t fn = (iFppuL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFppup(x64emu_t *emu, uintptr_t fcn) { iFppup_t fn = (iFppup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void iFppdd(x64emu_t *emu, uintptr_t fcn) { iFppdd_t fn = (iFppdd_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
@@ -4748,6 +4782,7 @@ void pFpCip(x64emu_t *emu, uintptr_t fcn) { pFpCip_t fn = (pFpCip_t)fcn; R_RAX=(
 void pFpWWW(x64emu_t *emu, uintptr_t fcn) { pFpWWW_t fn = (pFpWWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX); }
 void pFpuii(x64emu_t *emu, uintptr_t fcn) { pFpuii_t fn = (pFpuii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFpuip(x64emu_t *emu, uintptr_t fcn) { pFpuip_t fn = (pFpuip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void pFpuCC(x64emu_t *emu, uintptr_t fcn) { pFpuCC_t fn = (pFpuCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX); }
 void pFpuuu(x64emu_t *emu, uintptr_t fcn) { pFpuuu_t fn = (pFpuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFpuup(x64emu_t *emu, uintptr_t fcn) { pFpuup_t fn = (pFpuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void pFpudd(x64emu_t *emu, uintptr_t fcn) { pFpudd_t fn = (pFpudd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
@@ -4985,6 +5020,7 @@ void vFppiup(x64emu_t *emu, uintptr_t fcn) { vFppiup_t fn = (vFppiup_t)fcn; fn((
 void vFppiff(x64emu_t *emu, uintptr_t fcn) { vFppiff_t fn = (vFppiff_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void vFppidd(x64emu_t *emu, uintptr_t fcn) { vFppidd_t fn = (vFppidd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void vFppipi(x64emu_t *emu, uintptr_t fcn) { vFppipi_t fn = (vFppipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
+void vFppipu(x64emu_t *emu, uintptr_t fcn) { vFppipu_t fn = (vFppipu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void vFppipp(x64emu_t *emu, uintptr_t fcn) { vFppipp_t fn = (vFppipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFppWui(x64emu_t *emu, uintptr_t fcn) { vFppWui_t fn = (vFppWui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8); }
 void vFppuii(x64emu_t *emu, uintptr_t fcn) { vFppuii_t fn = (vFppuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
@@ -5090,6 +5126,7 @@ void iFpippW(x64emu_t *emu, uintptr_t fcn) { iFpippW_t fn = (iFpippW_t)fcn; R_RA
 void iFpippL(x64emu_t *emu, uintptr_t fcn) { iFpippL_t fn = (iFpippL_t)fcn; R_RAX=(uint32_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=(uint32_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=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8); }
+void iFpCCpu(x64emu_t *emu, uintptr_t fcn) { iFpCCpu_t fn = (iFpCCpu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void iFpCupp(x64emu_t *emu, uintptr_t fcn) { iFpCupp_t fn = (iFpCupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpCpip(x64emu_t *emu, uintptr_t fcn) { iFpCpip_t fn = (iFpCpip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFpuiip(x64emu_t *emu, uintptr_t fcn) { iFpuiip_t fn = (iFpuiip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
@@ -5111,6 +5148,7 @@ void iFpupuu(x64emu_t *emu, uintptr_t fcn) { iFpupuu_t fn = (iFpupuu_t)fcn; R_RA
 void iFpupuU(x64emu_t *emu, uintptr_t fcn) { iFpupuU_t fn = (iFpupuU_t)fcn; R_RAX=(uint32_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=(uint32_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=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8); }
+void iFpupLp(x64emu_t *emu, uintptr_t fcn) { iFpupLp_t fn = (iFpupLp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void iFpuppu(x64emu_t *emu, uintptr_t fcn) { iFpuppu_t fn = (iFpuppu_t)fcn; R_RAX=(uint32_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=(uint32_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=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5145,6 +5183,7 @@ void iFppipi(x64emu_t *emu, uintptr_t fcn) { iFppipi_t fn = (iFppipi_t)fcn; R_RA
 void iFppipu(x64emu_t *emu, uintptr_t fcn) { iFppipu_t fn = (iFppipu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void iFppipl(x64emu_t *emu, uintptr_t fcn) { iFppipl_t fn = (iFppipl_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8); }
 void iFppipp(x64emu_t *emu, uintptr_t fcn) { iFppipp_t fn = (iFppipp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFppWpp(x64emu_t *emu, uintptr_t fcn) { iFppWpp_t fn = (iFppWpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFppuwp(x64emu_t *emu, uintptr_t fcn) { iFppuwp_t fn = (iFppuwp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int16_t)R_RCX, (void*)R_R8); }
 void iFppuip(x64emu_t *emu, uintptr_t fcn) { iFppuip_t fn = (iFppuip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFppuuu(x64emu_t *emu, uintptr_t fcn) { iFppuuu_t fn = (iFppuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
@@ -5465,6 +5504,7 @@ void vFpuuupp(x64emu_t *emu, uintptr_t fcn) { vFpuuupp_t fn = (vFpuuupp_t)fcn; f
 void vFpuupuu(x64emu_t *emu, uintptr_t fcn) { vFpuupuu_t fn = (vFpuupuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void vFpuuppp(x64emu_t *emu, uintptr_t fcn) { vFpuuppp_t fn = (vFpuuppp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFpudddd(x64emu_t *emu, uintptr_t fcn) { vFpudddd_t fn = (vFpudddd_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
+void vFpuLuuu(x64emu_t *emu, uintptr_t fcn) { vFpuLuuu_t fn = (vFpuLuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void vFpupiUu(x64emu_t *emu, uintptr_t fcn) { vFpupiUu_t fn = (vFpupiUu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint64_t)R_R8, (uint32_t)R_R9); }
 void vFpupuuu(x64emu_t *emu, uintptr_t fcn) { vFpupuuu_t fn = (vFpupuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void vFpupupu(x64emu_t *emu, uintptr_t fcn) { vFpupupu_t fn = (vFpupupu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
@@ -5587,6 +5627,7 @@ void iFpipppp(x64emu_t *emu, uintptr_t fcn) { iFpipppp_t fn = (iFpipppp_t)fcn; R
 void iFpCiipp(x64emu_t *emu, uintptr_t fcn) { iFpCiipp_t fn = (iFpCiipp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpCpipu(x64emu_t *emu, uintptr_t fcn) { iFpCpipu_t fn = (iFpCpipu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void iFpWipip(x64emu_t *emu, uintptr_t fcn) { iFpWipip_t fn = (iFpWipip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
+void iFpWCupp(x64emu_t *emu, uintptr_t fcn) { iFpWCupp_t fn = (iFpWCupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpWpppp(x64emu_t *emu, uintptr_t fcn) { iFpWpppp_t fn = (iFpWpppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpuiCpp(x64emu_t *emu, uintptr_t fcn) { iFpuiCpp_t fn = (iFpuiCpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpuiLpp(x64emu_t *emu, uintptr_t fcn) { iFpuiLpp_t fn = (iFpuiLpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5641,6 +5682,7 @@ void iFppippi(x64emu_t *emu, uintptr_t fcn) { iFppippi_t fn = (iFppippi_t)fcn; R
 void iFppippu(x64emu_t *emu, uintptr_t fcn) { iFppippu_t fn = (iFppippu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void iFppippp(x64emu_t *emu, uintptr_t fcn) { iFppippp_t fn = (iFppippp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppIppp(x64emu_t *emu, uintptr_t fcn) { iFppIppp_t fn = (iFppIppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFppCupp(x64emu_t *emu, uintptr_t fcn) { iFppCupp_t fn = (iFppCupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppuiii(x64emu_t *emu, uintptr_t fcn) { iFppuiii_t fn = (iFppuiii_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFppuipp(x64emu_t *emu, uintptr_t fcn) { iFppuipp_t fn = (iFppuipp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppuIII(x64emu_t *emu, uintptr_t fcn) { iFppuIII_t fn = (iFppuIII_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
@@ -5720,6 +5762,7 @@ void lFipLpLL(x64emu_t *emu, uintptr_t fcn) { lFipLpLL_t fn = (lFipLpLL_t)fcn; R
 void lFpipill(x64emu_t *emu, uintptr_t fcn) { lFpipill_t fn = (lFpipill_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9); }
 void lFpuuLLp(x64emu_t *emu, uintptr_t fcn) { lFpuuLLp_t fn = (lFpuuLLp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void lFpluuic(x64emu_t *emu, uintptr_t fcn) { lFpluuic_t fn = (lFpluuic_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int8_t)R_R9); }
+void lFppuppL(x64emu_t *emu, uintptr_t fcn) { lFppuppL_t fn = (lFppuppL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void lFppLipp(x64emu_t *emu, uintptr_t fcn) { lFppLipp_t fn = (lFppLipp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void lFpppLpp(x64emu_t *emu, uintptr_t fcn) { lFpppLpp_t fn = (lFpppLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void LFEuuppp(x64emu_t *emu, uintptr_t fcn) { LFEuuppp_t fn = (LFEuuppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -6238,6 +6281,7 @@ void iFpCCWWpWu(x64emu_t *emu, uintptr_t fcn) { iFpCCWWpWu_t fn = (iFpCCWWpWu_t)
 void iFpWCuWCuu(x64emu_t *emu, uintptr_t fcn) { iFpWCuWCuu_t fn = (iFpWCuWCuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (uint16_t)R_R8, (uint8_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpuiipppp(x64emu_t *emu, uintptr_t fcn) { iFpuiipppp_t fn = (iFpuiipppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuippLpp(x64emu_t *emu, uintptr_t fcn) { iFpuippLpp_t fn = (iFpuippLpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void iFpuCiuuuu(x64emu_t *emu, uintptr_t fcn) { iFpuCiuuuu_t fn = (iFpuCiuuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint8_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpuuiiuuu(x64emu_t *emu, uintptr_t fcn) { iFpuuiiuuu_t fn = (iFpuuiiuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpuuipppp(x64emu_t *emu, uintptr_t fcn) { iFpuuipppp_t fn = (iFpuuipppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuuuiiii(x64emu_t *emu, uintptr_t fcn) { iFpuuuiiii_t fn = (iFpuuuiiii_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
@@ -6379,7 +6423,9 @@ void vFpiuippppi(x64emu_t *emu, uintptr_t fcn) { vFpiuippppi_t fn = (vFpiuippppi
 void vFpiLLpiipi(x64emu_t *emu, uintptr_t fcn) { vFpiLLpiipi_t fn = (vFpiLLpiipi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFpiLpLiipi(x64emu_t *emu, uintptr_t fcn) { vFpiLpLiipi_t fn = (vFpiLpLiipi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFpipiuiipp(x64emu_t *emu, uintptr_t fcn) { vFpipiuiipp_t fn = (vFpipiuiipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void vFpuuCiuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuCiuuuu_t fn = (vFpuuCiuuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint8_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
 void vFpuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuuuuuuu_t fn = (vFpuuuuuuuu_t)fcn; 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 vFpuppppppp(x64emu_t *emu, uintptr_t fcn) { vFpuppppppp_t fn = (vFpuppppppp_t)fcn; 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**)(R_RSP + 24)); }
 void vFpLiiipiii(x64emu_t *emu, uintptr_t fcn) { vFpLiiipiii_t fn = (vFpLiiipiii_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFpLpLpLLpp(x64emu_t *emu, uintptr_t fcn) { vFpLpLpLLpp_t fn = (vFpLpLpLLpp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFpLpppippp(x64emu_t *emu, uintptr_t fcn) { vFpLpppippp_t fn = (vFpLpppippp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
@@ -6871,6 +6917,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &WFp) return 1;
 	if (fun == &uFv) return 1;
 	if (fun == &uFi) return 1;
+	if (fun == &uFC) return 1;
 	if (fun == &uFu) return 1;
 	if (fun == &uFU) return 1;
 	if (fun == &uFd) return 2;
@@ -6970,6 +7017,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiU) return 1;
 	if (fun == &iFil) return 1;
 	if (fun == &iFip) return 1;
+	if (fun == &iFWW) return 1;
 	if (fun == &iFui) return 1;
 	if (fun == &iFuu) return 1;
 	if (fun == &iFuL) return 1;
@@ -7163,6 +7211,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpid) return 2;
 	if (fun == &vFpiL) return 1;
 	if (fun == &vFpip) return 1;
+	if (fun == &vFpCu) return 1;
 	if (fun == &vFpui) return 1;
 	if (fun == &vFpuI) return 1;
 	if (fun == &vFpuC) return 1;
@@ -7251,6 +7300,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpip) return 1;
 	if (fun == &iFpCu) return 1;
 	if (fun == &iFpCp) return 1;
+	if (fun == &iFpWW) return 1;
 	if (fun == &iFpWu) return 1;
 	if (fun == &iFpWp) return 1;
 	if (fun == &iFpui) return 1;
@@ -7301,6 +7351,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFipL) return 1;
 	if (fun == &uFuii) return 1;
 	if (fun == &uFuip) return 1;
+	if (fun == &uFuCC) return 1;
 	if (fun == &uFuuu) return 1;
 	if (fun == &uFuup) return 1;
 	if (fun == &uFufp) return 2;
@@ -7393,6 +7444,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFCuW) return 1;
 	if (fun == &pFWWW) return 1;
 	if (fun == &pFuip) return 1;
+	if (fun == &pFuCC) return 1;
 	if (fun == &pFuui) return 1;
 	if (fun == &pFuuu) return 1;
 	if (fun == &pFulu) return 1;
@@ -7540,6 +7592,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpCuW) return 1;
 	if (fun == &vFpuii) return 1;
 	if (fun == &vFpuip) return 1;
+	if (fun == &vFpuCC) return 1;
 	if (fun == &vFpuuu) return 1;
 	if (fun == &vFpuup) return 1;
 	if (fun == &vFpufi) return 2;
@@ -7650,6 +7703,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpiid) return 2;
 	if (fun == &iFpiiL) return 1;
 	if (fun == &iFpiip) return 1;
+	if (fun == &iFpiCp) return 1;
 	if (fun == &iFpiuu) return 1;
 	if (fun == &iFpiuL) return 1;
 	if (fun == &iFpiup) return 1;
@@ -7662,6 +7716,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpipp) return 1;
 	if (fun == &iFpCCC) return 1;
 	if (fun == &iFpCpi) return 1;
+	if (fun == &iFpCpu) return 1;
 	if (fun == &iFpCpp) return 1;
 	if (fun == &iFpWWW) return 1;
 	if (fun == &iFpWWu) return 1;
@@ -7684,6 +7739,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpupC) return 1;
 	if (fun == &iFpupu) return 1;
 	if (fun == &iFpupU) return 1;
+	if (fun == &iFpupl) return 1;
 	if (fun == &iFpupL) return 1;
 	if (fun == &iFpupp) return 1;
 	if (fun == &iFpUip) return 1;
@@ -7725,6 +7781,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppuw) return 1;
 	if (fun == &iFppui) return 1;
 	if (fun == &iFppuu) return 1;
+	if (fun == &iFppul) return 1;
 	if (fun == &iFppuL) return 1;
 	if (fun == &iFppup) return 1;
 	if (fun == &iFppdd) return 3;
@@ -7874,6 +7931,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpWWW) return 1;
 	if (fun == &pFpuii) return 1;
 	if (fun == &pFpuip) return 1;
+	if (fun == &pFpuCC) return 1;
 	if (fun == &pFpuuu) return 1;
 	if (fun == &pFpuup) return 1;
 	if (fun == &pFpudd) return 3;
@@ -8063,6 +8121,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppiff) return 3;
 	if (fun == &vFppidd) return 3;
 	if (fun == &vFppipi) return 1;
+	if (fun == &vFppipu) return 1;
 	if (fun == &vFppipp) return 1;
 	if (fun == &vFppWui) return 1;
 	if (fun == &vFppuii) return 1;
@@ -8142,6 +8201,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpippL) return 1;
 	if (fun == &iFpippp) return 1;
 	if (fun == &iFpCCCC) return 1;
+	if (fun == &iFpCCpu) return 1;
 	if (fun == &iFpCupp) return 1;
 	if (fun == &iFpCpip) return 1;
 	if (fun == &iFpuiip) return 1;
@@ -8163,6 +8223,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpupuU) return 1;
 	if (fun == &iFpupup) return 1;
 	if (fun == &iFpupLu) return 1;
+	if (fun == &iFpupLp) return 1;
 	if (fun == &iFpuppu) return 1;
 	if (fun == &iFpuppL) return 1;
 	if (fun == &iFpuppp) return 1;
@@ -8197,6 +8258,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppipu) return 1;
 	if (fun == &iFppipl) return 1;
 	if (fun == &iFppipp) return 1;
+	if (fun == &iFppWpp) return 1;
 	if (fun == &iFppuwp) return 1;
 	if (fun == &iFppuip) return 1;
 	if (fun == &iFppuuu) return 1;
@@ -8447,6 +8509,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuupuu) return 1;
 	if (fun == &vFpuuppp) return 1;
 	if (fun == &vFpudddd) return 5;
+	if (fun == &vFpuLuuu) return 1;
 	if (fun == &vFpupiUu) return 1;
 	if (fun == &vFpupuuu) return 1;
 	if (fun == &vFpupupu) return 1;
@@ -8552,6 +8615,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpCiipp) return 1;
 	if (fun == &iFpCpipu) return 1;
 	if (fun == &iFpWipip) return 1;
+	if (fun == &iFpWCupp) return 1;
 	if (fun == &iFpWpppp) return 1;
 	if (fun == &iFpuiCpp) return 1;
 	if (fun == &iFpuiLpp) return 1;
@@ -8606,6 +8670,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppippu) return 1;
 	if (fun == &iFppippp) return 1;
 	if (fun == &iFppIppp) return 1;
+	if (fun == &iFppCupp) return 1;
 	if (fun == &iFppuiii) return 1;
 	if (fun == &iFppuipp) return 1;
 	if (fun == &iFppuIII) return 1;
@@ -8673,6 +8738,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFpipill) return 1;
 	if (fun == &lFpuuLLp) return 1;
 	if (fun == &lFpluuic) return 1;
+	if (fun == &lFppuppL) return 1;
 	if (fun == &lFppLipp) return 1;
 	if (fun == &lFpppLpp) return 1;
 	if (fun == &LFpipipi) return 1;
@@ -8822,6 +8888,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &WFu) return 1;
 	if (fun == &WFp) return 1;
 	if (fun == &uFv) return 1;
+	if (fun == &uFC) return 1;
 	if (fun == &uFu) return 1;
 	if (fun == &uFU) return 1;
 	if (fun == &uFd) return 2;
@@ -8981,6 +9048,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFLup) return 1;
 	if (fun == &vFLpL) return 1;
 	if (fun == &vFLpp) return 1;
+	if (fun == &vFpCu) return 1;
 	if (fun == &vFpuI) return 1;
 	if (fun == &vFpuC) return 1;
 	if (fun == &vFpuW) return 1;
@@ -9017,6 +9085,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &CFuff) return 3;
 	if (fun == &CFppp) return 1;
 	if (fun == &WFppp) return 1;
+	if (fun == &uFuCC) return 1;
 	if (fun == &uFuuu) return 1;
 	if (fun == &uFuup) return 1;
 	if (fun == &uFufp) return 2;
@@ -9073,6 +9142,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFppp) return 1;
 	if (fun == &pFCuW) return 1;
 	if (fun == &pFWWW) return 1;
+	if (fun == &pFuCC) return 1;
 	if (fun == &pFuuu) return 1;
 	if (fun == &pFulu) return 1;
 	if (fun == &pFulp) return 1;
@@ -9132,6 +9202,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFffff) return 5;
 	if (fun == &vFdddd) return 5;
 	if (fun == &vFpCuW) return 1;
+	if (fun == &vFpuCC) return 1;
 	if (fun == &vFpuuu) return 1;
 	if (fun == &vFpuup) return 1;
 	if (fun == &vFpudd) return 3;
@@ -9220,6 +9291,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFLLpp) return 1;
 	if (fun == &pFLppp) return 1;
 	if (fun == &pFpWWW) return 1;
+	if (fun == &pFpuCC) return 1;
 	if (fun == &pFpuuu) return 1;
 	if (fun == &pFpuup) return 1;
 	if (fun == &pFpudd) return 3;
@@ -9382,6 +9454,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuupuu) return 1;
 	if (fun == &vFpuuppp) return 1;
 	if (fun == &vFpudddd) return 5;
+	if (fun == &vFpuLuuu) return 1;
 	if (fun == &vFpupuuu) return 1;
 	if (fun == &vFpupupu) return 1;
 	if (fun == &vFpuppuu) return 1;
@@ -9421,6 +9494,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFppLppL) return 1;
 	if (fun == &uFpppppp) return 1;
 	if (fun == &lFpuuLLp) return 1;
+	if (fun == &lFppuppL) return 1;
 	if (fun == &lFpppLpp) return 1;
 	if (fun == &LFpLLLLL) return 1;
 	if (fun == &LFppLLpL) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index e439ff4b..8791ac0f 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -97,6 +97,7 @@ void WFu(x64emu_t *emu, uintptr_t fnc);
 void WFp(x64emu_t *emu, uintptr_t fnc);
 void uFv(x64emu_t *emu, uintptr_t fnc);
 void uFi(x64emu_t *emu, uintptr_t fnc);
+void uFC(x64emu_t *emu, uintptr_t fnc);
 void uFu(x64emu_t *emu, uintptr_t fnc);
 void uFU(x64emu_t *emu, uintptr_t fnc);
 void uFd(x64emu_t *emu, uintptr_t fnc);
@@ -236,6 +237,7 @@ void iFiU(x64emu_t *emu, uintptr_t fnc);
 void iFil(x64emu_t *emu, uintptr_t fnc);
 void iFip(x64emu_t *emu, uintptr_t fnc);
 void iFiS(x64emu_t *emu, uintptr_t fnc);
+void iFWW(x64emu_t *emu, uintptr_t fnc);
 void iFui(x64emu_t *emu, uintptr_t fnc);
 void iFuu(x64emu_t *emu, uintptr_t fnc);
 void iFuL(x64emu_t *emu, uintptr_t fnc);
@@ -489,6 +491,7 @@ void vFpid(x64emu_t *emu, uintptr_t fnc);
 void vFpiL(x64emu_t *emu, uintptr_t fnc);
 void vFpip(x64emu_t *emu, uintptr_t fnc);
 void vFpiS(x64emu_t *emu, uintptr_t fnc);
+void vFpCu(x64emu_t *emu, uintptr_t fnc);
 void vFpui(x64emu_t *emu, uintptr_t fnc);
 void vFpuI(x64emu_t *emu, uintptr_t fnc);
 void vFpuC(x64emu_t *emu, uintptr_t fnc);
@@ -595,6 +598,7 @@ void iFpiL(x64emu_t *emu, uintptr_t fnc);
 void iFpip(x64emu_t *emu, uintptr_t fnc);
 void iFpCu(x64emu_t *emu, uintptr_t fnc);
 void iFpCp(x64emu_t *emu, uintptr_t fnc);
+void iFpWW(x64emu_t *emu, uintptr_t fnc);
 void iFpWu(x64emu_t *emu, uintptr_t fnc);
 void iFpWp(x64emu_t *emu, uintptr_t fnc);
 void iFpui(x64emu_t *emu, uintptr_t fnc);
@@ -661,6 +665,7 @@ void uFipu(x64emu_t *emu, uintptr_t fnc);
 void uFipL(x64emu_t *emu, uintptr_t fnc);
 void uFuii(x64emu_t *emu, uintptr_t fnc);
 void uFuip(x64emu_t *emu, uintptr_t fnc);
+void uFuCC(x64emu_t *emu, uintptr_t fnc);
 void uFuuu(x64emu_t *emu, uintptr_t fnc);
 void uFuup(x64emu_t *emu, uintptr_t fnc);
 void uFufp(x64emu_t *emu, uintptr_t fnc);
@@ -780,6 +785,7 @@ void pFipp(x64emu_t *emu, uintptr_t fnc);
 void pFCuW(x64emu_t *emu, uintptr_t fnc);
 void pFWWW(x64emu_t *emu, uintptr_t fnc);
 void pFuip(x64emu_t *emu, uintptr_t fnc);
+void pFuCC(x64emu_t *emu, uintptr_t fnc);
 void pFuui(x64emu_t *emu, uintptr_t fnc);
 void pFuuu(x64emu_t *emu, uintptr_t fnc);
 void pFulu(x64emu_t *emu, uintptr_t fnc);
@@ -972,6 +978,7 @@ void vFpipp(x64emu_t *emu, uintptr_t fnc);
 void vFpCuW(x64emu_t *emu, uintptr_t fnc);
 void vFpuii(x64emu_t *emu, uintptr_t fnc);
 void vFpuip(x64emu_t *emu, uintptr_t fnc);
+void vFpuCC(x64emu_t *emu, uintptr_t fnc);
 void vFpuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuup(x64emu_t *emu, uintptr_t fnc);
 void vFpufi(x64emu_t *emu, uintptr_t fnc);
@@ -1111,6 +1118,7 @@ void iFpiiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiid(x64emu_t *emu, uintptr_t fnc);
 void iFpiiL(x64emu_t *emu, uintptr_t fnc);
 void iFpiip(x64emu_t *emu, uintptr_t fnc);
+void iFpiCp(x64emu_t *emu, uintptr_t fnc);
 void iFpiuu(x64emu_t *emu, uintptr_t fnc);
 void iFpiuL(x64emu_t *emu, uintptr_t fnc);
 void iFpiup(x64emu_t *emu, uintptr_t fnc);
@@ -1124,6 +1132,7 @@ void iFpipp(x64emu_t *emu, uintptr_t fnc);
 void iFpipV(x64emu_t *emu, uintptr_t fnc);
 void iFpCCC(x64emu_t *emu, uintptr_t fnc);
 void iFpCpi(x64emu_t *emu, uintptr_t fnc);
+void iFpCpu(x64emu_t *emu, uintptr_t fnc);
 void iFpCpp(x64emu_t *emu, uintptr_t fnc);
 void iFpWWW(x64emu_t *emu, uintptr_t fnc);
 void iFpWWu(x64emu_t *emu, uintptr_t fnc);
@@ -1146,6 +1155,7 @@ void iFpupi(x64emu_t *emu, uintptr_t fnc);
 void iFpupC(x64emu_t *emu, uintptr_t fnc);
 void iFpupu(x64emu_t *emu, uintptr_t fnc);
 void iFpupU(x64emu_t *emu, uintptr_t fnc);
+void iFpupl(x64emu_t *emu, uintptr_t fnc);
 void iFpupL(x64emu_t *emu, uintptr_t fnc);
 void iFpupp(x64emu_t *emu, uintptr_t fnc);
 void iFpupV(x64emu_t *emu, uintptr_t fnc);
@@ -1189,6 +1199,7 @@ void iFppCC(x64emu_t *emu, uintptr_t fnc);
 void iFppuw(x64emu_t *emu, uintptr_t fnc);
 void iFppui(x64emu_t *emu, uintptr_t fnc);
 void iFppuu(x64emu_t *emu, uintptr_t fnc);
+void iFppul(x64emu_t *emu, uintptr_t fnc);
 void iFppuL(x64emu_t *emu, uintptr_t fnc);
 void iFppup(x64emu_t *emu, uintptr_t fnc);
 void iFppdd(x64emu_t *emu, uintptr_t fnc);
@@ -1378,6 +1389,7 @@ void pFpCip(x64emu_t *emu, uintptr_t fnc);
 void pFpWWW(x64emu_t *emu, uintptr_t fnc);
 void pFpuii(x64emu_t *emu, uintptr_t fnc);
 void pFpuip(x64emu_t *emu, uintptr_t fnc);
+void pFpuCC(x64emu_t *emu, uintptr_t fnc);
 void pFpuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpuup(x64emu_t *emu, uintptr_t fnc);
 void pFpudd(x64emu_t *emu, uintptr_t fnc);
@@ -1615,6 +1627,7 @@ void vFppiup(x64emu_t *emu, uintptr_t fnc);
 void vFppiff(x64emu_t *emu, uintptr_t fnc);
 void vFppidd(x64emu_t *emu, uintptr_t fnc);
 void vFppipi(x64emu_t *emu, uintptr_t fnc);
+void vFppipu(x64emu_t *emu, uintptr_t fnc);
 void vFppipp(x64emu_t *emu, uintptr_t fnc);
 void vFppWui(x64emu_t *emu, uintptr_t fnc);
 void vFppuii(x64emu_t *emu, uintptr_t fnc);
@@ -1720,6 +1733,7 @@ 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 iFpCCpu(x64emu_t *emu, uintptr_t fnc);
 void iFpCupp(x64emu_t *emu, uintptr_t fnc);
 void iFpCpip(x64emu_t *emu, uintptr_t fnc);
 void iFpuiip(x64emu_t *emu, uintptr_t fnc);
@@ -1741,6 +1755,7 @@ 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 iFpupLp(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);
@@ -1775,6 +1790,7 @@ void iFppipi(x64emu_t *emu, uintptr_t fnc);
 void iFppipu(x64emu_t *emu, uintptr_t fnc);
 void iFppipl(x64emu_t *emu, uintptr_t fnc);
 void iFppipp(x64emu_t *emu, uintptr_t fnc);
+void iFppWpp(x64emu_t *emu, uintptr_t fnc);
 void iFppuwp(x64emu_t *emu, uintptr_t fnc);
 void iFppuip(x64emu_t *emu, uintptr_t fnc);
 void iFppuuu(x64emu_t *emu, uintptr_t fnc);
@@ -2095,6 +2111,7 @@ void vFpuuupp(x64emu_t *emu, uintptr_t fnc);
 void vFpuupuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuppp(x64emu_t *emu, uintptr_t fnc);
 void vFpudddd(x64emu_t *emu, uintptr_t fnc);
+void vFpuLuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpupiUu(x64emu_t *emu, uintptr_t fnc);
 void vFpupuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpupupu(x64emu_t *emu, uintptr_t fnc);
@@ -2218,6 +2235,7 @@ void iFpipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpCiipp(x64emu_t *emu, uintptr_t fnc);
 void iFpCpipu(x64emu_t *emu, uintptr_t fnc);
 void iFpWipip(x64emu_t *emu, uintptr_t fnc);
+void iFpWCupp(x64emu_t *emu, uintptr_t fnc);
 void iFpWpppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiCpp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiLpp(x64emu_t *emu, uintptr_t fnc);
@@ -2272,6 +2290,7 @@ void iFppippi(x64emu_t *emu, uintptr_t fnc);
 void iFppippu(x64emu_t *emu, uintptr_t fnc);
 void iFppippp(x64emu_t *emu, uintptr_t fnc);
 void iFppIppp(x64emu_t *emu, uintptr_t fnc);
+void iFppCupp(x64emu_t *emu, uintptr_t fnc);
 void iFppuiii(x64emu_t *emu, uintptr_t fnc);
 void iFppuipp(x64emu_t *emu, uintptr_t fnc);
 void iFppuIII(x64emu_t *emu, uintptr_t fnc);
@@ -2351,6 +2370,7 @@ void lFipLpLL(x64emu_t *emu, uintptr_t fnc);
 void lFpipill(x64emu_t *emu, uintptr_t fnc);
 void lFpuuLLp(x64emu_t *emu, uintptr_t fnc);
 void lFpluuic(x64emu_t *emu, uintptr_t fnc);
+void lFppuppL(x64emu_t *emu, uintptr_t fnc);
 void lFppLipp(x64emu_t *emu, uintptr_t fnc);
 void lFpppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFEuuppp(x64emu_t *emu, uintptr_t fnc);
@@ -2869,6 +2889,7 @@ void iFpCCWWpWu(x64emu_t *emu, uintptr_t fnc);
 void iFpWCuWCuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuiipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuippLpp(x64emu_t *emu, uintptr_t fnc);
+void iFpuCiuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuuiiuuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuuipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuuiiii(x64emu_t *emu, uintptr_t fnc);
@@ -3010,7 +3031,9 @@ void vFpiuippppi(x64emu_t *emu, uintptr_t fnc);
 void vFpiLLpiipi(x64emu_t *emu, uintptr_t fnc);
 void vFpiLpLiipi(x64emu_t *emu, uintptr_t fnc);
 void vFpipiuiipp(x64emu_t *emu, uintptr_t fnc);
+void vFpuuCiuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
+void vFpuppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiipiii(x64emu_t *emu, uintptr_t fnc);
 void vFpLpLpLLpp(x64emu_t *emu, uintptr_t fnc);
 void vFpLpppippp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgstrtp_private.h b/src/wrapped/wrappedgstrtp_private.h
index 91c55cb5..1f1bad0a 100644
--- a/src/wrapped/wrappedgstrtp_private.h
+++ b/src/wrapped/wrappedgstrtp_private.h
@@ -1,215 +1,215 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
-//GO(gst_buffer_add_rtp_source_meta, 
-//GO(gst_buffer_get_rtp_source_meta, 
-//GO(gst_rtcp_buffer_add_packet, 
-//GO(gst_rtcp_buffer_get_first_packet, 
-//GO(gst_rtcp_buffer_get_packet_count, 
-//GO(gst_rtcp_buffer_map, 
-//GO(gst_rtcp_buffer_new, 
-//GO(gst_rtcp_buffer_new_copy_data, 
-//GO(gst_rtcp_buffer_new_take_data, 
-//GO(gst_rtcp_buffer_unmap, 
-//GO(gst_rtcp_buffer_validate, 
-//GO(gst_rtcp_buffer_validate_data, 
-//GO(gst_rtcp_buffer_validate_data_reduced, 
-//GO(gst_rtcp_buffer_validate_reduced, 
+GO(gst_buffer_add_rtp_source_meta, pFpppu)
+GO(gst_buffer_get_rtp_source_meta, pFp)
+GO(gst_rtcp_buffer_add_packet, iFpup)
+GO(gst_rtcp_buffer_get_first_packet, iFpp)
+GO(gst_rtcp_buffer_get_packet_count, uFp)
+GO(gst_rtcp_buffer_map, iFpup)
+GO(gst_rtcp_buffer_new, pFu)
+GO(gst_rtcp_buffer_new_copy_data, pFpu)
+GO(gst_rtcp_buffer_new_take_data, pFpu)
+GO(gst_rtcp_buffer_unmap, iFp)
+GO(gst_rtcp_buffer_validate, iFp)
+GO(gst_rtcp_buffer_validate_data, iFpu)
+GO(gst_rtcp_buffer_validate_data_reduced, iFpu)
+GO(gst_rtcp_buffer_validate_reduced, iFp)
 GO(gst_rtcpfb_type_get_type, LFv)
-//GO(gst_rtcp_ntp_to_unix, 
-//GO(gst_rtcp_packet_add_profile_specific_ext, 
-//GO(gst_rtcp_packet_add_rb, 
-//GO(gst_rtcp_packet_app_get_data, 
-//GO(gst_rtcp_packet_app_get_data_length, 
-//GO(gst_rtcp_packet_app_get_name, 
-//GO(gst_rtcp_packet_app_get_ssrc, 
-//GO(gst_rtcp_packet_app_get_subtype, 
-//GO(gst_rtcp_packet_app_set_data_length, 
-//GO(gst_rtcp_packet_app_set_name, 
-//GO(gst_rtcp_packet_app_set_ssrc, 
-//GO(gst_rtcp_packet_app_set_subtype, 
-//GO(gst_rtcp_packet_bye_add_ssrc, 
-//GO(gst_rtcp_packet_bye_add_ssrcs, 
-//GO(gst_rtcp_packet_bye_get_nth_ssrc, 
-//GO(gst_rtcp_packet_bye_get_reason, 
-//GO(gst_rtcp_packet_bye_get_reason_len, 
-//GO(gst_rtcp_packet_bye_get_ssrc_count, 
-//GO(gst_rtcp_packet_bye_set_reason, 
-//GO(gst_rtcp_packet_copy_profile_specific_ext, 
-//GO(gst_rtcp_packet_fb_get_fci, 
-//GO(gst_rtcp_packet_fb_get_fci_length, 
-//GO(gst_rtcp_packet_fb_get_media_ssrc, 
-//GO(gst_rtcp_packet_fb_get_sender_ssrc, 
-GO(gst_rtcp_packet_fb_get_type, LFv)
-//GO(gst_rtcp_packet_fb_set_fci_length, 
-//GO(gst_rtcp_packet_fb_set_media_ssrc, 
-//GO(gst_rtcp_packet_fb_set_sender_ssrc, 
-//GO(gst_rtcp_packet_fb_set_type, 
-//GO(gst_rtcp_packet_get_count, 
-//GO(gst_rtcp_packet_get_length, 
-//GO(gst_rtcp_packet_get_padding, 
-//GO(gst_rtcp_packet_get_profile_specific_ext, 
-//GO(gst_rtcp_packet_get_profile_specific_ext_length, 
-//GO(gst_rtcp_packet_get_rb, 
-//GO(gst_rtcp_packet_get_rb_count, 
-GO(gst_rtcp_packet_get_type, LFv)
-//GO(gst_rtcp_packet_move_to_next, 
-//GO(gst_rtcp_packet_remove, 
-//GO(gst_rtcp_packet_rr_get_ssrc, 
-//GO(gst_rtcp_packet_rr_set_ssrc, 
-//GO(gst_rtcp_packet_sdes_add_entry, 
-//GO(gst_rtcp_packet_sdes_add_item, 
-//GO(gst_rtcp_packet_sdes_copy_entry, 
-//GO(gst_rtcp_packet_sdes_first_entry, 
-//GO(gst_rtcp_packet_sdes_first_item, 
-//GO(gst_rtcp_packet_sdes_get_entry, 
-//GO(gst_rtcp_packet_sdes_get_item_count, 
-//GO(gst_rtcp_packet_sdes_get_ssrc, 
-//GO(gst_rtcp_packet_sdes_next_entry, 
-//GO(gst_rtcp_packet_sdes_next_item, 
-//GO(gst_rtcp_packet_set_rb, 
-//GO(gst_rtcp_packet_sr_get_sender_info, 
-//GO(gst_rtcp_packet_sr_set_sender_info, 
-//GO(gst_rtcp_packet_xr_first_rb, 
-//GO(gst_rtcp_packet_xr_get_block_length, 
-//GO(gst_rtcp_packet_xr_get_block_type, 
-//GO(gst_rtcp_packet_xr_get_dlrr_block, 
-//GO(gst_rtcp_packet_xr_get_prt_by_seq, 
-//GO(gst_rtcp_packet_xr_get_prt_info, 
-//GO(gst_rtcp_packet_xr_get_rle_info, 
-//GO(gst_rtcp_packet_xr_get_rle_nth_chunk, 
-//GO(gst_rtcp_packet_xr_get_rrt, 
-//GO(gst_rtcp_packet_xr_get_ssrc, 
-//GO(gst_rtcp_packet_xr_get_summary_info, 
-//GO(gst_rtcp_packet_xr_get_summary_jitter, 
-//GO(gst_rtcp_packet_xr_get_summary_pkt, 
-//GO(gst_rtcp_packet_xr_get_summary_ttl, 
-//GO(gst_rtcp_packet_xr_get_voip_burst_metrics, 
-//GO(gst_rtcp_packet_xr_get_voip_configuration_params, 
-//GO(gst_rtcp_packet_xr_get_voip_delay_metrics, 
-//GO(gst_rtcp_packet_xr_get_voip_jitter_buffer_params, 
-//GO(gst_rtcp_packet_xr_get_voip_metrics_ssrc, 
-//GO(gst_rtcp_packet_xr_get_voip_packet_metrics, 
-//GO(gst_rtcp_packet_xr_get_voip_quality_metrics, 
-//GO(gst_rtcp_packet_xr_get_voip_signal_metrics, 
-//GO(gst_rtcp_packet_xr_next_rb, 
-//GO(gst_rtcp_sdes_name_to_type, 
+GO(gst_rtcp_ntp_to_unix, LFL)
+GO(gst_rtcp_packet_add_profile_specific_ext, iFppu)
+GO(gst_rtcp_packet_add_rb, iFpuCiuuuu)
+GO(gst_rtcp_packet_app_get_data, pFp)
+GO(gst_rtcp_packet_app_get_data_length, WFp)
+GO(gst_rtcp_packet_app_get_name, pFp)
+GO(gst_rtcp_packet_app_get_ssrc, uFp)
+GO(gst_rtcp_packet_app_get_subtype, CFp)
+GO(gst_rtcp_packet_app_set_data_length, iFpW)
+GO(gst_rtcp_packet_app_set_name, vFpp)
+GO(gst_rtcp_packet_app_set_ssrc, vFpu)
+GO(gst_rtcp_packet_app_set_subtype, vFpC)
+GO(gst_rtcp_packet_bye_add_ssrc, iFpu)
+GO(gst_rtcp_packet_bye_add_ssrcs, iFppu)
+GO(gst_rtcp_packet_bye_get_nth_ssrc, uFpu)
+GO(gst_rtcp_packet_bye_get_reason, pFp)
+GO(gst_rtcp_packet_bye_get_reason_len, CFp)
+GO(gst_rtcp_packet_bye_get_ssrc_count, uFp)
+GO(gst_rtcp_packet_bye_set_reason, iFpp)
+GO(gst_rtcp_packet_copy_profile_specific_ext, iFppp)
+GO(gst_rtcp_packet_fb_get_fci, pFp)
+GO(gst_rtcp_packet_fb_get_fci_length, WFp)
+GO(gst_rtcp_packet_fb_get_media_ssrc, uFp)
+GO(gst_rtcp_packet_fb_get_sender_ssrc, uFp)
+GO(gst_rtcp_packet_fb_get_type, uFp)
+GO(gst_rtcp_packet_fb_set_fci_length, iFpW)
+GO(gst_rtcp_packet_fb_set_media_ssrc, vFpu)
+GO(gst_rtcp_packet_fb_set_sender_ssrc, vFpu)
+GO(gst_rtcp_packet_fb_set_type, vFpu)
+GO(gst_rtcp_packet_get_count, CFp)
+GO(gst_rtcp_packet_get_length, WFp)
+GO(gst_rtcp_packet_get_padding, iFp)
+GO(gst_rtcp_packet_get_profile_specific_ext, iFppp)
+GO(gst_rtcp_packet_get_profile_specific_ext_length, WFp)
+GO(gst_rtcp_packet_get_rb, vFpuppppppp)
+GO(gst_rtcp_packet_get_rb_count, uFp)
+GO(gst_rtcp_packet_get_type, uFp)
+GO(gst_rtcp_packet_move_to_next, iFp)
+GO(gst_rtcp_packet_remove, iFp)
+GO(gst_rtcp_packet_rr_get_ssrc, uFp)
+GO(gst_rtcp_packet_rr_set_ssrc, vFpu)
+GO(gst_rtcp_packet_sdes_add_entry, iFpiCp)
+GO(gst_rtcp_packet_sdes_add_item, iFpu)
+GO(gst_rtcp_packet_sdes_copy_entry, iFpppp)
+GO(gst_rtcp_packet_sdes_first_entry, iFp)
+GO(gst_rtcp_packet_sdes_first_item, iFp)
+GO(gst_rtcp_packet_sdes_get_entry, iFpppp)
+GO(gst_rtcp_packet_sdes_get_item_count, uFp)
+GO(gst_rtcp_packet_sdes_get_ssrc, uFp)
+GO(gst_rtcp_packet_sdes_next_entry, iFp)
+GO(gst_rtcp_packet_sdes_next_item, iFp)
+GO(gst_rtcp_packet_set_rb, vFpuuCiuuuu)
+GO(gst_rtcp_packet_sr_get_sender_info, vFpppppp)
+GO(gst_rtcp_packet_sr_set_sender_info, vFpuLuuu)
+GO(gst_rtcp_packet_xr_first_rb, iFp)
+GO(gst_rtcp_packet_xr_get_block_length, WFp)
+GO(gst_rtcp_packet_xr_get_block_type, iFp)
+GO(gst_rtcp_packet_xr_get_dlrr_block, iFpuppp)
+GO(gst_rtcp_packet_xr_get_prt_by_seq, iFpWp)
+GO(gst_rtcp_packet_xr_get_prt_info, iFppppp)
+GO(gst_rtcp_packet_xr_get_rle_info, iFpppppp)
+GO(gst_rtcp_packet_xr_get_rle_nth_chunk, iFpup)
+GO(gst_rtcp_packet_xr_get_rrt, iFpp)
+GO(gst_rtcp_packet_xr_get_ssrc, uFp)
+GO(gst_rtcp_packet_xr_get_summary_info, iFpppp)
+GO(gst_rtcp_packet_xr_get_summary_jitter, iFppppp)
+GO(gst_rtcp_packet_xr_get_summary_pkt, iFppp)
+GO(gst_rtcp_packet_xr_get_summary_ttl, iFpppppp)
+GO(gst_rtcp_packet_xr_get_voip_burst_metrics, iFppppp)
+GO(gst_rtcp_packet_xr_get_voip_configuration_params, iFppp)
+GO(gst_rtcp_packet_xr_get_voip_delay_metrics, iFppp)
+GO(gst_rtcp_packet_xr_get_voip_jitter_buffer_params, iFpppp)
+GO(gst_rtcp_packet_xr_get_voip_metrics_ssrc, iFpp)
+GO(gst_rtcp_packet_xr_get_voip_packet_metrics, iFppp)
+GO(gst_rtcp_packet_xr_get_voip_quality_metrics, iFppppp)
+GO(gst_rtcp_packet_xr_get_voip_signal_metrics, iFppppp)
+GO(gst_rtcp_packet_xr_next_rb, iFp)
+GO(gst_rtcp_sdes_name_to_type, iFp)
 GO(gst_rtcpsdes_type_get_type, LFv)
-//GO(gst_rtcp_sdes_type_to_name, 
+GO(gst_rtcp_sdes_type_to_name, pFi)
 GO(gst_rtcp_type_get_type, LFv)
-//GO(gst_rtcp_unix_to_ntp, 
+GO(gst_rtcp_unix_to_ntp, LFL)
 GO(gst_rtcpxr_type_get_type, LFv)
-//GO(gst_rtp_base_audio_payload_flush, 
-//GO(gst_rtp_base_audio_payload_get_adapter, 
+GO(gst_rtp_base_audio_payload_flush, iFpuL)
+GO(gst_rtp_base_audio_payload_get_adapter, pFp)
 GO(gst_rtp_base_audio_payload_get_type, LFv)
-//GO(gst_rtp_base_audio_payload_push, 
-//GO(gst_rtp_base_audio_payload_set_frame_based, 
-//GO(gst_rtp_base_audio_payload_set_frame_options, 
-//GO(gst_rtp_base_audio_payload_set_sample_based, 
-//GO(gst_rtp_base_audio_payload_set_samplebits_options, 
-//GO(gst_rtp_base_audio_payload_set_sample_options, 
+GO(gst_rtp_base_audio_payload_push, iFppuL)
+GO(gst_rtp_base_audio_payload_set_frame_based, vFp)
+GO(gst_rtp_base_audio_payload_set_frame_options, vFpii)
+GO(gst_rtp_base_audio_payload_set_sample_based, vFp)
+GO(gst_rtp_base_audio_payload_set_samplebits_options, vFpi)
+GO(gst_rtp_base_audio_payload_set_sample_options, vFpi)
 GO(gst_rtp_base_depayload_get_type, LFv)
-//GO(gst_rtp_base_depayload_is_source_info_enabled, 
-//GO(gst_rtp_base_depayload_push, 
-//GO(gst_rtp_base_depayload_push_list, 
-//GO(gst_rtp_base_depayload_set_source_info_enabled, 
-//GO(gst_rtp_base_payload_allocate_output_buffer, 
-//GO(gst_rtp_base_payload_get_source_count, 
+GO(gst_rtp_base_depayload_is_source_info_enabled, iFp)
+GO(gst_rtp_base_depayload_push, iFpp)
+GO(gst_rtp_base_depayload_push_list, iFpp)
+GO(gst_rtp_base_depayload_set_source_info_enabled, vFpi)
+GO(gst_rtp_base_payload_allocate_output_buffer, pFpuCC)
+GO(gst_rtp_base_payload_get_source_count, uFpp)
 GO(gst_rtp_base_payload_get_type, LFv)
-//GO(gst_rtp_base_payload_is_filled, 
-//GO(gst_rtp_base_payload_is_source_info_enabled, 
-//GO(gst_rtp_base_payload_push, 
-//GO(gst_rtp_base_payload_push_list, 
-//GO(gst_rtp_base_payload_set_options, 
-//GO(gst_rtp_base_payload_set_outcaps, 
-//GO(gst_rtp_base_payload_set_outcaps_structure, 
-//GO(gst_rtp_base_payload_set_source_info_enabled, 
-//GO(gst_rtp_buffer_add_extension_onebyte_header, 
-//GO(gst_rtp_buffer_add_extension_twobytes_header, 
-//GO(gst_rtp_buffer_allocate_data, 
-//GO(gst_rtp_buffer_calc_header_len, 
-//GO(gst_rtp_buffer_calc_packet_len, 
-//GO(gst_rtp_buffer_calc_payload_len, 
-//GO(gst_rtp_buffer_compare_seqnum, 
-//GO(gst_rtp_buffer_default_clock_rate, 
-//GO(gst_rtp_buffer_ext_timestamp, 
+GO(gst_rtp_base_payload_is_filled, iFpuL)
+GO(gst_rtp_base_payload_is_source_info_enabled, iFp)
+GO(gst_rtp_base_payload_push, iFpp)
+GO(gst_rtp_base_payload_push_list, iFpp)
+GO(gst_rtp_base_payload_set_options, vFppipu)
+//GOM(gst_rtp_base_payload_set_outcaps, iFEppV)
+GO(gst_rtp_base_payload_set_outcaps_structure, iFpp)
+GO(gst_rtp_base_payload_set_source_info_enabled, vFpi)
+GO(gst_rtp_buffer_add_extension_onebyte_header, iFpCpu)
+GO(gst_rtp_buffer_add_extension_twobytes_header, iFpCCpu)
+GO(gst_rtp_buffer_allocate_data, vFpuCC)
+GO(gst_rtp_buffer_calc_header_len, uFC)
+GO(gst_rtp_buffer_calc_packet_len, uFuCC)
+GO(gst_rtp_buffer_calc_payload_len, uFuCC)
+GO(gst_rtp_buffer_compare_seqnum, iFWW)
+GO(gst_rtp_buffer_default_clock_rate, uFC)
+GO(gst_rtp_buffer_ext_timestamp, LFpu)
 GO(gst_rtp_buffer_flags_get_type, LFv)
-//GO(gst_rtp_buffer_get_csrc, 
-//GO(gst_rtp_buffer_get_csrc_count, 
-//GO(gst_rtp_buffer_get_extension, 
-//GO(gst_rtp_buffer_get_extension_bytes, 
-//GO(gst_rtp_buffer_get_extension_data, 
-//GO(gst_rtp_buffer_get_extension_onebyte_header, 
-//GO(gst_rtp_buffer_get_extension_onebyte_header_from_bytes, 
-//GO(gst_rtp_buffer_get_extension_twobytes_header, 
-//GO(gst_rtp_buffer_get_header_len, 
-//GO(gst_rtp_buffer_get_marker, 
-//GO(gst_rtp_buffer_get_packet_len, 
-//GO(gst_rtp_buffer_get_padding, 
-//GO(gst_rtp_buffer_get_payload, 
-//GO(gst_rtp_buffer_get_payload_buffer, 
-//GO(gst_rtp_buffer_get_payload_bytes, 
-//GO(gst_rtp_buffer_get_payload_len, 
-//GO(gst_rtp_buffer_get_payload_subbuffer, 
-//GO(gst_rtp_buffer_get_payload_type, 
-//GO(gst_rtp_buffer_get_seq, 
-//GO(gst_rtp_buffer_get_ssrc, 
-//GO(gst_rtp_buffer_get_timestamp, 
-//GO(gst_rtp_buffer_get_version, 
-//GO(gst_rtp_buffer_map, 
+GO(gst_rtp_buffer_get_csrc, uFpC)
+GO(gst_rtp_buffer_get_csrc_count, CFp)
+GO(gst_rtp_buffer_get_extension, iFp)
+GO(gst_rtp_buffer_get_extension_bytes, pFpp)
+GO(gst_rtp_buffer_get_extension_data, iFpppp)
+GO(gst_rtp_buffer_get_extension_onebyte_header, iFpCupp)
+GO(gst_rtp_buffer_get_extension_onebyte_header_from_bytes, iFpWCupp)
+GO(gst_rtp_buffer_get_extension_twobytes_header, iFppCupp)
+GO(gst_rtp_buffer_get_header_len, uFp)
+GO(gst_rtp_buffer_get_marker, iFp)
+GO(gst_rtp_buffer_get_packet_len, uFp)
+GO(gst_rtp_buffer_get_padding, iFp)
+GO(gst_rtp_buffer_get_payload, pFp)
+GO(gst_rtp_buffer_get_payload_buffer, pFp)
+GO(gst_rtp_buffer_get_payload_bytes, pFp)
+GO(gst_rtp_buffer_get_payload_len, uFp)
+GO(gst_rtp_buffer_get_payload_subbuffer, pFpuu)
+GO(gst_rtp_buffer_get_payload_type, CFp)
+GO(gst_rtp_buffer_get_seq, WFp)
+GO(gst_rtp_buffer_get_ssrc, uFp)
+GO(gst_rtp_buffer_get_timestamp, uFp)
+GO(gst_rtp_buffer_get_version, CFp)
+GO(gst_rtp_buffer_map, iFpup)
 GO(gst_rtp_buffer_map_flags_get_type, LFv)
-//GO(gst_rtp_buffer_new_allocate, 
-//GO(gst_rtp_buffer_new_allocate_len, 
-//GO(gst_rtp_buffer_new_copy_data, 
-//GO(gst_rtp_buffer_new_take_data, 
-//GO(gst_rtp_buffer_pad_to, 
-//GO(gst_rtp_buffer_remove_extension_data, 
-//GO(gst_rtp_buffer_set_csrc, 
-//GO(gst_rtp_buffer_set_extension, 
-//GO(gst_rtp_buffer_set_extension_data, 
-//GO(gst_rtp_buffer_set_marker, 
-//GO(gst_rtp_buffer_set_packet_len, 
-//GO(gst_rtp_buffer_set_padding, 
-//GO(gst_rtp_buffer_set_payload_type, 
-//GO(gst_rtp_buffer_set_seq, 
-//GO(gst_rtp_buffer_set_ssrc, 
-//GO(gst_rtp_buffer_set_timestamp, 
-//GO(gst_rtp_buffer_set_version, 
-//GO(gst_rtp_buffer_unmap, 
-//GO(gst_rtp_get_header_extension_list, 
-//GO(gst_rtp_hdrext_get_ntp_56, 
-//GO(gst_rtp_hdrext_get_ntp_64, 
-//GO(gst_rtp_hdrext_set_ntp_56, 
-//GO(gst_rtp_hdrext_set_ntp_64, 
-//GO(gst_rtp_header_extension_class_set_uri, 
-//GO(gst_rtp_header_extension_create_from_uri, 
+GO(gst_rtp_buffer_new_allocate, pFuCC)
+GO(gst_rtp_buffer_new_allocate_len, pFuCC)
+GO(gst_rtp_buffer_new_copy_data, pFpL)
+GO(gst_rtp_buffer_new_take_data, pFpL)
+GO(gst_rtp_buffer_pad_to, vFpu)
+GO(gst_rtp_buffer_remove_extension_data, vFp)
+GO(gst_rtp_buffer_set_csrc, vFpCu)
+GO(gst_rtp_buffer_set_extension, vFpi)
+GO(gst_rtp_buffer_set_extension_data, iFpWW)
+GO(gst_rtp_buffer_set_marker, vFpi)
+GO(gst_rtp_buffer_set_packet_len, vFpu)
+GO(gst_rtp_buffer_set_padding, vFpi)
+GO(gst_rtp_buffer_set_payload_type, vFpC)
+GO(gst_rtp_buffer_set_seq, vFpW)
+GO(gst_rtp_buffer_set_ssrc, vFpu)
+GO(gst_rtp_buffer_set_timestamp, vFpu)
+GO(gst_rtp_buffer_set_version, vFpC)
+GO(gst_rtp_buffer_unmap, vFp)
+GO(gst_rtp_get_header_extension_list, pFv)
+GO(gst_rtp_hdrext_get_ntp_56, iFpup)
+GO(gst_rtp_hdrext_get_ntp_64, iFpup)
+GO(gst_rtp_hdrext_set_ntp_56, iFpuL)
+GO(gst_rtp_hdrext_set_ntp_64, iFpuL)
+GO(gst_rtp_header_extension_class_set_uri, vFpp)
+GO(gst_rtp_header_extension_create_from_uri, pFp)
 GO(gst_rtp_header_extension_direction_get_type, LFv)
 GO(gst_rtp_header_extension_flags_get_type, LFv)
-//GO(gst_rtp_header_extension_get_direction, 
-//GO(gst_rtp_header_extension_get_id, 
-//GO(gst_rtp_header_extension_get_max_size, 
-//GO(gst_rtp_header_extension_get_sdp_caps_field_name, 
-//GO(gst_rtp_header_extension_get_supported_flags, 
+GO(gst_rtp_header_extension_get_direction, uFp)
+GO(gst_rtp_header_extension_get_id, uFp)
+GO(gst_rtp_header_extension_get_max_size, LFpp)
+GO(gst_rtp_header_extension_get_sdp_caps_field_name, pFp)
+GO(gst_rtp_header_extension_get_supported_flags, uFp)
 GO(gst_rtp_header_extension_get_type, LFv)
-//GO(gst_rtp_header_extension_get_uri, 
-//GO(gst_rtp_header_extension_read, 
-//GO(gst_rtp_header_extension_set_attributes_from_caps, 
-//GO(gst_rtp_header_extension_set_caps_from_attributes, 
-//GO(gst_rtp_header_extension_set_caps_from_attributes_helper, 
-//GO(gst_rtp_header_extension_set_direction, 
-//GO(gst_rtp_header_extension_set_id, 
-//GO(gst_rtp_header_extension_set_non_rtp_sink_caps, 
-//GO(gst_rtp_header_extension_set_wants_update_non_rtp_src_caps, 
-//GO(gst_rtp_header_extension_update_non_rtp_src_caps, 
-//GO(gst_rtp_header_extension_wants_update_non_rtp_src_caps, 
-//GO(gst_rtp_header_extension_write, 
+GO(gst_rtp_header_extension_get_uri, pFp)
+GO(gst_rtp_header_extension_read, iFpupLp)
+GO(gst_rtp_header_extension_set_attributes_from_caps, iFpp)
+GO(gst_rtp_header_extension_set_caps_from_attributes, iFpp)
+GO(gst_rtp_header_extension_set_caps_from_attributes_helper, iFppp)
+GO(gst_rtp_header_extension_set_direction, vFpu)
+GO(gst_rtp_header_extension_set_id, vFpu)
+GO(gst_rtp_header_extension_set_non_rtp_sink_caps, iFpp)
+GO(gst_rtp_header_extension_set_wants_update_non_rtp_src_caps, vFpi)
+GO(gst_rtp_header_extension_update_non_rtp_src_caps, iFpp)
+GO(gst_rtp_header_extension_wants_update_non_rtp_src_caps, iFp)
+GO(gst_rtp_header_extension_write, lFppuppL)
 GO(gst_rtp_payload_get_type, LFv)
-//GO(gst_rtp_payload_info_for_name, 
-//GO(gst_rtp_payload_info_for_pt, 
+GO(gst_rtp_payload_info_for_name, pFpp)
+GO(gst_rtp_payload_info_for_pt, pFC)
 GO(gst_rtp_profile_get_type, LFv)
 GO(gst_rtp_source_meta_api_get_type, LFv)
-//GO(gst_rtp_source_meta_append_csrc, 
-//GO(gst_rtp_source_meta_get_info, 
-//GO(gst_rtp_source_meta_get_source_count, 
-//GO(gst_rtp_source_meta_set_ssrc, 
+GO(gst_rtp_source_meta_append_csrc, iFppu)
+GO(gst_rtp_source_meta_get_info, pFv)
+GO(gst_rtp_source_meta_get_source_count, uFp)
+GO(gst_rtp_source_meta_set_ssrc, iFpp)
diff --git a/src/wrapped/wrappedgstrtsp_private.h b/src/wrapped/wrappedgstrtsp_private.h
index f9d9ebfc..992f89bd 100644
--- a/src/wrapped/wrappedgstrtsp_private.h
+++ b/src/wrapped/wrappedgstrtsp_private.h
@@ -1,170 +1,170 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(gst_rtsp_auth_credential_get_type, LFv)
-//GO(gst_rtsp_auth_credentials_free, 
+GO(gst_rtsp_auth_credentials_free, vFp)
 GO(gst_rtsp_auth_method_get_type, LFv)
-//GO(gst_rtsp_auth_param_copy, 
-//GO(gst_rtsp_auth_param_free, 
+GO(gst_rtsp_auth_param_copy, pFp)
+GO(gst_rtsp_auth_param_free, vFp)
 GO(gst_rtsp_auth_param_get_type, LFv)
-//GO(gst_rtsp_connection_accept, 
-//GO(gst_rtsp_connection_clear_auth_params, 
-//GO(gst_rtsp_connection_close, 
-//GO(gst_rtsp_connection_connect, 
-//GO(gst_rtsp_connection_connect_usec, 
-//GO(gst_rtsp_connection_connect_with_response, 
-//GO(gst_rtsp_connection_connect_with_response_usec, 
-//GO(gst_rtsp_connection_create, 
-//GO(gst_rtsp_connection_create_from_socket, 
-//GO(gst_rtsp_connection_do_tunnel, 
-//GO(gst_rtsp_connection_flush, 
-//GO(gst_rtsp_connection_free, 
-//GO(gst_rtsp_connection_get_ignore_x_server_reply, 
-//GO(gst_rtsp_connection_get_ip, 
-//GO(gst_rtsp_connection_get_read_socket, 
-//GO(gst_rtsp_connection_get_remember_session_id, 
-//GO(gst_rtsp_connection_get_tls, 
-//GO(gst_rtsp_connection_get_tls_database, 
-//GO(gst_rtsp_connection_get_tls_interaction, 
-//GO(gst_rtsp_connection_get_tls_validation_flags, 
-//GO(gst_rtsp_connection_get_tunnelid, 
-//GO(gst_rtsp_connection_get_url, 
-//GO(gst_rtsp_connection_get_write_socket, 
-//GO(gst_rtsp_connection_is_tunneled, 
-//GO(gst_rtsp_connection_next_timeout, 
-//GO(gst_rtsp_connection_next_timeout_usec, 
-//GO(gst_rtsp_connection_poll, 
-//GO(gst_rtsp_connection_poll_usec, 
-//GO(gst_rtsp_connection_read, 
-//GO(gst_rtsp_connection_read_usec, 
-//GO(gst_rtsp_connection_receive, 
-//GO(gst_rtsp_connection_receive_usec, 
-//GO(gst_rtsp_connection_reset_timeout, 
-//GO(gst_rtsp_connection_send, 
-//GO(gst_rtsp_connection_send_messages, 
-//GO(gst_rtsp_connection_send_messages_usec, 
-//GO(gst_rtsp_connection_send_usec, 
-//GO(gst_rtsp_connection_set_accept_certificate_func, 
-//GO(gst_rtsp_connection_set_auth, 
-//GO(gst_rtsp_connection_set_auth_param, 
-//GO(gst_rtsp_connection_set_content_length_limit, 
-//GO(gst_rtsp_connection_set_http_mode, 
-//GO(gst_rtsp_connection_set_ignore_x_server_reply, 
-//GO(gst_rtsp_connection_set_ip, 
-//GO(gst_rtsp_connection_set_proxy, 
-//GO(gst_rtsp_connection_set_qos_dscp, 
-//GO(gst_rtsp_connection_set_remember_session_id, 
-//GO(gst_rtsp_connection_set_tls_database, 
-//GO(gst_rtsp_connection_set_tls_interaction, 
-//GO(gst_rtsp_connection_set_tls_validation_flags, 
-//GO(gst_rtsp_connection_set_tunneled, 
-//GO(gst_rtsp_connection_write, 
-//GO(gst_rtsp_connection_write_usec, 
+GO(gst_rtsp_connection_accept, iFppp)
+GO(gst_rtsp_connection_clear_auth_params, vFp)
+GO(gst_rtsp_connection_close, iFp)
+GO(gst_rtsp_connection_connect, iFpp)
+GO(gst_rtsp_connection_connect_usec, iFpl)
+GO(gst_rtsp_connection_connect_with_response, iFppp)
+GO(gst_rtsp_connection_connect_with_response_usec, iFplp)
+GO(gst_rtsp_connection_create, iFpp)
+GO(gst_rtsp_connection_create_from_socket, iFppWpp)
+GO(gst_rtsp_connection_do_tunnel, iFpp)
+GO(gst_rtsp_connection_flush, iFpi)
+GO(gst_rtsp_connection_free, iFp)
+GO(gst_rtsp_connection_get_ignore_x_server_reply, iFp)
+GO(gst_rtsp_connection_get_ip, pFp)
+GO(gst_rtsp_connection_get_read_socket, pFp)
+GO(gst_rtsp_connection_get_remember_session_id, iFp)
+GO(gst_rtsp_connection_get_tls, pFpp)
+GO(gst_rtsp_connection_get_tls_database, pFp)
+GO(gst_rtsp_connection_get_tls_interaction, pFp)
+GO(gst_rtsp_connection_get_tls_validation_flags, uFp)
+GO(gst_rtsp_connection_get_tunnelid, pFp)
+GO(gst_rtsp_connection_get_url, pFp)
+GO(gst_rtsp_connection_get_write_socket, pFp)
+GO(gst_rtsp_connection_is_tunneled, iFp)
+GO(gst_rtsp_connection_next_timeout, iFpp)
+GO(gst_rtsp_connection_next_timeout_usec, lFp)
+GO(gst_rtsp_connection_poll, iFpupp)
+GO(gst_rtsp_connection_poll_usec, iFpupl)
+GO(gst_rtsp_connection_read, iFppup)
+GO(gst_rtsp_connection_read_usec, iFppul)
+GO(gst_rtsp_connection_receive, iFppp)
+GO(gst_rtsp_connection_receive_usec, iFppl)
+GO(gst_rtsp_connection_reset_timeout, iFp)
+GO(gst_rtsp_connection_send, iFppp)
+GO(gst_rtsp_connection_send_messages, iFppup)
+GO(gst_rtsp_connection_send_messages_usec, iFppul)
+GO(gst_rtsp_connection_send_usec, iFppl)
+//GOM(gst_rtsp_connection_set_accept_certificate_func, vFEpppp)
+GO(gst_rtsp_connection_set_auth, iFpupp)
+GO(gst_rtsp_connection_set_auth_param, vFppp)
+GO(gst_rtsp_connection_set_content_length_limit, vFpu)
+GO(gst_rtsp_connection_set_http_mode, vFpi)
+GO(gst_rtsp_connection_set_ignore_x_server_reply, vFpi)
+GO(gst_rtsp_connection_set_ip, vFpp)
+GO(gst_rtsp_connection_set_proxy, iFppu)
+GO(gst_rtsp_connection_set_qos_dscp, iFpu)
+GO(gst_rtsp_connection_set_remember_session_id, vFpi)
+GO(gst_rtsp_connection_set_tls_database, vFpp)
+GO(gst_rtsp_connection_set_tls_interaction, vFpp)
+GO(gst_rtsp_connection_set_tls_validation_flags, iFpu)
+GO(gst_rtsp_connection_set_tunneled, vFpi)
+GO(gst_rtsp_connection_write, iFppup)
+GO(gst_rtsp_connection_write_usec, iFppul)
 GO(gst_rtsp_event_get_type, LFv)
-//GO(gst_rtsp_extension_after_send, 
-//GO(gst_rtsp_extension_before_send, 
-//GO(gst_rtsp_extension_configure_stream, 
-//GO(gst_rtsp_extension_detect_server, 
-//GO(gst_rtsp_extension_get_transports, 
+GO(gst_rtsp_extension_after_send, iFppp)
+GO(gst_rtsp_extension_before_send, iFpp)
+GO(gst_rtsp_extension_configure_stream, iFpp)
+GO(gst_rtsp_extension_detect_server, iFpp)
+GO(gst_rtsp_extension_get_transports, iFpup)
 GO(gst_rtsp_extension_get_type, LFv)
-//GO(gst_rtsp_extension_parse_sdp, 
-//GO(gst_rtsp_extension_receive_request, 
-//GO(gst_rtsp_extension_send, 
-//GO(gst_rtsp_extension_setup_media, 
-//GO(gst_rtsp_extension_stream_select, 
+GO(gst_rtsp_extension_parse_sdp, iFppp)
+GO(gst_rtsp_extension_receive_request, iFpp)
+GO(gst_rtsp_extension_send, iFppp)
+GO(gst_rtsp_extension_setup_media, iFpp)
+GO(gst_rtsp_extension_stream_select, iFpp)
 GO(gst_rtsp_family_get_type, LFv)
-//GO(gst_rtsp_find_header_field, 
-//GO(gst_rtsp_find_method, 
-//GO(gst_rtsp_generate_digest_auth_response, 
-//GO(gst_rtsp_generate_digest_auth_response_from_md5, 
-//GO(gst_rtsp_header_allow_multiple, 
-//GO(gst_rtsp_header_as_text, 
+GO(gst_rtsp_find_header_field, uFp)
+GO(gst_rtsp_find_method, uFp)
+GO(gst_rtsp_generate_digest_auth_response, pFppppppp)
+GO(gst_rtsp_generate_digest_auth_response_from_md5, pFppppp)
+GO(gst_rtsp_header_allow_multiple, iFu)
+GO(gst_rtsp_header_as_text, pFu)
 GO(gst_rtsp_header_field_get_type, LFv)
 GO(gst_rtsp_lower_trans_get_type, LFv)
-//GO(gst_rtsp_message_add_header, 
-//GO(gst_rtsp_message_add_header_by_name, 
-//GO(gst_rtsp_message_append_headers, 
-//GO(gst_rtsp_message_copy, 
-//GO(gst_rtsp_message_dump, 
-//GO(gst_rtsp_message_free, 
-//GO(gst_rtsp_message_get_body, 
-//GO(gst_rtsp_message_get_body_buffer, 
-//GO(gst_rtsp_message_get_header, 
-//GO(gst_rtsp_message_get_header_by_name, 
-GO(gst_rtsp_message_get_type, LFv)
-//GO(gst_rtsp_message_has_body_buffer, 
-//GO(gst_rtsp_message_init, 
-//GO(gst_rtsp_message_init_data, 
-//GO(gst_rtsp_message_init_request, 
-//GO(gst_rtsp_message_init_response, 
-//GO(gst_rtsp_message_new, 
-//GO(gst_rtsp_message_new_data, 
-//GO(gst_rtsp_message_new_request, 
-//GO(gst_rtsp_message_new_response, 
-//GO(gst_rtsp_message_parse_auth_credentials, 
-//GO(gst_rtsp_message_parse_data, 
-//GO(gst_rtsp_message_parse_request, 
-//GO(gst_rtsp_message_parse_response, 
-//GO(gst_rtsp_message_remove_header, 
-//GO(gst_rtsp_message_remove_header_by_name, 
-//GO(gst_rtsp_message_set_body, 
-//GO(gst_rtsp_message_set_body_buffer, 
-//GO(gst_rtsp_message_steal_body, 
-//GO(gst_rtsp_message_steal_body_buffer, 
-//GO(gst_rtsp_message_take_body, 
-//GO(gst_rtsp_message_take_body_buffer, 
-//GO(gst_rtsp_message_take_header, 
-//GO(gst_rtsp_message_take_header_by_name, 
-//GO(gst_rtsp_message_unset, 
-//GO(gst_rtsp_method_as_text, 
+GO(gst_rtsp_message_add_header, iFpup)
+GO(gst_rtsp_message_add_header_by_name, iFppp)
+GO(gst_rtsp_message_append_headers, iFpp)
+GO(gst_rtsp_message_copy, iFpp)
+GO(gst_rtsp_message_dump, iFp)
+GO(gst_rtsp_message_free, iFp)
+GO(gst_rtsp_message_get_body, iFppp)
+GO(gst_rtsp_message_get_body_buffer, iFpp)
+GO(gst_rtsp_message_get_header, iFpupi)
+GO(gst_rtsp_message_get_header_by_name, iFpppi)
+GO(gst_rtsp_message_get_type, uFp)
+GO(gst_rtsp_message_has_body_buffer, iFp)
+GO(gst_rtsp_message_init, iFp)
+GO(gst_rtsp_message_init_data, iFpC)
+GO(gst_rtsp_message_init_request, iFpup)
+GO(gst_rtsp_message_init_response, iFpupp)
+GO(gst_rtsp_message_new, iFp)
+GO(gst_rtsp_message_new_data, iFpC)
+GO(gst_rtsp_message_new_request, iFpup)
+GO(gst_rtsp_message_new_response, iFpupp)
+GO(gst_rtsp_message_parse_auth_credentials, pFpu)
+GO(gst_rtsp_message_parse_data, iFpp)
+GO(gst_rtsp_message_parse_request, iFpppp)
+GO(gst_rtsp_message_parse_response, iFpppp)
+GO(gst_rtsp_message_remove_header, iFpui)
+GO(gst_rtsp_message_remove_header_by_name, iFppi)
+GO(gst_rtsp_message_set_body, iFppu)
+GO(gst_rtsp_message_set_body_buffer, iFpp)
+GO(gst_rtsp_message_steal_body, iFppp)
+GO(gst_rtsp_message_steal_body_buffer, iFpp)
+GO(gst_rtsp_message_take_body, iFppu)
+GO(gst_rtsp_message_take_body_buffer, iFpp)
+GO(gst_rtsp_message_take_header, iFpup)
+GO(gst_rtsp_message_take_header_by_name, iFppp)
+GO(gst_rtsp_message_unset, iFp)
+GO(gst_rtsp_method_as_text, pFu)
 GO(gst_rtsp_method_get_type, LFv)
 GO(gst_rtsp_msg_get_type, LFv)
 GO(gst_rtsp_msg_type_get_type, LFv)
-//GO(gst_rtsp_options_as_text, 
-//GO(gst_rtsp_options_from_text, 
+GO(gst_rtsp_options_as_text, pFu)
+GO(gst_rtsp_options_from_text, uFp)
 GO(gst_rtsp_profile_get_type, LFv)
-//GO(gst_rtsp_range_convert_units, 
-//GO(gst_rtsp_range_free, 
-//GO(gst_rtsp_range_get_times, 
-//GO(gst_rtsp_range_parse, 
-//GO(gst_rtsp_range_to_string, 
+GO(gst_rtsp_range_convert_units, iFpu)
+GO(gst_rtsp_range_free, vFp)
+GO(gst_rtsp_range_get_times, iFppp)
+GO(gst_rtsp_range_parse, iFpp)
+GO(gst_rtsp_range_to_string, pFp)
 GO(gst_rtsp_range_unit_get_type, LFv)
 GO(gst_rtsp_result_get_type, LFv)
 GO(gst_rtsp_state_get_type, LFv)
-//GO(gst_rtsp_status_as_text, 
+GO(gst_rtsp_status_as_text, pFu)
 GO(gst_rtsp_status_code_get_type, LFv)
-//GO(gst_rtsp_strresult, 
+GO(gst_rtsp_strresult, pFi)
 GO(gst_rtsp_time_type_get_type, LFv)
 GO(gst_rtsp_trans_mode_get_type, LFv)
-//GO(gst_rtsp_transport_as_text, 
-//GO(gst_rtsp_transport_free, 
-//GO(gst_rtsp_transport_get_manager, 
-//GO(gst_rtsp_transport_get_media_type, 
-//GO(gst_rtsp_transport_get_mime, 
-//GO(gst_rtsp_transport_init, 
-//GO(gst_rtsp_transport_new, 
-//GO(gst_rtsp_transport_parse, 
-//GO(gst_rtsp_url_copy, 
-//GO(gst_rtsp_url_decode_path_components, 
-//GO(gst_rtsp_url_free, 
-//GO(gst_rtsp_url_get_port, 
-//GO(gst_rtsp_url_get_request_uri, 
-//GO(gst_rtsp_url_get_request_uri_with_control, 
+GO(gst_rtsp_transport_as_text, pFp)
+GO(gst_rtsp_transport_free, iFp)
+GO(gst_rtsp_transport_get_manager, iFupu)
+GO(gst_rtsp_transport_get_media_type, iFpp)
+GO(gst_rtsp_transport_get_mime, iFup)
+GO(gst_rtsp_transport_init, iFp)
+GO(gst_rtsp_transport_new, iFp)
+GO(gst_rtsp_transport_parse, iFpp)
+GO(gst_rtsp_url_copy, pFp)
+GO(gst_rtsp_url_decode_path_components, pFp)
+GO(gst_rtsp_url_free, vFp)
+GO(gst_rtsp_url_get_port, iFpp)
+GO(gst_rtsp_url_get_request_uri, pFp)
+GO(gst_rtsp_url_get_request_uri_with_control, pFpp)
 GO(gst_rtsp_url_get_type, LFv)
-//GO(gst_rtsp_url_parse, 
-//GO(gst_rtsp_url_set_port, 
-//GO(gst_rtsp_version_as_text, 
+GO(gst_rtsp_url_parse, iFpp)
+GO(gst_rtsp_url_set_port, iFpW)
+GO(gst_rtsp_version_as_text, pFu)
 GO(gst_rtsp_version_get_type, LFv)
-//GO(gst_rtsp_watch_attach, 
-//GO(gst_rtsp_watch_get_send_backlog, 
-//GO(gst_rtsp_watch_new, 
-//GO(gst_rtsp_watch_reset, 
-//GO(gst_rtsp_watch_send_message, 
-//GO(gst_rtsp_watch_send_messages, 
-//GO(gst_rtsp_watch_set_flushing, 
-//GO(gst_rtsp_watch_set_send_backlog, 
-//GO(gst_rtsp_watch_unref, 
-//GO(gst_rtsp_watch_wait_backlog, 
-//GO(gst_rtsp_watch_wait_backlog_usec, 
-//GO(gst_rtsp_watch_write_data, 
+GO(gst_rtsp_watch_attach, uFpp)
+GO(gst_rtsp_watch_get_send_backlog, vFppp)
+//GOM(gst_rtsp_watch_new, pFEpppp)
+GO(gst_rtsp_watch_reset, vFp)
+GO(gst_rtsp_watch_send_message, iFppp)
+GO(gst_rtsp_watch_send_messages, iFppup)
+GO(gst_rtsp_watch_set_flushing, vFpi)
+GO(gst_rtsp_watch_set_send_backlog, vFpLu)
+GO(gst_rtsp_watch_unref, vFp)
+GO(gst_rtsp_watch_wait_backlog, iFpp)
+GO(gst_rtsp_watch_wait_backlog_usec, iFpl)
+GO(gst_rtsp_watch_write_data, iFppup)