about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/generated/functions_list.txt37
-rw-r--r--src/wrapped/generated/wrapper.c97
-rw-r--r--src/wrapped/generated/wrapper.h37
-rw-r--r--src/wrapped/wrappeddbus_private.h2
-rw-r--r--src/wrapped/wrappedlibxcb_private.h80
-rw-r--r--src/wrapped/wrappedlibxcbicccm_private.h12
-rw-r--r--src/wrapped/wrappedlibxcbimage_private.h2
-rw-r--r--src/wrapped/wrappedlibxcbrandr_private.h14
-rw-r--r--src/wrapped/wrappedlibxcbrender_private.h18
-rw-r--r--src/wrapped/wrappedlibxcbrenderutil_private.h2
-rw-r--r--src/wrapped/wrappedlibxcbshape_private.h10
-rw-r--r--src/wrapped/wrappedlibxcbshm_private.h12
-rw-r--r--src/wrapped/wrappedlibxcbsync_private.h4
-rw-r--r--src/wrapped/wrappedlibxcbxfixes_private.h8
-rw-r--r--src/wrapped/wrappedlibxcbxkb_private.h14
15 files changed, 187 insertions, 162 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 098a823c..461fbf5c 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -567,11 +567,15 @@
 #() uFpip
 #() uFpCi
 #() uFpWi
+#() uFpWW
 #() uFpWu
 #() uFpWf
 #() uFpWp
 #() uFpui
+#() uFpuC
+#() uFpuW
 #() uFpuu
+#() uFpuU
 #() uFpuL
 #() uFpup
 #() uFpfu
@@ -1074,7 +1078,11 @@
 #() uFpipu
 #() uFpipp
 #() uFpCCC
+#() uFpCWp
 #() uFpuip
+#() uFpuWp
+#() uFpuuC
+#() uFpuuu
 #() uFpuup
 #() uFpupi
 #() uFpupu
@@ -1184,7 +1192,6 @@
 #() pFpipL
 #() pFpipp
 #() pFpCip
-#() pFpCWp
 #() pFpCuW
 #() pFpCuu
 #() pFpWWW
@@ -1218,10 +1225,7 @@
 #() pFppiL
 #() pFppip
 #() pFppCp
-#() pFppWW
 #() pFppWp
-#() pFppuC
-#() pFppuW
 #() pFppuu
 #() pFppuL
 #() pFppup
@@ -1595,9 +1599,13 @@
 #() uFuiiii
 #() uFLpppL
 #() uFpCCCC
+#() uFpCuuu
+#() uFpCuup
 #() uFpWuip
+#() uFpuuWW
 #() uFpuuui
 #() uFpuuuu
+#() uFpuuup
 #() uFpuupp
 #() uFpupuu
 #() uFpuppp
@@ -1680,8 +1688,6 @@
 #() pFpipup
 #() pFpippi
 #() pFpippp
-#() pFpCpup
-#() pFpCppp
 #() pFpuiii
 #() pFpuiip
 #() pFpuWWW
@@ -2033,9 +2039,11 @@
 #() uFuppppp
 #() uFpiuppu
 #() uFpippup
+#() uFpCuuWW
 #() uFpWuipp
 #() uFpWuuCp
 #() uFpuippp
+#() uFpuuiup
 #() uFpuuuup
 #() uFpuuupp
 #() uFpuuppp
@@ -2100,7 +2108,6 @@
 #() pFpippip
 #() pFpipppp
 #() pFpCuuCC
-#() pFpCuuWW
 #() pFpCuuup
 #() pFpuiiip
 #() pFpuuwwu
@@ -2129,12 +2136,10 @@
 #() pFppuppp
 #() pFpplplp
 #() pFpplppp
-#() pFpppiup
 #() pFpppupp
 #() pFpppLii
 #() pFpppLui
 #() pFppppii
-#() pFppppWW
 #() pFpppppi
 #() pFpppppu
 #() pFpppppp
@@ -2343,8 +2348,11 @@
 #() uFiiiuuuu
 #() uFuippppp
 #() uFpippppp
+#() uFpCuuuuu
+#() uFpuuuwwu
 #() uFpuuuupp
 #() uFpuuuppp
+#() uFpuupwwC
 #() uFpuupppp
 #() uFppiuppi
 #() uFppiuppp
@@ -2372,11 +2380,8 @@
 #() pFpCuwwWW
 #() pFpCuWCCC
 #() pFpCuuwwp
-#() pFpCuuuuu
 #() pFpCpWWup
 #() pFpWppWpp
-#() pFpuuuwwu
-#() pFpuupwwC
 #() pFpuLpipp
 #() pFpupiipp
 #() pFpuppipp
@@ -2552,6 +2557,8 @@
 #() uFuipppppp
 #() uFuupuuiuf
 #() uFulpppppp
+#() uFpCuuuCup
+#() uFpWWWWWWp
 #() uFpuupupuu
 #() uFpupuuuCp
 #() uFppuuuupp
@@ -2723,9 +2730,7 @@
 #() pFpLppLLiLi
 #() pFppiiiiiip
 #() pFppipppppp
-#() pFppCuuuCup
 #() pFpppiiiiii
-#() pFpppWWWWWp
 #() pFpppuipppp
 #() pFpppppiipp
 #() pFpppppuuCC
@@ -2917,8 +2922,8 @@
 #() iFpupiiiipppppp
 #() iFppppppLLLLupp
 #() uFippuuuulllipp
+#() uFpCuuwwWWWWuup
 #() uFpppppuupppppp
-#() pFpCuuwwWWWWuup
 #() pFpuupppwwwwWWC
 #() pFppLppppiiLpip
 #() pFpppppppuipppp
@@ -2959,10 +2964,10 @@
 #() pFippppppppppppppppp
 #() pFpupppppppppppppppp
 #() vFpiiiiiiiiiiiiiiiiii
+#() uFpWWWCCCCCCCCWCCCCCC
 #() pFiiiippppppppppppppp
 #() pFpippppppppppppppppp
 #() pFpupupppppppppppppppp
-#() pFpppWWCCpCpCpCWpCpCpC
 #() iFpppppppppppppppppppppp
 #() uFippuuuuiiiiuuiiiiiiiipp
 #() vFpppppppppppppppppppppppp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 207856e0..687cac49 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -603,11 +603,15 @@ typedef uint32_t (*uFpiu_t)(void*, int32_t, uint32_t);
 typedef uint32_t (*uFpip_t)(void*, int32_t, void*);
 typedef uint32_t (*uFpCi_t)(void*, uint8_t, int32_t);
 typedef uint32_t (*uFpWi_t)(void*, uint16_t, int32_t);
+typedef uint32_t (*uFpWW_t)(void*, uint16_t, uint16_t);
 typedef uint32_t (*uFpWu_t)(void*, uint16_t, uint32_t);
 typedef uint32_t (*uFpWf_t)(void*, uint16_t, float);
 typedef uint32_t (*uFpWp_t)(void*, uint16_t, void*);
 typedef uint32_t (*uFpui_t)(void*, uint32_t, int32_t);
+typedef uint32_t (*uFpuC_t)(void*, uint32_t, uint8_t);
+typedef uint32_t (*uFpuW_t)(void*, uint32_t, uint16_t);
 typedef uint32_t (*uFpuu_t)(void*, uint32_t, uint32_t);
+typedef uint32_t (*uFpuU_t)(void*, uint32_t, uint64_t);
 typedef uint32_t (*uFpuL_t)(void*, uint32_t, uintptr_t);
 typedef uint32_t (*uFpup_t)(void*, uint32_t, void*);
 typedef uint32_t (*uFpfu_t)(void*, float, uint32_t);
@@ -1110,7 +1114,11 @@ 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 (*uFpipp_t)(void*, int32_t, void*, void*);
 typedef uint32_t (*uFpCCC_t)(void*, uint8_t, uint8_t, uint8_t);
+typedef uint32_t (*uFpCWp_t)(void*, uint8_t, uint16_t, void*);
 typedef uint32_t (*uFpuip_t)(void*, uint32_t, int32_t, void*);
+typedef uint32_t (*uFpuWp_t)(void*, uint32_t, uint16_t, void*);
+typedef uint32_t (*uFpuuC_t)(void*, uint32_t, uint32_t, uint8_t);
+typedef uint32_t (*uFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFpuup_t)(void*, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFpupi_t)(void*, uint32_t, void*, int32_t);
 typedef uint32_t (*uFpupu_t)(void*, uint32_t, void*, uint32_t);
@@ -1220,7 +1228,6 @@ typedef void* (*pFpipd_t)(void*, int32_t, void*, double);
 typedef void* (*pFpipL_t)(void*, int32_t, void*, uintptr_t);
 typedef void* (*pFpipp_t)(void*, int32_t, void*, void*);
 typedef void* (*pFpCip_t)(void*, uint8_t, int32_t, void*);
-typedef void* (*pFpCWp_t)(void*, uint8_t, uint16_t, void*);
 typedef void* (*pFpCuW_t)(void*, uint8_t, uint32_t, uint16_t);
 typedef void* (*pFpCuu_t)(void*, uint8_t, uint32_t, uint32_t);
 typedef void* (*pFpWWW_t)(void*, uint16_t, uint16_t, uint16_t);
@@ -1254,10 +1261,7 @@ typedef void* (*pFppiu_t)(void*, void*, int32_t, uint32_t);
 typedef void* (*pFppiL_t)(void*, void*, int32_t, uintptr_t);
 typedef void* (*pFppip_t)(void*, void*, int32_t, void*);
 typedef void* (*pFppCp_t)(void*, void*, uint8_t, void*);
-typedef void* (*pFppWW_t)(void*, void*, uint16_t, uint16_t);
 typedef void* (*pFppWp_t)(void*, void*, uint16_t, void*);
-typedef void* (*pFppuC_t)(void*, void*, uint32_t, uint8_t);
-typedef void* (*pFppuW_t)(void*, void*, uint32_t, uint16_t);
 typedef void* (*pFppuu_t)(void*, void*, uint32_t, uint32_t);
 typedef void* (*pFppuL_t)(void*, void*, uint32_t, uintptr_t);
 typedef void* (*pFppup_t)(void*, void*, uint32_t, void*);
@@ -1631,9 +1635,13 @@ typedef uint32_t (*uFipLpp_t)(int32_t, void*, uintptr_t, void*, void*);
 typedef uint32_t (*uFuiiii_t)(uint32_t, int32_t, int32_t, int32_t, int32_t);
 typedef uint32_t (*uFLpppL_t)(uintptr_t, void*, void*, void*, uintptr_t);
 typedef uint32_t (*uFpCCCC_t)(void*, uint8_t, uint8_t, uint8_t, uint8_t);
+typedef uint32_t (*uFpCuuu_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t);
+typedef uint32_t (*uFpCuup_t)(void*, uint8_t, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFpWuip_t)(void*, uint16_t, uint32_t, int32_t, void*);
+typedef uint32_t (*uFpuuWW_t)(void*, uint32_t, uint32_t, uint16_t, uint16_t);
 typedef uint32_t (*uFpuuui_t)(void*, uint32_t, uint32_t, uint32_t, int32_t);
 typedef uint32_t (*uFpuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef uint32_t (*uFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
 typedef uint32_t (*uFpupuu_t)(void*, uint32_t, void*, uint32_t, uint32_t);
 typedef uint32_t (*uFpuppp_t)(void*, uint32_t, void*, void*, void*);
@@ -1716,8 +1724,6 @@ 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);
 typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*);
-typedef void* (*pFpCpup_t)(void*, uint8_t, void*, uint32_t, void*);
-typedef void* (*pFpCppp_t)(void*, uint8_t, void*, void*, void*);
 typedef void* (*pFpuiii_t)(void*, uint32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFpuiip_t)(void*, uint32_t, int32_t, int32_t, void*);
 typedef void* (*pFpuWWW_t)(void*, uint32_t, uint16_t, uint16_t, uint16_t);
@@ -2069,9 +2075,11 @@ typedef uint32_t (*uFupuufp_t)(uint32_t, void*, uint32_t, uint32_t, float, void*
 typedef uint32_t (*uFuppppp_t)(uint32_t, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFpiuppu_t)(void*, int32_t, uint32_t, void*, void*, uint32_t);
 typedef uint32_t (*uFpippup_t)(void*, int32_t, void*, void*, uint32_t, void*);
+typedef uint32_t (*uFpCuuWW_t)(void*, uint8_t, uint32_t, uint32_t, uint16_t, uint16_t);
 typedef uint32_t (*uFpWuipp_t)(void*, uint16_t, uint32_t, int32_t, void*, void*);
 typedef uint32_t (*uFpWuuCp_t)(void*, uint16_t, uint32_t, uint32_t, uint8_t, void*);
 typedef uint32_t (*uFpuippp_t)(void*, uint32_t, int32_t, void*, void*, void*);
+typedef uint32_t (*uFpuuiup_t)(void*, uint32_t, uint32_t, int32_t, uint32_t, void*);
 typedef uint32_t (*uFpuuuup_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFpuuupp_t)(void*, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef uint32_t (*uFpuuppp_t)(void*, uint32_t, uint32_t, void*, void*, void*);
@@ -2136,7 +2144,6 @@ typedef void* (*pFpipipp_t)(void*, int32_t, void*, int32_t, void*, void*);
 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* (*pFpCuuCC_t)(void*, uint8_t, uint32_t, uint32_t, uint8_t, uint8_t);
-typedef void* (*pFpCuuWW_t)(void*, uint8_t, uint32_t, uint32_t, uint16_t, uint16_t);
 typedef void* (*pFpCuuup_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, void*);
 typedef void* (*pFpuiiip_t)(void*, uint32_t, int32_t, int32_t, int32_t, void*);
 typedef void* (*pFpuuwwu_t)(void*, uint32_t, uint32_t, int16_t, int16_t, uint32_t);
@@ -2165,12 +2172,10 @@ typedef void* (*pFppupii_t)(void*, void*, uint32_t, void*, int32_t, int32_t);
 typedef void* (*pFppuppp_t)(void*, void*, uint32_t, void*, void*, void*);
 typedef void* (*pFpplplp_t)(void*, void*, intptr_t, void*, intptr_t, void*);
 typedef void* (*pFpplppp_t)(void*, void*, intptr_t, void*, void*, void*);
-typedef void* (*pFpppiup_t)(void*, void*, void*, int32_t, uint32_t, void*);
 typedef void* (*pFpppupp_t)(void*, void*, void*, uint32_t, void*, void*);
 typedef void* (*pFpppLii_t)(void*, void*, void*, uintptr_t, int32_t, int32_t);
 typedef void* (*pFpppLui_t)(void*, void*, void*, uintptr_t, uint32_t, int32_t);
 typedef void* (*pFppppii_t)(void*, void*, void*, void*, int32_t, int32_t);
-typedef void* (*pFppppWW_t)(void*, void*, void*, void*, uint16_t, uint16_t);
 typedef void* (*pFpppppi_t)(void*, void*, void*, void*, void*, int32_t);
 typedef void* (*pFpppppu_t)(void*, void*, void*, void*, void*, uint32_t);
 typedef void* (*pFpppppp_t)(void*, void*, void*, void*, void*, void*);
@@ -2379,8 +2384,11 @@ typedef uint32_t (*uFEpppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, vo
 typedef uint32_t (*uFiiiuuuu_t)(int32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFuippppp_t)(uint32_t, int32_t, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFpippppp_t)(void*, int32_t, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFpCuuuuu_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef uint32_t (*uFpuuuwwu_t)(void*, uint32_t, uint32_t, uint32_t, int16_t, int16_t, uint32_t);
 typedef uint32_t (*uFpuuuupp_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef uint32_t (*uFpuuuppp_t)(void*, uint32_t, uint32_t, uint32_t, void*, void*, void*);
+typedef uint32_t (*uFpuupwwC_t)(void*, uint32_t, uint32_t, void*, int16_t, int16_t, uint8_t);
 typedef uint32_t (*uFpuupppp_t)(void*, uint32_t, uint32_t, void*, void*, void*, void*);
 typedef uint32_t (*uFppiuppi_t)(void*, void*, int32_t, uint32_t, void*, void*, int32_t);
 typedef uint32_t (*uFppiuppp_t)(void*, void*, int32_t, uint32_t, void*, void*, void*);
@@ -2408,11 +2416,8 @@ typedef void* (*pFpipippp_t)(void*, int32_t, void*, int32_t, void*, void*, void*
 typedef void* (*pFpCuwwWW_t)(void*, uint8_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t);
 typedef void* (*pFpCuWCCC_t)(void*, uint8_t, uint32_t, uint16_t, uint8_t, uint8_t, uint8_t);
 typedef void* (*pFpCuuwwp_t)(void*, uint8_t, uint32_t, uint32_t, int16_t, int16_t, void*);
-typedef void* (*pFpCuuuuu_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpCpWWup_t)(void*, uint8_t, void*, uint16_t, uint16_t, uint32_t, void*);
 typedef void* (*pFpWppWpp_t)(void*, uint16_t, void*, void*, uint16_t, void*, void*);
-typedef void* (*pFpuuuwwu_t)(void*, uint32_t, uint32_t, uint32_t, int16_t, int16_t, uint32_t);
-typedef void* (*pFpuupwwC_t)(void*, uint32_t, uint32_t, void*, int16_t, int16_t, uint8_t);
 typedef void* (*pFpuLpipp_t)(void*, uint32_t, uintptr_t, void*, int32_t, void*, void*);
 typedef void* (*pFpupiipp_t)(void*, uint32_t, void*, int32_t, int32_t, void*, void*);
 typedef void* (*pFpuppipp_t)(void*, uint32_t, void*, void*, int32_t, void*, void*);
@@ -2588,6 +2593,8 @@ typedef uint32_t (*uFEppppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, v
 typedef uint32_t (*uFuipppppp_t)(uint32_t, int32_t, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFuupuuiuf_t)(uint32_t, uint32_t, void*, uint32_t, uint32_t, int32_t, uint32_t, float);
 typedef uint32_t (*uFulpppppp_t)(uint32_t, intptr_t, void*, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFpCuuuCup_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint8_t, uint32_t, void*);
+typedef uint32_t (*uFpWWWWWWp_t)(void*, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, void*);
 typedef uint32_t (*uFpuupupuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, void*, uint32_t, uint32_t);
 typedef uint32_t (*uFpupuuuCp_t)(void*, uint32_t, void*, uint32_t, uint32_t, uint32_t, uint8_t, void*);
 typedef uint32_t (*uFppuuuupp_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, void*, void*);
@@ -2759,9 +2766,7 @@ typedef void* (*pFpLpLLipui_t)(void*, uintptr_t, void*, uintptr_t, uintptr_t, in
 typedef void* (*pFpLppLLiLi_t)(void*, uintptr_t, void*, void*, uintptr_t, uintptr_t, int32_t, uintptr_t, int32_t);
 typedef void* (*pFppiiiiiip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*);
 typedef void* (*pFppipppppp_t)(void*, void*, int32_t, void*, void*, void*, void*, void*, void*);
-typedef void* (*pFppCuuuCup_t)(void*, void*, uint8_t, uint32_t, uint32_t, uint32_t, uint8_t, uint32_t, void*);
 typedef void* (*pFpppiiiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
-typedef void* (*pFpppWWWWWp_t)(void*, void*, void*, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, void*);
 typedef void* (*pFpppuipppp_t)(void*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
 typedef void* (*pFpppppiipp_t)(void*, void*, void*, void*, void*, int32_t, int32_t, void*, void*);
 typedef void* (*pFpppppuuCC_t)(void*, void*, void*, void*, void*, uint32_t, uint32_t, uint8_t, uint8_t);
@@ -2953,8 +2958,8 @@ typedef int32_t (*iFpippuuuiipppp_t)(void*, int32_t, void*, void*, uint32_t, uin
 typedef int32_t (*iFpupiiiipppppp_t)(void*, uint32_t, void*, int32_t, int32_t, int32_t, int32_t, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFppppppLLLLupp_t)(void*, void*, void*, void*, void*, void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uint32_t, void*, void*);
 typedef uint32_t (*uFippuuuulllipp_t)(int32_t, void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, intptr_t, intptr_t, intptr_t, int32_t, void*, void*);
+typedef uint32_t (*uFpCuuwwWWWWuup_t)(void*, uint8_t, uint32_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFpppppuupppppp_t)(void*, void*, void*, void*, void*, uint32_t, uint32_t, void*, void*, void*, void*, void*, void*);
-typedef void* (*pFpCuuwwWWWWuup_t)(void*, uint8_t, uint32_t, uint32_t, int16_t, int16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint32_t, uint32_t, void*);
 typedef void* (*pFpuupppwwwwWWC_t)(void*, uint32_t, uint32_t, void*, void*, void*, int16_t, int16_t, int16_t, int16_t, uint16_t, uint16_t, uint8_t);
 typedef void* (*pFppLppppiiLpip_t)(void*, void*, uintptr_t, void*, void*, void*, void*, int32_t, int32_t, uintptr_t, void*, int32_t, void*);
 typedef void* (*pFpppppppuipppp_t)(void*, void*, void*, void*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
@@ -2995,10 +3000,10 @@ typedef uintptr_t (*LFpppppppppppppppppp_t)(void*, void*, void*, void*, void*, v
 typedef void* (*pFippppppppppppppppp_t)(int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpupppppppppppppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFpiiiiiiiiiiiiiiiiii_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef uint32_t (*uFpWWWCCCCCCCCWCCCCCC_t)(void*, uint16_t, uint16_t, uint16_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint16_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
 typedef void* (*pFiiiippppppppppppppp_t)(int32_t, int32_t, int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpippppppppppppppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpupupppppppppppppppp_t)(void*, uint32_t, void*, uint32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
-typedef void* (*pFpppWWCCpCpCpCWpCpCpC_t)(void*, void*, void*, uint16_t, uint16_t, uint8_t, uint8_t, void*, uint8_t, void*, uint8_t, void*, uint8_t, uint16_t, void*, uint8_t, void*, uint8_t, void*, uint8_t);
 typedef int32_t (*iFpppppppppppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFippuuuuiiiiuuiiiiiiiipp_t)(int32_t, void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*);
 typedef void (*vFpppppppppppppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
@@ -3595,11 +3600,15 @@ void uFpiu(x64emu_t *emu, uintptr_t fcn) { uFpiu_t fn = (uFpiu_t)fcn; R_RAX=(uin
 void uFpip(x64emu_t *emu, uintptr_t fcn) { uFpip_t fn = (uFpip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void uFpCi(x64emu_t *emu, uintptr_t fcn) { uFpCi_t fn = (uFpCi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX); }
 void uFpWi(x64emu_t *emu, uintptr_t fcn) { uFpWi_t fn = (uFpWi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX); }
+void uFpWW(x64emu_t *emu, uintptr_t fcn) { uFpWW_t fn = (uFpWW_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX); }
 void uFpWu(x64emu_t *emu, uintptr_t fcn) { uFpWu_t fn = (uFpWu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX); }
 void uFpWf(x64emu_t *emu, uintptr_t fcn) { uFpWf_t fn = (uFpWf_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, emu->xmm[0].f[0]); }
 void uFpWp(x64emu_t *emu, uintptr_t fcn) { uFpWp_t fn = (uFpWp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
 void uFpui(x64emu_t *emu, uintptr_t fcn) { uFpui_t fn = (uFpui_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
+void uFpuC(x64emu_t *emu, uintptr_t fcn) { uFpuC_t fn = (uFpuC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint8_t)R_RDX); }
+void uFpuW(x64emu_t *emu, uintptr_t fcn) { uFpuW_t fn = (uFpuW_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX); }
 void uFpuu(x64emu_t *emu, uintptr_t fcn) { uFpuu_t fn = (uFpuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
+void uFpuU(x64emu_t *emu, uintptr_t fcn) { uFpuU_t fn = (uFpuU_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX); }
 void uFpuL(x64emu_t *emu, uintptr_t fcn) { uFpuL_t fn = (uFpuL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX); }
 void uFpup(x64emu_t *emu, uintptr_t fcn) { uFpup_t fn = (uFpup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void uFpfu(x64emu_t *emu, uintptr_t fcn) { uFpfu_t fn = (uFpfu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, emu->xmm[0].f[0], (uint32_t)R_RSI); }
@@ -4102,7 +4111,11 @@ void uFpiip(x64emu_t *emu, uintptr_t fcn) { uFpiip_t fn = (uFpiip_t)fcn; R_RAX=(
 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 uFpipp(x64emu_t *emu, uintptr_t fcn) { uFpipp_t fn = (uFpipp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFpCCC(x64emu_t *emu, uintptr_t fcn) { uFpCCC_t fn = (uFpCCC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX); }
+void uFpCWp(x64emu_t *emu, uintptr_t fcn) { uFpCWp_t fn = (uFpCWp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
 void uFpuip(x64emu_t *emu, uintptr_t fcn) { uFpuip_t fn = (uFpuip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void uFpuWp(x64emu_t *emu, uintptr_t fcn) { uFpuWp_t fn = (uFpuWp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
+void uFpuuC(x64emu_t *emu, uintptr_t fcn) { uFpuuC_t fn = (uFpuuC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint8_t)R_RCX); }
+void uFpuuu(x64emu_t *emu, uintptr_t fcn) { uFpuuu_t fn = (uFpuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void uFpuup(x64emu_t *emu, uintptr_t fcn) { uFpuup_t fn = (uFpuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void uFpupi(x64emu_t *emu, uintptr_t fcn) { uFpupi_t fn = (uFpupi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void uFpupu(x64emu_t *emu, uintptr_t fcn) { uFpupu_t fn = (uFpupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
@@ -4212,7 +4225,6 @@ void pFpipd(x64emu_t *emu, uintptr_t fcn) { pFpipd_t fn = (pFpipd_t)fcn; R_RAX=(
 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); }
 void pFpipp(x64emu_t *emu, uintptr_t fcn) { pFpipp_t fn = (pFpipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFpCip(x64emu_t *emu, uintptr_t fcn) { pFpCip_t fn = (pFpCip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
-void pFpCWp(x64emu_t *emu, uintptr_t fcn) { pFpCWp_t fn = (pFpCWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
 void pFpCuW(x64emu_t *emu, uintptr_t fcn) { pFpCuW_t fn = (pFpCuW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX); }
 void pFpCuu(x64emu_t *emu, uintptr_t fcn) { pFpCuu_t fn = (pFpCuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFpWWW(x64emu_t *emu, uintptr_t fcn) { pFpWWW_t fn = (pFpWWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX); }
@@ -4246,10 +4258,7 @@ void pFppiu(x64emu_t *emu, uintptr_t fcn) { pFppiu_t fn = (pFppiu_t)fcn; R_RAX=(
 void pFppiL(x64emu_t *emu, uintptr_t fcn) { pFppiL_t fn = (pFppiL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void pFppip(x64emu_t *emu, uintptr_t fcn) { pFppip_t fn = (pFppip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFppCp(x64emu_t *emu, uintptr_t fcn) { pFppCp_t fn = (pFppCp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (void*)R_RCX); }
-void pFppWW(x64emu_t *emu, uintptr_t fcn) { pFppWW_t fn = (pFppWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX); }
 void pFppWp(x64emu_t *emu, uintptr_t fcn) { pFppWp_t fn = (pFppWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (void*)R_RCX); }
-void pFppuC(x64emu_t *emu, uintptr_t fcn) { pFppuC_t fn = (pFppuC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint8_t)R_RCX); }
-void pFppuW(x64emu_t *emu, uintptr_t fcn) { pFppuW_t fn = (pFppuW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX); }
 void pFppuu(x64emu_t *emu, uintptr_t fcn) { pFppuu_t fn = (pFppuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFppuL(x64emu_t *emu, uintptr_t fcn) { pFppuL_t fn = (pFppuL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
 void pFppup(x64emu_t *emu, uintptr_t fcn) { pFppup_t fn = (pFppup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
@@ -4623,9 +4632,13 @@ void uFipLpp(x64emu_t *emu, uintptr_t fcn) { uFipLpp_t fn = (uFipLpp_t)fcn; R_RA
 void uFuiiii(x64emu_t *emu, uintptr_t fcn) { uFuiiii_t fn = (uFuiiii_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void uFLpppL(x64emu_t *emu, uintptr_t fcn) { uFLpppL_t fn = (uFLpppL_t)fcn; R_RAX=(uint32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void uFpCCCC(x64emu_t *emu, uintptr_t fcn) { uFpCCCC_t fn = (uFpCCCC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8); }
+void uFpCuuu(x64emu_t *emu, uintptr_t fcn) { uFpCuuu_t fn = (uFpCuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
+void uFpCuup(x64emu_t *emu, uintptr_t fcn) { uFpCuup_t fn = (uFpCuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void uFpWuip(x64emu_t *emu, uintptr_t fcn) { uFpWuip_t fn = (uFpWuip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
+void uFpuuWW(x64emu_t *emu, uintptr_t fcn) { uFpuuWW_t fn = (uFpuuWW_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8); }
 void uFpuuui(x64emu_t *emu, uintptr_t fcn) { uFpuuui_t fn = (uFpuuui_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8); }
 void uFpuuuu(x64emu_t *emu, uintptr_t fcn) { uFpuuuu_t fn = (uFpuuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
+void uFpuuup(x64emu_t *emu, uintptr_t fcn) { uFpuuup_t fn = (uFpuuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void uFpuupp(x64emu_t *emu, uintptr_t fcn) { uFpuupp_t fn = (uFpuupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFpupuu(x64emu_t *emu, uintptr_t fcn) { uFpupuu_t fn = (uFpupuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void uFpuppp(x64emu_t *emu, uintptr_t fcn) { uFpuppp_t fn = (uFpuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -4708,8 +4721,6 @@ void pFpipip(x64emu_t *emu, uintptr_t fcn) { pFpipip_t fn = (pFpipip_t)fcn; R_RA
 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); }
 void pFpippp(x64emu_t *emu, uintptr_t fcn) { pFpippp_t fn = (pFpippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void pFpCpup(x64emu_t *emu, uintptr_t fcn) { pFpCpup_t fn = (pFpCpup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
-void pFpCppp(x64emu_t *emu, uintptr_t fcn) { pFpCppp_t fn = (pFpCppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFpuiii(x64emu_t *emu, uintptr_t fcn) { pFpuiii_t fn = (pFpuiii_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 pFpuiip(x64emu_t *emu, uintptr_t fcn) { pFpuiip_t fn = (pFpuiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFpuWWW(x64emu_t *emu, uintptr_t fcn) { pFpuWWW_t fn = (pFpuWWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8); }
@@ -5061,9 +5072,11 @@ void uFupuufp(x64emu_t *emu, uintptr_t fcn) { uFupuufp_t fn = (uFupuufp_t)fcn; R
 void uFuppppp(x64emu_t *emu, uintptr_t fcn) { uFuppppp_t fn = (uFuppppp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpiuppu(x64emu_t *emu, uintptr_t fcn) { uFpiuppu_t fn = (uFpiuppu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void uFpippup(x64emu_t *emu, uintptr_t fcn) { uFpippup_t fn = (uFpippup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
+void uFpCuuWW(x64emu_t *emu, uintptr_t fcn) { uFpCuuWW_t fn = (uFpCuuWW_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9); }
 void uFpWuipp(x64emu_t *emu, uintptr_t fcn) { uFpWuipp_t fn = (uFpWuipp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpWuuCp(x64emu_t *emu, uintptr_t fcn) { uFpWuuCp_t fn = (uFpWuuCp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint8_t)R_R8, (void*)R_R9); }
 void uFpuippp(x64emu_t *emu, uintptr_t fcn) { uFpuippp_t fn = (uFpuippp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void uFpuuiup(x64emu_t *emu, uintptr_t fcn) { uFpuuiup_t fn = (uFpuuiup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void uFpuuuup(x64emu_t *emu, uintptr_t fcn) { uFpuuuup_t fn = (uFpuuuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void uFpuuupp(x64emu_t *emu, uintptr_t fcn) { uFpuuupp_t fn = (uFpuuupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpuuppp(x64emu_t *emu, uintptr_t fcn) { uFpuuppp_t fn = (uFpuuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5128,7 +5141,6 @@ void pFpipipp(x64emu_t *emu, uintptr_t fcn) { pFpipipp_t fn = (pFpipipp_t)fcn; R
 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 pFpCuuCC(x64emu_t *emu, uintptr_t fcn) { pFpCuuCC_t fn = (pFpCuuCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9); }
-void pFpCuuWW(x64emu_t *emu, uintptr_t fcn) { pFpCuuWW_t fn = (pFpCuuWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9); }
 void pFpCuuup(x64emu_t *emu, uintptr_t fcn) { pFpCuuup_t fn = (pFpCuuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (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); }
 void pFpuuwwu(x64emu_t *emu, uintptr_t fcn) { pFpuuwwu_t fn = (pFpuuwwu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int16_t)R_RCX, (int16_t)R_R8, (uint32_t)R_R9); }
@@ -5157,12 +5169,10 @@ void pFppupii(x64emu_t *emu, uintptr_t fcn) { pFppupii_t fn = (pFppupii_t)fcn; R
 void pFppuppp(x64emu_t *emu, uintptr_t fcn) { pFppuppp_t fn = (pFppuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpplplp(x64emu_t *emu, uintptr_t fcn) { pFpplplp_t fn = (pFpplplp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8, (void*)R_R9); }
 void pFpplppp(x64emu_t *emu, uintptr_t fcn) { pFpplppp_t fn = (pFpplppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
-void pFpppiup(x64emu_t *emu, uintptr_t fcn) { pFpppiup_t fn = (pFpppiup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void pFpppupp(x64emu_t *emu, uintptr_t fcn) { pFpppupp_t fn = (pFpppupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpppLii(x64emu_t *emu, uintptr_t fcn) { pFpppLii_t fn = (pFpppLii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFpppLui(x64emu_t *emu, uintptr_t fcn) { pFpppLui_t fn = (pFpppLui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); }
 void pFppppii(x64emu_t *emu, uintptr_t fcn) { pFppppii_t fn = (pFppppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
-void pFppppWW(x64emu_t *emu, uintptr_t fcn) { pFppppWW_t fn = (pFppppWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9); }
 void pFpppppi(x64emu_t *emu, uintptr_t fcn) { pFpppppi_t fn = (pFpppppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void pFpppppu(x64emu_t *emu, uintptr_t fcn) { pFpppppu_t fn = (pFpppppu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void pFpppppp(x64emu_t *emu, uintptr_t fcn) { pFpppppp_t fn = (pFpppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5371,8 +5381,11 @@ void uFEpppppp(x64emu_t *emu, uintptr_t fcn) { uFEpppppp_t fn = (uFEpppppp_t)fcn
 void uFiiiuuuu(x64emu_t *emu, uintptr_t fcn) { uFiiiuuuu_t fn = (uFiiiuuuu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void uFuippppp(x64emu_t *emu, uintptr_t fcn) { uFuippppp_t fn = (uFuippppp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFpippppp(x64emu_t *emu, uintptr_t fcn) { uFpippppp_t fn = (uFpippppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void uFpCuuuuu(x64emu_t *emu, uintptr_t fcn) { uFpCuuuuu_t fn = (uFpCuuuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
+void uFpuuuwwu(x64emu_t *emu, uintptr_t fcn) { uFpuuuwwu_t fn = (uFpuuuwwu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void uFpuuuupp(x64emu_t *emu, uintptr_t fcn) { uFpuuuupp_t fn = (uFpuuuupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFpuuuppp(x64emu_t *emu, uintptr_t fcn) { uFpuuuppp_t fn = (uFpuuuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void uFpuupwwC(x64emu_t *emu, uintptr_t fcn) { uFpuupwwC_t fn = (uFpuupwwC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint8_t*)(R_RSP + 8)); }
 void uFpuupppp(x64emu_t *emu, uintptr_t fcn) { uFpuupppp_t fn = (uFpuupppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFppiuppi(x64emu_t *emu, uintptr_t fcn) { uFppiuppi_t fn = (uFppiuppi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void uFppiuppp(x64emu_t *emu, uintptr_t fcn) { uFppiuppp_t fn = (uFppiuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -5400,11 +5413,8 @@ void pFpipippp(x64emu_t *emu, uintptr_t fcn) { pFpipippp_t fn = (pFpipippp_t)fcn
 void pFpCuwwWW(x64emu_t *emu, uintptr_t fcn) { pFpCuwwWW_t fn = (pFpCuwwWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (int16_t)R_RCX, (int16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8)); }
 void pFpCuWCCC(x64emu_t *emu, uintptr_t fcn) { pFpCuWCCC_t fn = (pFpCuWCCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8)); }
 void pFpCuuwwp(x64emu_t *emu, uintptr_t fcn) { pFpCuuwwp_t fn = (pFpCuuwwp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(void**)(R_RSP + 8)); }
-void pFpCuuuuu(x64emu_t *emu, uintptr_t fcn) { pFpCuuuuu_t fn = (pFpCuuuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void pFpCpWWup(x64emu_t *emu, uintptr_t fcn) { pFpCpWWup_t fn = (pFpCpWWup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFpWppWpp(x64emu_t *emu, uintptr_t fcn) { pFpWppWpp_t fn = (pFpWppWpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void pFpuuuwwu(x64emu_t *emu, uintptr_t fcn) { pFpuuuwwu_t fn = (pFpuuuwwu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
-void pFpuupwwC(x64emu_t *emu, uintptr_t fcn) { pFpuupwwC_t fn = (pFpuupwwC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint8_t*)(R_RSP + 8)); }
 void 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)); }
 void pFpupiipp(x64emu_t *emu, uintptr_t fcn) { pFpupiipp_t fn = (pFpupiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpuppipp(x64emu_t *emu, uintptr_t fcn) { pFpuppipp_t fn = (pFpuppipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -5580,6 +5590,8 @@ void uFEppppppp(x64emu_t *emu, uintptr_t fcn) { uFEppppppp_t fn = (uFEppppppp_t)
 void uFuipppppp(x64emu_t *emu, uintptr_t fcn) { uFuipppppp_t fn = (uFuipppppp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void uFuupuuiuf(x64emu_t *emu, uintptr_t fcn) { uFuupuuiuf_t fn = (uFuupuuiuf_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), emu->xmm[0].f[0]); }
 void uFulpppppp(x64emu_t *emu, uintptr_t fcn) { uFulpppppp_t fn = (uFulpppppp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void uFpCuuuCup(x64emu_t *emu, uintptr_t fcn) { uFpCuuuCup_t fn = (uFpCuuuCup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint8_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void uFpWWWWWWp(x64emu_t *emu, uintptr_t fcn) { uFpWWWWWWp_t fn = (uFpWWWWWWp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void uFpuupupuu(x64emu_t *emu, uintptr_t fcn) { uFpuupupuu_t fn = (uFpuupupuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void uFpupuuuCp(x64emu_t *emu, uintptr_t fcn) { uFpupuuuCp_t fn = (uFpupuuuCp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint8_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void uFppuuuupp(x64emu_t *emu, uintptr_t fcn) { uFppuuuupp_t fn = (uFppuuuupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -5751,9 +5763,7 @@ void pFpLpLLipui(x64emu_t *emu, uintptr_t fcn) { pFpLpLLipui_t fn = (pFpLpLLipui
 void pFpLppLLiLi(x64emu_t *emu, uintptr_t fcn) { pFpLppLLiLi_t fn = (pFpLppLLiLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(int32_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void pFppiiiiiip(x64emu_t *emu, uintptr_t fcn) { pFppiiiiiip_t fn = (pFppiiiiiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFppipppppp(x64emu_t *emu, uintptr_t fcn) { pFppipppppp_t fn = (pFppipppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
-void pFppCuuuCup(x64emu_t *emu, uintptr_t fcn) { pFppCuuuCup_t fn = (pFppCuuuCup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint8_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpppiiiiii(x64emu_t *emu, uintptr_t fcn) { pFpppiiiiii_t fn = (pFpppiiiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
-void pFpppWWWWWp(x64emu_t *emu, uintptr_t fcn) { pFpppWWWWWp_t fn = (pFpppWWWWWp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint16_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpppuipppp(x64emu_t *emu, uintptr_t fcn) { pFpppuipppp_t fn = (pFpppuipppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpppppiipp(x64emu_t *emu, uintptr_t fcn) { pFpppppiipp_t fn = (pFpppppiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpppppuuCC(x64emu_t *emu, uintptr_t fcn) { pFpppppuuCC_t fn = (pFpppppuuCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint8_t*)(R_RSP + 16), *(uint8_t*)(R_RSP + 24)); }
@@ -5945,8 +5955,8 @@ void iFpippuuuiipppp(x64emu_t *emu, uintptr_t fcn) { iFpippuuuiipppp_t fn = (iFp
 void iFpupiiiipppppp(x64emu_t *emu, uintptr_t fcn) { iFpupiiiipppppp_t fn = (iFpupiiiipppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_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**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void iFppppppLLLLupp(x64emu_t *emu, uintptr_t fcn) { iFppppppLLLLupp_t fn = (iFppppppLLLLupp_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, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24), *(uintptr_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void uFippuuuulllipp(x64emu_t *emu, uintptr_t fcn) { uFippuuuulllipp_t fn = (uFippuuuulllipp_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(intptr_t*)(R_RSP + 16), *(intptr_t*)(R_RSP + 24), *(intptr_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
+void uFpCuuwwWWWWuup(x64emu_t *emu, uintptr_t fcn) { uFpCuuwwWWWWuup_t fn = (uFpCuuwwWWWWuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint16_t*)(R_RSP + 16), *(uint16_t*)(R_RSP + 24), *(uint16_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void uFpppppuupppppp(x64emu_t *emu, uintptr_t fcn) { uFpppppuupppppp_t fn = (uFpppppuupppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
-void pFpCuuwwWWWWuup(x64emu_t *emu, uintptr_t fcn) { pFpCuuwwWWWWuup_t fn = (pFpCuuwwWWWWuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint16_t*)(R_RSP + 16), *(uint16_t*)(R_RSP + 24), *(uint16_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void pFpuupppwwwwWWC(x64emu_t *emu, uintptr_t fcn) { pFpuupppwwwwWWC_t fn = (pFpuupppwwwwWWC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(int16_t*)(R_RSP + 24), *(int16_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(uint16_t*)(R_RSP + 48), *(uint8_t*)(R_RSP + 56)); }
 void pFppLppppiiLpip(x64emu_t *emu, uintptr_t fcn) { pFppLppppiiLpip_t fn = (pFppLppppiiLpip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uintptr_t*)(R_RSP + 32), *(void**)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void pFpppppppuipppp(x64emu_t *emu, uintptr_t fcn) { pFpppppppuipppp_t fn = (pFpppppppuipppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
@@ -5987,10 +5997,10 @@ void LFpppppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { LFpppppppppppppppppp_t
 void pFippppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFippppppppppppppppp_t fn = (pFippppppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96)); }
 void pFpupppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFpupppppppppppppppp_t fn = (pFpupppppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96)); }
 void vFpiiiiiiiiiiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFpiiiiiiiiiiiiiiiiii_t fn = (vFpiiiiiiiiiiiiiiiiii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(int32_t*)(R_RSP + 72), *(int32_t*)(R_RSP + 80), *(int32_t*)(R_RSP + 88), *(int32_t*)(R_RSP + 96), *(int32_t*)(R_RSP + 104)); }
+void uFpWWWCCCCCCCCWCCCCCC(x64emu_t *emu, uintptr_t fcn) { uFpWWWCCCCCCCCWCCCCCC_t fn = (uFpWWWCCCCCCCCWCCCCCC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8), *(uint8_t*)(R_RSP + 16), *(uint8_t*)(R_RSP + 24), *(uint8_t*)(R_RSP + 32), *(uint8_t*)(R_RSP + 40), *(uint8_t*)(R_RSP + 48), *(uint16_t*)(R_RSP + 56), *(uint8_t*)(R_RSP + 64), *(uint8_t*)(R_RSP + 72), *(uint8_t*)(R_RSP + 80), *(uint8_t*)(R_RSP + 88), *(uint8_t*)(R_RSP + 96), *(uint8_t*)(R_RSP + 104)); }
 void pFiiiippppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFiiiippppppppppppppp_t fn = (pFiiiippppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)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**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104)); }
 void pFpippppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFpippppppppppppppppp_t fn = (pFpippppppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104)); }
 void pFpupupppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFpupupppppppppppppppp_t fn = (pFpupupppppppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)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**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104), *(void**)(R_RSP + 112)); }
-void pFpppWWCCpCpCpCWpCpCpC(x64emu_t *emu, uintptr_t fcn) { pFpppWWCCpCpCpCWpCpCpC_t fn = (pFpppWWCCpCpCpCWpCpCpC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(uint8_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(uint8_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(uint8_t*)(R_RSP + 56), *(uint16_t*)(R_RSP + 64), *(void**)(R_RSP + 72), *(uint8_t*)(R_RSP + 80), *(void**)(R_RSP + 88), *(uint8_t*)(R_RSP + 96), *(void**)(R_RSP + 104), *(uint8_t*)(R_RSP + 112)); }
 void iFpppppppppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppppppppppppppppppp_t fn = (iFpppppppppppppppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104), *(void**)(R_RSP + 112), *(void**)(R_RSP + 120), *(void**)(R_RSP + 128)); }
 void uFippuuuuiiiiuuiiiiiiiipp(x64emu_t *emu, uintptr_t fcn) { uFippuuuuiiiiuuiiiiiiiipp_t fn = (uFippuuuuiiiiuuiiiiiiiipp_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_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), *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(uint32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(int32_t*)(R_RSP + 72), *(int32_t*)(R_RSP + 80), *(int32_t*)(R_RSP + 88), *(int32_t*)(R_RSP + 96), *(int32_t*)(R_RSP + 104), *(int32_t*)(R_RSP + 112), *(int32_t*)(R_RSP + 120), *(void**)(R_RSP + 128), *(void**)(R_RSP + 136)); }
 void vFpppppppppppppppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpppppppppppppppppppppppp_t fn = (vFpppppppppppppppppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(void**)(R_RSP + 88), *(void**)(R_RSP + 96), *(void**)(R_RSP + 104), *(void**)(R_RSP + 112), *(void**)(R_RSP + 120), *(void**)(R_RSP + 128), *(void**)(R_RSP + 136), *(void**)(R_RSP + 144)); }
@@ -6503,11 +6513,15 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpip) return 1;
 	if (fun == &uFpCi) return 1;
 	if (fun == &uFpWi) return 1;
+	if (fun == &uFpWW) return 1;
 	if (fun == &uFpWu) return 1;
 	if (fun == &uFpWf) return 2;
 	if (fun == &uFpWp) return 1;
 	if (fun == &uFpui) return 1;
+	if (fun == &uFpuC) return 1;
+	if (fun == &uFpuW) return 1;
 	if (fun == &uFpuu) return 1;
+	if (fun == &uFpuU) return 1;
 	if (fun == &uFpuL) return 1;
 	if (fun == &uFpup) return 1;
 	if (fun == &uFpfu) return 2;
@@ -6930,7 +6944,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpipu) return 1;
 	if (fun == &uFpipp) return 1;
 	if (fun == &uFpCCC) return 1;
+	if (fun == &uFpCWp) return 1;
 	if (fun == &uFpuip) return 1;
+	if (fun == &uFpuWp) return 1;
+	if (fun == &uFpuuC) return 1;
+	if (fun == &uFpuuu) return 1;
 	if (fun == &uFpuup) return 1;
 	if (fun == &uFpupi) return 1;
 	if (fun == &uFpupu) return 1;
@@ -7023,7 +7041,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpipL) return 1;
 	if (fun == &pFpipp) return 1;
 	if (fun == &pFpCip) return 1;
-	if (fun == &pFpCWp) return 1;
 	if (fun == &pFpCuW) return 1;
 	if (fun == &pFpCuu) return 1;
 	if (fun == &pFpWWW) return 1;
@@ -7057,10 +7074,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFppiL) return 1;
 	if (fun == &pFppip) return 1;
 	if (fun == &pFppCp) return 1;
-	if (fun == &pFppWW) return 1;
 	if (fun == &pFppWp) return 1;
-	if (fun == &pFppuC) return 1;
-	if (fun == &pFppuW) return 1;
 	if (fun == &pFppuu) return 1;
 	if (fun == &pFppuL) return 1;
 	if (fun == &pFppup) return 1;
@@ -7370,9 +7384,13 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFuiiii) return 1;
 	if (fun == &uFLpppL) return 1;
 	if (fun == &uFpCCCC) return 1;
+	if (fun == &uFpCuuu) return 1;
+	if (fun == &uFpCuup) return 1;
 	if (fun == &uFpWuip) return 1;
+	if (fun == &uFpuuWW) return 1;
 	if (fun == &uFpuuui) return 1;
 	if (fun == &uFpuuuu) return 1;
+	if (fun == &uFpuuup) return 1;
 	if (fun == &uFpuupp) return 1;
 	if (fun == &uFpupuu) return 1;
 	if (fun == &uFpuppp) return 1;
@@ -7437,8 +7455,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpipup) return 1;
 	if (fun == &pFpippi) return 1;
 	if (fun == &pFpippp) return 1;
-	if (fun == &pFpCpup) return 1;
-	if (fun == &pFpCppp) return 1;
 	if (fun == &pFpuiii) return 1;
 	if (fun == &pFpuiip) return 1;
 	if (fun == &pFpuWWW) return 1;
@@ -7741,9 +7757,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFuppppp) return 1;
 	if (fun == &uFpiuppu) return 1;
 	if (fun == &uFpippup) return 1;
+	if (fun == &uFpCuuWW) return 1;
 	if (fun == &uFpWuipp) return 1;
 	if (fun == &uFpWuuCp) return 1;
 	if (fun == &uFpuippp) return 1;
+	if (fun == &uFpuuiup) return 1;
 	if (fun == &uFpuuuup) return 1;
 	if (fun == &uFpuuupp) return 1;
 	if (fun == &uFpuuppp) return 1;
@@ -7789,7 +7807,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpippip) return 1;
 	if (fun == &pFpipppp) return 1;
 	if (fun == &pFpCuuCC) return 1;
-	if (fun == &pFpCuuWW) return 1;
 	if (fun == &pFpCuuup) return 1;
 	if (fun == &pFpuiiip) return 1;
 	if (fun == &pFpuuwwu) return 1;
@@ -7818,12 +7835,10 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFppuppp) return 1;
 	if (fun == &pFpplplp) return 1;
 	if (fun == &pFpplppp) return 1;
-	if (fun == &pFpppiup) return 1;
 	if (fun == &pFpppupp) return 1;
 	if (fun == &pFpppLii) return 1;
 	if (fun == &pFpppLui) return 1;
 	if (fun == &pFppppii) return 1;
-	if (fun == &pFppppWW) return 1;
 	if (fun == &pFpppppi) return 1;
 	if (fun == &pFpppppu) return 1;
 	if (fun == &pFpppppp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 5ab9c63b..5bb52395 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -604,11 +604,15 @@ void uFpiu(x64emu_t *emu, uintptr_t fnc);
 void uFpip(x64emu_t *emu, uintptr_t fnc);
 void uFpCi(x64emu_t *emu, uintptr_t fnc);
 void uFpWi(x64emu_t *emu, uintptr_t fnc);
+void uFpWW(x64emu_t *emu, uintptr_t fnc);
 void uFpWu(x64emu_t *emu, uintptr_t fnc);
 void uFpWf(x64emu_t *emu, uintptr_t fnc);
 void uFpWp(x64emu_t *emu, uintptr_t fnc);
 void uFpui(x64emu_t *emu, uintptr_t fnc);
+void uFpuC(x64emu_t *emu, uintptr_t fnc);
+void uFpuW(x64emu_t *emu, uintptr_t fnc);
 void uFpuu(x64emu_t *emu, uintptr_t fnc);
+void uFpuU(x64emu_t *emu, uintptr_t fnc);
 void uFpuL(x64emu_t *emu, uintptr_t fnc);
 void uFpup(x64emu_t *emu, uintptr_t fnc);
 void uFpfu(x64emu_t *emu, uintptr_t fnc);
@@ -1111,7 +1115,11 @@ void uFpiip(x64emu_t *emu, uintptr_t fnc);
 void uFpipu(x64emu_t *emu, uintptr_t fnc);
 void uFpipp(x64emu_t *emu, uintptr_t fnc);
 void uFpCCC(x64emu_t *emu, uintptr_t fnc);
+void uFpCWp(x64emu_t *emu, uintptr_t fnc);
 void uFpuip(x64emu_t *emu, uintptr_t fnc);
+void uFpuWp(x64emu_t *emu, uintptr_t fnc);
+void uFpuuC(x64emu_t *emu, uintptr_t fnc);
+void uFpuuu(x64emu_t *emu, uintptr_t fnc);
 void uFpuup(x64emu_t *emu, uintptr_t fnc);
 void uFpupi(x64emu_t *emu, uintptr_t fnc);
 void uFpupu(x64emu_t *emu, uintptr_t fnc);
@@ -1221,7 +1229,6 @@ void pFpipd(x64emu_t *emu, uintptr_t fnc);
 void pFpipL(x64emu_t *emu, uintptr_t fnc);
 void pFpipp(x64emu_t *emu, uintptr_t fnc);
 void pFpCip(x64emu_t *emu, uintptr_t fnc);
-void pFpCWp(x64emu_t *emu, uintptr_t fnc);
 void pFpCuW(x64emu_t *emu, uintptr_t fnc);
 void pFpCuu(x64emu_t *emu, uintptr_t fnc);
 void pFpWWW(x64emu_t *emu, uintptr_t fnc);
@@ -1255,10 +1262,7 @@ void pFppiu(x64emu_t *emu, uintptr_t fnc);
 void pFppiL(x64emu_t *emu, uintptr_t fnc);
 void pFppip(x64emu_t *emu, uintptr_t fnc);
 void pFppCp(x64emu_t *emu, uintptr_t fnc);
-void pFppWW(x64emu_t *emu, uintptr_t fnc);
 void pFppWp(x64emu_t *emu, uintptr_t fnc);
-void pFppuC(x64emu_t *emu, uintptr_t fnc);
-void pFppuW(x64emu_t *emu, uintptr_t fnc);
 void pFppuu(x64emu_t *emu, uintptr_t fnc);
 void pFppuL(x64emu_t *emu, uintptr_t fnc);
 void pFppup(x64emu_t *emu, uintptr_t fnc);
@@ -1632,9 +1636,13 @@ void uFipLpp(x64emu_t *emu, uintptr_t fnc);
 void uFuiiii(x64emu_t *emu, uintptr_t fnc);
 void uFLpppL(x64emu_t *emu, uintptr_t fnc);
 void uFpCCCC(x64emu_t *emu, uintptr_t fnc);
+void uFpCuuu(x64emu_t *emu, uintptr_t fnc);
+void uFpCuup(x64emu_t *emu, uintptr_t fnc);
 void uFpWuip(x64emu_t *emu, uintptr_t fnc);
+void uFpuuWW(x64emu_t *emu, uintptr_t fnc);
 void uFpuuui(x64emu_t *emu, uintptr_t fnc);
 void uFpuuuu(x64emu_t *emu, uintptr_t fnc);
+void uFpuuup(x64emu_t *emu, uintptr_t fnc);
 void uFpuupp(x64emu_t *emu, uintptr_t fnc);
 void uFpupuu(x64emu_t *emu, uintptr_t fnc);
 void uFpuppp(x64emu_t *emu, uintptr_t fnc);
@@ -1717,8 +1725,6 @@ void pFpipip(x64emu_t *emu, uintptr_t fnc);
 void pFpipup(x64emu_t *emu, uintptr_t fnc);
 void pFpippi(x64emu_t *emu, uintptr_t fnc);
 void pFpippp(x64emu_t *emu, uintptr_t fnc);
-void pFpCpup(x64emu_t *emu, uintptr_t fnc);
-void pFpCppp(x64emu_t *emu, uintptr_t fnc);
 void pFpuiii(x64emu_t *emu, uintptr_t fnc);
 void pFpuiip(x64emu_t *emu, uintptr_t fnc);
 void pFpuWWW(x64emu_t *emu, uintptr_t fnc);
@@ -2070,9 +2076,11 @@ void uFupuufp(x64emu_t *emu, uintptr_t fnc);
 void uFuppppp(x64emu_t *emu, uintptr_t fnc);
 void uFpiuppu(x64emu_t *emu, uintptr_t fnc);
 void uFpippup(x64emu_t *emu, uintptr_t fnc);
+void uFpCuuWW(x64emu_t *emu, uintptr_t fnc);
 void uFpWuipp(x64emu_t *emu, uintptr_t fnc);
 void uFpWuuCp(x64emu_t *emu, uintptr_t fnc);
 void uFpuippp(x64emu_t *emu, uintptr_t fnc);
+void uFpuuiup(x64emu_t *emu, uintptr_t fnc);
 void uFpuuuup(x64emu_t *emu, uintptr_t fnc);
 void uFpuuupp(x64emu_t *emu, uintptr_t fnc);
 void uFpuuppp(x64emu_t *emu, uintptr_t fnc);
@@ -2137,7 +2145,6 @@ void pFpipipp(x64emu_t *emu, uintptr_t fnc);
 void pFpippip(x64emu_t *emu, uintptr_t fnc);
 void pFpipppp(x64emu_t *emu, uintptr_t fnc);
 void pFpCuuCC(x64emu_t *emu, uintptr_t fnc);
-void pFpCuuWW(x64emu_t *emu, uintptr_t fnc);
 void pFpCuuup(x64emu_t *emu, uintptr_t fnc);
 void pFpuiiip(x64emu_t *emu, uintptr_t fnc);
 void pFpuuwwu(x64emu_t *emu, uintptr_t fnc);
@@ -2166,12 +2173,10 @@ void pFppupii(x64emu_t *emu, uintptr_t fnc);
 void pFppuppp(x64emu_t *emu, uintptr_t fnc);
 void pFpplplp(x64emu_t *emu, uintptr_t fnc);
 void pFpplppp(x64emu_t *emu, uintptr_t fnc);
-void pFpppiup(x64emu_t *emu, uintptr_t fnc);
 void pFpppupp(x64emu_t *emu, uintptr_t fnc);
 void pFpppLii(x64emu_t *emu, uintptr_t fnc);
 void pFpppLui(x64emu_t *emu, uintptr_t fnc);
 void pFppppii(x64emu_t *emu, uintptr_t fnc);
-void pFppppWW(x64emu_t *emu, uintptr_t fnc);
 void pFpppppi(x64emu_t *emu, uintptr_t fnc);
 void pFpppppu(x64emu_t *emu, uintptr_t fnc);
 void pFpppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2380,8 +2385,11 @@ void uFEpppppp(x64emu_t *emu, uintptr_t fnc);
 void uFiiiuuuu(x64emu_t *emu, uintptr_t fnc);
 void uFuippppp(x64emu_t *emu, uintptr_t fnc);
 void uFpippppp(x64emu_t *emu, uintptr_t fnc);
+void uFpCuuuuu(x64emu_t *emu, uintptr_t fnc);
+void uFpuuuwwu(x64emu_t *emu, uintptr_t fnc);
 void uFpuuuupp(x64emu_t *emu, uintptr_t fnc);
 void uFpuuuppp(x64emu_t *emu, uintptr_t fnc);
+void uFpuupwwC(x64emu_t *emu, uintptr_t fnc);
 void uFpuupppp(x64emu_t *emu, uintptr_t fnc);
 void uFppiuppi(x64emu_t *emu, uintptr_t fnc);
 void uFppiuppp(x64emu_t *emu, uintptr_t fnc);
@@ -2409,11 +2417,8 @@ void pFpipippp(x64emu_t *emu, uintptr_t fnc);
 void pFpCuwwWW(x64emu_t *emu, uintptr_t fnc);
 void pFpCuWCCC(x64emu_t *emu, uintptr_t fnc);
 void pFpCuuwwp(x64emu_t *emu, uintptr_t fnc);
-void pFpCuuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpCpWWup(x64emu_t *emu, uintptr_t fnc);
 void pFpWppWpp(x64emu_t *emu, uintptr_t fnc);
-void pFpuuuwwu(x64emu_t *emu, uintptr_t fnc);
-void pFpuupwwC(x64emu_t *emu, uintptr_t fnc);
 void pFpuLpipp(x64emu_t *emu, uintptr_t fnc);
 void pFpupiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpuppipp(x64emu_t *emu, uintptr_t fnc);
@@ -2589,6 +2594,8 @@ void uFEppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFuipppppp(x64emu_t *emu, uintptr_t fnc);
 void uFuupuuiuf(x64emu_t *emu, uintptr_t fnc);
 void uFulpppppp(x64emu_t *emu, uintptr_t fnc);
+void uFpCuuuCup(x64emu_t *emu, uintptr_t fnc);
+void uFpWWWWWWp(x64emu_t *emu, uintptr_t fnc);
 void uFpuupupuu(x64emu_t *emu, uintptr_t fnc);
 void uFpupuuuCp(x64emu_t *emu, uintptr_t fnc);
 void uFppuuuupp(x64emu_t *emu, uintptr_t fnc);
@@ -2760,9 +2767,7 @@ void pFpLpLLipui(x64emu_t *emu, uintptr_t fnc);
 void pFpLppLLiLi(x64emu_t *emu, uintptr_t fnc);
 void pFppiiiiiip(x64emu_t *emu, uintptr_t fnc);
 void pFppipppppp(x64emu_t *emu, uintptr_t fnc);
-void pFppCuuuCup(x64emu_t *emu, uintptr_t fnc);
 void pFpppiiiiii(x64emu_t *emu, uintptr_t fnc);
-void pFpppWWWWWp(x64emu_t *emu, uintptr_t fnc);
 void pFpppuipppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppuuCC(x64emu_t *emu, uintptr_t fnc);
@@ -2954,8 +2959,8 @@ void iFpippuuuiipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpupiiiipppppp(x64emu_t *emu, uintptr_t fnc);
 void iFppppppLLLLupp(x64emu_t *emu, uintptr_t fnc);
 void uFippuuuulllipp(x64emu_t *emu, uintptr_t fnc);
+void uFpCuuwwWWWWuup(x64emu_t *emu, uintptr_t fnc);
 void uFpppppuupppppp(x64emu_t *emu, uintptr_t fnc);
-void pFpCuuwwWWWWuup(x64emu_t *emu, uintptr_t fnc);
 void pFpuupppwwwwWWC(x64emu_t *emu, uintptr_t fnc);
 void pFppLppppiiLpip(x64emu_t *emu, uintptr_t fnc);
 void pFpppppppuipppp(x64emu_t *emu, uintptr_t fnc);
@@ -2996,10 +3001,10 @@ void LFpppppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFippppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpupppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiiiiiiiiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
+void uFpWWWCCCCCCCCWCCCCCC(x64emu_t *emu, uintptr_t fnc);
 void pFiiiippppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpippppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpupupppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
-void pFpppWWCCpCpCpCWpCpCpC(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFippuuuuiiiiuuiiiiiiiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappeddbus_private.h b/src/wrapped/wrappeddbus_private.h
index 10407c35..81fe3030 100644
--- a/src/wrapped/wrappeddbus_private.h
+++ b/src/wrapped/wrappeddbus_private.h
@@ -10,7 +10,7 @@ GO(dbus_address_unescape_value, pFpp)
 GO(dbus_bus_add_match, vFppp)
 GO(dbus_bus_get, pFip)
 GO(dbus_bus_get_id, pFpp)
-GO(dbus_bus_get_private, pFip)
+GO(dbus_bus_get_private, pFLp)
 GO(dbus_bus_get_unique_name, pFp)
 GO(dbus_bus_get_unix_user, uFppp)
 GO(dbus_bus_name_has_owner, iFppp)
diff --git a/src/wrapped/wrappedlibxcb_private.h b/src/wrapped/wrappedlibxcb_private.h
index 96c6f858..60cdd5a4 100644
--- a/src/wrapped/wrappedlibxcb_private.h
+++ b/src/wrapped/wrappedlibxcb_private.h
@@ -76,15 +76,15 @@ GO(xcb_change_keyboard_control, pFpup)
 //GO(xcb_change_keyboard_mapping_sizeof, 
 //GO(xcb_change_pointer_control, 
 //GO(xcb_change_pointer_control_checked, 
-GO(xcb_change_property, pFppCuuuCup)
-GO(xcb_change_property_checked, pFppCuuuCup)
+GO(xcb_change_property, uFpCuuuCup)
+GO(xcb_change_property_checked, uFpCuuuCup)
 //GO(xcb_change_property_data, 
 //GO(xcb_change_property_data_end, 
 //GO(xcb_change_property_data_length, 
 //GO(xcb_change_property_sizeof, 
 //GO(xcb_change_save_set, 
 //GO(xcb_change_save_set_checked, 
-GO(xcb_change_window_attributes, pFpuup)
+GO(xcb_change_window_attributes, uFpuup)
 //GO(xcb_change_window_attributes_aux, 
 //GO(xcb_change_window_attributes_aux_checked, 
 GO(xcb_change_window_attributes_checked, pFpuup)
@@ -132,14 +132,14 @@ GO(xcb_copy_area_checked, pFpuuuwwwwWW)
 //GO(xcb_copy_gc_checked, 
 //GO(xcb_copy_plane, 
 //GO(xcb_copy_plane_checked, 
-GO(xcb_create_colormap, pFpCppp)
-//GO(xcb_create_colormap_checked, 
+GO(xcb_create_colormap, uFpCuuu)
+GO(xcb_create_colormap_checked, uFpCuuu)
 GO(xcb_create_cursor, pFpuuuWWWWWWWW)
 //GO(xcb_create_cursor_checked, 
-GO(xcb_create_gc, pFpuuup)
+GO(xcb_create_gc, uFpuuup)
 //GO(xcb_create_gc_aux, 
 //GO(xcb_create_gc_aux_checked, 
-GO(xcb_create_gc_checked, pFpuuup)
+GO(xcb_create_gc_checked, uFpuuup)
 //GO(xcb_create_gc_sizeof, 
 //GO(xcb_create_gc_value_list, 
 //GO(xcb_create_gc_value_list_serialize, 
@@ -147,12 +147,12 @@ GO(xcb_create_gc_checked, pFpuuup)
 //GO(xcb_create_gc_value_list_unpack, 
 GO(xcb_create_glyph_cursor, pFpuuuWWWWWWWW)
 //GO(xcb_create_glyph_cursor_checked, 
-GO(xcb_create_pixmap, pFpCuuWW)
-GO(xcb_create_pixmap_checked, pFpCuuWW)
-GO(xcb_create_window, pFpCuuwwWWWWuup)
+GO(xcb_create_pixmap, uFpCuuWW)
+GO(xcb_create_pixmap_checked, uFpCuuWW)
+GO(xcb_create_window, uFpCuuwwWWWWuup)
 //GO(xcb_create_window_aux, 
 //GO(xcb_create_window_aux_checked, 
-GO(xcb_create_window_checked, pFpCuuwwWWWWuup)
+GO(xcb_create_window_checked, uFpCuuwwWWWWuup)
 //GO(xcb_create_window_sizeof, 
 //GO(xcb_create_window_value_list, 
 //GO(xcb_create_window_value_list_serialize, 
@@ -160,8 +160,8 @@ GO(xcb_create_window_checked, pFpCuuwwWWWWuup)
 //GO(xcb_create_window_value_list_unpack, 
 //GO(xcb_cursor_end, 
 //GO(xcb_cursor_next, 
-GO(xcb_delete_property, pFppp)
-//GO(xcb_delete_property_checked, 
+GO(xcb_delete_property, uFpuu)
+GO(xcb_delete_property_checked, uFpuu)
 //GO(xcb_depth_end, 
 GO(xcb_depth_next, vFp)
 GO(xcb_depth_sizeof, iFp)
@@ -204,14 +204,14 @@ GO(xcb_free_colormap_checked, pFpu)
 //GO(xcb_free_colors_sizeof, 
 GO(xcb_free_cursor, pFpp)
 //GO(xcb_free_cursor_checked, 
-GO(xcb_free_gc, pFpu)
-//GO(xcb_free_gc_checked, 
-GO(xcb_free_pixmap, pFpu)
-GO(xcb_free_pixmap_checked, pFpu)
+GO(xcb_free_gc, uFpu)
+GO(xcb_free_gc_checked, uFpu)
+GO(xcb_free_pixmap, uFpu)
+GO(xcb_free_pixmap_checked, uFpu)
 //GO(xcb_gcontext_end, 
 //GO(xcb_gcontext_next, 
 GO(xcb_generate_id, uFp)
-GO(xcb_get_atom_name, pFpu)
+GO(xcb_get_atom_name, uFpu)
 GO(xcb_get_atom_name_name, pFp)
 //GO(xcb_get_atom_name_name_end, 
 GO(xcb_get_atom_name_name_length, iFp)
@@ -236,7 +236,7 @@ GO(xcb_get_image_data_length, iFp)
 GO(xcb_get_image_reply, pFpup)
 //GO(xcb_get_image_sizeof, 
 GO(xcb_get_image_unchecked, pFpCuwwWWu)
-GO(xcb_get_input_focus, pFp)
+GO(xcb_get_input_focus, uFp)
 GO(xcb_get_input_focus_reply, pFpup)
 //GO(xcb_get_input_focus_unchecked, 
 //GO(xcb_get_keyboard_control, 
@@ -274,10 +274,10 @@ GO(xcb_get_modifier_mapping_reply, pFpup)
 //GO(xcb_get_pointer_mapping_reply, 
 //GO(xcb_get_pointer_mapping_sizeof, 
 //GO(xcb_get_pointer_mapping_unchecked, 
-GO(xcb_get_property, pFpCuuuuu)
+GO(xcb_get_property, uFpCuuuuu)
 GO(xcb_get_property_reply, pFpup)
 //GO(xcb_get_property_sizeof, 
-GO(xcb_get_property_unchecked, pFpCuuuuu)
+GO(xcb_get_property_unchecked, uFpCuuuuu)
 GO(xcb_get_property_value, pFp)
 //GO(xcb_get_property_value_end, 
 GO(xcb_get_property_value_length, iFp)
@@ -285,13 +285,13 @@ GO(xcb_get_reply_fds, pFppu)
 //GO(xcb_get_screen_saver, 
 //GO(xcb_get_screen_saver_reply, 
 //GO(xcb_get_screen_saver_unchecked, 
-GO(xcb_get_selection_owner, pFpu)
+GO(xcb_get_selection_owner, uFpu)
 GO(xcb_get_selection_owner_reply, pFpup)
-GO(xcb_get_selection_owner_unchecked, pFpu)
+GO(xcb_get_selection_owner_unchecked, uFpu)
 GO(xcb_get_setup, pFp)
-GO(xcb_get_window_attributes, pFpu)
+GO(xcb_get_window_attributes, uFpu)
 GO(xcb_get_window_attributes_reply, pFpup)
-GO(xcb_get_window_attributes_unchecked, pFpu)
+GO(xcb_get_window_attributes_unchecked, uFpu)
 GO(xcb_grab_button, pFpCuWCCuuCW)
 GO(xcb_grab_button_checked, pFpCuWCCuuCW)
 GO(xcb_grab_key, pFpCuWCCC)
@@ -302,8 +302,8 @@ GO(xcb_grab_key_checked, pFpCuWCCC)
 GO(xcb_grab_pointer, pFpCuWCCuuu)
 GO(xcb_grab_pointer_reply, pFpup)
 //GO(xcb_grab_pointer_unchecked, 
-GO(xcb_grab_server, pFp)
-//GO(xcb_grab_server_checked, 
+GO(xcb_grab_server, uFp)
+GO(xcb_grab_server_checked, uFp)
 //GO(xcb_host_address, 
 //GO(xcb_host_address_end, 
 //GO(xcb_host_address_length, 
@@ -324,10 +324,10 @@ GO(xcb_image_text_8_checked, pFpCuuwwp)
 //GO(xcb_image_text_8_string_length, 
 //GO(xcb_install_colormap, 
 //GO(xcb_install_colormap_checked, 
-GO(xcb_intern_atom, pFpCWp)
+GO(xcb_intern_atom, uFpCWp)
 GO(xcb_intern_atom_reply, pFpup)
 //GO(xcb_intern_atom_sizeof, 
-GO(xcb_intern_atom_unchecked, pFpCWp)
+GO(xcb_intern_atom_unchecked, uFpCWp)
 //GO(xcb_keycode32_end, 
 //GO(xcb_keycode32_next, 
 //GO(xcb_keycode_end, 
@@ -382,14 +382,14 @@ GO(xcb_intern_atom_unchecked, pFpCWp)
 //GO(xcb_lookup_color_reply, 
 //GO(xcb_lookup_color_sizeof, 
 //GO(xcb_lookup_color_unchecked, 
-GO(xcb_map_subwindows, pFpu)
+GO(xcb_map_subwindows, uFpu)
 //GO(xcb_map_subwindows_checked, 
-GO(xcb_map_window, pFpu)
-GO(xcb_map_window_checked, pFpu)
+GO(xcb_map_window, uFpu)
+GO(xcb_map_window_checked, uFpu)
 //GO(xcb_no_operation, 
 //GO(xcb_no_operation_checked, 
-GO(xcb_open_font, pFpuWp)
-GO(xcb_open_font_checked, pFpuWp)
+GO(xcb_open_font, uFpuWp)
+GO(xcb_open_font_checked, uFpuWp)
 //GO(xcb_open_font_name, 
 //GO(xcb_open_font_name_end, 
 //GO(xcb_open_font_name_length, 
@@ -494,9 +494,9 @@ GO(xcb_put_image_checked, pFpCuuWWwwCCup)
 GO(xcb_query_keymap, pFpp)
 GO(xcb_query_keymap_reply, pFpup)
 GO(xcb_query_keymap_unchecked, pFpp)
-GO(xcb_query_pointer, pFpu)
+GO(xcb_query_pointer, uFpu)
 GO(xcb_query_pointer_reply, pFpup)
-//GO(xcb_query_pointer_unchecked, 
+GO(xcb_query_pointer_unchecked, uFpu)
 GO(xcb_query_text_extents, pFpuup)
 GO(xcb_query_text_extents_reply, pFpup)
 //GO(xcb_query_text_extents_sizeof, 
@@ -531,8 +531,8 @@ GO(xcb_screen_next, vFp)
 //GO(xcb_screen_sizeof, 
 //GO(xcb_segment_end, 
 //GO(xcb_segment_next, 
-GO(xcb_send_event, pFpCpup)
-GO(xcb_send_event_checked, pFpCpup)
+GO(xcb_send_event, uFpCuup)
+GO(xcb_send_event_checked, uFpCuup)
 GO(xcb_send_fd, vFpi)
 GO(xcb_send_request, uFpipp)
 GO(xcb_send_request64, UFpipp)
@@ -640,8 +640,8 @@ GO(xcb_ungrab_keyboard_checked, pFpu)
 GO(xcb_ungrab_key_checked, pFpCuW)
 GO(xcb_ungrab_pointer, pFpu)
 //GO(xcb_ungrab_pointer_checked, 
-GO(xcb_ungrab_server, pFp)
-//GO(xcb_ungrab_server_checked, 
+GO(xcb_ungrab_server, uFp)
+GO(xcb_ungrab_server_checked, uFp)
 //GO(xcb_uninstall_colormap, 
 //GO(xcb_uninstall_colormap_checked, 
 //GO(xcb_unmap_subwindows, 
diff --git a/src/wrapped/wrappedlibxcbicccm_private.h b/src/wrapped/wrappedlibxcbicccm_private.h
index 01c25f78..be141716 100644
--- a/src/wrapped/wrappedlibxcbicccm_private.h
+++ b/src/wrapped/wrappedlibxcbicccm_private.h
@@ -19,10 +19,10 @@
 //GO(xcb_icccm_get_wm_colormap_windows_reply, 
 //GO(xcb_icccm_get_wm_colormap_windows_reply_wipe, 
 //GO(xcb_icccm_get_wm_colormap_windows_unchecked, 
-//GO(xcb_icccm_get_wm_hints, 
+GO(xcb_icccm_get_wm_hints, uFpu)
 //GO(xcb_icccm_get_wm_hints_from_reply, 
 GO(xcb_icccm_get_wm_hints_reply, CFpupp)
-GO(xcb_icccm_get_wm_hints_unchecked, pFppu)
+GO(xcb_icccm_get_wm_hints_unchecked, uFpu)
 //GO(xcb_icccm_get_wm_icon_name, 
 //GO(xcb_icccm_get_wm_icon_name_reply, 
 //GO(xcb_icccm_get_wm_icon_name_unchecked, 
@@ -51,14 +51,14 @@ GO(xcb_icccm_get_wm_hints_unchecked, pFppu)
 //GO(xcb_icccm_set_wm_client_machine_checked, 
 //GO(xcb_icccm_set_wm_colormap_windows, 
 //GO(xcb_icccm_set_wm_colormap_windows_checked, 
-GO(xcb_icccm_set_wm_hints, pFppup)
-GO(xcb_icccm_set_wm_hints_checked, pFppup)
+GO(xcb_icccm_set_wm_hints, uFpup)
+GO(xcb_icccm_set_wm_hints_checked, uFpup)
 //GO(xcb_icccm_set_wm_icon_name, 
 //GO(xcb_icccm_set_wm_icon_name_checked, 
 //GO(xcb_icccm_set_wm_name, 
 //GO(xcb_icccm_set_wm_name_checked, 
-GO(xcb_icccm_set_wm_normal_hints, pFppup)
-GO(xcb_icccm_set_wm_normal_hints_checked, pFppup)
+GO(xcb_icccm_set_wm_normal_hints, uFpup)
+GO(xcb_icccm_set_wm_normal_hints_checked, uFpup)
 //GO(xcb_icccm_set_wm_protocols, 
 //GO(xcb_icccm_set_wm_protocols_checked, 
 //GO(xcb_icccm_set_wm_size_hints, 
diff --git a/src/wrapped/wrappedlibxcbimage_private.h b/src/wrapped/wrappedlibxcbimage_private.h
index 0127ba25..6877abad 100644
--- a/src/wrapped/wrappedlibxcbimage_private.h
+++ b/src/wrapped/wrappedlibxcbimage_private.h
@@ -12,7 +12,7 @@ GO(xcb_image_destroy, vFp)
 GO(xcb_image_get, pFpdwwWWui)
 GO(xcb_image_get_pixel, uFpuu)
 GO(xcb_image_native, pFppi)
-GO(xcb_image_put, pFpuupwwC)
+GO(xcb_image_put, uFpuupwwC)
 GO(xcb_image_put_pixel, vFpuuu)
 GO(xcb_image_shm_get, iFpupppWWu)    //xcb_shm_segment_info_t is a struct with "u u p" => transform to pp?
 GO(xcb_image_shm_put, pFpuupppwwwwWWC)
diff --git a/src/wrapped/wrappedlibxcbrandr_private.h b/src/wrapped/wrappedlibxcbrandr_private.h
index 88b7aa18..058a4fb2 100644
--- a/src/wrapped/wrappedlibxcbrandr_private.h
+++ b/src/wrapped/wrappedlibxcbrandr_private.h
@@ -88,12 +88,12 @@ GO(xcb_randr_get_crtc_info_unchecked, pFpppu)
 //GO(xcb_randr_get_crtc_transform_reply, 
 //GO(xcb_randr_get_crtc_transform_sizeof, 
 //GO(xcb_randr_get_crtc_transform_unchecked, 
-GO(xcb_randr_get_monitors, pFppuC)
-GO(xcb_randr_get_monitors_monitors_iterator, pFpp)
+GO(xcb_randr_get_monitors, uFpuC)
+GO(xcb_randr_get_monitors_monitors_iterator, HFp)
 GO(xcb_randr_get_monitors_monitors_length, iFp)
 GO(xcb_randr_get_monitors_reply, pFpup)
 GO(xcb_randr_get_monitors_sizeof, iFp)
-GO(xcb_randr_get_monitors_unchecked, pFppuC)
+GO(xcb_randr_get_monitors_unchecked, uFpuC)
 GO(xcb_randr_get_output_info, pFpppu)
 //GO(xcb_randr_get_output_info_clones, 
 //GO(xcb_randr_get_output_info_clones_end, 
@@ -253,9 +253,9 @@ GO(xcb_randr_monitor_info_sizeof, iFp)
 //GO(xcb_randr_query_provider_property_valid_values, 
 //GO(xcb_randr_query_provider_property_valid_values_end, 
 //GO(xcb_randr_query_provider_property_valid_values_length, 
-GO(xcb_randr_query_version, pFppuu)
+GO(xcb_randr_query_version, uFpuu)
 GO(xcb_randr_query_version_reply, pFpup)
-GO(xcb_randr_query_version_unchecked, pFppuu)
+GO(xcb_randr_query_version_unchecked, uFpuu)
 //GO(xcb_randr_refresh_rates_end, 
 //GO(xcb_randr_refresh_rates_next, 
 //GO(xcb_randr_refresh_rates_rates, 
@@ -266,8 +266,8 @@ GO(xcb_randr_query_version_unchecked, pFppuu)
 //GO(xcb_randr_resource_change_next, 
 //GO(xcb_randr_screen_size_end, 
 //GO(xcb_randr_screen_size_next, 
-GO(xcb_randr_select_input, pFppuW)
-GO(xcb_randr_select_input_checked, pFppuW)
+GO(xcb_randr_select_input, uFpuW)
+GO(xcb_randr_select_input_checked, uFpuW)
 //GO(xcb_randr_set_crtc_config, 
 //GO(xcb_randr_set_crtc_config_reply, 
 //GO(xcb_randr_set_crtc_config_sizeof, 
diff --git a/src/wrapped/wrappedlibxcbrender_private.h b/src/wrapped/wrappedlibxcbrender_private.h
index 07557648..2cfe266a 100644
--- a/src/wrapped/wrappedlibxcbrender_private.h
+++ b/src/wrapped/wrappedlibxcbrender_private.h
@@ -68,8 +68,8 @@ GO(xcb_render_composite, pFppCpppwwwwwwWW)
 //GO(xcb_render_create_conical_gradient_stops, 
 //GO(xcb_render_create_conical_gradient_stops_end, 
 //GO(xcb_render_create_conical_gradient_stops_length, 
-GO(xcb_render_create_cursor, pFppppWW)
-GO(xcb_render_create_cursor_checked, pFppppWW)
+GO(xcb_render_create_cursor, uFpuuWW)
+GO(xcb_render_create_cursor_checked, uFpuuWW)
 //GO(xcb_render_create_glyph_set, 
 //GO(xcb_render_create_glyph_set_checked, 
 //GO(xcb_render_create_linear_gradient, 
@@ -81,10 +81,10 @@ GO(xcb_render_create_cursor_checked, pFppppWW)
 //GO(xcb_render_create_linear_gradient_stops, 
 //GO(xcb_render_create_linear_gradient_stops_end, 
 //GO(xcb_render_create_linear_gradient_stops_length, 
-GO(xcb_render_create_picture, pFpppiup)
+GO(xcb_render_create_picture, uFpuuiup)
 //GO(xcb_render_create_picture_aux, 
 //GO(xcb_render_create_picture_aux_checked, 
-GO(xcb_render_create_picture_checked, pFpppiup)
+GO(xcb_render_create_picture_checked, uFpuuiup)
 //GO(xcb_render_create_picture_sizeof, 
 //GO(xcb_render_create_picture_value_list, 
 //GO(xcb_render_create_picture_value_list_serialize, 
@@ -119,8 +119,8 @@ GO(xcb_render_create_picture_checked, pFpppiup)
 //GO(xcb_render_free_glyphs_glyphs_end, 
 //GO(xcb_render_free_glyphs_glyphs_length, 
 //GO(xcb_render_free_glyphs_sizeof, 
-GO(xcb_render_free_picture, pFppp)
-//GO(xcb_render_free_picture_checked, 
+GO(xcb_render_free_picture, uFpu)
+GO(xcb_render_free_picture_checked, fFpu)
 //GO(xcb_render_glyph_end, 
 //GO(xcb_render_glyphinfo_end, 
 //GO(xcb_render_glyphinfo_next, 
@@ -162,7 +162,7 @@ DATA(xcb_render_id, 2*sizeof(void*))
 //GO(xcb_render_query_filters_reply, 
 //GO(xcb_render_query_filters_sizeof, 
 //GO(xcb_render_query_filters_unchecked, 
-GO(xcb_render_query_pict_formats, pFpp)
+GO(xcb_render_query_pict_formats, uFpu)
 //GO(xcb_render_query_pict_formats_formats, 
 //GO(xcb_render_query_pict_formats_formats_iterator, 
 //GO(xcb_render_query_pict_formats_formats_length, 
@@ -181,9 +181,9 @@ GO(xcb_render_query_pict_formats_reply, pFpup)
 //GO(xcb_render_query_pict_index_values_values, 
 //GO(xcb_render_query_pict_index_values_values_iterator, 
 //GO(xcb_render_query_pict_index_values_values_length, 
-GO(xcb_render_query_version, pFppuu)
+GO(xcb_render_query_version, uFpuu)
 GO(xcb_render_query_version_reply, pFpup)
-GO(xcb_render_query_version_unchecked, pFppuu)
+GO(xcb_render_query_version_unchecked, uFpuu)
 //GO(xcb_render_reference_glyph_set, 
 //GO(xcb_render_reference_glyph_set_checked, 
 //GO(xcb_render_set_picture_clip_rectangles, 
diff --git a/src/wrapped/wrappedlibxcbrenderutil_private.h b/src/wrapped/wrappedlibxcbrenderutil_private.h
index cce74404..c20964de 100644
--- a/src/wrapped/wrappedlibxcbrenderutil_private.h
+++ b/src/wrapped/wrappedlibxcbrenderutil_private.h
@@ -9,7 +9,7 @@
 //GO(xcb_render_util_composite_text_stream, 
 //GO(xcb_render_util_disconnect, 
 //GO(xcb_render_util_find_format, 
-GO(xcb_render_util_find_standard_format, pFpi)
+GO(xcb_render_util_find_standard_format, uFpi)
 GO(xcb_render_util_find_visual_format, pFpp)
 //GO(xcb_render_util_glyphs_16, 
 //GO(xcb_render_util_glyphs_32, 
diff --git a/src/wrapped/wrappedlibxcbshape_private.h b/src/wrapped/wrappedlibxcbshape_private.h
index e46fada7..bb42d118 100644
--- a/src/wrapped/wrappedlibxcbshape_private.h
+++ b/src/wrapped/wrappedlibxcbshape_private.h
@@ -17,8 +17,8 @@ DATA(xcb_shape_id, 8)
 //GO(xcb_shape_input_selected_unchecked, 
 //GO(xcb_shape_kind_end, 
 //GO(xcb_shape_kind_next, 
-GO(xcb_shape_mask, pFpuuuwwu)
-GO(xcb_shape_mask_checked, pFpuuuwwu)
+GO(xcb_shape_mask, uFpuuuwwu)
+GO(xcb_shape_mask_checked, uFpuuuwwu)
 //GO(xcb_shape_offset, 
 //GO(xcb_shape_offset_checked, 
 //GO(xcb_shape_op_end, 
@@ -26,9 +26,9 @@ GO(xcb_shape_mask_checked, pFpuuuwwu)
 //GO(xcb_shape_query_extents, 
 //GO(xcb_shape_query_extents_reply, 
 //GO(xcb_shape_query_extents_unchecked, 
-GO(xcb_shape_query_version, pFp)
-GO(xcb_shape_query_version_reply, pFppp)
-GO(xcb_shape_query_version_unchecked, pFp)
+GO(xcb_shape_query_version, uFp)
+GO(xcb_shape_query_version_reply, pFpup)
+GO(xcb_shape_query_version_unchecked, uFp)
 GO(xcb_shape_rectangles, pFpiiCpWWup)
 //GO(xcb_shape_rectangles_checked, 
 //GO(xcb_shape_rectangles_rectangles, 
diff --git a/src/wrapped/wrappedlibxcbshm_private.h b/src/wrapped/wrappedlibxcbshm_private.h
index cf6de179..83536945 100644
--- a/src/wrapped/wrappedlibxcbshm_private.h
+++ b/src/wrapped/wrappedlibxcbshm_private.h
@@ -2,8 +2,8 @@
 #error meh!
 #endif
 
-GO(xcb_shm_attach, pFpuuC)
-GO(xcb_shm_attach_checked, pFpuuC)
+GO(xcb_shm_attach, uFpuuC)
+GO(xcb_shm_attach_checked, uFpuuC)
 GO(xcb_shm_attach_fd, pFpuuC)
 GO(xcb_shm_attach_fd_checked, pFpuuC)
 GO(xcb_shm_create_pixmap, pFpuuWWCuu)
@@ -12,16 +12,16 @@ GO(xcb_shm_create_segment, pFpuuC)
 GO(xcb_shm_create_segment_reply, pFpup)
 GO(xcb_shm_create_segment_reply_fds, pFpp)
 GO(xcb_shm_create_segment_unchecked, pFpuuC)
-GO(xcb_shm_detach, pFpu)
-GO(xcb_shm_detach_checked, pFpu)
+GO(xcb_shm_detach, uFpu)
+GO(xcb_shm_detach_checked, uFpu)
 GO(xcb_shm_get_image, pFpuwwWWuCuu)
 GO(xcb_shm_get_image_reply, pFpup)
 GO(xcb_shm_get_image_unchecked, pFpuwwWWuCuu)
 DATA(xcb_shm_id, 8)
 GO(xcb_shm_put_image, pFpuuWWWWWWwwCCCuu)
 GO(xcb_shm_put_image_checked, pFpuuWWWWWWwwCCCuu)
-GO(xcb_shm_query_version, pFp)
+GO(xcb_shm_query_version, uFp)
 GO(xcb_shm_query_version_reply, pFpup)
-GO(xcb_shm_query_version_unchecked, pFp)
+GO(xcb_shm_query_version_unchecked, uFp)
 GO(xcb_shm_seg_end, pFpii)
 GO(xcb_shm_seg_next, vFp)
diff --git a/src/wrapped/wrappedlibxcbsync_private.h b/src/wrapped/wrappedlibxcbsync_private.h
index 2ca5fdcd..a0ef1293 100644
--- a/src/wrapped/wrappedlibxcbsync_private.h
+++ b/src/wrapped/wrappedlibxcbsync_private.h
@@ -38,8 +38,8 @@
 //GO(xcb_sync_create_alarm_value_list_serialize, 
 //GO(xcb_sync_create_alarm_value_list_sizeof, 
 //GO(xcb_sync_create_alarm_value_list_unpack, 
-GO(xcb_sync_create_counter, pFpppU)
-GO(xcb_sync_create_counter_checked, pFpppU)
+GO(xcb_sync_create_counter, uFpuU)
+GO(xcb_sync_create_counter_checked, uFpuU)
 //GO(xcb_sync_create_fence, 
 //GO(xcb_sync_create_fence_checked, 
 //GO(xcb_sync_destroy_alarm, 
diff --git a/src/wrapped/wrappedlibxcbxfixes_private.h b/src/wrapped/wrappedlibxcbxfixes_private.h
index e17787dd..a0ef49fb 100644
--- a/src/wrapped/wrappedlibxcbxfixes_private.h
+++ b/src/wrapped/wrappedlibxcbxfixes_private.h
@@ -80,17 +80,17 @@ DATA(xcb_xfixes_id, 8)
 //GO(xcb_xfixes_intersect_region_checked, 
 //GO(xcb_xfixes_invert_region, 
 //GO(xcb_xfixes_invert_region_checked, 
-GO(xcb_xfixes_query_version, pFpuu)
+GO(xcb_xfixes_query_version, uFpuu)
 GO(xcb_xfixes_query_version_reply, pFpup)
-GO(xcb_xfixes_query_version_unchecked, pFpuu)
+GO(xcb_xfixes_query_version_unchecked, uFpuu)
 //GO(xcb_xfixes_region_end, 
 //GO(xcb_xfixes_region_extents, 
 //GO(xcb_xfixes_region_extents_checked, 
 //GO(xcb_xfixes_region_next, 
 //GO(xcb_xfixes_select_cursor_input, 
 //GO(xcb_xfixes_select_cursor_input_checked, 
-GO(xcb_xfixes_select_selection_input, pFppppu)
-GO(xcb_xfixes_select_selection_input_checked, pFppppu)
+GO(xcb_xfixes_select_selection_input, uFpuuu)
+GO(xcb_xfixes_select_selection_input_checked, uFpuuu)
 GO(xcb_xfixes_set_cursor_name, pFppWp)
 GO(xcb_xfixes_set_cursor_name_checked, pFppWp)
 GO(xcb_xfixes_set_cursor_name_name, pFp)
diff --git a/src/wrapped/wrappedlibxcbxkb_private.h b/src/wrapped/wrappedlibxcbxkb_private.h
index dc322736..6c37c8ab 100644
--- a/src/wrapped/wrappedlibxcbxkb_private.h
+++ b/src/wrapped/wrappedlibxcbxkb_private.h
@@ -147,7 +147,7 @@
 //GO(xcb_xkb_get_kbd_by_name_reply, 
 //GO(xcb_xkb_get_kbd_by_name_sizeof, 
 //GO(xcb_xkb_get_kbd_by_name_unchecked, 
-GO(xcb_xkb_get_map, pFpppWWCCpCpCpCWpCpCpC)
+GO(xcb_xkb_get_map, uFpWWWCCCCCCCCWCCCCCC)
 GO(xcb_xkb_get_map_map, pFp)
 //GO(xcb_xkb_get_map_map_acts_rtrn_acts, 
 //GO(xcb_xkb_get_map_map_acts_rtrn_acts_iterator, 
@@ -183,10 +183,10 @@ GO(xcb_xkb_get_map_reply, pFpup)
 //GO(xcb_xkb_get_named_indicator, 
 //GO(xcb_xkb_get_named_indicator_reply, 
 //GO(xcb_xkb_get_named_indicator_unchecked, 
-GO(xcb_xkb_get_names, pFpppu)
+GO(xcb_xkb_get_names, uFpWu)
 GO(xcb_xkb_get_names_reply, pFpup)
 //GO(xcb_xkb_get_names_sizeof, 
-GO(xcb_xkb_get_names_unchecked, pFpppu)
+GO(xcb_xkb_get_names_unchecked, uFpWu)
 GO(xcb_xkb_get_names_value_list, pFp)
 //GO(xcb_xkb_get_names_value_list_groups, 
 //GO(xcb_xkb_get_names_value_list_groups_end, 
@@ -365,10 +365,10 @@ DATA(xcb_xkb_id, 2*sizeof(void*))
 //GO(xcb_xkb_sa_switch_screen_next, 
 //GO(xcb_xkb_sa_terminate_end, 
 //GO(xcb_xkb_sa_terminate_next, 
-GO(xcb_xkb_select_events, pFpppWWWWWp)
+GO(xcb_xkb_select_events, uFpWWWWWWp)
 //GO(xcb_xkb_select_events_aux, 
 //GO(xcb_xkb_select_events_aux_checked, 
-GO(xcb_xkb_select_events_checked, pFpppWWWWWp)
+GO(xcb_xkb_select_events_checked, uFpWWWWWWp)
 //GO(xcb_xkb_select_events_details, 
 //GO(xcb_xkb_select_events_details_serialize, 
 //GO(xcb_xkb_select_events_details_sizeof, 
@@ -499,7 +499,7 @@ GO(xcb_xkb_select_events_checked, pFpppWWWWWp)
 //GO(xcb_xkb_string8_next, 
 //GO(xcb_xkb_sym_interpret_end, 
 //GO(xcb_xkb_sym_interpret_next, 
-GO(xcb_xkb_use_extension, pFppWW)
+GO(xcb_xkb_use_extension, uFpWW)
 GO(xcb_xkb_use_extension_reply, pFpup)
-GO(xcb_xkb_use_extension_unchecked, pFppWW)
+GO(xcb_xkb_use_extension_unchecked, uFpWW)