about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2024-10-17 15:49:26 +0200
committerptitSeb <sebastien.chev@gmail.com>2024-10-17 15:49:26 +0200
commitb609328ac1620648e9cd51b2577787c785934e36 (patch)
tree5f5165ec061d9f48a94e280437064ad64f96d964 /src
parent65c2b103b16b321a81c8d26db7c228f0ab2d1201 (diff)
downloadbox64-b609328ac1620648e9cd51b2577787c785934e36.tar.gz
box64-b609328ac1620648e9cd51b2577787c785934e36.zip
[WRAPPER] Reworked libcups wrapping with new wrapperhelper
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/generated/functions_list.txt30
-rw-r--r--src/wrapped/generated/wrapper.c81
-rw-r--r--src/wrapped/generated/wrapper.h30
-rw-r--r--src/wrapped/wrappedlibcups_private.h740
4 files changed, 507 insertions, 374 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 13d90d63..2e646f3e 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -588,6 +588,7 @@
 #() iFppp
 #() iFpOi
 #() iFpOu
+#() iFpSu
 #() iFSIi
 #() iFSli
 #() iFSpL
@@ -681,6 +682,7 @@
 #() lFlll
 #() lFpli
 #() lFpLu
+#() lFpLd
 #() lFpLL
 #() lFpLp
 #() lFppi
@@ -766,6 +768,7 @@
 #() pFpWp
 #() pFpui
 #() pFpuu
+#() pFpuf
 #() pFpup
 #() pFpUi
 #() pFpUu
@@ -1087,6 +1090,7 @@
 #() iFpuuL
 #() iFpuup
 #() iFpuUp
+#() iFpufp
 #() iFpuLi
 #() iFpuLL
 #() iFpuLp
@@ -1172,6 +1176,7 @@
 #() uFiiuu
 #() uFifff
 #() uFuuuu
+#() uFuppd
 #() uFpiip
 #() uFpipu
 #() uFpipL
@@ -1192,6 +1197,7 @@
 #() uFppLp
 #() uFpppi
 #() uFpppu
+#() uFpppd
 #() uFpppL
 #() uFpppp
 #() uFbipp
@@ -1303,6 +1309,7 @@
 #() pFpiuu
 #() pFpiLi
 #() pFpiLL
+#() pFpipc
 #() pFpipi
 #() pFpipd
 #() pFpipL
@@ -1615,6 +1622,7 @@
 #() iFipppp
 #() iFuiuup
 #() iFuuupp
+#() iFuupid
 #() iFuppLp
 #() iFLppip
 #() iFLpppp
@@ -1687,6 +1695,7 @@
 #() iFpLppi
 #() iFpLppL
 #() iFpLppp
+#() iFppiii
 #() iFppiiu
 #() iFppiiL
 #() iFppiip
@@ -1696,6 +1705,7 @@
 #() iFppiLL
 #() iFppipi
 #() iFppipu
+#() iFppipl
 #() iFppipp
 #() iFppuwp
 #() iFppuip
@@ -1726,9 +1736,12 @@
 #() iFpppLp
 #() iFppppi
 #() iFppppu
+#() iFppppd
 #() iFppppl
 #() iFppppL
 #() iFppppp
+#() iFpSipp
+#() iFpSuif
 #() iFSppLp
 #() IFppIII
 #() uFEippp
@@ -1835,6 +1848,7 @@
 #() pFpiuup
 #() pFpiupp
 #() pFpiLip
+#() pFpipii
 #() pFpipip
 #() pFpipup
 #() pFpippi
@@ -2170,6 +2184,7 @@
 #() iFppiiip
 #() iFppiipi
 #() iFppiipp
+#() iFppiuii
 #() iFppiupp
 #() iFppilpp
 #() iFppipii
@@ -2200,6 +2215,7 @@
 #() iFppLLpp
 #() iFppLpLp
 #() iFppLppp
+#() iFpppiup
 #() iFpppipi
 #() iFpppipu
 #() iFpppipp
@@ -2219,6 +2235,7 @@
 #() iFpppppu
 #() iFpppppL
 #() iFpppppp
+#() iFpppppS
 #() uFEiippp
 #() uFEiuppp
 #() uFEpippi
@@ -2298,8 +2315,12 @@
 #() pFpiiipp
 #() pFpiiCCC
 #() pFpiiuup
+#() pFpiipip
+#() pFpiippp
 #() pFpiUUUU
+#() pFpipipL
 #() pFpipipp
+#() pFpipuii
 #() pFpippip
 #() pFpipppp
 #() pFpuiiip
@@ -2524,6 +2545,7 @@
 #() iFpLpLpip
 #() iFpLpLpLp
 #() iFpLppiii
+#() iFpLppiip
 #() iFppiiiip
 #() iFppiiuup
 #() iFppiiLll
@@ -2601,7 +2623,9 @@
 #() pFpiiiiid
 #() pFpiiippp
 #() pFpiiUdii
+#() pFpiipipp
 #() pFpiipppp
+#() pFpipiupp
 #() pFpipippp
 #() pFpWppWpp
 #() pFpuLpipp
@@ -2746,6 +2770,7 @@
 #() iFipippppp
 #() iFuiiiiuup
 #() iFuuuuuuuu
+#() iFupipppip
 #() iFdiippppL
 #() iFpiiiuuup
 #() iFpipiipip
@@ -2830,7 +2855,7 @@
 #() pFpiiiiiuu
 #() pFpiiuuupp
 #() pFpiUdiiUi
-#() pFpipiiiip
+#() pFpipiuiip
 #() pFpuuuuupp
 #() pFpuuuupup
 #() pFpupLLLpp
@@ -3019,6 +3044,7 @@
 #() vFpiuippppip
 #() vFpuupuuuuuu
 #() vFppiiiiupip
+#() vFppipipippi
 #() vFppuipppiip
 #() vFppuuuiiiii
 #() vFppuuuuuuuu
@@ -3107,6 +3133,7 @@
 #() iFEpppupppppp
 #() iFEpppppppppp
 #() iFuiiiiuuiiip
+#() iFuppipipippi
 #() iFpiiLLiiipip
 #() iFpippupppppp
 #() iFpuppppppppp
@@ -3116,6 +3143,7 @@
 #() iFppuupLiupii
 #() iFppuppLLpupp
 #() iFpppiiuuiiuu
+#() iFpppippppppp
 #() iFpppppiiuupp
 #() uFEpLuupppLuV
 #() uFEpLuppppLup
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 38318b97..b6be806b 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -623,6 +623,7 @@ typedef int32_t (*iFppL_t)(void*, void*, uintptr_t);
 typedef int32_t (*iFppp_t)(void*, void*, void*);
 typedef int32_t (*iFpOi_t)(void*, int32_t, int32_t);
 typedef int32_t (*iFpOu_t)(void*, int32_t, uint32_t);
+typedef int32_t (*iFpSu_t)(void*, void*, uint32_t);
 typedef int32_t (*iFSIi_t)(void*, int64_t, int32_t);
 typedef int32_t (*iFSli_t)(void*, intptr_t, int32_t);
 typedef int32_t (*iFSpL_t)(void*, void*, uintptr_t);
@@ -713,6 +714,7 @@ typedef intptr_t (*lFipL_t)(int32_t, void*, uintptr_t);
 typedef intptr_t (*lFlll_t)(intptr_t, intptr_t, intptr_t);
 typedef intptr_t (*lFpli_t)(void*, intptr_t, int32_t);
 typedef intptr_t (*lFpLu_t)(void*, uintptr_t, uint32_t);
+typedef intptr_t (*lFpLd_t)(void*, uintptr_t, double);
 typedef intptr_t (*lFpLL_t)(void*, uintptr_t, uintptr_t);
 typedef intptr_t (*lFpLp_t)(void*, uintptr_t, void*);
 typedef intptr_t (*lFppi_t)(void*, void*, int32_t);
@@ -797,6 +799,7 @@ typedef void* (*pFpWW_t)(void*, uint16_t, uint16_t);
 typedef void* (*pFpWp_t)(void*, uint16_t, void*);
 typedef void* (*pFpui_t)(void*, uint32_t, int32_t);
 typedef void* (*pFpuu_t)(void*, uint32_t, uint32_t);
+typedef void* (*pFpuf_t)(void*, uint32_t, float);
 typedef void* (*pFpup_t)(void*, uint32_t, void*);
 typedef void* (*pFpUi_t)(void*, uint64_t, int32_t);
 typedef void* (*pFpUu_t)(void*, uint64_t, uint32_t);
@@ -1118,6 +1121,7 @@ typedef int32_t (*iFpuul_t)(void*, uint32_t, uint32_t, intptr_t);
 typedef int32_t (*iFpuuL_t)(void*, uint32_t, uint32_t, uintptr_t);
 typedef int32_t (*iFpuup_t)(void*, uint32_t, uint32_t, void*);
 typedef int32_t (*iFpuUp_t)(void*, uint32_t, uint64_t, void*);
+typedef int32_t (*iFpufp_t)(void*, uint32_t, float, void*);
 typedef int32_t (*iFpuLi_t)(void*, uint32_t, uintptr_t, int32_t);
 typedef int32_t (*iFpuLL_t)(void*, uint32_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpuLp_t)(void*, uint32_t, uintptr_t, void*);
@@ -1202,6 +1206,7 @@ typedef uint32_t (*uFiiii_t)(int32_t, int32_t, int32_t, int32_t);
 typedef uint32_t (*uFiiuu_t)(int32_t, int32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFifff_t)(int32_t, float, float, float);
 typedef uint32_t (*uFuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t);
+typedef uint32_t (*uFuppd_t)(uint32_t, void*, void*, double);
 typedef uint32_t (*uFpiip_t)(void*, int32_t, int32_t, void*);
 typedef uint32_t (*uFpipu_t)(void*, int32_t, void*, uint32_t);
 typedef uint32_t (*uFpipL_t)(void*, int32_t, void*, uintptr_t);
@@ -1222,6 +1227,7 @@ typedef uint32_t (*uFpplp_t)(void*, void*, intptr_t, void*);
 typedef uint32_t (*uFppLp_t)(void*, void*, uintptr_t, void*);
 typedef uint32_t (*uFpppi_t)(void*, void*, void*, int32_t);
 typedef uint32_t (*uFpppu_t)(void*, void*, void*, uint32_t);
+typedef uint32_t (*uFpppd_t)(void*, void*, void*, double);
 typedef uint32_t (*uFpppL_t)(void*, void*, void*, uintptr_t);
 typedef uint32_t (*uFpppp_t)(void*, void*, void*, void*);
 typedef uint32_t (*uFbipp_t)(void*, int32_t, void*, void*);
@@ -1332,6 +1338,7 @@ typedef void* (*pFpiip_t)(void*, int32_t, int32_t, void*);
 typedef void* (*pFpiuu_t)(void*, int32_t, uint32_t, uint32_t);
 typedef void* (*pFpiLi_t)(void*, int32_t, uintptr_t, int32_t);
 typedef void* (*pFpiLL_t)(void*, int32_t, uintptr_t, uintptr_t);
+typedef void* (*pFpipc_t)(void*, int32_t, void*, int8_t);
 typedef void* (*pFpipi_t)(void*, int32_t, void*, int32_t);
 typedef void* (*pFpipd_t)(void*, int32_t, void*, double);
 typedef void* (*pFpipL_t)(void*, int32_t, void*, uintptr_t);
@@ -1644,6 +1651,7 @@ typedef int32_t (*iFipppi_t)(int32_t, void*, void*, void*, int32_t);
 typedef int32_t (*iFipppp_t)(int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFuiuup_t)(uint32_t, int32_t, uint32_t, uint32_t, void*);
 typedef int32_t (*iFuuupp_t)(uint32_t, uint32_t, uint32_t, void*, void*);
+typedef int32_t (*iFuupid_t)(uint32_t, uint32_t, void*, int32_t, double);
 typedef int32_t (*iFuppLp_t)(uint32_t, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFLppip_t)(uintptr_t, void*, void*, int32_t, void*);
 typedef int32_t (*iFLpppp_t)(uintptr_t, void*, void*, void*, void*);
@@ -1716,6 +1724,7 @@ typedef int32_t (*iFpLpLi_t)(void*, uintptr_t, void*, uintptr_t, int32_t);
 typedef int32_t (*iFpLppi_t)(void*, uintptr_t, void*, void*, int32_t);
 typedef int32_t (*iFpLppL_t)(void*, uintptr_t, void*, void*, uintptr_t);
 typedef int32_t (*iFpLppp_t)(void*, uintptr_t, void*, void*, void*);
+typedef int32_t (*iFppiii_t)(void*, void*, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppiiu_t)(void*, void*, int32_t, int32_t, uint32_t);
 typedef int32_t (*iFppiiL_t)(void*, void*, int32_t, int32_t, uintptr_t);
 typedef int32_t (*iFppiip_t)(void*, void*, int32_t, int32_t, void*);
@@ -1725,6 +1734,7 @@ typedef int32_t (*iFppiLi_t)(void*, void*, int32_t, uintptr_t, int32_t);
 typedef int32_t (*iFppiLL_t)(void*, void*, int32_t, uintptr_t, uintptr_t);
 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 (*iFppuwp_t)(void*, void*, uint32_t, int16_t, void*);
 typedef int32_t (*iFppuip_t)(void*, void*, uint32_t, int32_t, void*);
@@ -1755,9 +1765,12 @@ 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);
 typedef int32_t (*iFppppu_t)(void*, void*, void*, void*, uint32_t);
+typedef int32_t (*iFppppd_t)(void*, void*, void*, void*, double);
 typedef int32_t (*iFppppl_t)(void*, void*, void*, void*, intptr_t);
 typedef int32_t (*iFppppL_t)(void*, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*);
+typedef int32_t (*iFpSipp_t)(void*, void*, int32_t, void*, void*);
+typedef int32_t (*iFpSuif_t)(void*, void*, uint32_t, int32_t, float);
 typedef int32_t (*iFSppLp_t)(void*, void*, void*, uintptr_t, void*);
 typedef int64_t (*IFppIII_t)(void*, void*, int64_t, int64_t, int64_t);
 typedef uint32_t (*uFEippp_t)(x64emu_t*, int32_t, void*, void*, void*);
@@ -1864,6 +1877,7 @@ typedef void* (*pFpiuuu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpiuup_t)(void*, int32_t, uint32_t, uint32_t, void*);
 typedef void* (*pFpiupp_t)(void*, int32_t, uint32_t, void*, void*);
 typedef void* (*pFpiLip_t)(void*, int32_t, uintptr_t, int32_t, void*);
+typedef void* (*pFpipii_t)(void*, int32_t, void*, int32_t, int32_t);
 typedef void* (*pFpipip_t)(void*, int32_t, void*, int32_t, void*);
 typedef void* (*pFpipup_t)(void*, int32_t, void*, uint32_t, void*);
 typedef void* (*pFpippi_t)(void*, int32_t, void*, void*, int32_t);
@@ -2198,6 +2212,7 @@ typedef int32_t (*iFppiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppiiip_t)(void*, void*, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFppiipi_t)(void*, void*, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFppiipp_t)(void*, void*, int32_t, int32_t, void*, void*);
+typedef int32_t (*iFppiuii_t)(void*, void*, int32_t, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFppiupp_t)(void*, void*, int32_t, uint32_t, void*, void*);
 typedef int32_t (*iFppilpp_t)(void*, void*, int32_t, intptr_t, void*, void*);
 typedef int32_t (*iFppipii_t)(void*, void*, int32_t, void*, int32_t, int32_t);
@@ -2228,6 +2243,7 @@ typedef int32_t (*iFppLLup_t)(void*, void*, uintptr_t, uintptr_t, uint32_t, void
 typedef int32_t (*iFppLLpp_t)(void*, void*, uintptr_t, uintptr_t, void*, void*);
 typedef int32_t (*iFppLpLp_t)(void*, void*, uintptr_t, void*, uintptr_t, void*);
 typedef int32_t (*iFppLppp_t)(void*, void*, uintptr_t, void*, void*, void*);
+typedef int32_t (*iFpppiup_t)(void*, void*, void*, int32_t, uint32_t, void*);
 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*);
@@ -2247,6 +2263,7 @@ typedef int32_t (*iFpppppi_t)(void*, void*, void*, void*, void*, int32_t);
 typedef int32_t (*iFpppppu_t)(void*, void*, void*, void*, void*, uint32_t);
 typedef int32_t (*iFpppppL_t)(void*, void*, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+typedef int32_t (*iFpppppS_t)(void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFEiippp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*);
 typedef uint32_t (*uFEiuppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFEpippi_t)(x64emu_t*, void*, int32_t, void*, void*, int32_t);
@@ -2326,8 +2343,12 @@ 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);
 typedef void* (*pFpiiuup_t)(void*, int32_t, int32_t, uint32_t, uint32_t, void*);
+typedef void* (*pFpiipip_t)(void*, int32_t, int32_t, void*, int32_t, void*);
+typedef void* (*pFpiippp_t)(void*, int32_t, int32_t, void*, void*, void*);
 typedef void* (*pFpiUUUU_t)(void*, int32_t, uint64_t, uint64_t, uint64_t, uint64_t);
+typedef void* (*pFpipipL_t)(void*, int32_t, void*, int32_t, void*, uintptr_t);
 typedef void* (*pFpipipp_t)(void*, int32_t, void*, int32_t, void*, void*);
+typedef void* (*pFpipuii_t)(void*, int32_t, void*, uint32_t, int32_t, int32_t);
 typedef void* (*pFpippip_t)(void*, int32_t, void*, void*, int32_t, void*);
 typedef void* (*pFpipppp_t)(void*, int32_t, void*, void*, void*, void*);
 typedef void* (*pFpuiiip_t)(void*, uint32_t, int32_t, int32_t, int32_t, void*);
@@ -2552,6 +2573,7 @@ typedef int32_t (*iFpLpLuLi_t)(void*, uintptr_t, void*, uintptr_t, uint32_t, uin
 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 (*iFpLppiip_t)(void*, uintptr_t, void*, void*, int32_t, int32_t, void*);
 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*);
 typedef int32_t (*iFppiiLll_t)(void*, void*, int32_t, int32_t, uintptr_t, intptr_t, intptr_t);
@@ -2629,7 +2651,9 @@ typedef void* (*pFdiiiIiI_t)(double, int32_t, int32_t, int32_t, int64_t, int32_t
 typedef void* (*pFpiiiiid_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, double);
 typedef void* (*pFpiiippp_t)(void*, int32_t, int32_t, int32_t, void*, void*, void*);
 typedef void* (*pFpiiUdii_t)(void*, int32_t, int32_t, uint64_t, double, int32_t, int32_t);
+typedef void* (*pFpiipipp_t)(void*, int32_t, int32_t, void*, int32_t, void*, void*);
 typedef void* (*pFpiipppp_t)(void*, int32_t, int32_t, void*, void*, void*, void*);
+typedef void* (*pFpipiupp_t)(void*, int32_t, void*, int32_t, uint32_t, void*, void*);
 typedef void* (*pFpipippp_t)(void*, int32_t, void*, int32_t, void*, void*, void*);
 typedef void* (*pFpWppWpp_t)(void*, uint16_t, void*, void*, uint16_t, void*, void*);
 typedef void* (*pFpuLpipp_t)(void*, uint32_t, uintptr_t, void*, int32_t, void*, void*);
@@ -2774,6 +2798,7 @@ typedef int32_t (*iFiuuuupip_t)(int32_t, uint32_t, uint32_t, uint32_t, uint32_t,
 typedef int32_t (*iFipippppp_t)(int32_t, void*, int32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFuiiiiuup_t)(uint32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, void*);
 typedef int32_t (*iFuuuuuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef int32_t (*iFupipppip_t)(uint32_t, void*, int32_t, void*, void*, void*, int32_t, void*);
 typedef int32_t (*iFdiippppL_t)(double, int32_t, int32_t, void*, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFpiiiuuup_t)(void*, int32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, void*);
 typedef int32_t (*iFpipiipip_t)(void*, int32_t, void*, int32_t, int32_t, void*, int32_t, void*);
@@ -2858,7 +2883,7 @@ typedef void* (*pFuupupipp_t)(uint32_t, uint32_t, void*, uint32_t, void*, int32_
 typedef void* (*pFpiiiiiuu_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t);
 typedef void* (*pFpiiuuupp_t)(void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef void* (*pFpiUdiiUi_t)(void*, int32_t, uint64_t, double, int32_t, int32_t, uint64_t, int32_t);
-typedef void* (*pFpipiiiip_t)(void*, int32_t, void*, int32_t, int32_t, int32_t, int32_t, void*);
+typedef void* (*pFpipiuiip_t)(void*, int32_t, void*, int32_t, uint32_t, int32_t, int32_t, void*);
 typedef void* (*pFpuuuuupp_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef void* (*pFpuuuupup_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, void*, uint32_t, void*);
 typedef void* (*pFpupLLLpp_t)(void*, uint32_t, void*, uintptr_t, uintptr_t, uintptr_t, void*, void*);
@@ -3046,6 +3071,7 @@ typedef void (*vFffffffffff_t)(float, float, float, float, float, float, float,
 typedef void (*vFpiuippppip_t)(void*, int32_t, uint32_t, int32_t, void*, void*, void*, void*, int32_t, void*);
 typedef void (*vFpuupuuuuuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFppiiiiupip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, void*, int32_t, void*);
+typedef void (*vFppipipippi_t)(void*, void*, int32_t, void*, int32_t, void*, int32_t, void*, void*, int32_t);
 typedef void (*vFppuipppiip_t)(void*, void*, uint32_t, int32_t, void*, void*, void*, int32_t, int32_t, void*);
 typedef void (*vFppuuuiiiii_t)(void*, void*, uint32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppuuuuuuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -3134,6 +3160,7 @@ typedef int32_t (*iFEppLpLpLLpp_t)(x64emu_t*, void*, void*, uintptr_t, void*, ui
 typedef int32_t (*iFEpppupppppp_t)(x64emu_t*, void*, void*, void*, uint32_t, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEpppppppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFuiiiiuuiiip_t)(uint32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, void*);
+typedef int32_t (*iFuppipipippi_t)(uint32_t, void*, void*, int32_t, void*, int32_t, void*, int32_t, void*, void*, int32_t);
 typedef int32_t (*iFpiiLLiiipip_t)(void*, int32_t, int32_t, uintptr_t, uintptr_t, int32_t, int32_t, int32_t, void*, int32_t, void*);
 typedef int32_t (*iFpippupppppp_t)(void*, int32_t, void*, void*, uint32_t, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpuppppppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*);
@@ -3143,6 +3170,7 @@ typedef int32_t (*iFppippipppip_t)(void*, void*, int32_t, void*, void*, int32_t,
 typedef int32_t (*iFppuupLiupii_t)(void*, void*, uint32_t, uint32_t, void*, uintptr_t, int32_t, uint32_t, void*, int32_t, int32_t);
 typedef int32_t (*iFppuppLLpupp_t)(void*, void*, uint32_t, void*, void*, uintptr_t, uintptr_t, void*, uint32_t, void*, void*);
 typedef int32_t (*iFpppiiuuiiuu_t)(void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t);
+typedef int32_t (*iFpppippppppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpppppiiuupp_t)(void*, void*, void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, void*, void*);
 typedef uint32_t (*uFEpLuupppLuV_t)(x64emu_t*, void*, uintptr_t, uint32_t, uint32_t, void*, void*, void*, uintptr_t, uint32_t, void*);
 typedef uint32_t (*uFEpLuppppLup_t)(x64emu_t*, void*, uintptr_t, uint32_t, void*, void*, void*, void*, uintptr_t, uint32_t, void*);
@@ -3915,6 +3943,7 @@ void iFppL(x64emu_t *emu, uintptr_t fcn) { iFppL_t fn = (iFppL_t)fcn; R_RAX=(int
 void iFppp(x64emu_t *emu, uintptr_t fcn) { iFppp_t fn = (iFppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFpOi(x64emu_t *emu, uintptr_t fcn) { iFpOi_t fn = (iFpOi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (int32_t)R_RDX); }
 void iFpOu(x64emu_t *emu, uintptr_t fcn) { iFpOu_t fn = (iFpOu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (uint32_t)R_RDX); }
+void iFpSu(x64emu_t *emu, uintptr_t fcn) { iFpSu_t fn = (iFpSu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, io_convert((void*)R_RSI), (uint32_t)R_RDX); }
 void iFSIi(x64emu_t *emu, uintptr_t fcn) { iFSIi_t fn = (iFSIi_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (int64_t)R_RSI, (int32_t)R_RDX); }
 void iFSli(x64emu_t *emu, uintptr_t fcn) { iFSli_t fn = (iFSli_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (intptr_t)R_RSI, (int32_t)R_RDX); }
 void iFSpL(x64emu_t *emu, uintptr_t fcn) { iFSpL_t fn = (iFSpL_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (uintptr_t)R_RDX); }
@@ -4005,6 +4034,7 @@ void lFipL(x64emu_t *emu, uintptr_t fcn) { lFipL_t fn = (lFipL_t)fcn; R_RAX=(int
 void lFlll(x64emu_t *emu, uintptr_t fcn) { lFlll_t fn = (lFlll_t)fcn; R_RAX=(intptr_t)fn((intptr_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void lFpli(x64emu_t *emu, uintptr_t fcn) { lFpli_t fn = (lFpli_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX); }
 void lFpLu(x64emu_t *emu, uintptr_t fcn) { lFpLu_t fn = (lFpLu_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX); }
+void lFpLd(x64emu_t *emu, uintptr_t fcn) { lFpLd_t fn = (lFpLd_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, emu->xmm[0].d[0]); }
 void lFpLL(x64emu_t *emu, uintptr_t fcn) { lFpLL_t fn = (lFpLL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 void lFpLp(x64emu_t *emu, uintptr_t fcn) { lFpLp_t fn = (lFpLp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void lFppi(x64emu_t *emu, uintptr_t fcn) { lFppi_t fn = (lFppi_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
@@ -4089,6 +4119,7 @@ void pFpWW(x64emu_t *emu, uintptr_t fcn) { pFpWW_t fn = (pFpWW_t)fcn; R_RAX=(uin
 void pFpWp(x64emu_t *emu, uintptr_t fcn) { pFpWp_t fn = (pFpWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
 void pFpui(x64emu_t *emu, uintptr_t fcn) { pFpui_t fn = (pFpui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void pFpuu(x64emu_t *emu, uintptr_t fcn) { pFpuu_t fn = (pFpuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
+void pFpuf(x64emu_t *emu, uintptr_t fcn) { pFpuf_t fn = (pFpuf_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0]); }
 void pFpup(x64emu_t *emu, uintptr_t fcn) { pFpup_t fn = (pFpup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void pFpUi(x64emu_t *emu, uintptr_t fcn) { pFpUi_t fn = (pFpUi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX); }
 void pFpUu(x64emu_t *emu, uintptr_t fcn) { pFpUu_t fn = (pFpUu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX); }
@@ -4410,6 +4441,7 @@ void iFpuul(x64emu_t *emu, uintptr_t fcn) { iFpuul_t fn = (iFpuul_t)fcn; R_RAX=(
 void iFpuuL(x64emu_t *emu, uintptr_t fcn) { iFpuuL_t fn = (iFpuuL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpuup(x64emu_t *emu, uintptr_t fcn) { iFpuup_t fn = (iFpuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void iFpuUp(x64emu_t *emu, uintptr_t fcn) { iFpuUp_t fn = (iFpuUp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX); }
+void iFpufp(x64emu_t *emu, uintptr_t fcn) { iFpufp_t fn = (iFpufp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0], (void*)R_RDX); }
 void iFpuLi(x64emu_t *emu, uintptr_t fcn) { iFpuLi_t fn = (iFpuLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
 void iFpuLL(x64emu_t *emu, uintptr_t fcn) { iFpuLL_t fn = (iFpuLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpuLp(x64emu_t *emu, uintptr_t fcn) { iFpuLp_t fn = (iFpuLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
@@ -4494,6 +4526,7 @@ void uFiiii(x64emu_t *emu, uintptr_t fcn) { uFiiii_t fn = (uFiiii_t)fcn; R_RAX=(
 void uFiiuu(x64emu_t *emu, uintptr_t fcn) { uFiiuu_t fn = (uFiiuu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void uFifff(x64emu_t *emu, uintptr_t fcn) { uFifff_t fn = (uFifff_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void uFuuuu(x64emu_t *emu, uintptr_t fcn) { uFuuuu_t fn = (uFuuuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
+void uFuppd(x64emu_t *emu, uintptr_t fcn) { uFuppd_t fn = (uFuppd_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].d[0]); }
 void uFpiip(x64emu_t *emu, uintptr_t fcn) { uFpiip_t fn = (uFpiip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void uFpipu(x64emu_t *emu, uintptr_t fcn) { uFpipu_t fn = (uFpipu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void uFpipL(x64emu_t *emu, uintptr_t fcn) { uFpipL_t fn = (uFpipL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
@@ -4514,6 +4547,7 @@ void uFpplp(x64emu_t *emu, uintptr_t fcn) { uFpplp_t fn = (uFpplp_t)fcn; R_RAX=(
 void uFppLp(x64emu_t *emu, uintptr_t fcn) { uFppLp_t fn = (uFppLp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void uFpppi(x64emu_t *emu, uintptr_t fcn) { uFpppi_t fn = (uFpppi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void uFpppu(x64emu_t *emu, uintptr_t fcn) { uFpppu_t fn = (uFpppu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
+void uFpppd(x64emu_t *emu, uintptr_t fcn) { uFpppd_t fn = (uFpppd_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].d[0]); }
 void uFpppL(x64emu_t *emu, uintptr_t fcn) { uFpppL_t fn = (uFpppL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void uFpppp(x64emu_t *emu, uintptr_t fcn) { uFpppp_t fn = (uFpppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFbipp(x64emu_t *emu, uintptr_t fcn) { uFbipp_t fn = (uFbipp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
@@ -4624,6 +4658,7 @@ void pFpiip(x64emu_t *emu, uintptr_t fcn) { pFpiip_t fn = (pFpiip_t)fcn; R_RAX=(
 void pFpiuu(x64emu_t *emu, uintptr_t fcn) { pFpiuu_t fn = (pFpiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFpiLi(x64emu_t *emu, uintptr_t fcn) { pFpiLi_t fn = (pFpiLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
 void pFpiLL(x64emu_t *emu, uintptr_t fcn) { pFpiLL_t fn = (pFpiLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
+void pFpipc(x64emu_t *emu, uintptr_t fcn) { pFpipc_t fn = (pFpipc_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int8_t)R_RCX); }
 void pFpipi(x64emu_t *emu, uintptr_t fcn) { pFpipi_t fn = (pFpipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFpipd(x64emu_t *emu, uintptr_t fcn) { pFpipd_t fn = (pFpipd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, emu->xmm[0].d[0]); }
 void pFpipL(x64emu_t *emu, uintptr_t fcn) { pFpipL_t fn = (pFpipL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
@@ -4936,6 +4971,7 @@ void iFipppi(x64emu_t *emu, uintptr_t fcn) { iFipppi_t fn = (iFipppi_t)fcn; R_RA
 void iFipppp(x64emu_t *emu, uintptr_t fcn) { iFipppp_t fn = (iFipppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFuiuup(x64emu_t *emu, uintptr_t fcn) { iFuiuup_t fn = (iFuiuup_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFuuupp(x64emu_t *emu, uintptr_t fcn) { iFuuupp_t fn = (iFuuupp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFuupid(x64emu_t *emu, uintptr_t fcn) { iFuupid_t fn = (iFuupid_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, emu->xmm[0].d[0]); }
 void iFuppLp(x64emu_t *emu, uintptr_t fcn) { iFuppLp_t fn = (iFuppLp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void iFLppip(x64emu_t *emu, uintptr_t fcn) { iFLppip_t fn = (iFLppip_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFLpppp(x64emu_t *emu, uintptr_t fcn) { iFLpppp_t fn = (iFLpppp_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5008,6 +5044,7 @@ void iFpLpLi(x64emu_t *emu, uintptr_t fcn) { iFpLpLi_t fn = (iFpLpLi_t)fcn; R_RA
 void iFpLppi(x64emu_t *emu, uintptr_t fcn) { iFpLppi_t fn = (iFpLppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFpLppL(x64emu_t *emu, uintptr_t fcn) { iFpLppL_t fn = (iFpLppL_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 iFpLppp(x64emu_t *emu, uintptr_t fcn) { iFpLppp_t fn = (iFpLppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFppiii(x64emu_t *emu, uintptr_t fcn) { iFppiii_t fn = (iFppiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void iFppiiu(x64emu_t *emu, uintptr_t fcn) { iFppiiu_t fn = (iFppiiu_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); }
 void iFppiiL(x64emu_t *emu, uintptr_t fcn) { iFppiiL_t fn = (iFppiiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); }
 void iFppiip(x64emu_t *emu, uintptr_t fcn) { iFppiip_t fn = (iFppiip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
@@ -5017,6 +5054,7 @@ void iFppiLi(x64emu_t *emu, uintptr_t fcn) { iFppiLi_t fn = (iFppiLi_t)fcn; R_RA
 void iFppiLL(x64emu_t *emu, uintptr_t fcn) { iFppiLL_t fn = (iFppiLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
 void iFppipi(x64emu_t *emu, uintptr_t fcn) { iFppipi_t fn = (iFppipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFppipu(x64emu_t *emu, uintptr_t fcn) { iFppipu_t fn = (iFppipu_t)fcn; R_RAX=(int32_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=(int32_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=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_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=(int32_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=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
@@ -5047,9 +5085,12 @@ void iFpppLL(x64emu_t *emu, uintptr_t fcn) { iFpppLL_t fn = (iFpppLL_t)fcn; R_RA
 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); }
 void iFppppu(x64emu_t *emu, uintptr_t fcn) { iFppppu_t fn = (iFppppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
+void iFppppd(x64emu_t *emu, uintptr_t fcn) { iFppppd_t fn = (iFppppd_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 iFppppl(x64emu_t *emu, uintptr_t fcn) { iFppppl_t fn = (iFppppl_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (intptr_t)R_R8); }
 void iFppppL(x64emu_t *emu, uintptr_t fcn) { iFppppL_t fn = (iFppppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void iFppppp(x64emu_t *emu, uintptr_t fcn) { iFppppp_t fn = (iFppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFpSipp(x64emu_t *emu, uintptr_t fcn) { iFpSipp_t fn = (iFpSipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, io_convert((void*)R_RSI), (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFpSuif(x64emu_t *emu, uintptr_t fcn) { iFpSuif_t fn = (iFpSuif_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, io_convert((void*)R_RSI), (uint32_t)R_RDX, (int32_t)R_RCX, emu->xmm[0].f[0]); }
 void iFSppLp(x64emu_t *emu, uintptr_t fcn) { iFSppLp_t fn = (iFSppLp_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void IFppIII(x64emu_t *emu, uintptr_t fcn) { IFppIII_t fn = (IFppIII_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void uFEippp(x64emu_t *emu, uintptr_t fcn) { uFEippp_t fn = (uFEippp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -5156,6 +5197,7 @@ void pFpiuuu(x64emu_t *emu, uintptr_t fcn) { pFpiuuu_t fn = (pFpiuuu_t)fcn; R_RA
 void pFpiuup(x64emu_t *emu, uintptr_t fcn) { pFpiuup_t fn = (pFpiuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void pFpiupp(x64emu_t *emu, uintptr_t fcn) { pFpiupp_t fn = (pFpiupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFpiLip(x64emu_t *emu, uintptr_t fcn) { pFpiLip_t fn = (pFpiLip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
+void pFpipii(x64emu_t *emu, uintptr_t fcn) { pFpipii_t fn = (pFpipii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFpipip(x64emu_t *emu, uintptr_t fcn) { pFpipip_t fn = (pFpipip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFpipup(x64emu_t *emu, uintptr_t fcn) { pFpipup_t fn = (pFpipup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void pFpippi(x64emu_t *emu, uintptr_t fcn) { pFpippi_t fn = (pFpippi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
@@ -5490,6 +5532,7 @@ void iFppiiii(x64emu_t *emu, uintptr_t fcn) { iFppiiii_t fn = (iFppiiii_t)fcn; R
 void iFppiiip(x64emu_t *emu, uintptr_t fcn) { iFppiiip_t fn = (iFppiiip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void iFppiipi(x64emu_t *emu, uintptr_t fcn) { iFppiipi_t fn = (iFppiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void iFppiipp(x64emu_t *emu, uintptr_t fcn) { iFppiipp_t fn = (iFppiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFppiuii(x64emu_t *emu, uintptr_t fcn) { iFppiuii_t fn = (iFppiuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFppiupp(x64emu_t *emu, uintptr_t fcn) { iFppiupp_t fn = (iFppiupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppilpp(x64emu_t *emu, uintptr_t fcn) { iFppilpp_t fn = (iFppilpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppipii(x64emu_t *emu, uintptr_t fcn) { iFppipii_t fn = (iFppipii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
@@ -5520,6 +5563,7 @@ void iFppLLup(x64emu_t *emu, uintptr_t fcn) { iFppLLup_t fn = (iFppLLup_t)fcn; R
 void iFppLLpp(x64emu_t *emu, uintptr_t fcn) { iFppLLpp_t fn = (iFppLLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppLpLp(x64emu_t *emu, uintptr_t fcn) { iFppLpLp_t fn = (iFppLpLp_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); }
 void iFppLppp(x64emu_t *emu, uintptr_t fcn) { iFppLppp_t fn = (iFppLppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFpppiup(x64emu_t *emu, uintptr_t fcn) { iFpppiup_t fn = (iFpppiup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void iFpppipi(x64emu_t *emu, uintptr_t fcn) { iFpppipi_t fn = (iFpppipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void 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); }
@@ -5539,6 +5583,7 @@ void iFpppppi(x64emu_t *emu, uintptr_t fcn) { iFpppppi_t fn = (iFpppppi_t)fcn; R
 void iFpppppu(x64emu_t *emu, uintptr_t fcn) { iFpppppu_t fn = (iFpppppu_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 iFpppppL(x64emu_t *emu, uintptr_t fcn) { iFpppppL_t fn = (iFpppppL_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 iFpppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppp_t fn = (iFpppppp_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 iFpppppS(x64emu_t *emu, uintptr_t fcn) { iFpppppS_t fn = (iFpppppS_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, io_convert((void*)R_R9)); }
 void uFEiippp(x64emu_t *emu, uintptr_t fcn) { uFEiippp_t fn = (uFEiippp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFEiuppp(x64emu_t *emu, uintptr_t fcn) { uFEiuppp_t fn = (uFEiuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFEpippi(x64emu_t *emu, uintptr_t fcn) { uFEpippi_t fn = (uFEpippi_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
@@ -5618,8 +5663,12 @@ void pFpiiiiu(x64emu_t *emu, uintptr_t fcn) { pFpiiiiu_t fn = (pFpiiiiu_t)fcn; R
 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); }
 void pFpiiuup(x64emu_t *emu, uintptr_t fcn) { pFpiiuup_t fn = (pFpiiuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
+void pFpiipip(x64emu_t *emu, uintptr_t fcn) { pFpiipip_t fn = (pFpiipip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
+void pFpiippp(x64emu_t *emu, uintptr_t fcn) { pFpiippp_t fn = (pFpiippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpiUUUU(x64emu_t *emu, uintptr_t fcn) { pFpiUUUU_t fn = (pFpiUUUU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9); }
+void pFpipipL(x64emu_t *emu, uintptr_t fcn) { pFpipipL_t fn = (pFpipipL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void pFpipipp(x64emu_t *emu, uintptr_t fcn) { pFpipipp_t fn = (pFpipipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void pFpipuii(x64emu_t *emu, uintptr_t fcn) { pFpipuii_t fn = (pFpipuii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFpippip(x64emu_t *emu, uintptr_t fcn) { pFpippip_t fn = (pFpippip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void pFpipppp(x64emu_t *emu, uintptr_t fcn) { pFpipppp_t fn = (pFpipppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpuiiip(x64emu_t *emu, uintptr_t fcn) { pFpuiiip_t fn = (pFpuiiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
@@ -5844,6 +5893,7 @@ void iFpLpLuLi(x64emu_t *emu, uintptr_t fcn) { iFpLpLuLi_t fn = (iFpLpLuLi_t)fcn
 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 iFpLppiip(x64emu_t *emu, uintptr_t fcn) { iFpLppiip_t fn = (iFpLppiip_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, *(void**)(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)); }
 void iFppiiLll(x64emu_t *emu, uintptr_t fcn) { iFppiiLll_t fn = (iFppiiLll_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8, (intptr_t)R_R9, *(intptr_t*)(R_RSP + 8)); }
@@ -5921,7 +5971,9 @@ void pFdiiiIiI(x64emu_t *emu, uintptr_t fcn) { pFdiiiIiI_t fn = (pFdiiiIiI_t)fcn
 void pFpiiiiid(x64emu_t *emu, uintptr_t fcn) { pFpiiiiid_t fn = (pFpiiiiid_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, emu->xmm[0].d[0]); }
 void pFpiiippp(x64emu_t *emu, uintptr_t fcn) { pFpiiippp_t fn = (pFpiiippp_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**)(R_RSP + 8)); }
 void pFpiiUdii(x64emu_t *emu, uintptr_t fcn) { pFpiiUdii_t fn = (pFpiiUdii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX, emu->xmm[0].d[0], (int32_t)R_R8, (int32_t)R_R9); }
+void pFpiipipp(x64emu_t *emu, uintptr_t fcn) { pFpiipipp_t fn = (pFpiipipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpiipppp(x64emu_t *emu, uintptr_t fcn) { pFpiipppp_t fn = (pFpiipppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void pFpipiupp(x64emu_t *emu, uintptr_t fcn) { pFpipiupp_t fn = (pFpipiupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpipippp(x64emu_t *emu, uintptr_t fcn) { pFpipippp_t fn = (pFpipippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpWppWpp(x64emu_t *emu, uintptr_t fcn) { pFpWppWpp_t fn = (pFpWppWpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpuLpipp(x64emu_t *emu, uintptr_t fcn) { pFpuLpipp_t fn = (pFpuLpipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -6066,6 +6118,7 @@ void iFiuuuupip(x64emu_t *emu, uintptr_t fcn) { iFiuuuupip_t fn = (iFiuuuupip_t)
 void iFipippppp(x64emu_t *emu, uintptr_t fcn) { iFipippppp_t fn = (iFipippppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFuiiiiuup(x64emu_t *emu, uintptr_t fcn) { iFuiiiiuup_t fn = (iFuiiiiuup_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { iFuuuuuuuu_t fn = (iFuuuuuuuu_t)fcn; R_RAX=(int32_t)fn((uint32_t)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)); }
+void iFupipppip(x64emu_t *emu, uintptr_t fcn) { iFupipppip_t fn = (iFupipppip_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFdiippppL(x64emu_t *emu, uintptr_t fcn) { iFdiippppL_t fn = (iFdiippppL_t)fcn; R_RAX=(int32_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8)); }
 void iFpiiiuuup(x64emu_t *emu, uintptr_t fcn) { iFpiiiuuup_t fn = (iFpiiiuuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpipiipip(x64emu_t *emu, uintptr_t fcn) { iFpipiipip_t fn = (iFpipiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -6150,7 +6203,7 @@ void pFuupupipp(x64emu_t *emu, uintptr_t fcn) { pFuupupipp_t fn = (pFuupupipp_t)
 void pFpiiiiiuu(x64emu_t *emu, uintptr_t fcn) { pFpiiiiiuu_t fn = (pFpiiiiiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void pFpiiuuupp(x64emu_t *emu, uintptr_t fcn) { pFpiiuuupp_t fn = (pFpiiuuupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpiUdiiUi(x64emu_t *emu, uintptr_t fcn) { pFpiUdiiUi_t fn = (pFpiUdiiUi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, emu->xmm[0].d[0], (int32_t)R_RCX, (int32_t)R_R8, (uint64_t)R_R9, *(int32_t*)(R_RSP + 8)); }
-void pFpipiiiip(x64emu_t *emu, uintptr_t fcn) { pFpipiiiip_t fn = (pFpipiiiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void pFpipiuiip(x64emu_t *emu, uintptr_t fcn) { pFpipiuiip_t fn = (pFpipiuiip_t)fcn; R_RAX=(uintptr_t)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 pFpuuuuupp(x64emu_t *emu, uintptr_t fcn) { pFpuuuuupp_t fn = (pFpuuuuupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpuuuupup(x64emu_t *emu, uintptr_t fcn) { pFpuuuupup_t fn = (pFpuuuupup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpupLLLpp(x64emu_t *emu, uintptr_t fcn) { pFpupLLLpp_t fn = (pFpupLLLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -6338,6 +6391,7 @@ void vFffffffffff(x64emu_t *emu, uintptr_t fcn) { vFffffffffff_t fn = (vFfffffff
 void vFpiuippppip(x64emu_t *emu, uintptr_t fcn) { vFpiuippppip_t fn = (vFpiuippppip_t)fcn; fn((void*)R_RDI, (int32_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), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFpuupuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuupuuuuuu_t fn = (vFpuupuuuuuu_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, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
 void vFppiiiiupip(x64emu_t *emu, uintptr_t fcn) { vFppiiiiupip_t fn = (vFppiiiiupip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
+void vFppipipippi(x64emu_t *emu, uintptr_t fcn) { vFppipipippi_t fn = (vFppipipippi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void vFppuipppiip(x64emu_t *emu, uintptr_t fcn) { vFppuipppiip_t fn = (vFppuipppiip_t)fcn; 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), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFppuuuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuuiiiii_t fn = (vFppuuuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_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), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void vFppuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFppuuuuuuuu_t fn = (vFppuuuuuuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
@@ -6426,6 +6480,7 @@ void iFEppLpLpLLpp(x64emu_t *emu, uintptr_t fcn) { iFEppLpLpLLpp_t fn = (iFEppLp
 void iFEpppupppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppupppppp_t fn = (iFEpppupppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFEpppppppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppppppppp_t fn = (iFEpppppppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFuiiiiuuiiip(x64emu_t *emu, uintptr_t fcn) { iFuiiiiuuiiip_t fn = (iFuiiiiuuiiip_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_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), *(int32_t*)(R_RSP + 32), *(void**)(R_RSP + 40)); }
+void iFuppipipippi(x64emu_t *emu, uintptr_t fcn) { iFuppipipippi_t fn = (iFuppipipippi_t)fcn; R_RAX=(int32_t)fn((uint32_t)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**)(R_RSP + 24), *(void**)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void iFpiiLLiiipip(x64emu_t *emu, uintptr_t fcn) { iFpiiLLiiipip_t fn = (iFpiiLLiiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_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), *(int32_t*)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFpippupppppp(x64emu_t *emu, uintptr_t fcn) { iFpippupppppp_t fn = (iFpippupppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFpuppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpuppppppppp_t fn = (iFpuppppppppp_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**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
@@ -6435,6 +6490,7 @@ void iFppippipppip(x64emu_t *emu, uintptr_t fcn) { iFppippipppip_t fn = (iFppipp
 void iFppuupLiupii(x64emu_t *emu, uintptr_t fcn) { iFppuupLiupii_t fn = (iFppuupLiupii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void iFppuppLLpupp(x64emu_t *emu, uintptr_t fcn) { iFppuppLLpupp_t fn = (iFppuppLLpupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFpppiiuuiiuu(x64emu_t *emu, uintptr_t fcn) { iFpppiiuuiiuu_t fn = (iFpppiiuuiiuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40)); }
+void iFpppippppppp(x64emu_t *emu, uintptr_t fcn) { iFpppippppppp_t fn = (iFpppippppppp_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**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFpppppiiuupp(x64emu_t *emu, uintptr_t fcn) { iFpppppiiuupp_t fn = (iFpppppiiuupp_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, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void uFEpLuupppLuV(x64emu_t *emu, uintptr_t fcn) { uFEpLuupppLuV_t fn = (uFEpLuupppLuV_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), (void*)(R_RSP + 32)); }
 void uFEpLuppppLup(x64emu_t *emu, uintptr_t fcn) { uFEpLuppppLup_t fn = (uFEpLuppppLup_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
@@ -7178,6 +7234,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFlll) return 1;
 	if (fun == &lFpli) return 1;
 	if (fun == &lFpLu) return 1;
+	if (fun == &lFpLd) return 2;
 	if (fun == &lFpLL) return 1;
 	if (fun == &lFpLp) return 1;
 	if (fun == &lFppi) return 1;
@@ -7248,6 +7305,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpWp) return 1;
 	if (fun == &pFpui) return 1;
 	if (fun == &pFpuu) return 1;
+	if (fun == &pFpuf) return 2;
 	if (fun == &pFpup) return 1;
 	if (fun == &pFpUi) return 1;
 	if (fun == &pFpUu) return 1;
@@ -7497,6 +7555,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpuuL) return 1;
 	if (fun == &iFpuup) return 1;
 	if (fun == &iFpuUp) return 1;
+	if (fun == &iFpufp) return 2;
 	if (fun == &iFpuLi) return 1;
 	if (fun == &iFpuLL) return 1;
 	if (fun == &iFpuLp) return 1;
@@ -7570,6 +7629,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFiiuu) return 1;
 	if (fun == &uFifff) return 4;
 	if (fun == &uFuuuu) return 1;
+	if (fun == &uFuppd) return 2;
 	if (fun == &uFpiip) return 1;
 	if (fun == &uFpipu) return 1;
 	if (fun == &uFpipL) return 1;
@@ -7589,6 +7649,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFppLp) return 1;
 	if (fun == &uFpppi) return 1;
 	if (fun == &uFpppu) return 1;
+	if (fun == &uFpppd) return 2;
 	if (fun == &uFpppL) return 1;
 	if (fun == &uFpppp) return 1;
 	if (fun == &UFpUui) return 1;
@@ -7672,6 +7733,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpiuu) return 1;
 	if (fun == &pFpiLi) return 1;
 	if (fun == &pFpiLL) return 1;
+	if (fun == &pFpipc) return 1;
 	if (fun == &pFpipi) return 1;
 	if (fun == &pFpipd) return 2;
 	if (fun == &pFpipL) return 1;
@@ -7913,6 +7975,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFipppp) return 1;
 	if (fun == &iFuiuup) return 1;
 	if (fun == &iFuuupp) return 1;
+	if (fun == &iFuupid) return 2;
 	if (fun == &iFuppLp) return 1;
 	if (fun == &iFLppip) return 1;
 	if (fun == &iFLpppp) return 1;
@@ -7985,6 +8048,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpLppi) return 1;
 	if (fun == &iFpLppL) return 1;
 	if (fun == &iFpLppp) return 1;
+	if (fun == &iFppiii) return 1;
 	if (fun == &iFppiiu) return 1;
 	if (fun == &iFppiiL) return 1;
 	if (fun == &iFppiip) return 1;
@@ -7994,6 +8058,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppiLL) return 1;
 	if (fun == &iFppipi) return 1;
 	if (fun == &iFppipu) return 1;
+	if (fun == &iFppipl) return 1;
 	if (fun == &iFppipp) return 1;
 	if (fun == &iFppuwp) return 1;
 	if (fun == &iFppuip) return 1;
@@ -8024,6 +8089,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppLp) return 1;
 	if (fun == &iFppppi) return 1;
 	if (fun == &iFppppu) return 1;
+	if (fun == &iFppppd) return 2;
 	if (fun == &iFppppl) return 1;
 	if (fun == &iFppppL) return 1;
 	if (fun == &iFppppp) return 1;
@@ -8102,6 +8168,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpiuup) return 1;
 	if (fun == &pFpiupp) return 1;
 	if (fun == &pFpiLip) return 1;
+	if (fun == &pFpipii) return 1;
 	if (fun == &pFpipip) return 1;
 	if (fun == &pFpipup) return 1;
 	if (fun == &pFpippi) return 1;
@@ -8383,6 +8450,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppiiip) return 1;
 	if (fun == &iFppiipi) return 1;
 	if (fun == &iFppiipp) return 1;
+	if (fun == &iFppiuii) return 1;
 	if (fun == &iFppiupp) return 1;
 	if (fun == &iFppilpp) return 1;
 	if (fun == &iFppipii) return 1;
@@ -8413,6 +8481,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppLLpp) return 1;
 	if (fun == &iFppLpLp) return 1;
 	if (fun == &iFppLppp) return 1;
+	if (fun == &iFpppiup) return 1;
 	if (fun == &iFpppipi) return 1;
 	if (fun == &iFpppipu) return 1;
 	if (fun == &iFpppipp) return 1;
@@ -8482,8 +8551,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpiiipp) return 1;
 	if (fun == &pFpiiCCC) return 1;
 	if (fun == &pFpiiuup) return 1;
+	if (fun == &pFpiipip) return 1;
+	if (fun == &pFpiippp) return 1;
 	if (fun == &pFpiUUUU) return 1;
+	if (fun == &pFpipipL) return 1;
 	if (fun == &pFpipipp) return 1;
+	if (fun == &pFpipuii) return 1;
 	if (fun == &pFpippip) return 1;
 	if (fun == &pFpipppp) return 1;
 	if (fun == &pFpuiiip) return 1;
@@ -8823,6 +8896,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &dFppp) return -1;
 	if (fun == &lFlll) return 1;
 	if (fun == &lFpLu) return 1;
+	if (fun == &lFpLd) return 2;
 	if (fun == &lFpLL) return 1;
 	if (fun == &lFpLp) return 1;
 	if (fun == &lFppu) return 1;
@@ -8859,6 +8933,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpWW) return 1;
 	if (fun == &pFpWp) return 1;
 	if (fun == &pFpuu) return 1;
+	if (fun == &pFpuf) return 2;
 	if (fun == &pFpup) return 1;
 	if (fun == &pFpUu) return 1;
 	if (fun == &pFpdu) return 2;
@@ -8942,6 +9017,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpppp) return 1;
 	if (fun == &CFuuff) return 3;
 	if (fun == &uFuuuu) return 1;
+	if (fun == &uFuppd) return 2;
 	if (fun == &uFpCCC) return 1;
 	if (fun == &uFpuup) return 1;
 	if (fun == &uFpupu) return 1;
@@ -8952,6 +9028,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpplp) return 1;
 	if (fun == &uFppLp) return 1;
 	if (fun == &uFpppu) return 1;
+	if (fun == &uFpppd) return 2;
 	if (fun == &uFpppL) return 1;
 	if (fun == &uFpppp) return 1;
 	if (fun == &dFpppp) return -1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 63df0758..6a8137f9 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -625,6 +625,7 @@ void iFppL(x64emu_t *emu, uintptr_t fnc);
 void iFppp(x64emu_t *emu, uintptr_t fnc);
 void iFpOi(x64emu_t *emu, uintptr_t fnc);
 void iFpOu(x64emu_t *emu, uintptr_t fnc);
+void iFpSu(x64emu_t *emu, uintptr_t fnc);
 void iFSIi(x64emu_t *emu, uintptr_t fnc);
 void iFSli(x64emu_t *emu, uintptr_t fnc);
 void iFSpL(x64emu_t *emu, uintptr_t fnc);
@@ -718,6 +719,7 @@ void lFipL(x64emu_t *emu, uintptr_t fnc);
 void lFlll(x64emu_t *emu, uintptr_t fnc);
 void lFpli(x64emu_t *emu, uintptr_t fnc);
 void lFpLu(x64emu_t *emu, uintptr_t fnc);
+void lFpLd(x64emu_t *emu, uintptr_t fnc);
 void lFpLL(x64emu_t *emu, uintptr_t fnc);
 void lFpLp(x64emu_t *emu, uintptr_t fnc);
 void lFppi(x64emu_t *emu, uintptr_t fnc);
@@ -803,6 +805,7 @@ void pFpWW(x64emu_t *emu, uintptr_t fnc);
 void pFpWp(x64emu_t *emu, uintptr_t fnc);
 void pFpui(x64emu_t *emu, uintptr_t fnc);
 void pFpuu(x64emu_t *emu, uintptr_t fnc);
+void pFpuf(x64emu_t *emu, uintptr_t fnc);
 void pFpup(x64emu_t *emu, uintptr_t fnc);
 void pFpUi(x64emu_t *emu, uintptr_t fnc);
 void pFpUu(x64emu_t *emu, uintptr_t fnc);
@@ -1124,6 +1127,7 @@ void iFpuul(x64emu_t *emu, uintptr_t fnc);
 void iFpuuL(x64emu_t *emu, uintptr_t fnc);
 void iFpuup(x64emu_t *emu, uintptr_t fnc);
 void iFpuUp(x64emu_t *emu, uintptr_t fnc);
+void iFpufp(x64emu_t *emu, uintptr_t fnc);
 void iFpuLi(x64emu_t *emu, uintptr_t fnc);
 void iFpuLL(x64emu_t *emu, uintptr_t fnc);
 void iFpuLp(x64emu_t *emu, uintptr_t fnc);
@@ -1209,6 +1213,7 @@ void uFiiii(x64emu_t *emu, uintptr_t fnc);
 void uFiiuu(x64emu_t *emu, uintptr_t fnc);
 void uFifff(x64emu_t *emu, uintptr_t fnc);
 void uFuuuu(x64emu_t *emu, uintptr_t fnc);
+void uFuppd(x64emu_t *emu, uintptr_t fnc);
 void uFpiip(x64emu_t *emu, uintptr_t fnc);
 void uFpipu(x64emu_t *emu, uintptr_t fnc);
 void uFpipL(x64emu_t *emu, uintptr_t fnc);
@@ -1229,6 +1234,7 @@ void uFpplp(x64emu_t *emu, uintptr_t fnc);
 void uFppLp(x64emu_t *emu, uintptr_t fnc);
 void uFpppi(x64emu_t *emu, uintptr_t fnc);
 void uFpppu(x64emu_t *emu, uintptr_t fnc);
+void uFpppd(x64emu_t *emu, uintptr_t fnc);
 void uFpppL(x64emu_t *emu, uintptr_t fnc);
 void uFpppp(x64emu_t *emu, uintptr_t fnc);
 void uFbipp(x64emu_t *emu, uintptr_t fnc);
@@ -1340,6 +1346,7 @@ void pFpiip(x64emu_t *emu, uintptr_t fnc);
 void pFpiuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiLi(x64emu_t *emu, uintptr_t fnc);
 void pFpiLL(x64emu_t *emu, uintptr_t fnc);
+void pFpipc(x64emu_t *emu, uintptr_t fnc);
 void pFpipi(x64emu_t *emu, uintptr_t fnc);
 void pFpipd(x64emu_t *emu, uintptr_t fnc);
 void pFpipL(x64emu_t *emu, uintptr_t fnc);
@@ -1652,6 +1659,7 @@ void iFipppi(x64emu_t *emu, uintptr_t fnc);
 void iFipppp(x64emu_t *emu, uintptr_t fnc);
 void iFuiuup(x64emu_t *emu, uintptr_t fnc);
 void iFuuupp(x64emu_t *emu, uintptr_t fnc);
+void iFuupid(x64emu_t *emu, uintptr_t fnc);
 void iFuppLp(x64emu_t *emu, uintptr_t fnc);
 void iFLppip(x64emu_t *emu, uintptr_t fnc);
 void iFLpppp(x64emu_t *emu, uintptr_t fnc);
@@ -1724,6 +1732,7 @@ void iFpLpLi(x64emu_t *emu, uintptr_t fnc);
 void iFpLppi(x64emu_t *emu, uintptr_t fnc);
 void iFpLppL(x64emu_t *emu, uintptr_t fnc);
 void iFpLppp(x64emu_t *emu, uintptr_t fnc);
+void iFppiii(x64emu_t *emu, uintptr_t fnc);
 void iFppiiu(x64emu_t *emu, uintptr_t fnc);
 void iFppiiL(x64emu_t *emu, uintptr_t fnc);
 void iFppiip(x64emu_t *emu, uintptr_t fnc);
@@ -1733,6 +1742,7 @@ void iFppiLi(x64emu_t *emu, uintptr_t fnc);
 void iFppiLL(x64emu_t *emu, uintptr_t fnc);
 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 iFppuwp(x64emu_t *emu, uintptr_t fnc);
 void iFppuip(x64emu_t *emu, uintptr_t fnc);
@@ -1763,9 +1773,12 @@ void iFpppLL(x64emu_t *emu, uintptr_t fnc);
 void iFpppLp(x64emu_t *emu, uintptr_t fnc);
 void iFppppi(x64emu_t *emu, uintptr_t fnc);
 void iFppppu(x64emu_t *emu, uintptr_t fnc);
+void iFppppd(x64emu_t *emu, uintptr_t fnc);
 void iFppppl(x64emu_t *emu, uintptr_t fnc);
 void iFppppL(x64emu_t *emu, uintptr_t fnc);
 void iFppppp(x64emu_t *emu, uintptr_t fnc);
+void iFpSipp(x64emu_t *emu, uintptr_t fnc);
+void iFpSuif(x64emu_t *emu, uintptr_t fnc);
 void iFSppLp(x64emu_t *emu, uintptr_t fnc);
 void IFppIII(x64emu_t *emu, uintptr_t fnc);
 void uFEippp(x64emu_t *emu, uintptr_t fnc);
@@ -1872,6 +1885,7 @@ void pFpiuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiuup(x64emu_t *emu, uintptr_t fnc);
 void pFpiupp(x64emu_t *emu, uintptr_t fnc);
 void pFpiLip(x64emu_t *emu, uintptr_t fnc);
+void pFpipii(x64emu_t *emu, uintptr_t fnc);
 void pFpipip(x64emu_t *emu, uintptr_t fnc);
 void pFpipup(x64emu_t *emu, uintptr_t fnc);
 void pFpippi(x64emu_t *emu, uintptr_t fnc);
@@ -2207,6 +2221,7 @@ void iFppiiii(x64emu_t *emu, uintptr_t fnc);
 void iFppiiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiipi(x64emu_t *emu, uintptr_t fnc);
 void iFppiipp(x64emu_t *emu, uintptr_t fnc);
+void iFppiuii(x64emu_t *emu, uintptr_t fnc);
 void iFppiupp(x64emu_t *emu, uintptr_t fnc);
 void iFppilpp(x64emu_t *emu, uintptr_t fnc);
 void iFppipii(x64emu_t *emu, uintptr_t fnc);
@@ -2237,6 +2252,7 @@ void iFppLLup(x64emu_t *emu, uintptr_t fnc);
 void iFppLLpp(x64emu_t *emu, uintptr_t fnc);
 void iFppLpLp(x64emu_t *emu, uintptr_t fnc);
 void iFppLppp(x64emu_t *emu, uintptr_t fnc);
+void iFpppiup(x64emu_t *emu, uintptr_t fnc);
 void iFpppipi(x64emu_t *emu, uintptr_t fnc);
 void iFpppipu(x64emu_t *emu, uintptr_t fnc);
 void iFpppipp(x64emu_t *emu, uintptr_t fnc);
@@ -2256,6 +2272,7 @@ void iFpppppi(x64emu_t *emu, uintptr_t fnc);
 void iFpppppu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppL(x64emu_t *emu, uintptr_t fnc);
 void iFpppppp(x64emu_t *emu, uintptr_t fnc);
+void iFpppppS(x64emu_t *emu, uintptr_t fnc);
 void uFEiippp(x64emu_t *emu, uintptr_t fnc);
 void uFEiuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpippi(x64emu_t *emu, uintptr_t fnc);
@@ -2335,8 +2352,12 @@ void pFpiiiiu(x64emu_t *emu, uintptr_t fnc);
 void pFpiiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpiiCCC(x64emu_t *emu, uintptr_t fnc);
 void pFpiiuup(x64emu_t *emu, uintptr_t fnc);
+void pFpiipip(x64emu_t *emu, uintptr_t fnc);
+void pFpiippp(x64emu_t *emu, uintptr_t fnc);
 void pFpiUUUU(x64emu_t *emu, uintptr_t fnc);
+void pFpipipL(x64emu_t *emu, uintptr_t fnc);
 void pFpipipp(x64emu_t *emu, uintptr_t fnc);
+void pFpipuii(x64emu_t *emu, uintptr_t fnc);
 void pFpippip(x64emu_t *emu, uintptr_t fnc);
 void pFpipppp(x64emu_t *emu, uintptr_t fnc);
 void pFpuiiip(x64emu_t *emu, uintptr_t fnc);
@@ -2561,6 +2582,7 @@ 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 iFpLppiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiiuup(x64emu_t *emu, uintptr_t fnc);
 void iFppiiLll(x64emu_t *emu, uintptr_t fnc);
@@ -2638,7 +2660,9 @@ void pFdiiiIiI(x64emu_t *emu, uintptr_t fnc);
 void pFpiiiiid(x64emu_t *emu, uintptr_t fnc);
 void pFpiiippp(x64emu_t *emu, uintptr_t fnc);
 void pFpiiUdii(x64emu_t *emu, uintptr_t fnc);
+void pFpiipipp(x64emu_t *emu, uintptr_t fnc);
 void pFpiipppp(x64emu_t *emu, uintptr_t fnc);
+void pFpipiupp(x64emu_t *emu, uintptr_t fnc);
 void pFpipippp(x64emu_t *emu, uintptr_t fnc);
 void pFpWppWpp(x64emu_t *emu, uintptr_t fnc);
 void pFpuLpipp(x64emu_t *emu, uintptr_t fnc);
@@ -2783,6 +2807,7 @@ void iFiuuuupip(x64emu_t *emu, uintptr_t fnc);
 void iFipippppp(x64emu_t *emu, uintptr_t fnc);
 void iFuiiiiuup(x64emu_t *emu, uintptr_t fnc);
 void iFuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
+void iFupipppip(x64emu_t *emu, uintptr_t fnc);
 void iFdiippppL(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiuuup(x64emu_t *emu, uintptr_t fnc);
 void iFpipiipip(x64emu_t *emu, uintptr_t fnc);
@@ -2867,7 +2892,7 @@ void pFuupupipp(x64emu_t *emu, uintptr_t fnc);
 void pFpiiiiiuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiiuuupp(x64emu_t *emu, uintptr_t fnc);
 void pFpiUdiiUi(x64emu_t *emu, uintptr_t fnc);
-void pFpipiiiip(x64emu_t *emu, uintptr_t fnc);
+void pFpipiuiip(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuuupp(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuupup(x64emu_t *emu, uintptr_t fnc);
 void pFpupLLLpp(x64emu_t *emu, uintptr_t fnc);
@@ -3056,6 +3081,7 @@ void vFffffffffff(x64emu_t *emu, uintptr_t fnc);
 void vFpiuippppip(x64emu_t *emu, uintptr_t fnc);
 void vFpuupuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiupip(x64emu_t *emu, uintptr_t fnc);
+void vFppipipippi(x64emu_t *emu, uintptr_t fnc);
 void vFppuipppiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
@@ -3144,6 +3170,7 @@ void iFEppLpLpLLpp(x64emu_t *emu, uintptr_t fnc);
 void iFEpppupppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFuiiiiuuiiip(x64emu_t *emu, uintptr_t fnc);
+void iFuppipipippi(x64emu_t *emu, uintptr_t fnc);
 void iFpiiLLiiipip(x64emu_t *emu, uintptr_t fnc);
 void iFpippupppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuppppppppp(x64emu_t *emu, uintptr_t fnc);
@@ -3153,6 +3180,7 @@ void iFppippipppip(x64emu_t *emu, uintptr_t fnc);
 void iFppuupLiupii(x64emu_t *emu, uintptr_t fnc);
 void iFppuppLLpupp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiuuiiuu(x64emu_t *emu, uintptr_t fnc);
+void iFpppippppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppppiiuupp(x64emu_t *emu, uintptr_t fnc);
 void uFEpLuupppLuV(x64emu_t *emu, uintptr_t fnc);
 void uFEpLuppppLup(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedlibcups_private.h b/src/wrapped/wrappedlibcups_private.h
index 13f3b988..0d38b9f2 100644
--- a/src/wrapped/wrappedlibcups_private.h
+++ b/src/wrapped/wrappedlibcups_private.h
@@ -1,111 +1,111 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
-//GO(cupsAddDest, 
-//GO(cupsAddIntegerOption, 
+GO(cupsAddDest, iFppip)
+GO(cupsAddIntegerOption, iFpiip)
 GO(cupsAddOption, iFppip)
-//GO(cupsAdminCreateWindowsPPD, 
-//GO(cupsAdminExportSamba, 
-//GO(cupsAdminGetServerSettings, 
-//GO(cupsAdminSetServerSettings, 
-//GO(cupsArrayAdd, 
+GO(cupsAdminCreateWindowsPPD, pFpppi)
+GO(cupsAdminExportSamba, iFpppppS)
+GO(cupsAdminGetServerSettings, iFppp)
+GO(cupsAdminSetServerSettings, iFpip)
+GO(cupsArrayAdd, iFpp)
 //GO(_cupsArrayAddStrings, 
-//GO(cupsArrayClear, 
-//GO(cupsArrayCount, 
-//GO(cupsArrayCurrent, 
-//GO(cupsArrayDelete, 
-//GO(cupsArrayDup, 
-//GO(cupsArrayFind, 
-//GO(cupsArrayFirst, 
-//GO(cupsArrayGetIndex, 
-//GO(cupsArrayGetInsert, 
-//GO(cupsArrayIndex, 
-//GO(cupsArrayInsert, 
-//GO(cupsArrayLast, 
-//GO(cupsArrayNew, 
-//GO(cupsArrayNew2, 
-//GO(cupsArrayNew3, 
+GO(cupsArrayClear, vFp)
+GO(cupsArrayCount, iFp)
+GO(cupsArrayCurrent, pFp)
+GO(cupsArrayDelete, vFp)
+GO(cupsArrayDup, pFp)
+GO(cupsArrayFind, pFpp)
+GO(cupsArrayFirst, pFp)
+GO(cupsArrayGetIndex, iFp)
+GO(cupsArrayGetInsert, iFp)
+GO(cupsArrayIndex, pFpi)
+GO(cupsArrayInsert, iFpp)
+GO(cupsArrayLast, pFp)
+//GOM(cupsArrayNew, pFEpp)
+//GOM(cupsArrayNew2, pFEpppi)
+//GOM(cupsArrayNew3, pFEpppipp)
 //GO(_cupsArrayNewStrings, 
-//GO(cupsArrayNext, 
-//GO(cupsArrayPrev, 
-//GO(cupsArrayRemove, 
-//GO(cupsArrayRestore, 
-//GO(cupsArraySave, 
-//GO(cupsArrayUserData, 
-//GO(cupsBackChannelRead, 
-//GO(cupsBackChannelWrite, 
-//GO(cupsBackendDeviceURI, 
-//GO(cupsBackendReport, 
+GO(cupsArrayNext, pFp)
+GO(cupsArrayPrev, pFp)
+GO(cupsArrayRemove, iFpp)
+GO(cupsArrayRestore, pFp)
+GO(cupsArraySave, iFp)
+GO(cupsArrayUserData, pFp)
+GO(cupsBackChannelRead, lFpLd)
+GO(cupsBackChannelWrite, lFpLd)
+GO(cupsBackendDeviceURI, pFp)
+GO(cupsBackendReport, vFpppppp)
 //GO(_cupsBufferGet, 
 //GO(_cupsBufferRelease, 
-//GO(cupsCancelDestJob, 
-//GO(cupsCancelJob, 
-//GO(cupsCancelJob2, 
+GO(cupsCancelDestJob, iFppi)
+GO(cupsCancelJob, iFpi)
+GO(cupsCancelJob2, iFppii)
 //GO(_cupsCharmapFlush, 
-//GO(cupsCharsetToUTF8, 
-//GO(cupsCheckDestSupported, 
-//GO(cupsCloseDestJob, 
+GO(cupsCharsetToUTF8, iFppii)
+GO(cupsCheckDestSupported, iFppppp)
+GO(cupsCloseDestJob, iFpppi)
 //GO(_cupsCondBroadcast, 
 //GO(_cupsCondInit, 
 //GO(_cupsCondWait, 
 //GO(_cupsConnect, 
-//GO(cupsConnectDest, 
+//GOM(cupsConnectDest, pFEpuippLpp)
 //GO(_cupsConvertOptions, 
 GO(cupsCopyDest, iFpip)
-//GO(cupsCopyDestConflicts, 
-//GO(cupsCopyDestInfo, 
+GO(cupsCopyDestConflicts, iFpppippppppp)
+GO(cupsCopyDestInfo, pFpp)
 //GO(_cupsCreateDest, 
-//GO(cupsCreateDestJob, 
+GO(cupsCreateDestJob, iFpppppip)
 GO(cupsCreateJob, iFpppip)
 //DATA(_cups_debug_fd, 
 //DATA(_cups_debug_level, 
-//GO(cupsDirClose, 
-//GO(cupsDirOpen, 
-//GO(cupsDirRead, 
-//GO(cupsDirRewind, 
-//GO(cupsDoAuthentication, 
-//GO(cupsDoFileRequest, 
-//GO(cupsDoIORequest, 
-//GO(cupsDoRequest, 
-//GO(cupsEncodeOptions, 
-//GO(cupsEncodeOptions2, 
+GO(cupsDirClose, vFp)
+GO(cupsDirOpen, pFp)
+GO(cupsDirRead, pFp)
+GO(cupsDirRewind, vFp)
+GO(cupsDoAuthentication, iFppp)
+GO(cupsDoFileRequest, pFpppp)
+GO(cupsDoIORequest, pFpppii)
+GO(cupsDoRequest, pFppp)
+GO(cupsEncodeOptions, vFpip)
+GO(cupsEncodeOptions2, vFpipi)
 //GO(_cupsEncodingName, 
-//GO(cupsEncryption, 
+GO(cupsEncryption, uFv)
 GOM(cupsEnumDests, iFEuipuupp)
 //GO(_cupsFileCheck, 
 //GO(_cupsFileCheckFilter, 
-//GO(cupsFileClose, 
-//GO(cupsFileCompression, 
-//GO(cupsFileEOF, 
-//GO(cupsFileFind, 
-//GO(cupsFileFlush, 
-//GO(cupsFileGetChar, 
-//GO(cupsFileGetConf, 
-//GO(cupsFileGetLine, 
-//GO(cupsFileGets, 
-//GO(cupsFileLock, 
-//GO(cupsFileNumber, 
-//GO(cupsFileOpen, 
-//GO(cupsFileOpenFd, 
+GO(cupsFileClose, iFp)
+GO(cupsFileCompression, iFp)
+GO(cupsFileEOF, iFp)
+GO(cupsFileFind, pFppipi)
+GO(cupsFileFlush, iFp)
+GO(cupsFileGetChar, iFp)
+GO(cupsFileGetConf, pFppLpp)
+GO(cupsFileGetLine, LFppL)
+GO(cupsFileGets, pFppL)
+GO(cupsFileLock, iFpi)
+GO(cupsFileNumber, iFp)
+GO(cupsFileOpen, pFpp)
+GO(cupsFileOpenFd, pFip)
 //GO(_cupsFilePeekAhead, 
-//GO(cupsFilePeekChar, 
-//GO(cupsFilePrintf, 
-//GO(cupsFilePutChar, 
-//GO(cupsFilePutConf, 
-//GO(cupsFilePuts, 
-//GO(cupsFileRead, 
-//GO(cupsFileRewind, 
-//GO(cupsFileSeek, 
-//GO(cupsFileStderr, 
-//GO(cupsFileStdin, 
-//GO(cupsFileStdout, 
-//GO(cupsFileTell, 
-//GO(cupsFileUnlock, 
-//GO(cupsFileWrite, 
-//GO(cupsFindDestDefault, 
-//GO(cupsFindDestReady, 
-//GO(cupsFindDestSupported, 
+GO(cupsFilePeekChar, iFp)
+//GOM(cupsFilePrintf, iFEppV)
+GO(cupsFilePutChar, iFpi)
+GO(cupsFilePutConf, lFppp)
+GO(cupsFilePuts, iFpp)
+GO(cupsFileRead, lFppL)
+GO(cupsFileRewind, lFp)
+GO(cupsFileSeek, lFpl)
+GO(cupsFileStderr, pFv)
+GO(cupsFileStdin, pFv)
+GO(cupsFileStdout, pFv)
+GO(cupsFileTell, lFp)
+GO(cupsFileUnlock, iFp)
+GO(cupsFileWrite, lFppL)
+GO(cupsFindDestDefault, pFpppp)
+GO(cupsFindDestReady, pFpppp)
+GO(cupsFindDestSupported, pFpppp)
 GO(cupsFinishDestDocument, iFppp)
 GO(cupsFinishDocument, iFpp)
 GO(cupsFreeDestInfo, vFp)
@@ -114,24 +114,24 @@ GO(cupsFreeJobs, vFip)
 GO(cupsFreeOptions, vFip)
 //GO(_cupsGet1284Values, 
 GO(cupsGetClasses, iFp)
-//GO(cupsGetConflicts, 
+GO(cupsGetConflicts, iFpppp)
 GO(cupsGetDefault, pFv)
 GO(cupsGetDefault2, pFp)
 GO(cupsGetDest, pFppip)
-//GO(cupsGetDestMediaByIndex, 
+GO(cupsGetDestMediaByIndex, iFpppiup)
 GO(cupsGetDestMediaByName, iFppppup)
 GO(cupsGetDestMediaBySize, iFpppiiup)
-//GO(cupsGetDestMediaCount, 
-//GO(cupsGetDestMediaDefault, 
+GO(cupsGetDestMediaCount, iFpppu)
+GO(cupsGetDestMediaDefault, iFpppup)
 //GO(_cupsGetDestResource, 
 //GO(_cupsGetDests, 
 GO(cupsGetDests, iFp)
 GO(cupsGetDests2, iFpp)
-//GO(cupsGetDestWithURI, 
-//GO(cupsGetDevices, 
-//GO(cupsGetFd, 
-//GO(cupsGetFile, 
-//GO(cupsGetIntegerOption, 
+GO(cupsGetDestWithURI, pFpp)
+//GOM(cupsGetDevices, iFEpipppp)
+GO(cupsGetFd, iFppi)
+GO(cupsGetFile, iFppp)
+GO(cupsGetIntegerOption, iFpip)
 GO(cupsGetJobs, iFppii)
 GO(cupsGetJobs2, iFpppii)
 GO(cupsGetNamedDest, pFppp)
@@ -143,14 +143,14 @@ GO(cupsGetPPD, pFp)
 GO(cupsGetPPD2, pFpp)
 GO(cupsGetPPD3, iFppppL)
 GO(cupsGetPrinters, iFp)
-//GO(cupsGetResponse, 
+GO(cupsGetResponse, pFpp)
 GO(cupsGetServerPPD, pFpp)
 //GO(_cupsGlobalLock, 
 //GO(_cupsGlobals, 
 //GO(_cupsGlobalUnlock, 
 //GO(_cupsGSSServiceName, 
-//GO(cupsHashData, 
-//GO(cupsHashString, 
+GO(cupsHashData, lFppLpL)
+GO(cupsHashString, pFpLpL)
 GO(cupsLangDefault, pFv)
 GO(cupsLangEncoding, pFp)
 GO(cupsLangFlush, vFv)
@@ -163,10 +163,10 @@ GO(cupsLangGet, pFp)
 //GO(_cupsLangString, 
 GO(cupsLastError, iFv)
 GO(cupsLastErrorString, pFv)
-//GO(cupsLocalizeDestMedia, 
+GO(cupsLocalizeDestMedia, pFpppup)
 GO(cupsLocalizeDestOption, pFpppp)
 GO(cupsLocalizeDestValue, pFppppp)
-//GO(cupsMakeServerCredentials, 
+GO(cupsMakeServerCredentials, iFppipl)
 GO(cupsMarkOptions, iFpip)
 //GO(_cupsMessageFree, 
 //GO(_cupsMessageLoad, 
@@ -176,49 +176,49 @@ GO(cupsMarkOptions, iFpip)
 //GO(_cupsMutexLock, 
 //GO(_cupsMutexUnlock, 
 //GO(_cupsNextDelay, 
-//GO(cupsNotifySubject, 
+GO(cupsNotifySubject, pFpp)
 GO(cupsNotifyText, pFpp)
 GO(cupsParseOptions, iFpip)
 GO(cupsPrintFile, iFpppip)
 GO(cupsPrintFile2, iFppppip)
 GO(cupsPrintFiles, iFpippip)
 GO(cupsPrintFiles2, iFppippip)
-//GO(cupsPutFd, 
-//GO(cupsPutFile, 
-//GO(cupsReadResponseData, 
+GO(cupsPutFd, iFppi)
+GO(cupsPutFile, iFppp)
+GO(cupsReadResponseData, lFppL)
 GO(cupsRemoveDest, iFppip)
 GO(cupsRemoveOption, iFpip)
-//GO(cupsResolveConflicts, 
+GO(cupsResolveConflicts, iFppppp)
 //GO(_cupsRWInit, 
 //GO(_cupsRWLockRead, 
 //GO(_cupsRWLockWrite, 
 //GO(_cupsRWUnlock, 
 //GO(_cups_safe_vsnprintf, 
-//GO(cupsSendRequest, 
+GO(cupsSendRequest, iFpppL)
 GO(cupsServer, pFv)
-//GO(cupsSetClientCertCB, 
-//GO(cupsSetCredentials, 
+//GOM(cupsSetClientCertCB, vFEpp)
+GO(cupsSetCredentials, iFp)
 GO(cupsSetDefaultDest, vFppip)
 //GO(_cupsSetDefaults, 
-//GO(cupsSetDests, 
-//GO(cupsSetDests2, 
-//GO(cupsSetEncryption, 
+GO(cupsSetDests, vFip)
+GO(cupsSetDests2, iFpip)
+GO(cupsSetEncryption, vFu)
 //GO(_cupsSetError, 
 //GO(_cupsSetHTTPError, 
 //GO(_cupsSetLocale, 
 //GO(_cupsSetNegotiateAuthString, 
-//GO(cupsSetPasswordCB, 
+//GOM(cupsSetPasswordCB, vFEp)
 GOM(cupsSetPasswordCB2, vFEpp)
-//GO(cupsSetServer, 
-//GO(cupsSetServerCertCB, 
-//GO(cupsSetServerCredentials, 
-//GO(cupsSetUser, 
-//GO(cupsSetUserAgent, 
-//GO(cupsSideChannelDoRequest, 
-//GO(cupsSideChannelRead, 
-//GO(cupsSideChannelSNMPGet, 
-//GO(cupsSideChannelSNMPWalk, 
-//GO(cupsSideChannelWrite, 
+GO(cupsSetServer, vFp)
+//GOM(cupsSetServerCertCB, vFEpp)
+GO(cupsSetServerCredentials, iFppi)
+GO(cupsSetUser, vFp)
+GO(cupsSetUserAgent, vFp)
+GO(cupsSideChannelDoRequest, uFuppd)
+GO(cupsSideChannelRead, iFppppd)
+GO(cupsSideChannelSNMPGet, uFpppd)
+//GOM(cupsSideChannelSNMPWalk, uFEpdpp)
+GO(cupsSideChannelWrite, iFuupid)
 //GO(_cupsSNMPClose, 
 //GO(_cupsSNMPCopyOID, 
 //GO(_cupsSNMPDefaultCommunity, 
@@ -246,138 +246,138 @@ GO(cupsStartDocument, iFppippi)
 //GO(_cupsStrRetain, 
 //GO(_cupsStrScand, 
 //GO(_cupsStrStatistics, 
-//GO(cupsTempFd, 
-//GO(cupsTempFile, 
-//GO(cupsTempFile2, 
+GO(cupsTempFd, iFpi)
+GO(cupsTempFile, pFpi)
+GO(cupsTempFile2, pFpi)
 //GO(_cupsThreadCancel, 
 //GO(_cupsThreadCreate, 
 //GO(_cupsThreadDetach, 
 //GO(_cupsThreadWait, 
-//GO(cupsUser, 
-//GO(cupsUserAgent, 
+GO(cupsUser, pFv)
+GO(cupsUserAgent, pFv)
 //GO(_cupsUserDefault, 
-//GO(cupsUTF32ToUTF8, 
-//GO(cupsUTF8ToCharset, 
-//GO(cupsUTF8ToUTF32, 
-GO(cupsWriteRequestData, iFppl)
+GO(cupsUTF32ToUTF8, iFppi)
+GO(cupsUTF8ToCharset, iFppii)
+GO(cupsUTF8ToUTF32, iFppi)
+GO(cupsWriteRequestData, iFppL)
 
-//GO(httpAcceptConnection, 
-//GO(httpAddCredential, 
-//GO(httpAddrAny, 
-//GO(httpAddrClose, 
-//GO(httpAddrConnect, 
-//GO(httpAddrConnect2, 
-//GO(httpAddrCopyList, 
-//GO(httpAddrEqual, 
-//GO(httpAddrFamily, 
-//GO(httpAddrFreeList, 
-//GO(httpAddrGetList, 
-//GO(httpAddrLength, 
-//GO(httpAddrListen, 
-//GO(httpAddrLocalhost, 
-//GO(httpAddrLookup, 
-//GO(httpAddrPort, 
+GO(httpAcceptConnection, pFii)
+GO(httpAddCredential, iFppL)
+GO(httpAddrAny, iFp)
+GO(httpAddrClose, iFpi)
+GO(httpAddrConnect, pFpp)
+GO(httpAddrConnect2, pFppip)
+GO(httpAddrCopyList, pFp)
+GO(httpAddrEqual, iFpp)
+GO(httpAddrFamily, iFp)
+GO(httpAddrFreeList, vFp)
+GO(httpAddrGetList, pFpip)
+GO(httpAddrLength, iFp)
+GO(httpAddrListen, iFpi)
+GO(httpAddrLocalhost, iFp)
+GO(httpAddrLookup, pFppi)
+GO(httpAddrPort, iFp)
 //GO(_httpAddrSetPort, 
-//GO(httpAddrString, 
-//GO(httpAssembleURI, 
-//GO(httpAssembleURIf, 
-//GO(httpAssembleUUID, 
+GO(httpAddrString, pFppi)
+GO(httpAssembleURI, iFupipppip)
+//GOM(httpAssembleURIf, iFEupipppipV)
+GO(httpAssembleUUID, pFpipipL)
 GO(httpBlocking, vFpi)
-//GO(httpCheck, 
-//GO(httpClearCookie, 
-//GO(httpClearFields, 
+GO(httpCheck, iFp)
+GO(httpClearCookie, vFp)
+GO(httpClearFields, vFp)
 GO(httpClose, vFp)
-//GO(httpCompareCredentials, 
-//GO(httpConnect, 
-GO(httpConnect2, pFpipiiiip)
-GO(httpConnectEncrypt, pFpii)
-//GO(httpCopyCredentials, 
+GO(httpCompareCredentials, iFpp)
+GO(httpConnect, pFpi)
+GO(httpConnect2, pFpipiuiip)
+GO(httpConnectEncrypt, pFpiu)
+GO(httpCopyCredentials, iFpp)
 //GO(_httpCreateCredentials, 
-//GO(httpCredentialsAreValidForName, 
-//GO(httpCredentialsGetExpiration, 
-//GO(httpCredentialsGetTrust, 
-//GO(httpCredentialsString, 
-//GO(httpDecode64, 
-//GO(httpDecode64_2, 
+GO(httpCredentialsAreValidForName, iFpp)
+GO(httpCredentialsGetExpiration, lFp)
+GO(httpCredentialsGetTrust, uFpp)
+GO(httpCredentialsString, LFppL)
+GO(httpDecode64, pFpp)
+GO(httpDecode64_2, pFppp)
 //GO(_httpDecodeURI, 
-//GO(httpDelete, 
+GO(httpDelete, iFpp)
 //GO(_httpDisconnect, 
-//GO(httpEncode64, 
-//GO(httpEncode64_2, 
+GO(httpEncode64, pFpp)
+GO(httpEncode64_2, pFpipi)
 //GO(_httpEncodeURI, 
-//GO(httpEncryption, 
+GO(httpEncryption, iFpu)
 GO(httpError, iFp)
-//GO(httpFieldValue, 
-//GO(httpFlush, 
-//GO(httpFlushWrite, 
+GO(httpFieldValue, iFp)
+GO(httpFlush, vFp)
+GO(httpFlushWrite, iFp)
 //GO(_httpFreeCredentials, 
-//GO(httpFreeCredentials, 
-//GO(httpGet, 
-//GO(httpGetActivity, 
-//GO(httpGetAddress, 
-//GO(httpGetAuthString, 
-//GO(httpGetBlocking, 
-//GO(httpGetContentEncoding, 
-//GO(httpGetCookie, 
-//GO(httpGetDateString, 
-//GO(httpGetDateString2, 
-//GO(httpGetDateTime, 
-//GO(httpGetEncryption, 
-//GO(httpGetExpect, 
-//GO(httpGetFd, 
-//GO(httpGetField, 
-//GO(httpGetHostByName, 
-//GO(httpGetHostname, 
-//GO(httpGetKeepAlive, 
-//GO(httpGetLength, 
-//GO(httpGetLength2, 
-//GO(httpGetPending, 
-//GO(httpGetReady, 
-//GO(httpGetRemaining, 
-//GO(httpGets, 
-//GO(httpGetState, 
-//GO(httpGetStatus, 
-//GO(httpGetSubField, 
-//GO(httpGetSubField2, 
-//GO(httpGetVersion, 
-//GO(httpHead, 
-//GO(httpInitialize, 
-//GO(httpIsChunked, 
-//GO(httpIsEncrypted, 
-//GO(httpLoadCredentials, 
-//GO(httpMD5, 
-//GO(httpMD5Final, 
-//GO(httpMD5String, 
-//GO(httpOptions, 
-//GO(httpPeek, 
-//GO(httpPost, 
-//GO(httpPrintf, 
-//GO(httpPut, 
-//GO(httpRead, 
-//GO(httpRead2, 
-//GO(httpReadRequest, 
-//GO(httpReconnect, 
-//GO(httpReconnect2, 
-//GO(httpResolveHostname, 
+GO(httpFreeCredentials, vFp)
+GO(httpGet, iFpp)
+GO(httpGetActivity, lFp)
+GO(httpGetAddress, pFp)
+GO(httpGetAuthString, pFp)
+GO(httpGetBlocking, iFp)
+GO(httpGetContentEncoding, pFp)
+GO(httpGetCookie, pFp)
+GO(httpGetDateString, pFl)
+GO(httpGetDateString2, pFlpi)
+GO(httpGetDateTime, lFp)
+GO(httpGetEncryption, uFp)
+GO(httpGetExpect, iFp)
+GO(httpGetFd, iFp)
+GO(httpGetField, pFpi)
+GO(httpGetHostByName, pFp)
+GO(httpGetHostname, pFppi)
+GO(httpGetKeepAlive, uFp)
+GO(httpGetLength, iFp)
+GO(httpGetLength2, lFp)
+GO(httpGetPending, LFp)
+GO(httpGetReady, LFp)
+GO(httpGetRemaining, LFp)
+GO(httpGets, pFpip)
+GO(httpGetState, iFp)
+GO(httpGetStatus, iFp)
+GO(httpGetSubField, pFpipp)
+GO(httpGetSubField2, pFpippi)
+GO(httpGetVersion, uFp)
+GO(httpHead, iFpp)
+GO(httpInitialize, vFv)
+GO(httpIsChunked, iFp)
+GO(httpIsEncrypted, iFp)
+GO(httpLoadCredentials, iFppp)
+GO(httpMD5, pFpppp)
+GO(httpMD5Final, pFpppp)
+GO(httpMD5String, pFpp)
+GO(httpOptions, iFpp)
+GO(httpPeek, lFppL)
+GO(httpPost, iFpp)
+//GOM(httpPrintf, iFEppV)
+GO(httpPut, iFpp)
+GO(httpRead, iFppi)
+GO(httpRead2, lFppL)
+GO(httpReadRequest, iFppL)
+GO(httpReconnect, iFp)
+GO(httpReconnect2, iFpip)
+GO(httpResolveHostname, pFppL)
 //GO(_httpResolveURI, 
-//GO(httpSaveCredentials, 
-//GO(httpSeparate, 
-//GO(httpSeparate2, 
-//GO(httpSeparateURI, 
-//GO(httpSetAuthString, 
-//GO(httpSetCookie, 
-//GO(httpSetCredentials, 
-//GO(httpSetDefaultField, 
+GO(httpSaveCredentials, iFppp)
+GO(httpSeparate, vFpppppp)
+GO(httpSeparate2, vFppipipippi)
+GO(httpSeparateURI, iFuppipipippi)
+GO(httpSetAuthString, vFppp)
+GO(httpSetCookie, vFpp)
+GO(httpSetCredentials, iFpp)
+GO(httpSetDefaultField, vFpip)
 //GO(_httpSetDigestAuthString, 
-//GO(httpSetExpect, 
-//GO(httpSetField, 
-//GO(httpSetKeepAlive, 
-//GO(httpSetLength, 
-//GO(httpSetTimeout, 
-//GO(httpShutdown, 
-//GO(httpStateString, 
+GO(httpSetExpect, vFpi)
+GO(httpSetField, vFpip)
+GO(httpSetKeepAlive, vFpu)
+GO(httpSetLength, vFpL)
+//GOM(httpSetTimeout, vFEpdpp)
+GO(httpShutdown, vFp)
+GO(httpStateString, pFi)
 //GO(_httpStatus, 
-//GO(httpStatus, 
+GO(httpStatus, pFi)
 //GO(_httpTLSInitialize, 
 //GO(_httpTLSPending, 
 //GO(_httpTLSRead, 
@@ -386,108 +386,108 @@ GO(httpError, iFp)
 //GO(_httpTLSStart, 
 //GO(_httpTLSStop, 
 //GO(_httpTLSWrite, 
-//GO(httpTrace, 
+GO(httpTrace, iFpp)
 //GO(_httpUpdate, 
-//GO(httpUpdate, 
-//GO(httpURIStatusString, 
+GO(httpUpdate, iFp)
+GO(httpURIStatusString, pFi)
 //GO(_httpWait, 
-//GO(httpWait, 
-//GO(httpWrite, 
-//GO(httpWrite2, 
-//GO(httpWriteResponse, 
+GO(httpWait, iFpi)
+GO(httpWrite, iFppi)
+GO(httpWrite2, lFppL)
+GO(httpWriteResponse, iFpi)
 
-//GO(ippAddBoolean, 
-//GO(ippAddBooleans, 
-//GO(ippAddCollection, 
-//GO(ippAddCollections, 
-//GO(ippAddDate, 
-//GO(ippAddInteger, 
-//GO(ippAddIntegers, 
-//GO(ippAddOctetString, 
-//GO(ippAddOutOfBand, 
-//GO(ippAddRange, 
-//GO(ippAddRanges, 
-//GO(ippAddResolution, 
-//GO(ippAddResolutions, 
-//GO(ippAddSeparator, 
-//GO(ippAddString, 
-//GO(ippAddStringf, 
-//GO(ippAddStringfv, 
-//GO(ippAddStrings, 
-//GO(ippAttributeString, 
-//GO(ippContainsInteger, 
-//GO(ippContainsString, 
-//GO(ippCopyAttribute, 
-//GO(ippCopyAttributes, 
-//GO(ippCreateRequestedArray, 
-//GO(ippDateToTime, 
-//GO(ippDelete, 
-//GO(ippDeleteAttribute, 
-//GO(ippDeleteValues, 
-//GO(ippEnumString, 
-//GO(ippEnumValue, 
-//GO(ippErrorString, 
-//GO(ippErrorValue, 
-//GO(ippFindAttribute, 
-//GO(ippFindNextAttribute, 
+GO(ippAddBoolean, pFpipc)
+GO(ippAddBooleans, pFpipip)
+GO(ippAddCollection, pFpipp)
+GO(ippAddCollections, pFpipip)
+GO(ippAddDate, pFpipp)
+GO(ippAddInteger, pFpiipi)
+GO(ippAddIntegers, pFpiipip)
+GO(ippAddOctetString, pFpippi)
+GO(ippAddOutOfBand, pFpiip)
+GO(ippAddRange, pFpipii)
+GO(ippAddRanges, pFpipipp)
+GO(ippAddResolution, pFpipuii)
+GO(ippAddResolutions, pFpipiupp)
+GO(ippAddSeparator, pFp)
+GO(ippAddString, pFpiippp)
+//GOM(ippAddStringf, pFEpiipppV)
+//GOM(ippAddStringfv, pFEpiipppA)
+GO(ippAddStrings, pFpiipipp)
+GO(ippAttributeString, LFppL)
+GO(ippContainsInteger, iFpi)
+GO(ippContainsString, iFpp)
+GO(ippCopyAttribute, pFppi)
+//GOM(ippCopyAttributes, iFEppipp)
+GO(ippCreateRequestedArray, pFp)
+GO(ippDateToTime, lFp)
+GO(ippDelete, vFp)
+GO(ippDeleteAttribute, vFpp)
+GO(ippDeleteValues, iFppii)
+GO(ippEnumString, pFpi)
+GO(ippEnumValue, iFpp)
+GO(ippErrorString, pFi)
+GO(ippErrorValue, iFp)
+GO(ippFindAttribute, pFppi)
+GO(ippFindNextAttribute, pFppi)
 //GO(_ippFindOption, 
-//GO(ippFirstAttribute, 
-//GO(ippGetBoolean, 
-//GO(ippGetCollection, 
-//GO(ippGetCount, 
-//GO(ippGetDate, 
-//GO(ippGetGroupTag, 
-//GO(ippGetInteger, 
-//GO(ippGetName, 
-//GO(ippGetOctetString, 
-//GO(ippGetOperation, 
-//GO(ippGetRange, 
-//GO(ippGetRequestId, 
-//GO(ippGetResolution, 
-//GO(ippGetState, 
-//GO(ippGetStatusCode, 
-//GO(ippGetString, 
-//GO(ippGetValueTag, 
-//GO(ippGetVersion, 
-//GO(ippLength, 
-//GO(ippNew, 
-//GO(ippNewRequest, 
-//GO(ippNewResponse, 
-//GO(ippNextAttribute, 
-//GO(ippOpString, 
-//GO(ippOpValue, 
-//GO(ippPort, 
-//GO(ippRead, 
-//GO(ippReadFile, 
-//GO(ippReadIO, 
-//GO(ippSetBoolean, 
-//GO(ippSetCollection, 
-//GO(ippSetDate, 
-//GO(ippSetGroupTag, 
-//GO(ippSetInteger, 
-//GO(ippSetName, 
-//GO(ippSetOctetString, 
-//GO(ippSetOperation, 
-//GO(ippSetPort, 
-//GO(ippSetRange, 
-//GO(ippSetRequestId, 
-//GO(ippSetResolution, 
-//GO(ippSetState, 
-//GO(ippSetStatusCode, 
-//GO(ippSetString, 
-//GO(ippSetStringf, 
-//GO(ippSetStringfv, 
-//GO(ippSetValueTag, 
-//GO(ippSetVersion, 
-//GO(ippStateString, 
-//GO(ippTagString, 
-//GO(ippTagValue, 
-//GO(ippTimeToDate, 
-//GO(ippValidateAttribute, 
-//GO(ippValidateAttributes, 
-//GO(ippWrite, 
-//GO(ippWriteFile, 
-//GO(ippWriteIO, 
+GO(ippFirstAttribute, pFp)
+GO(ippGetBoolean, iFpi)
+GO(ippGetCollection, pFpi)
+GO(ippGetCount, iFp)
+GO(ippGetDate, pFpi)
+GO(ippGetGroupTag, iFp)
+GO(ippGetInteger, iFpi)
+GO(ippGetName, pFp)
+GO(ippGetOctetString, pFpip)
+GO(ippGetOperation, iFp)
+GO(ippGetRange, iFpip)
+GO(ippGetRequestId, iFp)
+GO(ippGetResolution, iFpipp)
+GO(ippGetState, iFp)
+GO(ippGetStatusCode, iFp)
+GO(ippGetString, pFpip)
+GO(ippGetValueTag, iFp)
+GO(ippGetVersion, iFpp)
+GO(ippLength, LFp)
+GO(ippNew, pFv)
+GO(ippNewRequest, pFi)
+GO(ippNewResponse, pFp)
+GO(ippNextAttribute, pFp)
+GO(ippOpString, pFi)
+GO(ippOpValue, iFp)
+GO(ippPort, iFv)
+GO(ippRead, iFpp)
+GO(ippReadFile, iFip)
+//GOM(ippReadIO, iFEppipp)
+GO(ippSetBoolean, iFppii)
+GO(ippSetCollection, iFppip)
+GO(ippSetDate, iFppip)
+GO(ippSetGroupTag, iFppi)
+GO(ippSetInteger, iFppii)
+GO(ippSetName, iFppp)
+GO(ippSetOctetString, iFppipi)
+GO(ippSetOperation, iFpi)
+GO(ippSetPort, vFi)
+GO(ippSetRange, iFppiii)
+GO(ippSetRequestId, iFpi)
+GO(ippSetResolution, iFppiuii)
+GO(ippSetState, iFpi)
+GO(ippSetStatusCode, iFpi)
+GO(ippSetString, iFppip)
+//GOM(ippSetStringf, iFEppipV)
+//GOM(ippSetStringfv, iFEppipA)
+GO(ippSetValueTag, iFppi)
+GO(ippSetVersion, iFpii)
+GO(ippStateString, pFi)
+GO(ippTagString, pFi)
+GO(ippTagValue, iFp)
+GO(ippTimeToDate, pFl)
+GO(ippValidateAttribute, iFp)
+GO(ippValidateAttributes, iFp)
+GO(ippWrite, iFpp)
+GO(ippWriteFile, iFip)
+//GOM(ippWriteIO, iFEppipp)
 
 //GO(_ppdCacheCreateWithFile, 
 //GO(_ppdCacheCreateWithPPD, 
@@ -504,64 +504,64 @@ GO(httpError, iFp)
 //GO(_ppdCacheGetType, 
 //GO(_ppdCacheWriteFile, 
 GO(ppdClose, vFp)
-//GO(ppdCollect, 
-//GO(ppdCollect2, 
-//GO(ppdConflicts, 
+GO(ppdCollect, iFpup)
+GO(ppdCollect2, iFpufp)
+GO(ppdConflicts, iFp)
 //GO(_ppdCreateFromIPP, 
-//GO(ppdEmit, 
-//GO(ppdEmitAfterOrder, 
-//GO(ppdEmitFd, 
-//GO(ppdEmitJCL, 
-//GO(ppdEmitJCLEnd, 
-//GO(ppdEmitString, 
-GO(ppdErrorString, pFi)
+GO(ppdEmit, iFpSu)
+GO(ppdEmitAfterOrder, iFpSuif)
+GO(ppdEmitFd, iFpiu)
+GO(ppdEmitJCL, iFpSipp)
+GO(ppdEmitJCLEnd, iFpS)
+GO(ppdEmitString, pFpuf)
+GO(ppdErrorString, pFu)
 GO(ppdFindAttr, pFppp)
 GO(ppdFindChoice, pFpp)
-//GO(ppdFindCustomOption, 
-//GO(ppdFindCustomParam, 
+GO(ppdFindCustomOption, pFpp)
+GO(ppdFindCustomParam, pFpp)
 GO(ppdFindMarkedChoice, pFpp)
-//GO(ppdFindNextAttr, 
+GO(ppdFindNextAttr, pFppp)
 GO(ppdFindOption, pFpp)
-//GO(ppdFirstCustomParam, 
-//GO(ppdFirstOption, 
+GO(ppdFirstCustomParam, pFp)
+GO(ppdFirstOption, pFp)
 //GO(_ppdFreeLanguages, 
 //GO(_ppdGetEncoding, 
 //GO(_ppdGetLanguages, 
 //GO(_ppdGlobals, 
 //GO(_ppdHashName, 
-//GO(ppdInstallableConflict, 
-//GO(ppdIsMarked, 
-GO(ppdLastError, iFp)
-//GO(ppdLocalize, 
-//GO(ppdLocalizeAttr, 
+GO(ppdInstallableConflict, iFppp)
+GO(ppdIsMarked, iFppp)
+GO(ppdLastError, uFp)
+GO(ppdLocalize, iFp)
+GO(ppdLocalizeAttr, pFppp)
 //GO(_ppdLocalizedAttr, 
-//GO(ppdLocalizeIPPReason, 
-//GO(ppdLocalizeMarkerName, 
+GO(ppdLocalizeIPPReason, pFppppL)
+GO(ppdLocalizeMarkerName, pFpp)
 GO(ppdMarkDefaults, vFp)
-//GO(ppdMarkOption, 
-//GO(ppdNextCustomParam, 
-//GO(ppdNextOption, 
+GO(ppdMarkOption, iFppp)
+GO(ppdNextCustomParam, pFp)
+GO(ppdNextOption, pFp)
 //GO(_ppdNormalizeMakeAndModel, 
 //GO(_ppdOpen, 
-//GO(ppdOpen, 
-//GO(ppdOpen2, 
+GO(ppdOpen, pFS)
+GO(ppdOpen2, pFp)
 GO(ppdOpenFd, pFi)
 //GO(_ppdOpenFile, 
 GO(ppdOpenFile, pFp)
-//GO(ppdPageLength, 
-//GO(ppdPageSize, 
-//GO(ppdPageSizeLimits, 
-//GO(ppdPageWidth, 
+GO(ppdPageLength, fFpp)
+GO(ppdPageSize, pFpp)
+GO(ppdPageSizeLimits, iFppp)
+GO(ppdPageWidth, fFpp)
 //GO(_ppdParseOptions, 
-//GO(ppdSetConformance, 
+GO(ppdSetConformance, vFu)
 
-//GO(pwgFormatSizeName, 
-//GO(pwgInitSize, 
+GO(pwgFormatSizeName, iFpLppiip)
+GO(pwgInitSize, iFppp)
 //GO(_pwgInputSlotForSource, 
-//GO(pwgMediaForLegacy, 
-//GO(pwgMediaForPPD, 
-//GO(pwgMediaForPWG, 
-//GO(pwgMediaForSize, 
+GO(pwgMediaForLegacy, pFp)
+GO(pwgMediaForPPD, pFp)
+GO(pwgMediaForPWG, pFp)
+GO(pwgMediaForSize, pFii)
 //GO(_pwgMediaNearSize, 
 //GO(_pwgMediaTable, 
 //GO(_pwgMediaTypeForType,