about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2024-11-25 18:06:21 +0100
committerptitSeb <sebastien.chev@gmail.com>2024-11-25 18:06:41 +0100
commitffa94268d7ff5034569faaafda48a4a2c1429d3b (patch)
tree7329c94b5fb0b765c2775b541edba17d6a2a066e
parentb7f09964592df00d31dfe345404b8c70450ce453 (diff)
downloadbox64-ffa94268d7ff5034569faaafda48a4a2c1429d3b.tar.gz
box64-ffa94268d7ff5034569faaafda48a4a2c1429d3b.zip
[WRAPPER] Reworked gstreamer with new wrapperhelper
-rw-r--r--src/wrapped/generated/functions_list.txt104
-rw-r--r--src/wrapped/generated/wrappedgstreamertypes.h48
-rw-r--r--src/wrapped/generated/wrapper.c232
-rw-r--r--src/wrapped/generated/wrapper.h76
-rw-r--r--src/wrapped/wrappedgstreamer.c105
-rw-r--r--src/wrapped/wrappedgstreamer_private.h1098
6 files changed, 875 insertions, 788 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index e3c7294a..b46240ef 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -328,15 +328,14 @@
 #() pFEL
 #() pFEp
 #() pFii
-#() pFiI
 #() pFiu
 #() pFip
 #() pFiV
 #() pFui
 #() pFuu
+#() pFul
 #() pFup
-#() pFUU
-#() pFdi
+#() pFdu
 #() pFdd
 #() pFli
 #() pFll
@@ -443,7 +442,6 @@
 #() vFpww
 #() vFpic
 #() vFpii
-#() vFpiI
 #() vFpiC
 #() vFpiu
 #() vFpiU
@@ -473,6 +471,7 @@
 #() vFpdd
 #() vFpdp
 #() vFpll
+#() vFplL
 #() vFplp
 #() vFpLi
 #() vFpLu
@@ -555,7 +554,6 @@
 #() iFpil
 #() iFpiL
 #() iFpip
-#() iFpII
 #() iFpCp
 #() iFpWp
 #() iFpui
@@ -659,9 +657,6 @@
 #() uFbuu
 #() uFbuU
 #() uFbup
-#() UFUii
-#() UFUUU
-#() UFpiU
 #() UFppi
 #() fFuii
 #() fFfff
@@ -727,6 +722,8 @@
 #() pFEip
 #() pFEiV
 #() pFEup
+#() pFEuV
+#() pFEuA
 #() pFEpi
 #() pFEpu
 #() pFEpp
@@ -735,7 +732,6 @@
 #() pFiii
 #() pFiiu
 #() pFiip
-#() pFiIi
 #() pFiLL
 #() pFipi
 #() pFipL
@@ -753,9 +749,9 @@
 #() pFupL
 #() pFupp
 #() pFdip
-#() pFdUU
 #() pFddi
 #() pFddd
+#() pFdLL
 #() pFDip
 #() pFlpi
 #() pFLup
@@ -777,9 +773,8 @@
 #() pFpui
 #() pFpuu
 #() pFpuf
+#() pFpul
 #() pFpup
-#() pFpUi
-#() pFpUu
 #() pFpdu
 #() pFpdd
 #() pFplc
@@ -792,9 +787,7 @@
 #() pFpLp
 #() pFppc
 #() pFppi
-#() pFppI
 #() pFppu
-#() pFppU
 #() pFppf
 #() pFppd
 #() pFppl
@@ -930,12 +923,11 @@
 #() vFpiuL
 #() vFpiup
 #() vFpiUu
-#() vFpiUU
 #() vFpiLu
+#() vFpiLL
 #() vFpipi
 #() vFpipu
 #() vFpipp
-#() vFpIdi
 #() vFpCuW
 #() vFpuii
 #() vFpuip
@@ -943,6 +935,7 @@
 #() vFpuup
 #() vFpufi
 #() vFpudd
+#() vFpuLL
 #() vFpupu
 #() vFpupp
 #() vFpUuu
@@ -956,6 +949,7 @@
 #() vFpdup
 #() vFpddu
 #() vFpddd
+#() vFpldi
 #() vFplll
 #() vFpllL
 #() vFplpp
@@ -1077,7 +1071,6 @@
 #() iFpiuu
 #() iFpiuL
 #() iFpiup
-#() iFpiUp
 #() iFpili
 #() iFpild
 #() iFpiLL
@@ -1300,7 +1293,6 @@
 #() pFiiLp
 #() pFiipi
 #() pFiipp
-#() pFiIIi
 #() pFillu
 #() pFipip
 #() pFippi
@@ -1312,6 +1304,8 @@
 #() pFuuip
 #() pFuuuu
 #() pFuddd
+#() pFudlL
+#() pFulli
 #() pFullu
 #() pFupii
 #() pFuppp
@@ -1346,7 +1340,6 @@
 #() pFpupi
 #() pFpupu
 #() pFpupp
-#() pFpdIU
 #() pFpddi
 #() pFplil
 #() pFplip
@@ -1367,9 +1360,9 @@
 #() pFppiS
 #() pFppCp
 #() pFppWp
+#() pFppui
 #() pFppuu
 #() pFppup
-#() pFppUU
 #() pFppdd
 #() pFppll
 #() pFpplp
@@ -1418,6 +1411,8 @@
 #() vFEpuuV
 #() vFEpuuA
 #() vFEpupp
+#() vFEpupV
+#() vFEpupA
 #() vFEpLLp
 #() vFEppip
 #() vFEppiV
@@ -1515,16 +1510,12 @@
 #() vFLpppp
 #() vFpwwWW
 #() vFpiiii
-#() vFpiiiI
 #() vFpiiiu
 #() vFpiiip
-#() vFpiiII
 #() vFpiiuu
 #() vFpiiup
 #() vFpiiff
 #() vFpiipp
-#() vFpiIiI
-#() vFpiIII
 #() vFpiuuu
 #() vFpiUUu
 #() vFpiUUp
@@ -1533,12 +1524,17 @@
 #() vFpipiu
 #() vFpippi
 #() vFpippp
+#() vFpuiii
+#() vFpuiil
 #() vFpuiip
+#() vFpuill
 #() vFpuipp
 #() vFpuuuu
 #() vFpuuup
 #() vFpuupp
 #() vFpuddd
+#() vFpulul
+#() vFpulll
 #() vFpupiu
 #() vFpupup
 #() vFpUuuu
@@ -1549,19 +1545,19 @@
 #() vFpUUUp
 #() vFpfffi
 #() vFpffff
-#() vFpdiII
+#() vFpdull
 #() vFpddii
 #() vFpdddd
 #() vFpddpp
 #() vFpliip
 #() vFpluul
-#() vFplppp
 #() vFpLiii
 #() vFpLiiL
 #() vFpLLLL
 #() vFpLLpp
 #() vFpLpiL
 #() vFpLppi
+#() vFpLppp
 #() vFppiic
 #() vFppiii
 #() vFppiiu
@@ -1680,7 +1676,7 @@
 #() iFpCupp
 #() iFpCpip
 #() iFpuill
-#() iFpuipi
+#() iFpuipu
 #() iFpuipp
 #() iFpuuip
 #() iFpuuup
@@ -1727,7 +1723,6 @@
 #() iFppiuu
 #() iFppiup
 #() iFppiLi
-#() iFppiLL
 #() iFppipi
 #() iFppipu
 #() iFppipl
@@ -1736,6 +1731,7 @@
 #() iFppuip
 #() iFppuuu
 #() iFppuup
+#() iFppuLL
 #() iFppupi
 #() iFppupu
 #() iFppupp
@@ -1860,6 +1856,7 @@
 #() pFuuupu
 #() pFuupuu
 #() pFudddp
+#() pFuLdii
 #() pFupLpl
 #() pFupLpL
 #() pFddddi
@@ -1869,7 +1866,6 @@
 #() pFpiiip
 #() pFpiiuu
 #() pFpiipi
-#() pFpiipL
 #() pFpiipp
 #() pFpiCCC
 #() pFpiuuu
@@ -1886,11 +1882,11 @@
 #() pFpuuip
 #() pFpuuuu
 #() pFpuuup
+#() pFpuupL
 #() pFpuupp
 #() pFpuLpp
 #() pFpuppu
 #() pFpuppp
-#() pFpUdii
 #() pFpfffi
 #() pFpdddd
 #() pFplppp
@@ -2307,7 +2303,7 @@
 #() lFpppLpp
 #() LFEuuppp
 #() LFELpppu
-#() LFEpippp
+#() LFEpuppp
 #() LFEppppu
 #() LFpipipi
 #() LFpLippp
@@ -2350,7 +2346,7 @@
 #() pFpiiuup
 #() pFpiipip
 #() pFpiippp
-#() pFpiUUUU
+#() pFpiLLLL
 #() pFpipipL
 #() pFpipipp
 #() pFpipuii
@@ -2406,6 +2402,7 @@
 #() iWpppppu
 #() vFEpuipuV
 #() vFEpuuipp
+#() vFEpuLppp
 #() vFEpupppp
 #() vFEppippp
 #() vFEpppLpp
@@ -2657,17 +2654,16 @@
 #() pFuuuiiip
 #() pFuupupup
 #() pFfiiiiid
-#() pFdiiiIiI
+#() pFduuulul
 #() pFpiiiiid
 #() pFpiiippp
-#() pFpiiUdii
 #() pFpiipipp
 #() pFpiiplui
 #() pFpiipppp
+#() pFpiuLdii
 #() pFpipiupp
 #() pFpipippp
 #() pFpWppWpp
-#() pFpuLpipp
 #() pFpupiipp
 #() pFpuppipp
 #() pFpuppppp
@@ -2883,9 +2879,9 @@
 #() LFEpuuuppp
 #() LFpLpuuLLu
 #() LFppLpLpLi
-#() pFEiplllpp
-#() pFEipLLLpp
+#() pFEupLLLpp
 #() pFEpiuCppp
+#() pFEpuLpupp
 #() pFEppLiiup
 #() pFEpppuipV
 #() pFEpppppiV
@@ -2898,10 +2894,10 @@
 #() pFuupupipp
 #() pFpiiiiiuu
 #() pFpiiuuupp
-#() pFpiUdiiUi
 #() pFpipiuiip
 #() pFpuuuuupp
 #() pFpuuuupup
+#() pFpuLdiiLi
 #() pFpupLLLpp
 #() pFpupppppp
 #() pFplpppppp
@@ -2925,9 +2921,9 @@
 #() iWEpuuuipp
 #() iWpuipuppp
 #() vFEpiiiuipp
-#() vFEpippippV
-#() vFEpippippA
 #() vFEpuuuippp
+#() vFEpuppippV
+#() vFEpuppippA
 #() vFEppuipppp
 #() vFEpppuippp
 #() vFEpppLLpLp
@@ -4024,7 +4020,12 @@ wrappedgstreamer:
 - pFA:
   - gst_tag_list_new_valist
 - vFpp:
+  - _gst_debug_register_funcptr
   - gst_init
+- pFuV:
+  - gst_caps_features_new_id
+- pFuA:
+  - gst_caps_features_new_id_valist
 - pFpp:
   - gst_plugin_load_file
 - pFpV:
@@ -4068,15 +4069,16 @@ wrappedgstreamer:
   - gst_structure_new
 - pFppA:
   - gst_structure_new_valist
-- vFpipV:
+- vFpupp:
+  - gst_mini_object_set_qdata
+- vFpupV:
   - gst_tag_list_add
   - gst_tag_list_add_values
-- vFpipA:
+- vFpupA:
   - gst_tag_list_add_valist
   - gst_tag_list_add_valist_values
 - vFpppp:
   - gst_bus_set_sync_handler
-  - gst_mini_object_set_qdata
   - gst_pad_set_activate_function_full
   - gst_pad_set_activatemode_function_full
   - gst_pad_set_chain_function_full
@@ -4086,8 +4088,9 @@ wrappedgstreamer:
   - gst_pad_set_link_function_full
   - gst_pad_set_query_function_full
 - iFpppp:
-  - gst_iterator_fold
   - gst_pad_start_task
+- uFpppp:
+  - gst_iterator_fold
 - pFppip:
   - gst_registry_feature_filter
 - pFpppV:
@@ -4096,17 +4099,18 @@ wrappedgstreamer:
   - gst_pad_create_stream_id_printf_valist
 - uFpippp:
   - gst_bus_add_watch_full
-- LFpippp:
+- LFpuppp:
   - gst_pad_add_probe
-- pFiplllpp:
+- vFpuLppp:
+  - gst_mini_object_init
+- pFupLLLpp:
   - gst_buffer_new_wrapped_full
-- pFipLLLpp:
   - gst_memory_new_wrapped
-- pFpuLpipp:
+- pFpuLpupp:
   - gst_util_array_binary_search
-- vFpippippV:
+- vFpuppippV:
   - gst_debug_log
-- vFpippippA:
+- vFpuppippA:
   - gst_debug_log_valist
 - iFppuppppp:
   - gst_type_find_register
diff --git a/src/wrapped/generated/wrappedgstreamertypes.h b/src/wrapped/generated/wrappedgstreamertypes.h
index 735eced9..186195b5 100644
--- a/src/wrapped/generated/wrappedgstreamertypes.h
+++ b/src/wrapped/generated/wrappedgstreamertypes.h
@@ -13,6 +13,8 @@
 
 typedef void* (*pFA_t)(va_list);
 typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFuV_t)(uint32_t, ...);
+typedef void* (*pFuA_t)(uint32_t, va_list);
 typedef void* (*pFpp_t)(void*, void*);
 typedef void* (*pFpV_t)(void*, ...);
 typedef void* (*pFpA_t)(void*, va_list);
@@ -26,26 +28,31 @@ typedef uint32_t (*uFppp_t)(void*, void*, void*);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef void* (*pFppV_t)(void*, void*, ...);
 typedef void* (*pFppA_t)(void*, void*, va_list);
-typedef void (*vFpipV_t)(void*, int32_t, void*, ...);
-typedef void (*vFpipA_t)(void*, int32_t, void*, va_list);
+typedef void (*vFpupp_t)(void*, uint32_t, void*, void*);
+typedef void (*vFpupV_t)(void*, uint32_t, void*, ...);
+typedef void (*vFpupA_t)(void*, uint32_t, void*, va_list);
 typedef void (*vFpppp_t)(void*, void*, void*, void*);
 typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef uint32_t (*uFpppp_t)(void*, void*, void*, void*);
 typedef void* (*pFppip_t)(void*, void*, int32_t, void*);
 typedef void* (*pFpppV_t)(void*, void*, void*, ...);
 typedef void* (*pFpppA_t)(void*, void*, void*, va_list);
 typedef uint32_t (*uFpippp_t)(void*, int32_t, void*, void*, void*);
-typedef uintptr_t (*LFpippp_t)(void*, int32_t, void*, void*, void*);
-typedef void* (*pFiplllpp_t)(int32_t, void*, intptr_t, intptr_t, intptr_t, void*, void*);
-typedef void* (*pFipLLLpp_t)(int32_t, void*, uintptr_t, uintptr_t, uintptr_t, void*, void*);
-typedef void* (*pFpuLpipp_t)(void*, uint32_t, uintptr_t, void*, int32_t, void*, void*);
-typedef void (*vFpippippV_t)(void*, int32_t, void*, void*, int32_t, void*, void*, ...);
-typedef void (*vFpippippA_t)(void*, int32_t, void*, void*, int32_t, void*, void*, va_list);
+typedef uintptr_t (*LFpuppp_t)(void*, uint32_t, void*, void*, void*);
+typedef void (*vFpuLppp_t)(void*, uint32_t, uintptr_t, void*, void*, void*);
+typedef void* (*pFupLLLpp_t)(uint32_t, void*, uintptr_t, uintptr_t, uintptr_t, void*, void*);
+typedef void* (*pFpuLpupp_t)(void*, uint32_t, uintptr_t, void*, uint32_t, void*, void*);
+typedef void (*vFpuppippV_t)(void*, uint32_t, void*, void*, int32_t, void*, void*, ...);
+typedef void (*vFpuppippA_t)(void*, uint32_t, void*, void*, int32_t, void*, void*, va_list);
 typedef int32_t (*iFppuppppp_t)(void*, void*, uint32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFiipppppppp_t)(int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(gst_tag_list_new_valist, pFA_t) \
+	GO(_gst_debug_register_funcptr, vFpp_t) \
 	GO(gst_init, vFpp_t) \
+	GO(gst_caps_features_new_id, pFuV_t) \
+	GO(gst_caps_features_new_id_valist, pFuA_t) \
 	GO(gst_plugin_load_file, pFpp_t) \
 	GO(_gst_element_error_printf, pFpV_t) \
 	GO(gst_caps_features_new, pFpV_t) \
@@ -76,12 +83,12 @@ typedef int32_t (*iFiipppppppp_t)(int32_t, int32_t, void*, void*, void*, void*,
 	GO(gst_caps_new_simple, pFppV_t) \
 	GO(gst_structure_new, pFppV_t) \
 	GO(gst_structure_new_valist, pFppA_t) \
-	GO(gst_tag_list_add, vFpipV_t) \
-	GO(gst_tag_list_add_values, vFpipV_t) \
-	GO(gst_tag_list_add_valist, vFpipA_t) \
-	GO(gst_tag_list_add_valist_values, vFpipA_t) \
+	GO(gst_mini_object_set_qdata, vFpupp_t) \
+	GO(gst_tag_list_add, vFpupV_t) \
+	GO(gst_tag_list_add_values, vFpupV_t) \
+	GO(gst_tag_list_add_valist, vFpupA_t) \
+	GO(gst_tag_list_add_valist_values, vFpupA_t) \
 	GO(gst_bus_set_sync_handler, vFpppp_t) \
-	GO(gst_mini_object_set_qdata, vFpppp_t) \
 	GO(gst_pad_set_activate_function_full, vFpppp_t) \
 	GO(gst_pad_set_activatemode_function_full, vFpppp_t) \
 	GO(gst_pad_set_chain_function_full, vFpppp_t) \
@@ -90,18 +97,19 @@ typedef int32_t (*iFiipppppppp_t)(int32_t, int32_t, void*, void*, void*, void*,
 	GO(gst_pad_set_iterate_internal_links_function_full, vFpppp_t) \
 	GO(gst_pad_set_link_function_full, vFpppp_t) \
 	GO(gst_pad_set_query_function_full, vFpppp_t) \
-	GO(gst_iterator_fold, iFpppp_t) \
 	GO(gst_pad_start_task, iFpppp_t) \
+	GO(gst_iterator_fold, uFpppp_t) \
 	GO(gst_registry_feature_filter, pFppip_t) \
 	GO(gst_pad_create_stream_id_printf, pFpppV_t) \
 	GO(gst_pad_create_stream_id_printf_valist, pFpppA_t) \
 	GO(gst_bus_add_watch_full, uFpippp_t) \
-	GO(gst_pad_add_probe, LFpippp_t) \
-	GO(gst_buffer_new_wrapped_full, pFiplllpp_t) \
-	GO(gst_memory_new_wrapped, pFipLLLpp_t) \
-	GO(gst_util_array_binary_search, pFpuLpipp_t) \
-	GO(gst_debug_log, vFpippippV_t) \
-	GO(gst_debug_log_valist, vFpippippA_t) \
+	GO(gst_pad_add_probe, LFpuppp_t) \
+	GO(gst_mini_object_init, vFpuLppp_t) \
+	GO(gst_buffer_new_wrapped_full, pFupLLLpp_t) \
+	GO(gst_memory_new_wrapped, pFupLLLpp_t) \
+	GO(gst_util_array_binary_search, pFpuLpupp_t) \
+	GO(gst_debug_log, vFpuppippV_t) \
+	GO(gst_debug_log_valist, vFpuppippA_t) \
 	GO(gst_type_find_register, iFppuppppp_t) \
 	GO(gst_plugin_register_static, iFiipppppppp_t)
 
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 5155920c..e53ccfed 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -365,15 +365,14 @@ typedef void* (*pFEi_t)(x64emu_t*, int32_t);
 typedef void* (*pFEL_t)(x64emu_t*, uintptr_t);
 typedef void* (*pFEp_t)(x64emu_t*, void*);
 typedef void* (*pFii_t)(int32_t, int32_t);
-typedef void* (*pFiI_t)(int32_t, int64_t);
 typedef void* (*pFiu_t)(int32_t, uint32_t);
 typedef void* (*pFip_t)(int32_t, void*);
 typedef void* (*pFiV_t)(int32_t, void*);
 typedef void* (*pFui_t)(uint32_t, int32_t);
 typedef void* (*pFuu_t)(uint32_t, uint32_t);
+typedef void* (*pFul_t)(uint32_t, intptr_t);
 typedef void* (*pFup_t)(uint32_t, void*);
-typedef void* (*pFUU_t)(uint64_t, uint64_t);
-typedef void* (*pFdi_t)(double, int32_t);
+typedef void* (*pFdu_t)(double, uint32_t);
 typedef void* (*pFdd_t)(double, double);
 typedef void* (*pFli_t)(intptr_t, int32_t);
 typedef void* (*pFll_t)(intptr_t, intptr_t);
@@ -478,7 +477,6 @@ typedef void (*vFLpp_t)(uintptr_t, void*, void*);
 typedef void (*vFpww_t)(void*, int16_t, int16_t);
 typedef void (*vFpic_t)(void*, int32_t, int8_t);
 typedef void (*vFpii_t)(void*, int32_t, int32_t);
-typedef void (*vFpiI_t)(void*, int32_t, int64_t);
 typedef void (*vFpiC_t)(void*, int32_t, uint8_t);
 typedef void (*vFpiu_t)(void*, int32_t, uint32_t);
 typedef void (*vFpiU_t)(void*, int32_t, uint64_t);
@@ -508,6 +506,7 @@ typedef void (*vFpdu_t)(void*, double, uint32_t);
 typedef void (*vFpdd_t)(void*, double, double);
 typedef void (*vFpdp_t)(void*, double, void*);
 typedef void (*vFpll_t)(void*, intptr_t, intptr_t);
+typedef void (*vFplL_t)(void*, intptr_t, uintptr_t);
 typedef void (*vFplp_t)(void*, intptr_t, void*);
 typedef void (*vFpLi_t)(void*, uintptr_t, int32_t);
 typedef void (*vFpLu_t)(void*, uintptr_t, uint32_t);
@@ -590,7 +589,6 @@ typedef int32_t (*iFpid_t)(void*, int32_t, double);
 typedef int32_t (*iFpil_t)(void*, int32_t, intptr_t);
 typedef int32_t (*iFpiL_t)(void*, int32_t, uintptr_t);
 typedef int32_t (*iFpip_t)(void*, int32_t, void*);
-typedef int32_t (*iFpII_t)(void*, int64_t, int64_t);
 typedef int32_t (*iFpCp_t)(void*, uint8_t, void*);
 typedef int32_t (*iFpWp_t)(void*, uint16_t, void*);
 typedef int32_t (*iFpui_t)(void*, uint32_t, int32_t);
@@ -694,9 +692,6 @@ typedef uint32_t (*uFbuW_t)(void*, uint32_t, uint16_t);
 typedef uint32_t (*uFbuu_t)(void*, uint32_t, uint32_t);
 typedef uint32_t (*uFbuU_t)(void*, uint32_t, uint64_t);
 typedef uint32_t (*uFbup_t)(void*, uint32_t, void*);
-typedef uint64_t (*UFUii_t)(uint64_t, int32_t, int32_t);
-typedef uint64_t (*UFUUU_t)(uint64_t, uint64_t, uint64_t);
-typedef uint64_t (*UFpiU_t)(void*, int32_t, uint64_t);
 typedef uint64_t (*UFppi_t)(void*, void*, int32_t);
 typedef float (*fFuii_t)(uint32_t, int32_t, int32_t);
 typedef float (*fFfff_t)(float, float, float);
@@ -759,6 +754,8 @@ typedef uintptr_t (*LFSpL_t)(void*, void*, uintptr_t);
 typedef void* (*pFEip_t)(x64emu_t*, int32_t, void*);
 typedef void* (*pFEiV_t)(x64emu_t*, int32_t, void*);
 typedef void* (*pFEup_t)(x64emu_t*, uint32_t, void*);
+typedef void* (*pFEuV_t)(x64emu_t*, uint32_t, void*);
+typedef void* (*pFEuA_t)(x64emu_t*, uint32_t, void*);
 typedef void* (*pFEpi_t)(x64emu_t*, void*, int32_t);
 typedef void* (*pFEpu_t)(x64emu_t*, void*, uint32_t);
 typedef void* (*pFEpp_t)(x64emu_t*, void*, void*);
@@ -767,7 +764,6 @@ typedef void* (*pFEpA_t)(x64emu_t*, void*, void*);
 typedef void* (*pFiii_t)(int32_t, int32_t, int32_t);
 typedef void* (*pFiiu_t)(int32_t, int32_t, uint32_t);
 typedef void* (*pFiip_t)(int32_t, int32_t, void*);
-typedef void* (*pFiIi_t)(int32_t, int64_t, int32_t);
 typedef void* (*pFiLL_t)(int32_t, uintptr_t, uintptr_t);
 typedef void* (*pFipi_t)(int32_t, void*, int32_t);
 typedef void* (*pFipL_t)(int32_t, void*, uintptr_t);
@@ -785,9 +781,9 @@ typedef void* (*pFupl_t)(uint32_t, void*, intptr_t);
 typedef void* (*pFupL_t)(uint32_t, void*, uintptr_t);
 typedef void* (*pFupp_t)(uint32_t, void*, void*);
 typedef void* (*pFdip_t)(double, int32_t, void*);
-typedef void* (*pFdUU_t)(double, uint64_t, uint64_t);
 typedef void* (*pFddi_t)(double, double, int32_t);
 typedef void* (*pFddd_t)(double, double, double);
+typedef void* (*pFdLL_t)(double, uintptr_t, uintptr_t);
 typedef void* (*pFlpi_t)(intptr_t, void*, int32_t);
 typedef void* (*pFLup_t)(uintptr_t, uint32_t, void*);
 typedef void* (*pFLLp_t)(uintptr_t, uintptr_t, void*);
@@ -808,9 +804,8 @@ 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* (*pFpul_t)(void*, uint32_t, intptr_t);
 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);
 typedef void* (*pFpdu_t)(void*, double, uint32_t);
 typedef void* (*pFpdd_t)(void*, double, double);
 typedef void* (*pFplc_t)(void*, intptr_t, int8_t);
@@ -823,9 +818,7 @@ typedef void* (*pFpLL_t)(void*, uintptr_t, uintptr_t);
 typedef void* (*pFpLp_t)(void*, uintptr_t, void*);
 typedef void* (*pFppc_t)(void*, void*, int8_t);
 typedef void* (*pFppi_t)(void*, void*, int32_t);
-typedef void* (*pFppI_t)(void*, void*, int64_t);
 typedef void* (*pFppu_t)(void*, void*, uint32_t);
-typedef void* (*pFppU_t)(void*, void*, uint64_t);
 typedef void* (*pFppf_t)(void*, void*, float);
 typedef void* (*pFppd_t)(void*, void*, double);
 typedef void* (*pFppl_t)(void*, void*, intptr_t);
@@ -961,12 +954,11 @@ typedef void (*vFpiui_t)(void*, int32_t, uint32_t, int32_t);
 typedef void (*vFpiuL_t)(void*, int32_t, uint32_t, uintptr_t);
 typedef void (*vFpiup_t)(void*, int32_t, uint32_t, void*);
 typedef void (*vFpiUu_t)(void*, int32_t, uint64_t, uint32_t);
-typedef void (*vFpiUU_t)(void*, int32_t, uint64_t, uint64_t);
 typedef void (*vFpiLu_t)(void*, int32_t, uintptr_t, uint32_t);
+typedef void (*vFpiLL_t)(void*, int32_t, uintptr_t, uintptr_t);
 typedef void (*vFpipi_t)(void*, int32_t, void*, int32_t);
 typedef void (*vFpipu_t)(void*, int32_t, void*, uint32_t);
 typedef void (*vFpipp_t)(void*, int32_t, void*, void*);
-typedef void (*vFpIdi_t)(void*, int64_t, double, int32_t);
 typedef void (*vFpCuW_t)(void*, uint8_t, uint32_t, uint16_t);
 typedef void (*vFpuii_t)(void*, uint32_t, int32_t, int32_t);
 typedef void (*vFpuip_t)(void*, uint32_t, int32_t, void*);
@@ -974,6 +966,7 @@ typedef void (*vFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpuup_t)(void*, uint32_t, uint32_t, void*);
 typedef void (*vFpufi_t)(void*, uint32_t, float, int32_t);
 typedef void (*vFpudd_t)(void*, uint32_t, double, double);
+typedef void (*vFpuLL_t)(void*, uint32_t, uintptr_t, uintptr_t);
 typedef void (*vFpupu_t)(void*, uint32_t, void*, uint32_t);
 typedef void (*vFpupp_t)(void*, uint32_t, void*, void*);
 typedef void (*vFpUuu_t)(void*, uint64_t, uint32_t, uint32_t);
@@ -987,6 +980,7 @@ typedef void (*vFpdii_t)(void*, double, int32_t, int32_t);
 typedef void (*vFpdup_t)(void*, double, uint32_t, void*);
 typedef void (*vFpddu_t)(void*, double, double, uint32_t);
 typedef void (*vFpddd_t)(void*, double, double, double);
+typedef void (*vFpldi_t)(void*, intptr_t, double, int32_t);
 typedef void (*vFplll_t)(void*, intptr_t, intptr_t, intptr_t);
 typedef void (*vFpllL_t)(void*, intptr_t, intptr_t, uintptr_t);
 typedef void (*vFplpp_t)(void*, intptr_t, void*, void*);
@@ -1108,7 +1102,6 @@ typedef int32_t (*iFpiip_t)(void*, int32_t, int32_t, void*);
 typedef int32_t (*iFpiuu_t)(void*, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpiuL_t)(void*, int32_t, uint32_t, uintptr_t);
 typedef int32_t (*iFpiup_t)(void*, int32_t, uint32_t, void*);
-typedef int32_t (*iFpiUp_t)(void*, int32_t, uint64_t, void*);
 typedef int32_t (*iFpili_t)(void*, int32_t, intptr_t, int32_t);
 typedef int32_t (*iFpild_t)(void*, int32_t, intptr_t, double);
 typedef int32_t (*iFpiLL_t)(void*, int32_t, uintptr_t, uintptr_t);
@@ -1330,7 +1323,6 @@ typedef void* (*pFiiup_t)(int32_t, int32_t, uint32_t, void*);
 typedef void* (*pFiiLp_t)(int32_t, int32_t, uintptr_t, void*);
 typedef void* (*pFiipi_t)(int32_t, int32_t, void*, int32_t);
 typedef void* (*pFiipp_t)(int32_t, int32_t, void*, void*);
-typedef void* (*pFiIIi_t)(int32_t, int64_t, int64_t, int32_t);
 typedef void* (*pFillu_t)(int32_t, intptr_t, intptr_t, uint32_t);
 typedef void* (*pFipip_t)(int32_t, void*, int32_t, void*);
 typedef void* (*pFippi_t)(int32_t, void*, void*, int32_t);
@@ -1342,6 +1334,8 @@ typedef void* (*pFuuii_t)(uint32_t, uint32_t, int32_t, int32_t);
 typedef void* (*pFuuip_t)(uint32_t, uint32_t, int32_t, void*);
 typedef void* (*pFuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFuddd_t)(uint32_t, double, double, double);
+typedef void* (*pFudlL_t)(uint32_t, double, intptr_t, uintptr_t);
+typedef void* (*pFulli_t)(uint32_t, intptr_t, intptr_t, int32_t);
 typedef void* (*pFullu_t)(uint32_t, intptr_t, intptr_t, uint32_t);
 typedef void* (*pFupii_t)(uint32_t, void*, int32_t, int32_t);
 typedef void* (*pFuppp_t)(uint32_t, void*, void*, void*);
@@ -1375,7 +1369,6 @@ typedef void* (*pFpuLL_t)(void*, uint32_t, uintptr_t, uintptr_t);
 typedef void* (*pFpupi_t)(void*, uint32_t, void*, int32_t);
 typedef void* (*pFpupu_t)(void*, uint32_t, void*, uint32_t);
 typedef void* (*pFpupp_t)(void*, uint32_t, void*, void*);
-typedef void* (*pFpdIU_t)(void*, double, int64_t, uint64_t);
 typedef void* (*pFpddi_t)(void*, double, double, int32_t);
 typedef void* (*pFplil_t)(void*, intptr_t, int32_t, intptr_t);
 typedef void* (*pFplip_t)(void*, intptr_t, int32_t, void*);
@@ -1396,9 +1389,9 @@ typedef void* (*pFppip_t)(void*, void*, int32_t, void*);
 typedef void* (*pFppiS_t)(void*, void*, int32_t, void*);
 typedef void* (*pFppCp_t)(void*, void*, uint8_t, void*);
 typedef void* (*pFppWp_t)(void*, void*, uint16_t, void*);
+typedef void* (*pFppui_t)(void*, void*, uint32_t, int32_t);
 typedef void* (*pFppuu_t)(void*, void*, uint32_t, uint32_t);
 typedef void* (*pFppup_t)(void*, void*, uint32_t, void*);
-typedef void* (*pFppUU_t)(void*, void*, uint64_t, uint64_t);
 typedef void* (*pFppdd_t)(void*, void*, double, double);
 typedef void* (*pFppll_t)(void*, void*, intptr_t, intptr_t);
 typedef void* (*pFpplp_t)(void*, void*, intptr_t, void*);
@@ -1447,6 +1440,8 @@ typedef void (*vFEpuup_t)(x64emu_t*, void*, uint32_t, uint32_t, void*);
 typedef void (*vFEpuuV_t)(x64emu_t*, void*, uint32_t, uint32_t, void*);
 typedef void (*vFEpuuA_t)(x64emu_t*, void*, uint32_t, uint32_t, void*);
 typedef void (*vFEpupp_t)(x64emu_t*, void*, uint32_t, void*, void*);
+typedef void (*vFEpupV_t)(x64emu_t*, void*, uint32_t, void*, void*);
+typedef void (*vFEpupA_t)(x64emu_t*, void*, uint32_t, void*, void*);
 typedef void (*vFEpLLp_t)(x64emu_t*, void*, uintptr_t, uintptr_t, void*);
 typedef void (*vFEppip_t)(x64emu_t*, void*, void*, int32_t, void*);
 typedef void (*vFEppiV_t)(x64emu_t*, void*, void*, int32_t, void*);
@@ -1544,16 +1539,12 @@ typedef void (*vFLpppi_t)(uintptr_t, void*, void*, void*, int32_t);
 typedef void (*vFLpppp_t)(uintptr_t, void*, void*, void*, void*);
 typedef void (*vFpwwWW_t)(void*, int16_t, int16_t, uint16_t, uint16_t);
 typedef void (*vFpiiii_t)(void*, int32_t, int32_t, int32_t, int32_t);
-typedef void (*vFpiiiI_t)(void*, int32_t, int32_t, int32_t, int64_t);
 typedef void (*vFpiiiu_t)(void*, int32_t, int32_t, int32_t, uint32_t);
 typedef void (*vFpiiip_t)(void*, int32_t, int32_t, int32_t, void*);
-typedef void (*vFpiiII_t)(void*, int32_t, int32_t, int64_t, int64_t);
 typedef void (*vFpiiuu_t)(void*, int32_t, int32_t, uint32_t, uint32_t);
 typedef void (*vFpiiup_t)(void*, int32_t, int32_t, uint32_t, void*);
 typedef void (*vFpiiff_t)(void*, int32_t, int32_t, float, float);
 typedef void (*vFpiipp_t)(void*, int32_t, int32_t, void*, void*);
-typedef void (*vFpiIiI_t)(void*, int32_t, int64_t, int32_t, int64_t);
-typedef void (*vFpiIII_t)(void*, int32_t, int64_t, int64_t, int64_t);
 typedef void (*vFpiuuu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpiUUu_t)(void*, int32_t, uint64_t, uint64_t, uint32_t);
 typedef void (*vFpiUUp_t)(void*, int32_t, uint64_t, uint64_t, void*);
@@ -1562,12 +1553,17 @@ typedef void (*vFpipii_t)(void*, int32_t, void*, int32_t, int32_t);
 typedef void (*vFpipiu_t)(void*, int32_t, void*, int32_t, uint32_t);
 typedef void (*vFpippi_t)(void*, int32_t, void*, void*, int32_t);
 typedef void (*vFpippp_t)(void*, int32_t, void*, void*, void*);
+typedef void (*vFpuiii_t)(void*, uint32_t, int32_t, int32_t, int32_t);
+typedef void (*vFpuiil_t)(void*, uint32_t, int32_t, int32_t, intptr_t);
 typedef void (*vFpuiip_t)(void*, uint32_t, int32_t, int32_t, void*);
+typedef void (*vFpuill_t)(void*, uint32_t, int32_t, intptr_t, intptr_t);
 typedef void (*vFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
 typedef void (*vFpuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
 typedef void (*vFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
 typedef void (*vFpuddd_t)(void*, uint32_t, double, double, double);
+typedef void (*vFpulul_t)(void*, uint32_t, intptr_t, uint32_t, intptr_t);
+typedef void (*vFpulll_t)(void*, uint32_t, intptr_t, intptr_t, intptr_t);
 typedef void (*vFpupiu_t)(void*, uint32_t, void*, int32_t, uint32_t);
 typedef void (*vFpupup_t)(void*, uint32_t, void*, uint32_t, void*);
 typedef void (*vFpUuuu_t)(void*, uint64_t, uint32_t, uint32_t, uint32_t);
@@ -1578,19 +1574,19 @@ typedef void (*vFpUUUu_t)(void*, uint64_t, uint64_t, uint64_t, uint32_t);
 typedef void (*vFpUUUp_t)(void*, uint64_t, uint64_t, uint64_t, void*);
 typedef void (*vFpfffi_t)(void*, float, float, float, int32_t);
 typedef void (*vFpffff_t)(void*, float, float, float, float);
-typedef void (*vFpdiII_t)(void*, double, int32_t, int64_t, int64_t);
+typedef void (*vFpdull_t)(void*, double, uint32_t, intptr_t, intptr_t);
 typedef void (*vFpddii_t)(void*, double, double, int32_t, int32_t);
 typedef void (*vFpdddd_t)(void*, double, double, double, double);
 typedef void (*vFpddpp_t)(void*, double, double, void*, void*);
 typedef void (*vFpliip_t)(void*, intptr_t, int32_t, int32_t, void*);
 typedef void (*vFpluul_t)(void*, intptr_t, uint32_t, uint32_t, intptr_t);
-typedef void (*vFplppp_t)(void*, intptr_t, void*, void*, void*);
 typedef void (*vFpLiii_t)(void*, uintptr_t, int32_t, int32_t, int32_t);
 typedef void (*vFpLiiL_t)(void*, uintptr_t, int32_t, int32_t, uintptr_t);
 typedef void (*vFpLLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
 typedef void (*vFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*);
 typedef void (*vFpLpiL_t)(void*, uintptr_t, void*, int32_t, uintptr_t);
 typedef void (*vFpLppi_t)(void*, uintptr_t, void*, void*, int32_t);
+typedef void (*vFpLppp_t)(void*, uintptr_t, void*, void*, void*);
 typedef void (*vFppiic_t)(void*, void*, int32_t, int32_t, int8_t);
 typedef void (*vFppiii_t)(void*, void*, int32_t, int32_t, int32_t);
 typedef void (*vFppiiu_t)(void*, void*, int32_t, int32_t, uint32_t);
@@ -1709,7 +1705,7 @@ typedef int32_t (*iFpCCCC_t)(void*, uint8_t, uint8_t, uint8_t, uint8_t);
 typedef int32_t (*iFpCupp_t)(void*, uint8_t, uint32_t, void*, void*);
 typedef int32_t (*iFpCpip_t)(void*, uint8_t, void*, int32_t, void*);
 typedef int32_t (*iFpuill_t)(void*, uint32_t, int32_t, intptr_t, intptr_t);
-typedef int32_t (*iFpuipi_t)(void*, uint32_t, int32_t, void*, int32_t);
+typedef int32_t (*iFpuipu_t)(void*, uint32_t, int32_t, void*, uint32_t);
 typedef int32_t (*iFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFpuuip_t)(void*, uint32_t, uint32_t, int32_t, void*);
 typedef int32_t (*iFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
@@ -1756,7 +1752,6 @@ typedef int32_t (*iFppiip_t)(void*, void*, int32_t, int32_t, void*);
 typedef int32_t (*iFppiuu_t)(void*, void*, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppiup_t)(void*, void*, int32_t, uint32_t, void*);
 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);
@@ -1765,6 +1760,7 @@ typedef int32_t (*iFppuwp_t)(void*, void*, uint32_t, int16_t, void*);
 typedef int32_t (*iFppuip_t)(void*, void*, uint32_t, int32_t, void*);
 typedef int32_t (*iFppuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppuup_t)(void*, void*, uint32_t, uint32_t, void*);
+typedef int32_t (*iFppuLL_t)(void*, void*, uint32_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFppupi_t)(void*, void*, uint32_t, void*, int32_t);
 typedef int32_t (*iFppupu_t)(void*, void*, uint32_t, void*, uint32_t);
 typedef int32_t (*iFppupp_t)(void*, void*, uint32_t, void*, void*);
@@ -1889,6 +1885,7 @@ typedef void* (*pFuuiip_t)(uint32_t, uint32_t, int32_t, int32_t, void*);
 typedef void* (*pFuuupu_t)(uint32_t, uint32_t, uint32_t, void*, uint32_t);
 typedef void* (*pFuupuu_t)(uint32_t, uint32_t, void*, uint32_t, uint32_t);
 typedef void* (*pFudddp_t)(uint32_t, double, double, double, void*);
+typedef void* (*pFuLdii_t)(uint32_t, uintptr_t, double, int32_t, int32_t);
 typedef void* (*pFupLpl_t)(uint32_t, void*, uintptr_t, void*, intptr_t);
 typedef void* (*pFupLpL_t)(uint32_t, void*, uintptr_t, void*, uintptr_t);
 typedef void* (*pFddddi_t)(double, double, double, double, int32_t);
@@ -1898,7 +1895,6 @@ typedef void* (*pFpiiii_t)(void*, int32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFpiiip_t)(void*, int32_t, int32_t, int32_t, void*);
 typedef void* (*pFpiiuu_t)(void*, int32_t, int32_t, uint32_t, uint32_t);
 typedef void* (*pFpiipi_t)(void*, int32_t, int32_t, void*, int32_t);
-typedef void* (*pFpiipL_t)(void*, int32_t, int32_t, void*, uintptr_t);
 typedef void* (*pFpiipp_t)(void*, int32_t, int32_t, void*, void*);
 typedef void* (*pFpiCCC_t)(void*, int32_t, uint8_t, uint8_t, uint8_t);
 typedef void* (*pFpiuuu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t);
@@ -1915,11 +1911,11 @@ typedef void* (*pFpuiip_t)(void*, uint32_t, int32_t, int32_t, void*);
 typedef void* (*pFpuuip_t)(void*, uint32_t, uint32_t, int32_t, void*);
 typedef void* (*pFpuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
+typedef void* (*pFpuupL_t)(void*, uint32_t, uint32_t, void*, uintptr_t);
 typedef void* (*pFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
 typedef void* (*pFpuLpp_t)(void*, uint32_t, uintptr_t, void*, void*);
 typedef void* (*pFpuppu_t)(void*, uint32_t, void*, void*, uint32_t);
 typedef void* (*pFpuppp_t)(void*, uint32_t, void*, void*, void*);
-typedef void* (*pFpUdii_t)(void*, uint64_t, double, int32_t, int32_t);
 typedef void* (*pFpfffi_t)(void*, float, float, float, int32_t);
 typedef void* (*pFpdddd_t)(void*, double, double, double, double);
 typedef void* (*pFplppp_t)(void*, intptr_t, void*, void*, void*);
@@ -2335,7 +2331,7 @@ typedef intptr_t (*lFppLipp_t)(void*, void*, uintptr_t, int32_t, void*, void*);
 typedef intptr_t (*lFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
 typedef uintptr_t (*LFEuuppp_t)(x64emu_t*, uint32_t, uint32_t, void*, void*, void*);
 typedef uintptr_t (*LFELpppu_t)(x64emu_t*, uintptr_t, void*, void*, void*, uint32_t);
-typedef uintptr_t (*LFEpippp_t)(x64emu_t*, void*, int32_t, void*, void*, void*);
+typedef uintptr_t (*LFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*);
 typedef uintptr_t (*LFEppppu_t)(x64emu_t*, void*, void*, void*, void*, uint32_t);
 typedef uintptr_t (*LFpipipi_t)(void*, int32_t, void*, int32_t, void*, int32_t);
 typedef uintptr_t (*LFpLippp_t)(void*, uintptr_t, int32_t, void*, void*, void*);
@@ -2378,7 +2374,7 @@ 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* (*pFpiLLLL_t)(void*, int32_t, uintptr_t, uintptr_t, uintptr_t, uintptr_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);
@@ -2434,6 +2430,7 @@ typedef int32_t (*iWpppppi_t)(void*, void*, void*, void*, void*, int32_t);
 typedef int32_t (*iWpppppu_t)(void*, void*, void*, void*, void*, uint32_t);
 typedef void (*vFEpuipuV_t)(x64emu_t*, void*, uint32_t, int32_t, void*, uint32_t, void*);
 typedef void (*vFEpuuipp_t)(x64emu_t*, void*, uint32_t, uint32_t, int32_t, void*, void*);
+typedef void (*vFEpuLppp_t)(x64emu_t*, void*, uint32_t, uintptr_t, void*, void*, void*);
 typedef void (*vFEpupppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*);
 typedef void (*vFEppippp_t)(x64emu_t*, void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFEpppLpp_t)(x64emu_t*, void*, void*, void*, uintptr_t, void*, void*);
@@ -2685,17 +2682,16 @@ typedef void* (*pFWpppppp_t)(uint16_t, void*, void*, void*, void*, void*, void*)
 typedef void* (*pFuuuiiip_t)(uint32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, void*);
 typedef void* (*pFuupupup_t)(uint32_t, uint32_t, void*, uint32_t, void*, uint32_t, void*);
 typedef void* (*pFfiiiiid_t)(float, int32_t, int32_t, int32_t, int32_t, int32_t, double);
-typedef void* (*pFdiiiIiI_t)(double, int32_t, int32_t, int32_t, int64_t, int32_t, int64_t);
+typedef void* (*pFduuulul_t)(double, uint32_t, uint32_t, uint32_t, intptr_t, uint32_t, intptr_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* (*pFpiiplui_t)(void*, int32_t, int32_t, void*, intptr_t, uint32_t, int32_t);
 typedef void* (*pFpiipppp_t)(void*, int32_t, int32_t, void*, void*, void*, void*);
+typedef void* (*pFpiuLdii_t)(void*, int32_t, uint32_t, uintptr_t, double, int32_t, int32_t);
 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*);
 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*);
 typedef void* (*pFpuppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*);
@@ -2911,9 +2907,9 @@ typedef uintptr_t (*LFELpupupu_t)(x64emu_t*, uintptr_t, void*, uint32_t, void*,
 typedef uintptr_t (*LFEpuuuppp_t)(x64emu_t*, void*, uint32_t, uint32_t, uint32_t, void*, void*, void*);
 typedef uintptr_t (*LFpLpuuLLu_t)(void*, uintptr_t, void*, uint32_t, uint32_t, uintptr_t, uintptr_t, uint32_t);
 typedef uintptr_t (*LFppLpLpLi_t)(void*, void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, int32_t);
-typedef void* (*pFEiplllpp_t)(x64emu_t*, int32_t, void*, intptr_t, intptr_t, intptr_t, void*, void*);
-typedef void* (*pFEipLLLpp_t)(x64emu_t*, int32_t, void*, uintptr_t, uintptr_t, uintptr_t, void*, void*);
+typedef void* (*pFEupLLLpp_t)(x64emu_t*, uint32_t, void*, uintptr_t, uintptr_t, uintptr_t, void*, void*);
 typedef void* (*pFEpiuCppp_t)(x64emu_t*, void*, int32_t, uint32_t, uint8_t, void*, void*, void*);
+typedef void* (*pFEpuLpupp_t)(x64emu_t*, void*, uint32_t, uintptr_t, void*, uint32_t, void*, void*);
 typedef void* (*pFEppLiiup_t)(x64emu_t*, void*, void*, uintptr_t, int32_t, int32_t, uint32_t, void*);
 typedef void* (*pFEpppuipV_t)(x64emu_t*, void*, void*, void*, uint32_t, int32_t, void*, void*);
 typedef void* (*pFEpppppiV_t)(x64emu_t*, void*, void*, void*, void*, void*, int32_t, void*);
@@ -2926,10 +2922,10 @@ typedef void* (*pFuCCCCpWw_t)(uint32_t, uint8_t, uint8_t, uint8_t, uint8_t, void
 typedef void* (*pFuupupipp_t)(uint32_t, uint32_t, void*, uint32_t, void*, int32_t, void*, void*);
 typedef void* (*pFpiiiiiuu_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t);
 typedef void* (*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* (*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* (*pFpuLdiiLi_t)(void*, uint32_t, uintptr_t, double, int32_t, int32_t, uintptr_t, int32_t);
 typedef void* (*pFpupLLLpp_t)(void*, uint32_t, void*, uintptr_t, uintptr_t, uintptr_t, void*, void*);
 typedef void* (*pFpupppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFplpppppp_t)(void*, intptr_t, void*, void*, void*, void*, void*, void*);
@@ -2953,9 +2949,9 @@ typedef int32_t (*iWEpuuiipp_t)(x64emu_t*, void*, uint32_t, uint32_t, int32_t, i
 typedef int32_t (*iWEpuuuipp_t)(x64emu_t*, void*, uint32_t, uint32_t, uint32_t, int32_t, void*, void*);
 typedef int32_t (*iWpuipuppp_t)(void*, uint32_t, int32_t, void*, uint32_t, void*, void*, void*);
 typedef void (*vFEpiiiuipp_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, uint32_t, int32_t, void*, void*);
-typedef void (*vFEpippippV_t)(x64emu_t*, void*, int32_t, void*, void*, int32_t, void*, void*, void*);
-typedef void (*vFEpippippA_t)(x64emu_t*, void*, int32_t, void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFEpuuuippp_t)(x64emu_t*, void*, uint32_t, uint32_t, uint32_t, int32_t, void*, void*, void*);
+typedef void (*vFEpuppippV_t)(x64emu_t*, void*, uint32_t, void*, void*, int32_t, void*, void*, void*);
+typedef void (*vFEpuppippA_t)(x64emu_t*, void*, uint32_t, void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFEppuipppp_t)(x64emu_t*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
 typedef void (*vFEpppuippp_t)(x64emu_t*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*);
 typedef void (*vFEpppLLpLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, uintptr_t, void*, uintptr_t, void*);
@@ -3729,15 +3725,14 @@ void pFEi(x64emu_t *emu, uintptr_t fcn) { pFEi_t fn = (pFEi_t)fcn; R_RAX=(uintpt
 void pFEL(x64emu_t *emu, uintptr_t fcn) { pFEL_t fn = (pFEL_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI); }
 void pFEp(x64emu_t *emu, uintptr_t fcn) { pFEp_t fn = (pFEp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI); }
 void pFii(x64emu_t *emu, uintptr_t fcn) { pFii_t fn = (pFii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI); }
-void pFiI(x64emu_t *emu, uintptr_t fcn) { pFiI_t fn = (pFiI_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI); }
 void pFiu(x64emu_t *emu, uintptr_t fcn) { pFiu_t fn = (pFiu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (uint32_t)R_RSI); }
 void pFip(x64emu_t *emu, uintptr_t fcn) { pFip_t fn = (pFip_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI); }
 void pFiV(x64emu_t *emu, uintptr_t fcn) { pFiV_t fn = (pFiV_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)(R_RSP + 8)); }
 void pFui(x64emu_t *emu, uintptr_t fcn) { pFui_t fn = (pFui_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
 void pFuu(x64emu_t *emu, uintptr_t fcn) { pFuu_t fn = (pFuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
+void pFul(x64emu_t *emu, uintptr_t fcn) { pFul_t fn = (pFul_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI); }
 void pFup(x64emu_t *emu, uintptr_t fcn) { pFup_t fn = (pFup_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI); }
-void pFUU(x64emu_t *emu, uintptr_t fcn) { pFUU_t fn = (pFUU_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
-void pFdi(x64emu_t *emu, uintptr_t fcn) { pFdi_t fn = (pFdi_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI); }
+void pFdu(x64emu_t *emu, uintptr_t fcn) { pFdu_t fn = (pFdu_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (uint32_t)R_RDI); }
 void pFdd(x64emu_t *emu, uintptr_t fcn) { pFdd_t fn = (pFdd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void pFli(x64emu_t *emu, uintptr_t fcn) { pFli_t fn = (pFli_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, (int32_t)R_RSI); }
 void pFll(x64emu_t *emu, uintptr_t fcn) { pFll_t fn = (pFll_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, (intptr_t)R_RSI); }
@@ -3842,7 +3837,6 @@ void vFLpp(x64emu_t *emu, uintptr_t fcn) { vFLpp_t fn = (vFLpp_t)fcn; fn((uintpt
 void vFpww(x64emu_t *emu, uintptr_t fcn) { vFpww_t fn = (vFpww_t)fcn; fn((void*)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX); }
 void vFpic(x64emu_t *emu, uintptr_t fcn) { vFpic_t fn = (vFpic_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int8_t)R_RDX); }
 void vFpii(x64emu_t *emu, uintptr_t fcn) { vFpii_t fn = (vFpii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
-void vFpiI(x64emu_t *emu, uintptr_t fcn) { vFpiI_t fn = (vFpiI_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int64_t)R_RDX); }
 void vFpiC(x64emu_t *emu, uintptr_t fcn) { vFpiC_t fn = (vFpiC_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint8_t)R_RDX); }
 void vFpiu(x64emu_t *emu, uintptr_t fcn) { vFpiu_t fn = (vFpiu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX); }
 void vFpiU(x64emu_t *emu, uintptr_t fcn) { vFpiU_t fn = (vFpiU_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX); }
@@ -3872,6 +3866,7 @@ void vFpdu(x64emu_t *emu, uintptr_t fcn) { vFpdu_t fn = (vFpdu_t)fcn; fn((void*)
 void vFpdd(x64emu_t *emu, uintptr_t fcn) { vFpdd_t fn = (vFpdd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void vFpdp(x64emu_t *emu, uintptr_t fcn) { vFpdp_t fn = (vFpdp_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (void*)R_RSI); }
 void vFpll(x64emu_t *emu, uintptr_t fcn) { vFpll_t fn = (vFpll_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
+void vFplL(x64emu_t *emu, uintptr_t fcn) { vFplL_t fn = (vFplL_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (uintptr_t)R_RDX); }
 void vFplp(x64emu_t *emu, uintptr_t fcn) { vFplp_t fn = (vFplp_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX); }
 void vFpLi(x64emu_t *emu, uintptr_t fcn) { vFpLi_t fn = (vFpLi_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX); }
 void vFpLu(x64emu_t *emu, uintptr_t fcn) { vFpLu_t fn = (vFpLu_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX); }
@@ -3954,7 +3949,6 @@ void iFpid(x64emu_t *emu, uintptr_t fcn) { iFpid_t fn = (iFpid_t)fcn; R_RAX=(uin
 void iFpil(x64emu_t *emu, uintptr_t fcn) { iFpil_t fn = (iFpil_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX); }
 void iFpiL(x64emu_t *emu, uintptr_t fcn) { iFpiL_t fn = (iFpiL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX); }
 void iFpip(x64emu_t *emu, uintptr_t fcn) { iFpip_t fn = (iFpip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
-void iFpII(x64emu_t *emu, uintptr_t fcn) { iFpII_t fn = (iFpII_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void iFpCp(x64emu_t *emu, uintptr_t fcn) { iFpCp_t fn = (iFpCp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX); }
 void iFpWp(x64emu_t *emu, uintptr_t fcn) { iFpWp_t fn = (iFpWp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
 void iFpui(x64emu_t *emu, uintptr_t fcn) { iFpui_t fn = (iFpui_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
@@ -4058,9 +4052,6 @@ void uFbuW(x64emu_t *emu, uintptr_t fcn) { uFbuW_t fn = (uFbuW_t)fcn; void *alig
 void uFbuu(x64emu_t *emu, uintptr_t fcn) { uFbuu_t fn = (uFbuu_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint32_t)R_RSI, (uint32_t)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void uFbuU(x64emu_t *emu, uintptr_t fcn) { uFbuU_t fn = (uFbuU_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint32_t)R_RSI, (uint64_t)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void uFbup(x64emu_t *emu, uintptr_t fcn) { uFbup_t fn = (uFbup_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint32_t)R_RSI, (void*)R_RDX); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
-void UFUii(x64emu_t *emu, uintptr_t fcn) { UFUii_t fn = (UFUii_t)fcn; R_RAX=fn((uint64_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
-void UFUUU(x64emu_t *emu, uintptr_t fcn) { UFUUU_t fn = (UFUUU_t)fcn; R_RAX=fn((uint64_t)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); }
-void UFpiU(x64emu_t *emu, uintptr_t fcn) { UFpiU_t fn = (UFpiU_t)fcn; R_RAX=fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX); }
 void UFppi(x64emu_t *emu, uintptr_t fcn) { UFppi_t fn = (UFppi_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void fFuii(x64emu_t *emu, uintptr_t fcn) { fFuii_t fn = (fFuii_t)fcn; emu->xmm[0].f[0]=fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
 void fFfff(x64emu_t *emu, uintptr_t fcn) { fFfff_t fn = (fFfff_t)fcn; emu->xmm[0].f[0]=fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
@@ -4123,6 +4114,8 @@ void LFSpL(x64emu_t *emu, uintptr_t fcn) { LFSpL_t fn = (LFSpL_t)fcn; R_RAX=(uin
 void pFEip(x64emu_t *emu, uintptr_t fcn) { pFEip_t fn = (pFEip_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI); }
 void pFEiV(x64emu_t *emu, uintptr_t fcn) { pFEiV_t fn = (pFEiV_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (void*)(R_RSP + 8)); }
 void pFEup(x64emu_t *emu, uintptr_t fcn) { pFEup_t fn = (pFEup_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (void*)R_RSI); }
+void pFEuV(x64emu_t *emu, uintptr_t fcn) { pFEuV_t fn = (pFEuV_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (void*)(R_RSP + 8)); }
+void pFEuA(x64emu_t *emu, uintptr_t fcn) { pFEuA_t fn = (pFEuA_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (void*)R_RSI); }
 void pFEpi(x64emu_t *emu, uintptr_t fcn) { pFEpi_t fn = (pFEpi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI); }
 void pFEpu(x64emu_t *emu, uintptr_t fcn) { pFEpu_t fn = (pFEpu_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI); }
 void pFEpp(x64emu_t *emu, uintptr_t fcn) { pFEpp_t fn = (pFEpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
@@ -4131,7 +4124,6 @@ void pFEpA(x64emu_t *emu, uintptr_t fcn) { pFEpA_t fn = (pFEpA_t)fcn; R_RAX=(uin
 void pFiii(x64emu_t *emu, uintptr_t fcn) { pFiii_t fn = (pFiii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
 void pFiiu(x64emu_t *emu, uintptr_t fcn) { pFiiu_t fn = (pFiiu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX); }
 void pFiip(x64emu_t *emu, uintptr_t fcn) { pFiip_t fn = (pFiip_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
-void pFiIi(x64emu_t *emu, uintptr_t fcn) { pFiIi_t fn = (pFiIi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
 void pFiLL(x64emu_t *emu, uintptr_t fcn) { pFiLL_t fn = (pFiLL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 void pFipi(x64emu_t *emu, uintptr_t fcn) { pFipi_t fn = (pFipi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void pFipL(x64emu_t *emu, uintptr_t fcn) { pFipL_t fn = (pFipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
@@ -4149,9 +4141,9 @@ void pFupl(x64emu_t *emu, uintptr_t fcn) { pFupl_t fn = (pFupl_t)fcn; R_RAX=(uin
 void pFupL(x64emu_t *emu, uintptr_t fcn) { pFupL_t fn = (pFupL_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void pFupp(x64emu_t *emu, uintptr_t fcn) { pFupp_t fn = (pFupp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void pFdip(x64emu_t *emu, uintptr_t fcn) { pFdip_t fn = (pFdip_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (void*)R_RSI); }
-void pFdUU(x64emu_t *emu, uintptr_t fcn) { pFdUU_t fn = (pFdUU_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (uint64_t)R_RDI, (uint64_t)R_RSI); }
 void pFddi(x64emu_t *emu, uintptr_t fcn) { pFddi_t fn = (pFddi_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RDI); }
 void pFddd(x64emu_t *emu, uintptr_t fcn) { pFddd_t fn = (pFddd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void pFdLL(x64emu_t *emu, uintptr_t fcn) { pFdLL_t fn = (pFdLL_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void pFlpi(x64emu_t *emu, uintptr_t fcn) { pFlpi_t fn = (pFlpi_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void pFLup(x64emu_t *emu, uintptr_t fcn) { pFLup_t fn = (pFLup_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void pFLLp(x64emu_t *emu, uintptr_t fcn) { pFLLp_t fn = (pFLLp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
@@ -4172,9 +4164,8 @@ void pFpWp(x64emu_t *emu, uintptr_t fcn) { pFpWp_t fn = (pFpWp_t)fcn; R_RAX=(uin
 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 pFpul(x64emu_t *emu, uintptr_t fcn) { pFpul_t fn = (pFpul_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX); }
 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); }
 void pFpdu(x64emu_t *emu, uintptr_t fcn) { pFpdu_t fn = (pFpdu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI); }
 void pFpdd(x64emu_t *emu, uintptr_t fcn) { pFpdd_t fn = (pFpdd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void pFplc(x64emu_t *emu, uintptr_t fcn) { pFplc_t fn = (pFplc_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int8_t)R_RDX); }
@@ -4187,9 +4178,7 @@ void pFpLL(x64emu_t *emu, uintptr_t fcn) { pFpLL_t fn = (pFpLL_t)fcn; R_RAX=(uin
 void pFpLp(x64emu_t *emu, uintptr_t fcn) { pFpLp_t fn = (pFpLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void pFppc(x64emu_t *emu, uintptr_t fcn) { pFppc_t fn = (pFppc_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int8_t)R_RDX); }
 void pFppi(x64emu_t *emu, uintptr_t fcn) { pFppi_t fn = (pFppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
-void pFppI(x64emu_t *emu, uintptr_t fcn) { pFppI_t fn = (pFppI_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
 void pFppu(x64emu_t *emu, uintptr_t fcn) { pFppu_t fn = (pFppu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
-void pFppU(x64emu_t *emu, uintptr_t fcn) { pFppU_t fn = (pFppU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
 void pFppf(x64emu_t *emu, uintptr_t fcn) { pFppf_t fn = (pFppf_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].f[0]); }
 void pFppd(x64emu_t *emu, uintptr_t fcn) { pFppd_t fn = (pFppd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0]); }
 void pFppl(x64emu_t *emu, uintptr_t fcn) { pFppl_t fn = (pFppl_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX); }
@@ -4325,12 +4314,11 @@ void vFpiui(x64emu_t *emu, uintptr_t fcn) { vFpiui_t fn = (vFpiui_t)fcn; fn((voi
 void vFpiuL(x64emu_t *emu, uintptr_t fcn) { vFpiuL_t fn = (vFpiuL_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
 void vFpiup(x64emu_t *emu, uintptr_t fcn) { vFpiup_t fn = (vFpiup_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void vFpiUu(x64emu_t *emu, uintptr_t fcn) { vFpiUu_t fn = (vFpiUu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX); }
-void vFpiUU(x64emu_t *emu, uintptr_t fcn) { vFpiUU_t fn = (vFpiUU_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX); }
 void vFpiLu(x64emu_t *emu, uintptr_t fcn) { vFpiLu_t fn = (vFpiLu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX); }
+void vFpiLL(x64emu_t *emu, uintptr_t fcn) { vFpiLL_t fn = (vFpiLL_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void vFpipi(x64emu_t *emu, uintptr_t fcn) { vFpipi_t fn = (vFpipi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void vFpipu(x64emu_t *emu, uintptr_t fcn) { vFpipu_t fn = (vFpipu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void vFpipp(x64emu_t *emu, uintptr_t fcn) { vFpipp_t fn = (vFpipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
-void vFpIdi(x64emu_t *emu, uintptr_t fcn) { vFpIdi_t fn = (vFpIdi_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX); }
 void vFpCuW(x64emu_t *emu, uintptr_t fcn) { vFpCuW_t fn = (vFpCuW_t)fcn; fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX); }
 void vFpuii(x64emu_t *emu, uintptr_t fcn) { vFpuii_t fn = (vFpuii_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFpuip(x64emu_t *emu, uintptr_t fcn) { vFpuip_t fn = (vFpuip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
@@ -4338,6 +4326,7 @@ void vFpuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuu_t fn = (vFpuuu_t)fcn; fn((voi
 void vFpuup(x64emu_t *emu, uintptr_t fcn) { vFpuup_t fn = (vFpuup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void vFpufi(x64emu_t *emu, uintptr_t fcn) { vFpufi_t fn = (vFpufi_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0], (int32_t)R_RDX); }
 void vFpudd(x64emu_t *emu, uintptr_t fcn) { vFpudd_t fn = (vFpudd_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
+void vFpuLL(x64emu_t *emu, uintptr_t fcn) { vFpuLL_t fn = (vFpuLL_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void vFpupu(x64emu_t *emu, uintptr_t fcn) { vFpupu_t fn = (vFpupu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void vFpupp(x64emu_t *emu, uintptr_t fcn) { vFpupp_t fn = (vFpupp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFpUuu(x64emu_t *emu, uintptr_t fcn) { vFpUuu_t fn = (vFpUuu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
@@ -4351,6 +4340,7 @@ void vFpdii(x64emu_t *emu, uintptr_t fcn) { vFpdii_t fn = (vFpdii_t)fcn; fn((voi
 void vFpdup(x64emu_t *emu, uintptr_t fcn) { vFpdup_t fn = (vFpdup_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI, (void*)R_RDX); }
 void vFpddu(x64emu_t *emu, uintptr_t fcn) { vFpddu_t fn = (vFpddu_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (uint32_t)R_RSI); }
 void vFpddd(x64emu_t *emu, uintptr_t fcn) { vFpddd_t fn = (vFpddd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void vFpldi(x64emu_t *emu, uintptr_t fcn) { vFpldi_t fn = (vFpldi_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX); }
 void vFplll(x64emu_t *emu, uintptr_t fcn) { vFplll_t fn = (vFplll_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
 void vFpllL(x64emu_t *emu, uintptr_t fcn) { vFpllL_t fn = (vFpllL_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uintptr_t)R_RCX); }
 void vFplpp(x64emu_t *emu, uintptr_t fcn) { vFplpp_t fn = (vFplpp_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -4472,7 +4462,6 @@ void iFpiip(x64emu_t *emu, uintptr_t fcn) { iFpiip_t fn = (iFpiip_t)fcn; R_RAX=(
 void iFpiuu(x64emu_t *emu, uintptr_t fcn) { iFpiuu_t fn = (iFpiuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void iFpiuL(x64emu_t *emu, uintptr_t fcn) { iFpiuL_t fn = (iFpiuL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpiup(x64emu_t *emu, uintptr_t fcn) { iFpiup_t fn = (iFpiup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
-void iFpiUp(x64emu_t *emu, uintptr_t fcn) { iFpiUp_t fn = (iFpiUp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX); }
 void iFpili(x64emu_t *emu, uintptr_t fcn) { iFpili_t fn = (iFpili_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX); }
 void iFpild(x64emu_t *emu, uintptr_t fcn) { iFpild_t fn = (iFpild_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, emu->xmm[0].d[0]); }
 void iFpiLL(x64emu_t *emu, uintptr_t fcn) { iFpiLL_t fn = (iFpiLL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
@@ -4694,7 +4683,6 @@ void pFiiup(x64emu_t *emu, uintptr_t fcn) { pFiiup_t fn = (pFiiup_t)fcn; R_RAX=(
 void pFiiLp(x64emu_t *emu, uintptr_t fcn) { pFiiLp_t fn = (pFiiLp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void pFiipi(x64emu_t *emu, uintptr_t fcn) { pFiipi_t fn = (pFiipi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFiipp(x64emu_t *emu, uintptr_t fcn) { pFiipp_t fn = (pFiipp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
-void pFiIIi(x64emu_t *emu, uintptr_t fcn) { pFiIIi_t fn = (pFiIIi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX); }
 void pFillu(x64emu_t *emu, uintptr_t fcn) { pFillu_t fn = (pFillu_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX); }
 void pFipip(x64emu_t *emu, uintptr_t fcn) { pFipip_t fn = (pFipip_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFippi(x64emu_t *emu, uintptr_t fcn) { pFippi_t fn = (pFippi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
@@ -4706,6 +4694,8 @@ void pFuuii(x64emu_t *emu, uintptr_t fcn) { pFuuii_t fn = (pFuuii_t)fcn; R_RAX=(
 void pFuuip(x64emu_t *emu, uintptr_t fcn) { pFuuip_t fn = (pFuuip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFuuuu(x64emu_t *emu, uintptr_t fcn) { pFuuuu_t fn = (pFuuuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFuddd(x64emu_t *emu, uintptr_t fcn) { pFuddd_t fn = (pFuddd_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void pFudlL(x64emu_t *emu, uintptr_t fcn) { pFudlL_t fn = (pFudlL_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, emu->xmm[0].d[0], (intptr_t)R_RSI, (uintptr_t)R_RDX); }
+void pFulli(x64emu_t *emu, uintptr_t fcn) { pFulli_t fn = (pFulli_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX); }
 void pFullu(x64emu_t *emu, uintptr_t fcn) { pFullu_t fn = (pFullu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX); }
 void pFupii(x64emu_t *emu, uintptr_t fcn) { pFupii_t fn = (pFupii_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFuppp(x64emu_t *emu, uintptr_t fcn) { pFuppp_t fn = (pFuppp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -4739,7 +4729,6 @@ void pFpuLL(x64emu_t *emu, uintptr_t fcn) { pFpuLL_t fn = (pFpuLL_t)fcn; R_RAX=(
 void pFpupi(x64emu_t *emu, uintptr_t fcn) { pFpupi_t fn = (pFpupi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFpupu(x64emu_t *emu, uintptr_t fcn) { pFpupu_t fn = (pFpupu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void pFpupp(x64emu_t *emu, uintptr_t fcn) { pFpupp_t fn = (pFpupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
-void pFpdIU(x64emu_t *emu, uintptr_t fcn) { pFpdIU_t fn = (pFpdIU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], (int64_t)R_RSI, (uint64_t)R_RDX); }
 void pFpddi(x64emu_t *emu, uintptr_t fcn) { pFpddi_t fn = (pFpddi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RSI); }
 void pFplil(x64emu_t *emu, uintptr_t fcn) { pFplil_t fn = (pFplil_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX); }
 void pFplip(x64emu_t *emu, uintptr_t fcn) { pFplip_t fn = (pFplip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
@@ -4760,9 +4749,9 @@ void pFppip(x64emu_t *emu, uintptr_t fcn) { pFppip_t fn = (pFppip_t)fcn; R_RAX=(
 void pFppiS(x64emu_t *emu, uintptr_t fcn) { pFppiS_t fn = (pFppiS_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, io_convert((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 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 pFppui(x64emu_t *emu, uintptr_t fcn) { pFppui_t fn = (pFppui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_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 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); }
-void pFppUU(x64emu_t *emu, uintptr_t fcn) { pFppUU_t fn = (pFppUU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX); }
 void pFppdd(x64emu_t *emu, uintptr_t fcn) { pFppdd_t fn = (pFppdd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void pFppll(x64emu_t *emu, uintptr_t fcn) { pFppll_t fn = (pFppll_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
 void pFpplp(x64emu_t *emu, uintptr_t fcn) { pFpplp_t fn = (pFpplp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
@@ -4811,6 +4800,8 @@ void vFEpuup(x64emu_t *emu, uintptr_t fcn) { vFEpuup_t fn = (vFEpuup_t)fcn; fn(e
 void vFEpuuV(x64emu_t *emu, uintptr_t fcn) { vFEpuuV_t fn = (vFEpuuV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)(R_RSP + 8)); }
 void vFEpuuA(x64emu_t *emu, uintptr_t fcn) { vFEpuuA_t fn = (vFEpuuA_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void vFEpupp(x64emu_t *emu, uintptr_t fcn) { vFEpupp_t fn = (vFEpupp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void vFEpupV(x64emu_t *emu, uintptr_t fcn) { vFEpupV_t fn = (vFEpupV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
+void vFEpupA(x64emu_t *emu, uintptr_t fcn) { vFEpupA_t fn = (vFEpupA_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFEpLLp(x64emu_t *emu, uintptr_t fcn) { vFEpLLp_t fn = (vFEpLLp_t)fcn; fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void vFEppip(x64emu_t *emu, uintptr_t fcn) { vFEppip_t fn = (vFEppip_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void vFEppiV(x64emu_t *emu, uintptr_t fcn) { vFEppiV_t fn = (vFEppiV_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)(R_RSP + 8)); }
@@ -4908,16 +4899,12 @@ void vFLpppi(x64emu_t *emu, uintptr_t fcn) { vFLpppi_t fn = (vFLpppi_t)fcn; fn((
 void vFLpppp(x64emu_t *emu, uintptr_t fcn) { vFLpppp_t fn = (vFLpppp_t)fcn; fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpwwWW(x64emu_t *emu, uintptr_t fcn) { vFpwwWW_t fn = (vFpwwWW_t)fcn; fn((void*)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8); }
 void vFpiiii(x64emu_t *emu, uintptr_t fcn) { vFpiiii_t fn = (vFpiiii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
-void vFpiiiI(x64emu_t *emu, uintptr_t fcn) { vFpiiiI_t fn = (vFpiiiI_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int64_t)R_R8); }
 void vFpiiiu(x64emu_t *emu, uintptr_t fcn) { vFpiiiu_t fn = (vFpiiiu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
 void vFpiiip(x64emu_t *emu, uintptr_t fcn) { vFpiiip_t fn = (vFpiiip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
-void vFpiiII(x64emu_t *emu, uintptr_t fcn) { vFpiiII_t fn = (vFpiiII_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void vFpiiuu(x64emu_t *emu, uintptr_t fcn) { vFpiiuu_t fn = (vFpiiuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void vFpiiup(x64emu_t *emu, uintptr_t fcn) { vFpiiup_t fn = (vFpiiup_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void vFpiiff(x64emu_t *emu, uintptr_t fcn) { vFpiiff_t fn = (vFpiiff_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void vFpiipp(x64emu_t *emu, uintptr_t fcn) { vFpiipp_t fn = (vFpiipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void vFpiIiI(x64emu_t *emu, uintptr_t fcn) { vFpiIiI_t fn = (vFpiIiI_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX, (int64_t)R_R8); }
-void vFpiIII(x64emu_t *emu, uintptr_t fcn) { vFpiIII_t fn = (vFpiIII_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void vFpiuuu(x64emu_t *emu, uintptr_t fcn) { vFpiuuu_t fn = (vFpiuuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void vFpiUUu(x64emu_t *emu, uintptr_t fcn) { vFpiUUu_t fn = (vFpiUUu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint32_t)R_R8); }
 void vFpiUUp(x64emu_t *emu, uintptr_t fcn) { vFpiUUp_t fn = (vFpiUUp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
@@ -4926,12 +4913,17 @@ void vFpipii(x64emu_t *emu, uintptr_t fcn) { vFpipii_t fn = (vFpipii_t)fcn; fn((
 void vFpipiu(x64emu_t *emu, uintptr_t fcn) { vFpipiu_t fn = (vFpipiu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
 void vFpippi(x64emu_t *emu, uintptr_t fcn) { vFpippi_t fn = (vFpippi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void vFpippp(x64emu_t *emu, uintptr_t fcn) { vFpippp_t fn = (vFpippp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void vFpuiii(x64emu_t *emu, uintptr_t fcn) { vFpuiii_t fn = (vFpuiii_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
+void vFpuiil(x64emu_t *emu, uintptr_t fcn) { vFpuiil_t fn = (vFpuiil_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (intptr_t)R_R8); }
 void vFpuiip(x64emu_t *emu, uintptr_t fcn) { vFpuiip_t fn = (vFpuiip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
+void vFpuill(x64emu_t *emu, uintptr_t fcn) { vFpuill_t fn = (vFpuill_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8); }
 void vFpuipp(x64emu_t *emu, uintptr_t fcn) { vFpuipp_t fn = (vFpuipp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuuu_t fn = (vFpuuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void vFpuuup(x64emu_t *emu, uintptr_t fcn) { vFpuuup_t fn = (vFpuuup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void vFpuupp(x64emu_t *emu, uintptr_t fcn) { vFpuupp_t fn = (vFpuupp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpuddd(x64emu_t *emu, uintptr_t fcn) { vFpuddd_t fn = (vFpuddd_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void vFpulul(x64emu_t *emu, uintptr_t fcn) { vFpulul_t fn = (vFpulul_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX, (intptr_t)R_R8); }
+void vFpulll(x64emu_t *emu, uintptr_t fcn) { vFpulll_t fn = (vFpulll_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8); }
 void vFpupiu(x64emu_t *emu, uintptr_t fcn) { vFpupiu_t fn = (vFpupiu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
 void vFpupup(x64emu_t *emu, uintptr_t fcn) { vFpupup_t fn = (vFpupup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void vFpUuuu(x64emu_t *emu, uintptr_t fcn) { vFpUuuu_t fn = (vFpUuuu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
@@ -4942,19 +4934,19 @@ void vFpUUUu(x64emu_t *emu, uintptr_t fcn) { vFpUUUu_t fn = (vFpUUUu_t)fcn; fn((
 void vFpUUUp(x64emu_t *emu, uintptr_t fcn) { vFpUUUp_t fn = (vFpUUUp_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
 void vFpfffi(x64emu_t *emu, uintptr_t fcn) { vFpfffi_t fn = (vFpfffi_t)fcn; fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], (int32_t)R_RSI); }
 void vFpffff(x64emu_t *emu, uintptr_t fcn) { vFpffff_t fn = (vFpffff_t)fcn; fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0]); }
-void vFpdiII(x64emu_t *emu, uintptr_t fcn) { vFpdiII_t fn = (vFpdiII_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (int32_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
+void vFpdull(x64emu_t *emu, uintptr_t fcn) { vFpdull_t fn = (vFpdull_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
 void vFpddii(x64emu_t *emu, uintptr_t fcn) { vFpddii_t fn = (vFpddii_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RSI, (int32_t)R_RDX); }
 void vFpdddd(x64emu_t *emu, uintptr_t fcn) { vFpdddd_t fn = (vFpdddd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
 void vFpddpp(x64emu_t *emu, uintptr_t fcn) { vFpddpp_t fn = (vFpddpp_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RSI, (void*)R_RDX); }
 void vFpliip(x64emu_t *emu, uintptr_t fcn) { vFpliip_t fn = (vFpliip_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void vFpluul(x64emu_t *emu, uintptr_t fcn) { vFpluul_t fn = (vFpluul_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (intptr_t)R_R8); }
-void vFplppp(x64emu_t *emu, uintptr_t fcn) { vFplppp_t fn = (vFplppp_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpLiii(x64emu_t *emu, uintptr_t fcn) { vFpLiii_t fn = (vFpLiii_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFpLiiL(x64emu_t *emu, uintptr_t fcn) { vFpLiiL_t fn = (vFpLiiL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); }
 void vFpLLLL(x64emu_t *emu, uintptr_t fcn) { vFpLLLL_t fn = (vFpLLLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
 void vFpLLpp(x64emu_t *emu, uintptr_t fcn) { vFpLLpp_t fn = (vFpLLpp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpLpiL(x64emu_t *emu, uintptr_t fcn) { vFpLpiL_t fn = (vFpLpiL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); }
 void vFpLppi(x64emu_t *emu, uintptr_t fcn) { vFpLppi_t fn = (vFpLppi_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
+void vFpLppp(x64emu_t *emu, uintptr_t fcn) { vFpLppp_t fn = (vFpLppp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFppiic(x64emu_t *emu, uintptr_t fcn) { vFppiic_t fn = (vFppiic_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int8_t)R_R8); }
 void vFppiii(x64emu_t *emu, uintptr_t fcn) { vFppiii_t fn = (vFppiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFppiiu(x64emu_t *emu, uintptr_t fcn) { vFppiiu_t fn = (vFppiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
@@ -5073,7 +5065,7 @@ void iFpCCCC(x64emu_t *emu, uintptr_t fcn) { iFpCCCC_t fn = (iFpCCCC_t)fcn; R_RA
 void iFpCupp(x64emu_t *emu, uintptr_t fcn) { iFpCupp_t fn = (iFpCupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpCpip(x64emu_t *emu, uintptr_t fcn) { iFpCpip_t fn = (iFpCpip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFpuill(x64emu_t *emu, uintptr_t fcn) { iFpuill_t fn = (iFpuill_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8); }
-void iFpuipi(x64emu_t *emu, uintptr_t fcn) { iFpuipi_t fn = (iFpuipi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
+void iFpuipu(x64emu_t *emu, uintptr_t fcn) { iFpuipu_t fn = (iFpuipu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void iFpuipp(x64emu_t *emu, uintptr_t fcn) { iFpuipp_t fn = (iFpuipp_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 iFpuuip(x64emu_t *emu, uintptr_t fcn) { iFpuuip_t fn = (iFpuuip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFpuuup(x64emu_t *emu, uintptr_t fcn) { iFpuuup_t fn = (iFpuuup_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); }
@@ -5120,7 +5112,6 @@ void iFppiip(x64emu_t *emu, uintptr_t fcn) { iFppiip_t fn = (iFppiip_t)fcn; R_RA
 void iFppiuu(x64emu_t *emu, uintptr_t fcn) { iFppiuu_t fn = (iFppiuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void iFppiup(x64emu_t *emu, uintptr_t fcn) { iFppiup_t fn = (iFppiup_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 iFppiLi(x64emu_t *emu, uintptr_t fcn) { iFppiLi_t fn = (iFppiLi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8); }
-void iFppiLL(x64emu_t *emu, uintptr_t fcn) { iFppiLL_t fn = (iFppiLL_t)fcn; R_RAX=(uint32_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=(uint32_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=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void iFppipl(x64emu_t *emu, uintptr_t fcn) { iFppipl_t fn = (iFppipl_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8); }
@@ -5129,6 +5120,7 @@ void iFppuwp(x64emu_t *emu, uintptr_t fcn) { iFppuwp_t fn = (iFppuwp_t)fcn; R_RA
 void iFppuip(x64emu_t *emu, uintptr_t fcn) { iFppuip_t fn = (iFppuip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFppuuu(x64emu_t *emu, uintptr_t fcn) { iFppuuu_t fn = (iFppuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void iFppuup(x64emu_t *emu, uintptr_t fcn) { iFppuup_t fn = (iFppuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
+void iFppuLL(x64emu_t *emu, uintptr_t fcn) { iFppuLL_t fn = (iFppuLL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
 void iFppupi(x64emu_t *emu, uintptr_t fcn) { iFppupi_t fn = (iFppupi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFppupu(x64emu_t *emu, uintptr_t fcn) { iFppupu_t fn = (iFppupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void iFppupp(x64emu_t *emu, uintptr_t fcn) { iFppupp_t fn = (iFppupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5253,6 +5245,7 @@ void pFuuiip(x64emu_t *emu, uintptr_t fcn) { pFuuiip_t fn = (pFuuiip_t)fcn; R_RA
 void pFuuupu(x64emu_t *emu, uintptr_t fcn) { pFuuupu_t fn = (pFuuupu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void pFuupuu(x64emu_t *emu, uintptr_t fcn) { pFuupuu_t fn = (pFuupuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void pFudddp(x64emu_t *emu, uintptr_t fcn) { pFudddp_t fn = (pFudddp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], (void*)R_RSI); }
+void pFuLdii(x64emu_t *emu, uintptr_t fcn) { pFuLdii_t fn = (pFuLdii_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uintptr_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFupLpl(x64emu_t *emu, uintptr_t fcn) { pFupLpl_t fn = (pFupLpl_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8); }
 void pFupLpL(x64emu_t *emu, uintptr_t fcn) { pFupLpL_t fn = (pFupLpL_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void pFddddi(x64emu_t *emu, uintptr_t fcn) { pFddddi_t fn = (pFddddi_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (int32_t)R_RDI); }
@@ -5262,7 +5255,6 @@ void pFpiiii(x64emu_t *emu, uintptr_t fcn) { pFpiiii_t fn = (pFpiiii_t)fcn; R_RA
 void pFpiiip(x64emu_t *emu, uintptr_t fcn) { pFpiiip_t fn = (pFpiiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFpiiuu(x64emu_t *emu, uintptr_t fcn) { pFpiiuu_t fn = (pFpiiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void pFpiipi(x64emu_t *emu, uintptr_t fcn) { pFpiipi_t fn = (pFpiipi_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 pFpiipL(x64emu_t *emu, uintptr_t fcn) { pFpiipL_t fn = (pFpiipL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void pFpiipp(x64emu_t *emu, uintptr_t fcn) { pFpiipp_t fn = (pFpiipp_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 pFpiCCC(x64emu_t *emu, uintptr_t fcn) { pFpiCCC_t fn = (pFpiCCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8); }
 void pFpiuuu(x64emu_t *emu, uintptr_t fcn) { pFpiuuu_t fn = (pFpiuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
@@ -5279,11 +5271,11 @@ void pFpuiip(x64emu_t *emu, uintptr_t fcn) { pFpuiip_t fn = (pFpuiip_t)fcn; R_RA
 void pFpuuip(x64emu_t *emu, uintptr_t fcn) { pFpuuip_t fn = (pFpuuip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFpuuuu(x64emu_t *emu, uintptr_t fcn) { pFpuuuu_t fn = (pFpuuuu_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 pFpuuup(x64emu_t *emu, uintptr_t fcn) { pFpuuup_t fn = (pFpuuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
+void pFpuupL(x64emu_t *emu, uintptr_t fcn) { pFpuupL_t fn = (pFpuupL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void pFpuupp(x64emu_t *emu, uintptr_t fcn) { pFpuupp_t fn = (pFpuupp_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 pFpuLpp(x64emu_t *emu, uintptr_t fcn) { pFpuLpp_t fn = (pFpuLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFpuppu(x64emu_t *emu, uintptr_t fcn) { pFpuppu_t fn = (pFpuppu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void pFpuppp(x64emu_t *emu, uintptr_t fcn) { pFpuppp_t fn = (pFpuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void pFpUdii(x64emu_t *emu, uintptr_t fcn) { pFpUdii_t fn = (pFpUdii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFpfffi(x64emu_t *emu, uintptr_t fcn) { pFpfffi_t fn = (pFpfffi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], (int32_t)R_RSI); }
 void pFpdddd(x64emu_t *emu, uintptr_t fcn) { pFpdddd_t fn = (pFpdddd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
 void pFplppp(x64emu_t *emu, uintptr_t fcn) { pFplppp_t fn = (pFplppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5699,7 +5691,7 @@ void lFppLipp(x64emu_t *emu, uintptr_t fcn) { lFppLipp_t fn = (lFppLipp_t)fcn; R
 void lFpppLpp(x64emu_t *emu, uintptr_t fcn) { lFpppLpp_t fn = (lFpppLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void LFEuuppp(x64emu_t *emu, uintptr_t fcn) { LFEuuppp_t fn = (LFEuuppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void LFELpppu(x64emu_t *emu, uintptr_t fcn) { LFELpppu_t fn = (LFELpppu_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
-void LFEpippp(x64emu_t *emu, uintptr_t fcn) { LFEpippp_t fn = (LFEpippp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void LFEpuppp(x64emu_t *emu, uintptr_t fcn) { LFEpuppp_t fn = (LFEpuppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void LFEppppu(x64emu_t *emu, uintptr_t fcn) { LFEppppu_t fn = (LFEppppu_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void LFpipipi(x64emu_t *emu, uintptr_t fcn) { LFpipipi_t fn = (LFpipipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void LFpLippp(x64emu_t *emu, uintptr_t fcn) { LFpLippp_t fn = (LFpLippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5742,7 +5734,7 @@ void pFpiiCCC(x64emu_t *emu, uintptr_t fcn) { pFpiiCCC_t fn = (pFpiiCCC_t)fcn; R
 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 pFpiLLLL(x64emu_t *emu, uintptr_t fcn) { pFpiLLLL_t fn = (pFpiLLLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_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); }
@@ -5798,6 +5790,7 @@ void iWpppppi(x64emu_t *emu, uintptr_t fcn) { iWpppppi_t fn = (iWpppppi_t)fcn; R
 void iWpppppu(x64emu_t *emu, uintptr_t fcn) { iWpppppu_t fn = (iWpppppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (void*)R_RDX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 40), *(uint32_t*)(R_RSP + 48)); }
 void vFEpuipuV(x64emu_t *emu, uintptr_t fcn) { vFEpuipuV_t fn = (vFEpuipuV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)(R_RSP + 8)); }
 void vFEpuuipp(x64emu_t *emu, uintptr_t fcn) { vFEpuuipp_t fn = (vFEpuuipp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void vFEpuLppp(x64emu_t *emu, uintptr_t fcn) { vFEpuLppp_t fn = (vFEpuLppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFEpupppp(x64emu_t *emu, uintptr_t fcn) { vFEpupppp_t fn = (vFEpupppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFEppippp(x64emu_t *emu, uintptr_t fcn) { vFEppippp_t fn = (vFEppippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFEpppLpp(x64emu_t *emu, uintptr_t fcn) { vFEpppLpp_t fn = (vFEpppLpp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -6049,17 +6042,16 @@ void pFWpppppp(x64emu_t *emu, uintptr_t fcn) { pFWpppppp_t fn = (pFWpppppp_t)fcn
 void pFuuuiiip(x64emu_t *emu, uintptr_t fcn) { pFuuuiiip_t fn = (pFuuuiiip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFuupupup(x64emu_t *emu, uintptr_t fcn) { pFuupupup_t fn = (pFuupupup_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFfiiiiid(x64emu_t *emu, uintptr_t fcn) { pFfiiiiid_t fn = (pFfiiiiid_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].f[0], (int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, emu->xmm[1].d[0]); }
-void pFdiiiIiI(x64emu_t *emu, uintptr_t fcn) { pFdiiiIiI_t fn = (pFdiiiIiI_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int64_t)R_RCX, (int32_t)R_R8, (int64_t)R_R9); }
+void pFduuulul(x64emu_t *emu, uintptr_t fcn) { pFduuulul_t fn = (pFduuulul_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (intptr_t)R_RCX, (uint32_t)R_R8, (intptr_t)R_R9); }
 void pFpiiiiid(x64emu_t *emu, uintptr_t fcn) { pFpiiiiid_t fn = (pFpiiiiid_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, emu->xmm[0].d[0]); }
 void 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 pFpiiplui(x64emu_t *emu, uintptr_t fcn) { pFpiiplui_t fn = (pFpiiplui_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8, (uint32_t)R_R9, *(int32_t*)(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 pFpiuLdii(x64emu_t *emu, uintptr_t fcn) { pFpiuLdii_t fn = (pFpiuLdii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, emu->xmm[0].d[0], (int32_t)R_R8, (int32_t)R_R9); }
 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)); }
 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)); }
 void pFpuppppp(x64emu_t *emu, uintptr_t fcn) { pFpuppppp_t fn = (pFpuppppp_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)); }
@@ -6275,9 +6267,9 @@ void LFELpupupu(x64emu_t *emu, uintptr_t fcn) { LFELpupupu_t fn = (LFELpupupu_t)
 void LFEpuuuppp(x64emu_t *emu, uintptr_t fcn) { LFEpuuuppp_t fn = (LFEpuuuppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (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 LFpLpuuLLu(x64emu_t *emu, uintptr_t fcn) { LFpLpuuLLu_t fn = (LFpLpuuLLu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void LFppLpLpLi(x64emu_t *emu, uintptr_t fcn) { LFppLpLpLi_t fn = (LFppLpLpLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
-void pFEiplllpp(x64emu_t *emu, uintptr_t fcn) { pFEiplllpp_t fn = (pFEiplllpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void pFEipLLLpp(x64emu_t *emu, uintptr_t fcn) { pFEipLLLpp_t fn = (pFEipLLLpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void pFEupLLLpp(x64emu_t *emu, uintptr_t fcn) { pFEupLLLpp_t fn = (pFEupLLLpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFEpiuCppp(x64emu_t *emu, uintptr_t fcn) { pFEpiuCppp_t fn = (pFEpiuCppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint8_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void pFEpuLpupp(x64emu_t *emu, uintptr_t fcn) { pFEpuLpupp_t fn = (pFEpuLpupp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFEppLiiup(x64emu_t *emu, uintptr_t fcn) { pFEppLiiup_t fn = (pFEppLiiup_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFEpppuipV(x64emu_t *emu, uintptr_t fcn) { pFEpppuipV_t fn = (pFEpppuipV_t)fcn; R_RAX=(uintptr_t)fn(emu, (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 pFEpppppiV(x64emu_t *emu, uintptr_t fcn) { pFEpppppiV_t fn = (pFEpppppiV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, (void*)(R_RSP + 8)); }
@@ -6290,10 +6282,10 @@ void pFuCCCCpWw(x64emu_t *emu, uintptr_t fcn) { pFuCCCCpWw_t fn = (pFuCCCCpWw_t)
 void pFuupupipp(x64emu_t *emu, uintptr_t fcn) { pFuupupipp_t fn = (pFuupupipp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFpiiiiiuu(x64emu_t *emu, uintptr_t fcn) { pFpiiiiiuu_t fn = (pFpiiiiiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void 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 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 pFpuLdiiLi(x64emu_t *emu, uintptr_t fcn) { pFpuLdiiLi_t fn = (pFpuLdiiLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, emu->xmm[0].d[0], (int32_t)R_RCX, (int32_t)R_R8, (uintptr_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 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)); }
 void pFpupppppp(x64emu_t *emu, uintptr_t fcn) { pFpupppppp_t fn = (pFpupppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void pFplpppppp(x64emu_t *emu, uintptr_t fcn) { pFplpppppp_t fn = (pFplpppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -6317,9 +6309,9 @@ void iWEpuuiipp(x64emu_t *emu, uintptr_t fcn) { iWEpuuiipp_t fn = (iWEpuuiipp_t)
 void iWEpuuuipp(x64emu_t *emu, uintptr_t fcn) { iWEpuuuipp_t fn = (iWEpuuuipp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RCX, (uint32_t)R_RDX, (uint32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void iWpuipuppp(x64emu_t *emu, uintptr_t fcn) { iWpuipuppp_t fn = (iWpuipuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (uint32_t)R_RDX, (int32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64)); }
 void vFEpiiiuipp(x64emu_t *emu, uintptr_t fcn) { vFEpiiiuipp_t fn = (vFEpiiiuipp_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void vFEpippippV(x64emu_t *emu, uintptr_t fcn) { vFEpippippV_t fn = (vFEpippippV_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), (void*)(R_RSP + 16)); }
-void vFEpippippA(x64emu_t *emu, uintptr_t fcn) { vFEpippippA_t fn = (vFEpippippA_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFEpuuuippp(x64emu_t *emu, uintptr_t fcn) { vFEpuuuippp_t fn = (vFEpuuuippp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void vFEpuppippV(x64emu_t *emu, uintptr_t fcn) { vFEpuppippV_t fn = (vFEpuppippV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), (void*)(R_RSP + 16)); }
+void vFEpuppippA(x64emu_t *emu, uintptr_t fcn) { vFEpuppippA_t fn = (vFEpuppippA_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFEppuipppp(x64emu_t *emu, uintptr_t fcn) { vFEppuipppp_t fn = (vFEppuipppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFEpppuippp(x64emu_t *emu, uintptr_t fcn) { vFEpppuippp_t fn = (vFEpppuippp_t)fcn; fn(emu, (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 vFEpppLLpLp(x64emu_t *emu, uintptr_t fcn) { vFEpppLLpLp_t fn = (vFEpppLLpLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -7038,14 +7030,13 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFpL) return 1;
 	if (fun == &LFpp) return 1;
 	if (fun == &pFii) return 1;
-	if (fun == &pFiI) return 1;
 	if (fun == &pFiu) return 1;
 	if (fun == &pFip) return 1;
 	if (fun == &pFui) return 1;
 	if (fun == &pFuu) return 1;
+	if (fun == &pFul) return 1;
 	if (fun == &pFup) return 1;
-	if (fun == &pFUU) return 1;
-	if (fun == &pFdi) return 2;
+	if (fun == &pFdu) return 2;
 	if (fun == &pFdd) return 3;
 	if (fun == &pFli) return 1;
 	if (fun == &pFll) return 1;
@@ -7127,7 +7118,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpww) return 1;
 	if (fun == &vFpic) return 1;
 	if (fun == &vFpii) return 1;
-	if (fun == &vFpiI) return 1;
 	if (fun == &vFpiC) return 1;
 	if (fun == &vFpiu) return 1;
 	if (fun == &vFpiU) return 1;
@@ -7156,6 +7146,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpdd) return 3;
 	if (fun == &vFpdp) return 2;
 	if (fun == &vFpll) return 1;
+	if (fun == &vFplL) return 1;
 	if (fun == &vFplp) return 1;
 	if (fun == &vFpLi) return 1;
 	if (fun == &vFpLu) return 1;
@@ -7220,7 +7211,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpil) return 1;
 	if (fun == &iFpiL) return 1;
 	if (fun == &iFpip) return 1;
-	if (fun == &iFpII) return 1;
 	if (fun == &iFpCp) return 1;
 	if (fun == &iFpWp) return 1;
 	if (fun == &iFpui) return 1;
@@ -7299,9 +7289,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFppu) return 1;
 	if (fun == &uFppL) return 1;
 	if (fun == &uFppp) return 1;
-	if (fun == &UFUii) return 1;
-	if (fun == &UFUUU) return 1;
-	if (fun == &UFpiU) return 1;
 	if (fun == &UFppi) return 1;
 	if (fun == &fFuii) return -1;
 	if (fun == &fFfff) return -4;
@@ -7359,7 +7346,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFiii) return 1;
 	if (fun == &pFiiu) return 1;
 	if (fun == &pFiip) return 1;
-	if (fun == &pFiIi) return 1;
 	if (fun == &pFiLL) return 1;
 	if (fun == &pFipi) return 1;
 	if (fun == &pFipL) return 1;
@@ -7377,9 +7363,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFupL) return 1;
 	if (fun == &pFupp) return 1;
 	if (fun == &pFdip) return 2;
-	if (fun == &pFdUU) return 2;
 	if (fun == &pFddi) return 3;
 	if (fun == &pFddd) return 4;
+	if (fun == &pFdLL) return 2;
 	if (fun == &pFlpi) return 1;
 	if (fun == &pFLup) return 1;
 	if (fun == &pFLLp) return 1;
@@ -7399,9 +7385,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpui) return 1;
 	if (fun == &pFpuu) return 1;
 	if (fun == &pFpuf) return 2;
+	if (fun == &pFpul) return 1;
 	if (fun == &pFpup) return 1;
-	if (fun == &pFpUi) return 1;
-	if (fun == &pFpUu) return 1;
 	if (fun == &pFpdu) return 2;
 	if (fun == &pFpdd) return 3;
 	if (fun == &pFplc) return 1;
@@ -7414,9 +7399,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpLp) return 1;
 	if (fun == &pFppc) return 1;
 	if (fun == &pFppi) return 1;
-	if (fun == &pFppI) return 1;
 	if (fun == &pFppu) return 1;
-	if (fun == &pFppU) return 1;
 	if (fun == &pFppf) return 2;
 	if (fun == &pFppd) return 2;
 	if (fun == &pFppl) return 1;
@@ -7509,12 +7492,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiuL) return 1;
 	if (fun == &vFpiup) return 1;
 	if (fun == &vFpiUu) return 1;
-	if (fun == &vFpiUU) return 1;
 	if (fun == &vFpiLu) return 1;
+	if (fun == &vFpiLL) return 1;
 	if (fun == &vFpipi) return 1;
 	if (fun == &vFpipu) return 1;
 	if (fun == &vFpipp) return 1;
-	if (fun == &vFpIdi) return 2;
 	if (fun == &vFpCuW) return 1;
 	if (fun == &vFpuii) return 1;
 	if (fun == &vFpuip) return 1;
@@ -7522,6 +7504,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuup) return 1;
 	if (fun == &vFpufi) return 2;
 	if (fun == &vFpudd) return 3;
+	if (fun == &vFpuLL) return 1;
 	if (fun == &vFpupu) return 1;
 	if (fun == &vFpupp) return 1;
 	if (fun == &vFpUuu) return 1;
@@ -7535,6 +7518,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpdup) return 2;
 	if (fun == &vFpddu) return 3;
 	if (fun == &vFpddd) return 4;
+	if (fun == &vFpldi) return 2;
 	if (fun == &vFplll) return 1;
 	if (fun == &vFpllL) return 1;
 	if (fun == &vFplpp) return 1;
@@ -7627,7 +7611,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpiuu) return 1;
 	if (fun == &iFpiuL) return 1;
 	if (fun == &iFpiup) return 1;
-	if (fun == &iFpiUp) return 1;
 	if (fun == &iFpili) return 1;
 	if (fun == &iFpild) return 2;
 	if (fun == &iFpiLL) return 1;
@@ -7808,7 +7791,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFiiLp) return 1;
 	if (fun == &pFiipi) return 1;
 	if (fun == &pFiipp) return 1;
-	if (fun == &pFiIIi) return 1;
 	if (fun == &pFillu) return 1;
 	if (fun == &pFipip) return 1;
 	if (fun == &pFippi) return 1;
@@ -7820,6 +7802,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFuuip) return 1;
 	if (fun == &pFuuuu) return 1;
 	if (fun == &pFuddd) return 4;
+	if (fun == &pFudlL) return 2;
+	if (fun == &pFulli) return 1;
 	if (fun == &pFullu) return 1;
 	if (fun == &pFupii) return 1;
 	if (fun == &pFuppp) return 1;
@@ -7853,7 +7837,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpupi) return 1;
 	if (fun == &pFpupu) return 1;
 	if (fun == &pFpupp) return 1;
-	if (fun == &pFpdIU) return 2;
 	if (fun == &pFpddi) return 3;
 	if (fun == &pFplil) return 1;
 	if (fun == &pFplip) return 1;
@@ -7873,9 +7856,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFppip) return 1;
 	if (fun == &pFppCp) return 1;
 	if (fun == &pFppWp) return 1;
+	if (fun == &pFppui) return 1;
 	if (fun == &pFppuu) return 1;
 	if (fun == &pFppup) return 1;
-	if (fun == &pFppUU) return 1;
 	if (fun == &pFppdd) return 3;
 	if (fun == &pFppll) return 1;
 	if (fun == &pFpplp) return 1;
@@ -7976,16 +7959,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFLpppp) return 1;
 	if (fun == &vFpwwWW) return 1;
 	if (fun == &vFpiiii) return 1;
-	if (fun == &vFpiiiI) return 1;
 	if (fun == &vFpiiiu) return 1;
 	if (fun == &vFpiiip) return 1;
-	if (fun == &vFpiiII) return 1;
 	if (fun == &vFpiiuu) return 1;
 	if (fun == &vFpiiup) return 1;
 	if (fun == &vFpiiff) return 3;
 	if (fun == &vFpiipp) return 1;
-	if (fun == &vFpiIiI) return 1;
-	if (fun == &vFpiIII) return 1;
 	if (fun == &vFpiuuu) return 1;
 	if (fun == &vFpiUUu) return 1;
 	if (fun == &vFpiUUp) return 1;
@@ -7994,12 +7973,17 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpipiu) return 1;
 	if (fun == &vFpippi) return 1;
 	if (fun == &vFpippp) return 1;
+	if (fun == &vFpuiii) return 1;
+	if (fun == &vFpuiil) return 1;
 	if (fun == &vFpuiip) return 1;
+	if (fun == &vFpuill) return 1;
 	if (fun == &vFpuipp) return 1;
 	if (fun == &vFpuuuu) return 1;
 	if (fun == &vFpuuup) return 1;
 	if (fun == &vFpuupp) return 1;
 	if (fun == &vFpuddd) return 4;
+	if (fun == &vFpulul) return 1;
+	if (fun == &vFpulll) return 1;
 	if (fun == &vFpupiu) return 1;
 	if (fun == &vFpupup) return 1;
 	if (fun == &vFpUuuu) return 1;
@@ -8010,19 +7994,19 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpUUUp) return 1;
 	if (fun == &vFpfffi) return 4;
 	if (fun == &vFpffff) return 5;
-	if (fun == &vFpdiII) return 2;
+	if (fun == &vFpdull) return 2;
 	if (fun == &vFpddii) return 3;
 	if (fun == &vFpdddd) return 5;
 	if (fun == &vFpddpp) return 3;
 	if (fun == &vFpliip) return 1;
 	if (fun == &vFpluul) return 1;
-	if (fun == &vFplppp) return 1;
 	if (fun == &vFpLiii) return 1;
 	if (fun == &vFpLiiL) return 1;
 	if (fun == &vFpLLLL) return 1;
 	if (fun == &vFpLLpp) return 1;
 	if (fun == &vFpLpiL) return 1;
 	if (fun == &vFpLppi) return 1;
+	if (fun == &vFpLppp) return 1;
 	if (fun == &vFppiic) return 1;
 	if (fun == &vFppiii) return 1;
 	if (fun == &vFppiiu) return 1;
@@ -8115,7 +8099,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpCupp) return 1;
 	if (fun == &iFpCpip) return 1;
 	if (fun == &iFpuill) return 1;
-	if (fun == &iFpuipi) return 1;
+	if (fun == &iFpuipu) return 1;
 	if (fun == &iFpuipp) return 1;
 	if (fun == &iFpuuip) return 1;
 	if (fun == &iFpuuup) return 1;
@@ -8162,7 +8146,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppiuu) return 1;
 	if (fun == &iFppiup) return 1;
 	if (fun == &iFppiLi) return 1;
-	if (fun == &iFppiLL) return 1;
 	if (fun == &iFppipi) return 1;
 	if (fun == &iFppipu) return 1;
 	if (fun == &iFppipl) return 1;
@@ -8171,6 +8154,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppuip) return 1;
 	if (fun == &iFppuuu) return 1;
 	if (fun == &iFppuup) return 1;
+	if (fun == &iFppuLL) return 1;
 	if (fun == &iFppupi) return 1;
 	if (fun == &iFppupu) return 1;
 	if (fun == &iFppupp) return 1;
@@ -8261,6 +8245,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFuuupu) return 1;
 	if (fun == &pFuupuu) return 1;
 	if (fun == &pFudddp) return 4;
+	if (fun == &pFuLdii) return 2;
 	if (fun == &pFupLpl) return 1;
 	if (fun == &pFupLpL) return 1;
 	if (fun == &pFddddi) return 5;
@@ -8270,7 +8255,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpiiip) return 1;
 	if (fun == &pFpiiuu) return 1;
 	if (fun == &pFpiipi) return 1;
-	if (fun == &pFpiipL) return 1;
 	if (fun == &pFpiipp) return 1;
 	if (fun == &pFpiCCC) return 1;
 	if (fun == &pFpiuuu) return 1;
@@ -8287,11 +8271,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpuuip) return 1;
 	if (fun == &pFpuuuu) return 1;
 	if (fun == &pFpuuup) return 1;
+	if (fun == &pFpuupL) return 1;
 	if (fun == &pFpuupp) return 1;
 	if (fun == &pFpuLpp) return 1;
 	if (fun == &pFpuppu) return 1;
 	if (fun == &pFpuppp) return 1;
-	if (fun == &pFpUdii) return 2;
 	if (fun == &pFpfffi) return 4;
 	if (fun == &pFpdddd) return 5;
 	if (fun == &pFplppp) return 1;
@@ -8667,7 +8651,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpiiuup) return 1;
 	if (fun == &pFpiipip) return 1;
 	if (fun == &pFpiippp) return 1;
-	if (fun == &pFpiUUUU) return 1;
+	if (fun == &pFpiLLLL) return 1;
 	if (fun == &pFpipipL) return 1;
 	if (fun == &pFpipipp) return 1;
 	if (fun == &pFpipuii) return 1;
@@ -8725,9 +8709,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppppdpu) return 2;
 	if (fun == &pFifffppp) return 4;
 	if (fun == &pFfiiiiid) return 3;
-	if (fun == &pFdiiiIiI) return 2;
+	if (fun == &pFduuulul) return 2;
 	if (fun == &pFpiiiiid) return 2;
-	if (fun == &pFpiiUdii) return 2;
+	if (fun == &pFpiuLdii) return 2;
 	if (fun == &pFpppfffi) return 4;
 	if (fun == &pFpppdddi) return 4;
 	if (fun == &vFuCCCCfff) return 4;
@@ -8899,8 +8883,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFpL) return 1;
 	if (fun == &LFpp) return 1;
 	if (fun == &pFuu) return 1;
+	if (fun == &pFul) return 1;
 	if (fun == &pFup) return 1;
-	if (fun == &pFUU) return 1;
+	if (fun == &pFdu) return 2;
 	if (fun == &pFdd) return 3;
 	if (fun == &pFll) return 1;
 	if (fun == &pFlp) return 1;
@@ -8962,6 +8947,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpdd) return 3;
 	if (fun == &vFpdp) return 2;
 	if (fun == &vFpll) return 1;
+	if (fun == &vFplL) return 1;
 	if (fun == &vFplp) return 1;
 	if (fun == &vFpLu) return 1;
 	if (fun == &vFpLL) return 1;
@@ -8998,7 +8984,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFppu) return 1;
 	if (fun == &uFppL) return 1;
 	if (fun == &uFppp) return 1;
-	if (fun == &UFUUU) return 1;
 	if (fun == &fFfff) return -4;
 	if (fun == &fFffp) return -3;
 	if (fun == &fFppL) return -1;
@@ -9042,8 +9027,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFupl) return 1;
 	if (fun == &pFupL) return 1;
 	if (fun == &pFupp) return 1;
-	if (fun == &pFdUU) return 2;
 	if (fun == &pFddd) return 4;
+	if (fun == &pFdLL) return 2;
 	if (fun == &pFLup) return 1;
 	if (fun == &pFLLp) return 1;
 	if (fun == &pFLpp) return 1;
@@ -9051,8 +9036,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpWp) return 1;
 	if (fun == &pFpuu) return 1;
 	if (fun == &pFpuf) return 2;
+	if (fun == &pFpul) return 1;
 	if (fun == &pFpup) return 1;
-	if (fun == &pFpUu) return 1;
 	if (fun == &pFpdu) return 2;
 	if (fun == &pFpdd) return 3;
 	if (fun == &pFplu) return 1;
@@ -9061,9 +9046,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpLu) return 1;
 	if (fun == &pFpLL) return 1;
 	if (fun == &pFpLp) return 1;
-	if (fun == &pFppI) return 1;
 	if (fun == &pFppu) return 1;
-	if (fun == &pFppU) return 1;
 	if (fun == &pFppf) return 2;
 	if (fun == &pFppd) return 2;
 	if (fun == &pFppl) return 1;
@@ -9099,6 +9082,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuuu) return 1;
 	if (fun == &vFpuup) return 1;
 	if (fun == &vFpudd) return 3;
+	if (fun == &vFpuLL) return 1;
 	if (fun == &vFpupu) return 1;
 	if (fun == &vFpupp) return 1;
 	if (fun == &vFpUuu) return 1;
@@ -9172,6 +9156,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFpppp) return 1;
 	if (fun == &pFuuuu) return 1;
 	if (fun == &pFuddd) return 4;
+	if (fun == &pFudlL) return 2;
 	if (fun == &pFullu) return 1;
 	if (fun == &pFuppp) return 1;
 	if (fun == &pFffff) return 5;
@@ -9187,7 +9172,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpuLL) return 1;
 	if (fun == &pFpupu) return 1;
 	if (fun == &pFpupp) return 1;
-	if (fun == &pFpdIU) return 2;
 	if (fun == &pFplpl) return 1;
 	if (fun == &pFplpp) return 1;
 	if (fun == &pFpLup) return 1;
@@ -9199,7 +9183,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFppWp) return 1;
 	if (fun == &pFppuu) return 1;
 	if (fun == &pFppup) return 1;
-	if (fun == &pFppUU) return 1;
 	if (fun == &pFppdd) return 3;
 	if (fun == &pFppll) return 1;
 	if (fun == &pFpplp) return 1;
@@ -9232,6 +9215,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuuup) return 1;
 	if (fun == &vFpuupp) return 1;
 	if (fun == &vFpuddd) return 4;
+	if (fun == &vFpulul) return 1;
+	if (fun == &vFpulll) return 1;
 	if (fun == &vFpupup) return 1;
 	if (fun == &vFpUuuu) return 1;
 	if (fun == &vFpUUuu) return 1;
@@ -9239,12 +9224,13 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpUUUu) return 1;
 	if (fun == &vFpUUUp) return 1;
 	if (fun == &vFpffff) return 5;
+	if (fun == &vFpdull) return 2;
 	if (fun == &vFpdddd) return 5;
 	if (fun == &vFpddpp) return 3;
 	if (fun == &vFpluul) return 1;
-	if (fun == &vFplppp) return 1;
 	if (fun == &vFpLLLL) return 1;
 	if (fun == &vFpLLpp) return 1;
+	if (fun == &vFpLppp) return 1;
 	if (fun == &vFppuuu) return 1;
 	if (fun == &vFppuup) return 1;
 	if (fun == &vFppudd) return 3;
@@ -9300,6 +9286,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFLuppp) return 1;
 	if (fun == &pFpuuuu) return 1;
 	if (fun == &pFpuuup) return 1;
+	if (fun == &pFpuupL) return 1;
 	if (fun == &pFpuupp) return 1;
 	if (fun == &pFpuLpp) return 1;
 	if (fun == &pFpuppu) return 1;
@@ -9412,6 +9399,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpdddddd) return 7;
 	if (fun == &vFppddddu) return 5;
 	if (fun == &vFpppffff) return 5;
+	if (fun == &pFduuulul) return 2;
 	if (fun == &vFuCCCCfff) return 4;
 	if (fun == &vFuuufffff) return 6;
 	if (fun == &vFffffffff) return 9;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index c5ecccc4..72c21252 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -365,15 +365,14 @@ void pFEi(x64emu_t *emu, uintptr_t fnc);
 void pFEL(x64emu_t *emu, uintptr_t fnc);
 void pFEp(x64emu_t *emu, uintptr_t fnc);
 void pFii(x64emu_t *emu, uintptr_t fnc);
-void pFiI(x64emu_t *emu, uintptr_t fnc);
 void pFiu(x64emu_t *emu, uintptr_t fnc);
 void pFip(x64emu_t *emu, uintptr_t fnc);
 void pFiV(x64emu_t *emu, uintptr_t fnc);
 void pFui(x64emu_t *emu, uintptr_t fnc);
 void pFuu(x64emu_t *emu, uintptr_t fnc);
+void pFul(x64emu_t *emu, uintptr_t fnc);
 void pFup(x64emu_t *emu, uintptr_t fnc);
-void pFUU(x64emu_t *emu, uintptr_t fnc);
-void pFdi(x64emu_t *emu, uintptr_t fnc);
+void pFdu(x64emu_t *emu, uintptr_t fnc);
 void pFdd(x64emu_t *emu, uintptr_t fnc);
 void pFli(x64emu_t *emu, uintptr_t fnc);
 void pFll(x64emu_t *emu, uintptr_t fnc);
@@ -480,7 +479,6 @@ void vFLpp(x64emu_t *emu, uintptr_t fnc);
 void vFpww(x64emu_t *emu, uintptr_t fnc);
 void vFpic(x64emu_t *emu, uintptr_t fnc);
 void vFpii(x64emu_t *emu, uintptr_t fnc);
-void vFpiI(x64emu_t *emu, uintptr_t fnc);
 void vFpiC(x64emu_t *emu, uintptr_t fnc);
 void vFpiu(x64emu_t *emu, uintptr_t fnc);
 void vFpiU(x64emu_t *emu, uintptr_t fnc);
@@ -510,6 +508,7 @@ void vFpdu(x64emu_t *emu, uintptr_t fnc);
 void vFpdd(x64emu_t *emu, uintptr_t fnc);
 void vFpdp(x64emu_t *emu, uintptr_t fnc);
 void vFpll(x64emu_t *emu, uintptr_t fnc);
+void vFplL(x64emu_t *emu, uintptr_t fnc);
 void vFplp(x64emu_t *emu, uintptr_t fnc);
 void vFpLi(x64emu_t *emu, uintptr_t fnc);
 void vFpLu(x64emu_t *emu, uintptr_t fnc);
@@ -592,7 +591,6 @@ void iFpid(x64emu_t *emu, uintptr_t fnc);
 void iFpil(x64emu_t *emu, uintptr_t fnc);
 void iFpiL(x64emu_t *emu, uintptr_t fnc);
 void iFpip(x64emu_t *emu, uintptr_t fnc);
-void iFpII(x64emu_t *emu, uintptr_t fnc);
 void iFpCp(x64emu_t *emu, uintptr_t fnc);
 void iFpWp(x64emu_t *emu, uintptr_t fnc);
 void iFpui(x64emu_t *emu, uintptr_t fnc);
@@ -696,9 +694,6 @@ void uFbuW(x64emu_t *emu, uintptr_t fnc);
 void uFbuu(x64emu_t *emu, uintptr_t fnc);
 void uFbuU(x64emu_t *emu, uintptr_t fnc);
 void uFbup(x64emu_t *emu, uintptr_t fnc);
-void UFUii(x64emu_t *emu, uintptr_t fnc);
-void UFUUU(x64emu_t *emu, uintptr_t fnc);
-void UFpiU(x64emu_t *emu, uintptr_t fnc);
 void UFppi(x64emu_t *emu, uintptr_t fnc);
 void fFuii(x64emu_t *emu, uintptr_t fnc);
 void fFfff(x64emu_t *emu, uintptr_t fnc);
@@ -764,6 +759,8 @@ void LFSpL(x64emu_t *emu, uintptr_t fnc);
 void pFEip(x64emu_t *emu, uintptr_t fnc);
 void pFEiV(x64emu_t *emu, uintptr_t fnc);
 void pFEup(x64emu_t *emu, uintptr_t fnc);
+void pFEuV(x64emu_t *emu, uintptr_t fnc);
+void pFEuA(x64emu_t *emu, uintptr_t fnc);
 void pFEpi(x64emu_t *emu, uintptr_t fnc);
 void pFEpu(x64emu_t *emu, uintptr_t fnc);
 void pFEpp(x64emu_t *emu, uintptr_t fnc);
@@ -772,7 +769,6 @@ void pFEpA(x64emu_t *emu, uintptr_t fnc);
 void pFiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiu(x64emu_t *emu, uintptr_t fnc);
 void pFiip(x64emu_t *emu, uintptr_t fnc);
-void pFiIi(x64emu_t *emu, uintptr_t fnc);
 void pFiLL(x64emu_t *emu, uintptr_t fnc);
 void pFipi(x64emu_t *emu, uintptr_t fnc);
 void pFipL(x64emu_t *emu, uintptr_t fnc);
@@ -790,9 +786,9 @@ void pFupl(x64emu_t *emu, uintptr_t fnc);
 void pFupL(x64emu_t *emu, uintptr_t fnc);
 void pFupp(x64emu_t *emu, uintptr_t fnc);
 void pFdip(x64emu_t *emu, uintptr_t fnc);
-void pFdUU(x64emu_t *emu, uintptr_t fnc);
 void pFddi(x64emu_t *emu, uintptr_t fnc);
 void pFddd(x64emu_t *emu, uintptr_t fnc);
+void pFdLL(x64emu_t *emu, uintptr_t fnc);
 void pFDip(x64emu_t *emu, uintptr_t fnc);
 void pFlpi(x64emu_t *emu, uintptr_t fnc);
 void pFLup(x64emu_t *emu, uintptr_t fnc);
@@ -814,9 +810,8 @@ 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 pFpul(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);
 void pFpdu(x64emu_t *emu, uintptr_t fnc);
 void pFpdd(x64emu_t *emu, uintptr_t fnc);
 void pFplc(x64emu_t *emu, uintptr_t fnc);
@@ -829,9 +824,7 @@ void pFpLL(x64emu_t *emu, uintptr_t fnc);
 void pFpLp(x64emu_t *emu, uintptr_t fnc);
 void pFppc(x64emu_t *emu, uintptr_t fnc);
 void pFppi(x64emu_t *emu, uintptr_t fnc);
-void pFppI(x64emu_t *emu, uintptr_t fnc);
 void pFppu(x64emu_t *emu, uintptr_t fnc);
-void pFppU(x64emu_t *emu, uintptr_t fnc);
 void pFppf(x64emu_t *emu, uintptr_t fnc);
 void pFppd(x64emu_t *emu, uintptr_t fnc);
 void pFppl(x64emu_t *emu, uintptr_t fnc);
@@ -967,12 +960,11 @@ void vFpiui(x64emu_t *emu, uintptr_t fnc);
 void vFpiuL(x64emu_t *emu, uintptr_t fnc);
 void vFpiup(x64emu_t *emu, uintptr_t fnc);
 void vFpiUu(x64emu_t *emu, uintptr_t fnc);
-void vFpiUU(x64emu_t *emu, uintptr_t fnc);
 void vFpiLu(x64emu_t *emu, uintptr_t fnc);
+void vFpiLL(x64emu_t *emu, uintptr_t fnc);
 void vFpipi(x64emu_t *emu, uintptr_t fnc);
 void vFpipu(x64emu_t *emu, uintptr_t fnc);
 void vFpipp(x64emu_t *emu, uintptr_t fnc);
-void vFpIdi(x64emu_t *emu, uintptr_t fnc);
 void vFpCuW(x64emu_t *emu, uintptr_t fnc);
 void vFpuii(x64emu_t *emu, uintptr_t fnc);
 void vFpuip(x64emu_t *emu, uintptr_t fnc);
@@ -980,6 +972,7 @@ void vFpuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuup(x64emu_t *emu, uintptr_t fnc);
 void vFpufi(x64emu_t *emu, uintptr_t fnc);
 void vFpudd(x64emu_t *emu, uintptr_t fnc);
+void vFpuLL(x64emu_t *emu, uintptr_t fnc);
 void vFpupu(x64emu_t *emu, uintptr_t fnc);
 void vFpupp(x64emu_t *emu, uintptr_t fnc);
 void vFpUuu(x64emu_t *emu, uintptr_t fnc);
@@ -993,6 +986,7 @@ void vFpdii(x64emu_t *emu, uintptr_t fnc);
 void vFpdup(x64emu_t *emu, uintptr_t fnc);
 void vFpddu(x64emu_t *emu, uintptr_t fnc);
 void vFpddd(x64emu_t *emu, uintptr_t fnc);
+void vFpldi(x64emu_t *emu, uintptr_t fnc);
 void vFplll(x64emu_t *emu, uintptr_t fnc);
 void vFpllL(x64emu_t *emu, uintptr_t fnc);
 void vFplpp(x64emu_t *emu, uintptr_t fnc);
@@ -1114,7 +1108,6 @@ void iFpiip(x64emu_t *emu, uintptr_t fnc);
 void iFpiuu(x64emu_t *emu, uintptr_t fnc);
 void iFpiuL(x64emu_t *emu, uintptr_t fnc);
 void iFpiup(x64emu_t *emu, uintptr_t fnc);
-void iFpiUp(x64emu_t *emu, uintptr_t fnc);
 void iFpili(x64emu_t *emu, uintptr_t fnc);
 void iFpild(x64emu_t *emu, uintptr_t fnc);
 void iFpiLL(x64emu_t *emu, uintptr_t fnc);
@@ -1337,7 +1330,6 @@ void pFiiup(x64emu_t *emu, uintptr_t fnc);
 void pFiiLp(x64emu_t *emu, uintptr_t fnc);
 void pFiipi(x64emu_t *emu, uintptr_t fnc);
 void pFiipp(x64emu_t *emu, uintptr_t fnc);
-void pFiIIi(x64emu_t *emu, uintptr_t fnc);
 void pFillu(x64emu_t *emu, uintptr_t fnc);
 void pFipip(x64emu_t *emu, uintptr_t fnc);
 void pFippi(x64emu_t *emu, uintptr_t fnc);
@@ -1349,6 +1341,8 @@ void pFuuii(x64emu_t *emu, uintptr_t fnc);
 void pFuuip(x64emu_t *emu, uintptr_t fnc);
 void pFuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFuddd(x64emu_t *emu, uintptr_t fnc);
+void pFudlL(x64emu_t *emu, uintptr_t fnc);
+void pFulli(x64emu_t *emu, uintptr_t fnc);
 void pFullu(x64emu_t *emu, uintptr_t fnc);
 void pFupii(x64emu_t *emu, uintptr_t fnc);
 void pFuppp(x64emu_t *emu, uintptr_t fnc);
@@ -1383,7 +1377,6 @@ void pFpuLL(x64emu_t *emu, uintptr_t fnc);
 void pFpupi(x64emu_t *emu, uintptr_t fnc);
 void pFpupu(x64emu_t *emu, uintptr_t fnc);
 void pFpupp(x64emu_t *emu, uintptr_t fnc);
-void pFpdIU(x64emu_t *emu, uintptr_t fnc);
 void pFpddi(x64emu_t *emu, uintptr_t fnc);
 void pFplil(x64emu_t *emu, uintptr_t fnc);
 void pFplip(x64emu_t *emu, uintptr_t fnc);
@@ -1404,9 +1397,9 @@ void pFppip(x64emu_t *emu, uintptr_t fnc);
 void pFppiS(x64emu_t *emu, uintptr_t fnc);
 void pFppCp(x64emu_t *emu, uintptr_t fnc);
 void pFppWp(x64emu_t *emu, uintptr_t fnc);
+void pFppui(x64emu_t *emu, uintptr_t fnc);
 void pFppuu(x64emu_t *emu, uintptr_t fnc);
 void pFppup(x64emu_t *emu, uintptr_t fnc);
-void pFppUU(x64emu_t *emu, uintptr_t fnc);
 void pFppdd(x64emu_t *emu, uintptr_t fnc);
 void pFppll(x64emu_t *emu, uintptr_t fnc);
 void pFpplp(x64emu_t *emu, uintptr_t fnc);
@@ -1455,6 +1448,8 @@ void vFEpuup(x64emu_t *emu, uintptr_t fnc);
 void vFEpuuV(x64emu_t *emu, uintptr_t fnc);
 void vFEpuuA(x64emu_t *emu, uintptr_t fnc);
 void vFEpupp(x64emu_t *emu, uintptr_t fnc);
+void vFEpupV(x64emu_t *emu, uintptr_t fnc);
+void vFEpupA(x64emu_t *emu, uintptr_t fnc);
 void vFEpLLp(x64emu_t *emu, uintptr_t fnc);
 void vFEppip(x64emu_t *emu, uintptr_t fnc);
 void vFEppiV(x64emu_t *emu, uintptr_t fnc);
@@ -1552,16 +1547,12 @@ void vFLpppi(x64emu_t *emu, uintptr_t fnc);
 void vFLpppp(x64emu_t *emu, uintptr_t fnc);
 void vFpwwWW(x64emu_t *emu, uintptr_t fnc);
 void vFpiiii(x64emu_t *emu, uintptr_t fnc);
-void vFpiiiI(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpiiip(x64emu_t *emu, uintptr_t fnc);
-void vFpiiII(x64emu_t *emu, uintptr_t fnc);
 void vFpiiuu(x64emu_t *emu, uintptr_t fnc);
 void vFpiiup(x64emu_t *emu, uintptr_t fnc);
 void vFpiiff(x64emu_t *emu, uintptr_t fnc);
 void vFpiipp(x64emu_t *emu, uintptr_t fnc);
-void vFpiIiI(x64emu_t *emu, uintptr_t fnc);
-void vFpiIII(x64emu_t *emu, uintptr_t fnc);
 void vFpiuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpiUUu(x64emu_t *emu, uintptr_t fnc);
 void vFpiUUp(x64emu_t *emu, uintptr_t fnc);
@@ -1570,12 +1561,17 @@ void vFpipii(x64emu_t *emu, uintptr_t fnc);
 void vFpipiu(x64emu_t *emu, uintptr_t fnc);
 void vFpippi(x64emu_t *emu, uintptr_t fnc);
 void vFpippp(x64emu_t *emu, uintptr_t fnc);
+void vFpuiii(x64emu_t *emu, uintptr_t fnc);
+void vFpuiil(x64emu_t *emu, uintptr_t fnc);
 void vFpuiip(x64emu_t *emu, uintptr_t fnc);
+void vFpuill(x64emu_t *emu, uintptr_t fnc);
 void vFpuipp(x64emu_t *emu, uintptr_t fnc);
 void vFpuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuup(x64emu_t *emu, uintptr_t fnc);
 void vFpuupp(x64emu_t *emu, uintptr_t fnc);
 void vFpuddd(x64emu_t *emu, uintptr_t fnc);
+void vFpulul(x64emu_t *emu, uintptr_t fnc);
+void vFpulll(x64emu_t *emu, uintptr_t fnc);
 void vFpupiu(x64emu_t *emu, uintptr_t fnc);
 void vFpupup(x64emu_t *emu, uintptr_t fnc);
 void vFpUuuu(x64emu_t *emu, uintptr_t fnc);
@@ -1586,19 +1582,19 @@ void vFpUUUu(x64emu_t *emu, uintptr_t fnc);
 void vFpUUUp(x64emu_t *emu, uintptr_t fnc);
 void vFpfffi(x64emu_t *emu, uintptr_t fnc);
 void vFpffff(x64emu_t *emu, uintptr_t fnc);
-void vFpdiII(x64emu_t *emu, uintptr_t fnc);
+void vFpdull(x64emu_t *emu, uintptr_t fnc);
 void vFpddii(x64emu_t *emu, uintptr_t fnc);
 void vFpdddd(x64emu_t *emu, uintptr_t fnc);
 void vFpddpp(x64emu_t *emu, uintptr_t fnc);
 void vFpliip(x64emu_t *emu, uintptr_t fnc);
 void vFpluul(x64emu_t *emu, uintptr_t fnc);
-void vFplppp(x64emu_t *emu, uintptr_t fnc);
 void vFpLiii(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiL(x64emu_t *emu, uintptr_t fnc);
 void vFpLLLL(x64emu_t *emu, uintptr_t fnc);
 void vFpLLpp(x64emu_t *emu, uintptr_t fnc);
 void vFpLpiL(x64emu_t *emu, uintptr_t fnc);
 void vFpLppi(x64emu_t *emu, uintptr_t fnc);
+void vFpLppp(x64emu_t *emu, uintptr_t fnc);
 void vFppiic(x64emu_t *emu, uintptr_t fnc);
 void vFppiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiu(x64emu_t *emu, uintptr_t fnc);
@@ -1717,7 +1713,7 @@ void iFpCCCC(x64emu_t *emu, uintptr_t fnc);
 void iFpCupp(x64emu_t *emu, uintptr_t fnc);
 void iFpCpip(x64emu_t *emu, uintptr_t fnc);
 void iFpuill(x64emu_t *emu, uintptr_t fnc);
-void iFpuipi(x64emu_t *emu, uintptr_t fnc);
+void iFpuipu(x64emu_t *emu, uintptr_t fnc);
 void iFpuipp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuip(x64emu_t *emu, uintptr_t fnc);
 void iFpuuup(x64emu_t *emu, uintptr_t fnc);
@@ -1764,7 +1760,6 @@ void iFppiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiuu(x64emu_t *emu, uintptr_t fnc);
 void iFppiup(x64emu_t *emu, uintptr_t fnc);
 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);
@@ -1773,6 +1768,7 @@ void iFppuwp(x64emu_t *emu, uintptr_t fnc);
 void iFppuip(x64emu_t *emu, uintptr_t fnc);
 void iFppuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuup(x64emu_t *emu, uintptr_t fnc);
+void iFppuLL(x64emu_t *emu, uintptr_t fnc);
 void iFppupi(x64emu_t *emu, uintptr_t fnc);
 void iFppupu(x64emu_t *emu, uintptr_t fnc);
 void iFppupp(x64emu_t *emu, uintptr_t fnc);
@@ -1897,6 +1893,7 @@ void pFuuiip(x64emu_t *emu, uintptr_t fnc);
 void pFuuupu(x64emu_t *emu, uintptr_t fnc);
 void pFuupuu(x64emu_t *emu, uintptr_t fnc);
 void pFudddp(x64emu_t *emu, uintptr_t fnc);
+void pFuLdii(x64emu_t *emu, uintptr_t fnc);
 void pFupLpl(x64emu_t *emu, uintptr_t fnc);
 void pFupLpL(x64emu_t *emu, uintptr_t fnc);
 void pFddddi(x64emu_t *emu, uintptr_t fnc);
@@ -1906,7 +1903,6 @@ void pFpiiii(x64emu_t *emu, uintptr_t fnc);
 void pFpiiip(x64emu_t *emu, uintptr_t fnc);
 void pFpiiuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiipi(x64emu_t *emu, uintptr_t fnc);
-void pFpiipL(x64emu_t *emu, uintptr_t fnc);
 void pFpiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpiCCC(x64emu_t *emu, uintptr_t fnc);
 void pFpiuuu(x64emu_t *emu, uintptr_t fnc);
@@ -1923,11 +1919,11 @@ void pFpuiip(x64emu_t *emu, uintptr_t fnc);
 void pFpuuip(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpuuup(x64emu_t *emu, uintptr_t fnc);
+void pFpuupL(x64emu_t *emu, uintptr_t fnc);
 void pFpuupp(x64emu_t *emu, uintptr_t fnc);
 void pFpuLpp(x64emu_t *emu, uintptr_t fnc);
 void pFpuppu(x64emu_t *emu, uintptr_t fnc);
 void pFpuppp(x64emu_t *emu, uintptr_t fnc);
-void pFpUdii(x64emu_t *emu, uintptr_t fnc);
 void pFpfffi(x64emu_t *emu, uintptr_t fnc);
 void pFpdddd(x64emu_t *emu, uintptr_t fnc);
 void pFplppp(x64emu_t *emu, uintptr_t fnc);
@@ -2344,7 +2340,7 @@ void lFppLipp(x64emu_t *emu, uintptr_t fnc);
 void lFpppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFEuuppp(x64emu_t *emu, uintptr_t fnc);
 void LFELpppu(x64emu_t *emu, uintptr_t fnc);
-void LFEpippp(x64emu_t *emu, uintptr_t fnc);
+void LFEpuppp(x64emu_t *emu, uintptr_t fnc);
 void LFEppppu(x64emu_t *emu, uintptr_t fnc);
 void LFpipipi(x64emu_t *emu, uintptr_t fnc);
 void LFpLippp(x64emu_t *emu, uintptr_t fnc);
@@ -2387,7 +2383,7 @@ 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 pFpiLLLL(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);
@@ -2443,6 +2439,7 @@ void iWpppppi(x64emu_t *emu, uintptr_t fnc);
 void iWpppppu(x64emu_t *emu, uintptr_t fnc);
 void vFEpuipuV(x64emu_t *emu, uintptr_t fnc);
 void vFEpuuipp(x64emu_t *emu, uintptr_t fnc);
+void vFEpuLppp(x64emu_t *emu, uintptr_t fnc);
 void vFEpupppp(x64emu_t *emu, uintptr_t fnc);
 void vFEppippp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppLpp(x64emu_t *emu, uintptr_t fnc);
@@ -2694,17 +2691,16 @@ void pFWpppppp(x64emu_t *emu, uintptr_t fnc);
 void pFuuuiiip(x64emu_t *emu, uintptr_t fnc);
 void pFuupupup(x64emu_t *emu, uintptr_t fnc);
 void pFfiiiiid(x64emu_t *emu, uintptr_t fnc);
-void pFdiiiIiI(x64emu_t *emu, uintptr_t fnc);
+void pFduuulul(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 pFpiiplui(x64emu_t *emu, uintptr_t fnc);
 void pFpiipppp(x64emu_t *emu, uintptr_t fnc);
+void pFpiuLdii(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);
 void pFpupiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpuppipp(x64emu_t *emu, uintptr_t fnc);
 void pFpuppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2920,9 +2916,9 @@ void LFELpupupu(x64emu_t *emu, uintptr_t fnc);
 void LFEpuuuppp(x64emu_t *emu, uintptr_t fnc);
 void LFpLpuuLLu(x64emu_t *emu, uintptr_t fnc);
 void LFppLpLpLi(x64emu_t *emu, uintptr_t fnc);
-void pFEiplllpp(x64emu_t *emu, uintptr_t fnc);
-void pFEipLLLpp(x64emu_t *emu, uintptr_t fnc);
+void pFEupLLLpp(x64emu_t *emu, uintptr_t fnc);
 void pFEpiuCppp(x64emu_t *emu, uintptr_t fnc);
+void pFEpuLpupp(x64emu_t *emu, uintptr_t fnc);
 void pFEppLiiup(x64emu_t *emu, uintptr_t fnc);
 void pFEpppuipV(x64emu_t *emu, uintptr_t fnc);
 void pFEpppppiV(x64emu_t *emu, uintptr_t fnc);
@@ -2935,10 +2931,10 @@ void pFuCCCCpWw(x64emu_t *emu, uintptr_t fnc);
 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 pFpipiuiip(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuuupp(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuupup(x64emu_t *emu, uintptr_t fnc);
+void pFpuLdiiLi(x64emu_t *emu, uintptr_t fnc);
 void pFpupLLLpp(x64emu_t *emu, uintptr_t fnc);
 void pFpupppppp(x64emu_t *emu, uintptr_t fnc);
 void pFplpppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2962,9 +2958,9 @@ void iWEpuuiipp(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuuipp(x64emu_t *emu, uintptr_t fnc);
 void iWpuipuppp(x64emu_t *emu, uintptr_t fnc);
 void vFEpiiiuipp(x64emu_t *emu, uintptr_t fnc);
-void vFEpippippV(x64emu_t *emu, uintptr_t fnc);
-void vFEpippippA(x64emu_t *emu, uintptr_t fnc);
 void vFEpuuuippp(x64emu_t *emu, uintptr_t fnc);
+void vFEpuppippV(x64emu_t *emu, uintptr_t fnc);
+void vFEpuppippA(x64emu_t *emu, uintptr_t fnc);
 void vFEppuipppp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppuippp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppLLpLp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgstreamer.c b/src/wrapped/wrappedgstreamer.c
index 46db408b..f82dd429 100644
--- a/src/wrapped/wrappedgstreamer.c
+++ b/src/wrapped/wrappedgstreamer.c
@@ -655,6 +655,75 @@ static void* findGstBufferForeachMetaFuncFct(void* fct)
     printf_log(LOG_NONE, "Warning, no more slot for gstreamer GstBufferForeachMetaFunc callback\n");
     return NULL;
 }
+//GstMiniObjectCopyFunction
+#define GO(A)   \
+static uintptr_t my_GstMiniObjectCopyFunction_fct_##A = 0;                          \
+static void* my_GstMiniObjectCopyFunction_##A(void* a)                              \
+{                                                                                   \
+    return (void*)RunFunctionFmt(my_GstMiniObjectCopyFunction_fct_##A, "p", a);     \
+}
+SUPER()
+#undef GO
+static void* findGstMiniObjectCopyFunctionFct(void* fct)
+{
+    if(!fct) return fct;
+    void* p;
+    if((p = GetNativeFnc((uintptr_t)fct))) return p;
+    #define GO(A) if(my_GstMiniObjectCopyFunction_fct_##A == (uintptr_t)fct) return my_GstMiniObjectCopyFunction_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_GstMiniObjectCopyFunction_fct_##A == 0) {my_GstMiniObjectCopyFunction_fct_##A = (uintptr_t)fct; return my_GstMiniObjectCopyFunction_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gstreamer GstMiniObjectCopyFunction callback\n");
+    return NULL;
+}
+//GstMiniObjectDisposeFunction
+#define GO(A)   \
+static uintptr_t my_GstMiniObjectDisposeFunction_fct_##A = 0;                       \
+static int my_GstMiniObjectDisposeFunction_##A(void* a)                             \
+{                                                                                   \
+    return (int)RunFunctionFmt(my_GstMiniObjectDisposeFunction_fct_##A, "p", a);    \
+}
+SUPER()
+#undef GO
+static void* findGstMiniObjectDisposeFunctionFct(void* fct)
+{
+    if(!fct) return fct;
+    void* p;
+    if((p = GetNativeFnc((uintptr_t)fct))) return p;
+    #define GO(A) if(my_GstMiniObjectDisposeFunction_fct_##A == (uintptr_t)fct) return my_GstMiniObjectDisposeFunction_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_GstMiniObjectDisposeFunction_fct_##A == 0) {my_GstMiniObjectDisposeFunction_fct_##A = (uintptr_t)fct; return my_GstMiniObjectDisposeFunction_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gstreamer GstMiniObjectDisposeFunction callback\n");
+    return NULL;
+}
+//GstMiniObjectFreeFunction
+#define GO(A)   \
+static uintptr_t my_GstMiniObjectFreeFunction_fct_##A = 0;          \
+static void my_GstMiniObjectFreeFunction_##A(void* a)               \
+{                                                                   \
+    RunFunctionFmt(my_GstMiniObjectFreeFunction_fct_##A, "p", a);   \
+}
+SUPER()
+#undef GO
+static void* findGstMiniObjectFreeFunctionFct(void* fct)
+{
+    if(!fct) return fct;
+    void* p;
+    if((p = GetNativeFnc((uintptr_t)fct))) return p;
+    #define GO(A) if(my_GstMiniObjectFreeFunction_fct_##A == (uintptr_t)fct) return my_GstMiniObjectFreeFunction_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_GstMiniObjectFreeFunction_fct_##A == 0) {my_GstMiniObjectFreeFunction_fct_##A = (uintptr_t)fct; return my_GstMiniObjectFreeFunction_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gstreamer GstMiniObjectFreeFunction callback\n");
+    return NULL;
+}
 
 #undef SUPER
 
@@ -688,14 +757,14 @@ EXPORT void my_gst_structure_remove_fields_valist(x64emu_t* emu, void* structure
     my->gst_structure_remove_fields_valist(structure, field, VARARGS);
 }
 
-EXPORT void my_gst_debug_log(x64emu_t* emu, void* cat, int level, void* file, void* func, int line, void* obj, void* fmt, void* b) {
+EXPORT void my_gst_debug_log(x64emu_t* emu, void* cat, uint32_t level, void* file, void* func, int line, void* obj, void* fmt, void* b) {
 
     myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 7);
     PREPARE_VALIST;
     my->gst_debug_log_valist(cat, level, file, func, line, obj, fmt, VARARGS);
 }
 
-EXPORT void my_gst_debug_log_valist(x64emu_t* emu, void* cat, int level, void* file, void* func, int line, void* obj, void* fmt, x64_va_list_t V) {
+EXPORT void my_gst_debug_log_valist(x64emu_t* emu, void* cat, uint32_t level, void* file, void* func, int line, void* obj, void* fmt, x64_va_list_t V) {
 
     #ifdef CONVERT_VALIST
     CONVERT_VALIST(V);
@@ -765,7 +834,7 @@ EXPORT void* my_gst_structure_new(x64emu_t* emu, void* name, void* first, uint64
     return my->gst_structure_new_valist(name, first, VARARGS);
 }
 
-EXPORT void my_gst_mini_object_set_qdata(x64emu_t* emu, void* object, void* quark, void* data, void* d)
+EXPORT void my_gst_mini_object_set_qdata(x64emu_t* emu, void* object, uint32_t quark, void* data, void* d)
 {
     my->gst_mini_object_set_qdata(object, quark, data, findDestroyFct(d));
 }
@@ -959,12 +1028,12 @@ EXPORT void my_gst_structure_set(x64emu_t* emu, void* st, void* fieldname, uintp
     my->gst_structure_set_valist(st, fieldname, VARARGS);
 }
 
-EXPORT int my_gst_iterator_fold(x64emu_t* emu, void* it, void* f, void* ret, void* data)
+EXPORT uint32_t my_gst_iterator_fold(x64emu_t* emu, void* it, void* f, void* ret, void* data)
 {
     return my->gst_iterator_fold(it, findGstIteratorFoldFunctionFct(f), ret, data);
 }
 
-EXPORT void* my_gst_util_array_binary_search(x64emu_t* emu, void* array, uint32_t num, size_t size, void* f, int mode, void* search, void* data)
+EXPORT void* my_gst_util_array_binary_search(x64emu_t* emu, void* array, uint32_t num, size_t size, void* f, uint32_t mode, void* search, void* data)
 {
     return my->gst_util_array_binary_search(array, num, size, findGCompareDataFuncFct(f), mode, search, data);
 }
@@ -997,7 +1066,7 @@ EXPORT void my_gst_tag_list_foreach(x64emu_t* emu, void* list, void* f, void* da
     my->gst_tag_list_foreach(list, findGstTagForeachFuncFct(f), data);
 }
 
-EXPORT void* my_gst_memory_new_wrapped(x64emu_t* emu, int flags, void* data, size_t maxsz, size_t offset, size_t size, void* user_data, void* d)
+EXPORT void* my_gst_memory_new_wrapped(x64emu_t* emu, uint32_t flags, void* data, size_t maxsz, size_t offset, size_t size, void* user_data, void* d)
 {
     return my->gst_memory_new_wrapped(flags, data, maxsz, offset, size, user_data, findDestroyFct(d));
 }
@@ -1018,6 +1087,23 @@ EXPORT void* my_gst_pad_create_stream_id_printf(x64emu_t* emu, void* pad, void*
     return my->gst_pad_create_stream_id_printf_valist(pad, parent, id, VARARGS);
 }
 
+EXPORT void* my_gst_caps_features_new_id_valist(x64emu_t* emu, uint32_t id, x64_va_list_t V)
+{
+    #ifdef CONVERT_VALIST
+    CONVERT_VALIST(V);
+    #else
+    CREATE_VALIST_FROM_VALIST(V, emu->scratch);
+    #endif
+    return my->gst_caps_features_new_id_valist(id, VARARGS);
+}
+
+EXPORT void* my_gst_caps_features_new_id(x64emu_t* emu, uint32_t id, uintptr_t* b)
+{
+    CREATE_VALIST_FROM_VAARG(b, emu->scratch, 1);
+    return my->gst_caps_features_new_id_valist(id, VARARGS);
+}
+
+
 EXPORT void my_gst_pad_set_activate_function_full(x64emu_t* emu, void* pad, void* f, void* data, void* d)
 {
     my->gst_pad_set_activate_function_full(pad, findGstPadActivateFunctionFct(f), data, findDestroyFct(d));
@@ -1071,7 +1157,7 @@ EXPORT void* my_gst_caps_features_new(x64emu_t* emu, void* feat1, uintptr_t* b)
     return my->gst_caps_features_new_valist(feat1, VARARGS);
 }
 
-EXPORT unsigned long my_gst_pad_add_probe(x64emu_t* emu, void* pad, int mask, void* f, void* data, void* d)
+EXPORT unsigned long my_gst_pad_add_probe(x64emu_t* emu, void* pad, uint32_t mask, void* f, void* data, void* d)
 {
     return my->gst_pad_add_probe(pad, mask, findGstPadProbeCallbackFct(f), data, findDestroyFct(d));
 }
@@ -1137,6 +1223,11 @@ EXPORT int my_gst_buffer_foreach_meta(x64emu_t* emu, void* buff, void* f, void*
     return my->gst_buffer_foreach_meta(buff, findGstBufferForeachMetaFuncFct(f), data);
 }
 
+EXPORT void my_gst_mini_object_init(x64emu_t* emu, void* obj, uint32_t flags, size_t type, void* copy_f, void* disp_f, void* free_f)
+{
+    my->gst_mini_object_init(obj, flags, type, findGstMiniObjectCopyFunctionFct(copy_f), findGstMiniObjectDisposeFunctionFct(disp_f), findGstMiniObjectFreeFunctionFct(free_f));
+}
+
 #define PRE_INIT    \
     if(box64_nogtk) \
         return -1;
diff --git a/src/wrapped/wrappedgstreamer_private.h b/src/wrapped/wrappedgstreamer_private.h
index 46bcc95f..089265b3 100644
--- a/src/wrapped/wrappedgstreamer_private.h
+++ b/src/wrapped/wrappedgstreamer_private.h
@@ -1,19 +1,19 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(gst_allocation_params_copy, pFp)
-//GO(gst_allocation_params_free, 
-//GO(gst_allocation_params_get_type, 
+GO(gst_allocation_params_free, vFp)
+GO(gst_allocation_params_get_type, LFv)
 GO(gst_allocation_params_init, vFp)
 GO(gst_allocator_alloc, pFpLp)
 GO(gst_allocator_find, pFp)
-//GO(gst_allocator_flags_get_type, 
-//GO(gst_allocator_free, 
+GO(gst_allocator_flags_get_type, LFv)
+GO(gst_allocator_free, vFpp)
 GO(gst_allocator_get_type, LFv)
-//GO(gst_allocator_register, 
-//GO(gst_allocator_set_default, 
-//GO(gst_atomic_queue_get_type, 
+GO(gst_allocator_register, vFpp)
+GO(gst_allocator_set_default, vFp)
+GO(gst_atomic_queue_get_type, LFv)
 GO(gst_atomic_queue_length, uFp)
 GO(gst_atomic_queue_new, pFu)
 GO(gst_atomic_queue_peek, pFp)
@@ -23,7 +23,7 @@ GO(gst_atomic_queue_ref, vFp)
 GO(gst_atomic_queue_unref, vFp)
 GO(gst_bin_add, iFpp)
 GOM(gst_bin_add_many, vFEppV)
-GO(gst_bin_find_unlinked_pad, pFpi)
+GO(gst_bin_find_unlinked_pad, pFpu)
 GO(gst_bin_flags_get_type, LFv)
 GO(gst_bin_get_by_interface, pFpL)
 GO(gst_bin_get_by_name, pFpp)
@@ -31,7 +31,7 @@ GO(gst_bin_get_by_name_recurse_up, pFpp)
 GO(gst_bin_get_suppressed_flags, uFp)
 GO(gst_bin_get_type, LFv)
 GO(gst_bin_iterate_all_by_element_factory_name, pFpp)
-GO(gst_bin_iterate_all_by_interface, pFpp)
+GO(gst_bin_iterate_all_by_interface, pFpL)
 GO(gst_bin_iterate_elements, pFp)
 GO(gst_bin_iterate_recurse, pFp)
 GO(gst_bin_iterate_sinks, pFp)
@@ -40,23 +40,23 @@ GO(gst_bin_iterate_sources, pFp)
 GO(gst_bin_new, pFp)
 GO(gst_bin_recalculate_latency, iFp)
 GO(gst_bin_remove, iFpp)
-//GOM(gst_bin_remove_many, iFEppV)
+//GOM(gst_bin_remove_many, vFEppV)
 GO(gst_bin_set_suppressed_flags, vFpu)
 GO(gst_bin_sync_children_states, iFp)
 GO(gst_bitmask_get_type, LFv)
-DATAB(_gst_bitmask_type, sizeof(void*))
+DATAB(_gst_bitmask_type, 8)
 GO(gst_buffer_add_meta, pFppp)
 GO(gst_buffer_add_parent_buffer_meta, pFpp)
 GO(gst_buffer_add_protection_meta, pFpp)
-GO(gst_buffer_add_reference_timestamp_meta, pFppUU)
+GO(gst_buffer_add_reference_timestamp_meta, pFppLL)
 GO(gst_buffer_append, pFpp)
 GO(gst_buffer_append_memory, vFpp)
 GO(gst_buffer_append_region, pFppll)
 GO(gst_buffer_copy, pFp)
 GO(gst_buffer_copy_deep, pFp)
 GO(gst_buffer_copy_flags_get_type, LFv)
-GO(gst_buffer_copy_into, iFppiLL)
-GO(gst_buffer_copy_region, pFpiLL)
+GO(gst_buffer_copy_into, iFppuLL)
+GO(gst_buffer_copy_region, pFpuLL)
 GO(gst_buffer_extract, LFpLpL)
 GO(gst_buffer_extract_dup, vFpLLpp)
 GO(gst_buffer_fill, LFpLpL)
@@ -64,55 +64,55 @@ GO(gst_buffer_find_memory, iFpLLppp)
 GO(gst_buffer_flags_get_type, LFv)
 GOM(gst_buffer_foreach_meta, iFEppp)
 GO(gst_buffer_get_all_memory, pFp)
-GO(gst_buffer_get_flags, iFp)
+GO(gst_buffer_get_flags, uFp)
 GO(gst_buffer_get_max_memory, uFv)
 GO(gst_buffer_get_memory, pFpu)
 GO(gst_buffer_get_memory_range, pFpui)
-GO(gst_buffer_get_meta, pFpp)
-GO(gst_buffer_get_n_meta, uFpp)
+GO(gst_buffer_get_meta, pFpL)
+GO(gst_buffer_get_n_meta, uFpL)
 GO(gst_buffer_get_reference_timestamp_meta, pFpp)
 GO(gst_buffer_get_size, LFp)
 GO(gst_buffer_get_sizes, LFppp)
 GO(gst_buffer_get_sizes_range, LFpuipp)
 GO(gst_buffer_get_type, LFv)
-GO(gst_buffer_has_flags, iFpi)
+GO(gst_buffer_has_flags, iFpu)
 GO(gst_buffering_mode_get_type, LFv)
 GO(gst_buffer_insert_memory, vFpip)
 GO(gst_buffer_is_all_memory_writable, iFp)
 GO(gst_buffer_is_memory_range_writable, iFpui)
 GO(gst_buffer_iterate_meta, pFpp)
-GO(gst_buffer_iterate_meta_filtered, pFppp)
+GO(gst_buffer_iterate_meta_filtered, pFppL)
 GO(gst_buffer_list_calculate_size, LFp)
-//GO(gst_buffer_list_copy, 
+GO(gst_buffer_list_copy, pFp)
 GO(gst_buffer_list_copy_deep, pFp)
-//GO(gst_buffer_list_foreach, 
+//GOM(gst_buffer_list_foreach, iFEppp)
 GO(gst_buffer_list_get, pFpu)
-//GO(gst_buffer_list_get_type, 
-//GO(gst_buffer_list_get_writable, 
+GO(gst_buffer_list_get_type, LFv)
+GO(gst_buffer_list_get_writable, pFpu)
 GO(gst_buffer_list_insert, vFpip)
 GO(gst_buffer_list_length, uFp)
 GO(gst_buffer_list_new, pFv)
 GO(gst_buffer_list_new_sized, pFu)
 GO(gst_buffer_list_ref, pFp)
 GO(gst_buffer_list_remove, vFpuu)
-//GO(gst_buffer_list_replace, 
+GO(gst_buffer_list_replace, iFpp)
 GO(gst_buffer_list_take, iFpp)
-//DATAB(_gst_buffer_list_type, 
-//GO(gst_buffer_list_unref, 
-GO(gst_buffer_map, iFppi)
-GO(gst_buffer_map_range, iFpuipi)
+DATAB(_gst_buffer_list_type, 8)
+GO(gst_buffer_list_unref, vFp)
+GO(gst_buffer_map, iFppu)
+GO(gst_buffer_map_range, iFpuipu)
 GO(gst_buffer_memcmp, iFpLpL)
 GO(gst_buffer_memset, LFpLCL)
 GO(gst_buffer_new, pFv)
-GO(gst_buffer_new_allocate, pFplp)
+GO(gst_buffer_new_allocate, pFpLp)
 GO(gst_buffer_new_memdup, pFpL)
-GO(gst_buffer_new_wrapped, pFpl)
+GO(gst_buffer_new_wrapped, pFpL)
 GO(gst_buffer_new_wrapped_bytes, pFp)
-GOM(gst_buffer_new_wrapped_full, pFEiplllpp)
+GOM(gst_buffer_new_wrapped_full, pFEupLLLpp)
 GO(gst_buffer_n_memory, uFp)
 GO(gst_buffer_peek_memory, pFpu)
 GO(gst_buffer_pool_acquire_buffer, iFppp)
-//GO(gst_buffer_pool_acquire_flags_get_type, 
+GO(gst_buffer_pool_acquire_flags_get_type, LFv)
 GO(gst_buffer_pool_config_add_option, vFpp)
 GO(gst_buffer_pool_config_get_allocator, iFppp)
 GO(gst_buffer_pool_config_get_option, pFpu)
@@ -128,7 +128,7 @@ GO(gst_buffer_pool_get_type, LFv)
 GO(gst_buffer_pool_has_option, iFpp)
 GO(gst_buffer_pool_is_active, iFp)
 GO(gst_buffer_pool_new, pFv)
-//GO(gst_buffer_pool_release_buffer, 
+GO(gst_buffer_pool_release_buffer, vFpp)
 GO(gst_buffer_pool_set_active, iFpi)
 GO(gst_buffer_pool_set_config, iFpp)
 GO(gst_buffer_pool_set_flushing, vFpi)
@@ -144,12 +144,12 @@ GO(gst_buffer_replace_memory, vFpup)
 GO(gst_buffer_replace_memory_range, vFpuip)
 GO(gst_buffer_resize, vFpll)
 GO(gst_buffer_resize_range, iFpuill)
-GO(gst_buffer_set_flags, iFpi)
+GO(gst_buffer_set_flags, iFpu)
 GO(gst_buffer_set_size, vFpl)
-DATAB(_gst_buffer_type, sizeof(void*))
+DATAB(_gst_buffer_type, 8)
 GO(gst_buffer_unmap, vFpp)
 GO(gst_buffer_unref, vFp)
-GO(gst_buffer_unset_flags, iFpi)
+GO(gst_buffer_unset_flags, iFpu)
 GO(gst_bus_add_signal_watch, vFp)
 GO(gst_bus_add_signal_watch_full, vFpi)
 GOM(gst_bus_add_watch, uFEppp)
@@ -164,7 +164,7 @@ GO(gst_bus_get_type, LFv)
 GO(gst_bus_have_pending, iFp)
 GO(gst_bus_new, pFv)
 GO(gst_bus_peek, pFp)
-GO(gst_bus_poll, pFppU)
+GO(gst_bus_poll, pFpiL)
 GO(gst_bus_pop, pFp)
 GO(gst_bus_pop_filtered, pFpi)
 GO(gst_bus_post, iFpp)
@@ -173,11 +173,11 @@ GO(gst_bus_remove_watch, iFp)
 GO(gst_bus_set_flushing, vFpi)
 GOM(gst_bus_set_sync_handler, vFEpppp)
 GO(gst_bus_sync_reply_get_type, LFv)
-GO(gst_bus_sync_signal_handler, iFppp)
-GO(gst_bus_timed_pop, pFpU)
-GO(gst_bus_timed_pop_filtered, pFpUi)
+GO(gst_bus_sync_signal_handler, uFppp)
+GO(gst_bus_timed_pop, pFpL)
+GO(gst_bus_timed_pop_filtered, pFpLi)
 GO(gst_calculate_linear_regression, iFppuppppp)
-DATAB(_gst_caps_any, sizeof(void*))
+DATAB(_gst_caps_any, 8)
 GO(gst_caps_append, vFpp)
 GO(gst_caps_append_structure, vFpp)
 GO(gst_caps_append_structure_full, vFppp)
@@ -185,8 +185,8 @@ GO(gst_caps_can_intersect, iFpp)
 GO(gst_caps_copy, pFp)
 GO(gst_caps_copy_nth, pFpu)
 GO(gst_caps_features_add, vFpp)
-//GO(gst_caps_features_add_id, 
-//DATAB(_gst_caps_features_any, 
+GO(gst_caps_features_add_id, vFpu)
+//DATAB(_gst_caps_features_any, 8)
 GO(gst_caps_features_contains, iFpp)
 GO(gst_caps_features_contains_id, iFpu)
 GO(gst_caps_features_copy, pFp)
@@ -195,22 +195,22 @@ GO(gst_caps_features_from_string, pFp)
 GO(gst_caps_features_get_nth, pFpu)
 GO(gst_caps_features_get_nth_id, uFpu)
 GO(gst_caps_features_get_size, uFp)
-//GO(gst_caps_features_get_type, 
+GO(gst_caps_features_get_type, LFv)
 GO(gst_caps_features_is_any, iFp)
 GO(gst_caps_features_is_equal, iFpp)
-DATAB(_gst_caps_features_memory_system_memory, sizeof(void*))
+DATAB(_gst_caps_features_memory_system_memory, 8)
 GOM(gst_caps_features_new, pFEpV)
 GO(gst_caps_features_new_any, pFv)
-//GO(gst_caps_features_new_empty, 
-//GO(gst_caps_features_new_id, 
-GO(gst_caps_features_new_id_valist, pFup)
+GO(gst_caps_features_new_empty, pFv)
+GOM(gst_caps_features_new_id, pFEuV)
+GOM(gst_caps_features_new_id_valist, pFEuA)
 GOM(gst_caps_features_new_valist, pFEpA)
 GO(gst_caps_features_remove, vFpp)
 GO(gst_caps_features_remove_id, vFpu)
 GO(gst_caps_features_set_parent_refcount, iFpp)
 GO(gst_caps_features_to_string, pFp)
-//DATAB(_gst_caps_features_type, 
-//GO(gst_caps_filter_and_map_in_place, 
+DATAB(_gst_caps_features_type, 8)
+//GOM(gst_caps_filter_and_map_in_place, vFEppp)
 GO(gst_caps_fixate, pFp)
 GO(gst_caps_flags_get_type, LFv)
 GOM(gst_caps_foreach, iFEppp)
@@ -220,7 +220,7 @@ GO(gst_caps_get_size, uFp)
 GO(gst_caps_get_structure, pFpu)
 GO(gst_caps_get_type, LFv)
 GO(gst_caps_intersect, pFpp)
-GO(gst_caps_intersect_full, pFppi)
+GO(gst_caps_intersect_full, pFppu)
 GO(gst_caps_intersect_mode_get_type, LFv)
 GO(gst_caps_is_always_compatible, iFpp)
 GO(gst_caps_is_any, iFp)
@@ -232,7 +232,7 @@ GO(gst_caps_is_strictly_equal, iFpp)
 GO(gst_caps_is_subset, iFpp)
 GO(gst_caps_is_subset_structure, iFpp)
 GO(gst_caps_is_subset_structure_full, iFppp)
-//GOM(gst_caps_map_in_place, iFEpBp)
+//GOM(gst_caps_map_in_place, iFEppp)
 GO(gst_caps_merge, pFpp)
 GO(gst_caps_merge_structure, pFpp)
 GO(gst_caps_merge_structure_full, pFppp)
@@ -242,10 +242,10 @@ GO(gst_caps_new_empty_simple, pFp)
 //GOM(gst_caps_new_full, pFEpV)
 //GOM(gst_caps_new_full_valist, pFEpA)
 GOM(gst_caps_new_simple, pFEppV)
-DATAB(_gst_caps_none, sizeof(void*))
+DATAB(_gst_caps_none, 8)
 GO(gst_caps_normalize, pFp)
 GO(gst_caps_ref, pFp)
-GO(gst_caps_remove_structure, vFpp)
+GO(gst_caps_remove_structure, vFpu)
 GO(gst_caps_replace, iFpp)
 GO(gst_caps_set_features, vFpup)
 GO(gst_caps_set_features_simple, vFpp)
@@ -258,7 +258,7 @@ GO(gst_caps_subtract, pFpp)
 GO(gst_caps_take, iFpp)
 GO(gst_caps_to_string, pFp)
 GO(gst_caps_truncate, pFp)
-DATAB(_gst_caps_type, sizeof(void*))
+DATAB(_gst_caps_type, 8)
 GO(gst_caps_unref, vFp)
 //DATAB(GST_CAT_BUFFER, 
 //DATAB(GST_CAT_BUFFER_LIST, 
@@ -267,7 +267,7 @@ GO(gst_caps_unref, vFp)
 //DATAB(GST_CAT_CAPS, 
 //DATAB(GST_CAT_CLOCK, 
 //DATAB(GST_CAT_CONTEXT, 
-DATAB(GST_CAT_DEFAULT, sizeof(void*))
+DATAB(GST_CAT_DEFAULT, 8)
 //DATAB(GST_CAT_ELEMENT_PADS, 
 //DATAB(GST_CAT_ERROR_SYSTEM, 
 //DATAB(GST_CAT_EVENT, 
@@ -294,112 +294,112 @@ DATAB(GST_CAT_DEFAULT, sizeof(void*))
 //DATAB(GST_CAT_STATES, 
 GO(gst_child_proxy_child_added, vFppp)
 GO(gst_child_proxy_child_removed, vFppp)
-//GO(gst_child_proxy_get, 
+//GOM(gst_child_proxy_get, vFEppV)
 GO(gst_child_proxy_get_child_by_index, pFpu)
-//GO(gst_child_proxy_get_child_by_name, 
+GO(gst_child_proxy_get_child_by_name, pFpp)
 GO(gst_child_proxy_get_children_count, uFp)
 GO(gst_child_proxy_get_property, vFppp)
 GO(gst_child_proxy_get_type, LFv)
-//GO(gst_child_proxy_get_valist, 
+//GOM(gst_child_proxy_get_valist, vFEppA)
 GO(gst_child_proxy_lookup, iFpppp)
-//GO(gst_child_proxy_set, 
+//GOM(gst_child_proxy_set, vFEppV)
 GO(gst_child_proxy_set_property, vFppp)
-//GO(gst_child_proxy_set_valist, 
-//GO(gst_clear_buffer, 
-//GO(gst_clear_buffer_list, 
+//GOM(gst_child_proxy_set_valist, vFEppA)
+GO(gst_clear_buffer, vFp)
+GO(gst_clear_buffer_list, vFp)
 GO(gst_clear_caps, vFp)
 GO(gst_clear_event, vFp)
 GO(gst_clear_message, vFp)
 GO(gst_clear_mini_object, vFp)
-//GO(gst_clear_object, 
+GO(gst_clear_object, vFp)
 GO(gst_clear_query, vFp)
 GO(gst_clear_structure, vFp)
-//GO(gst_clear_tag_list, 
-//GO(gst_clear_uri, 
+GO(gst_clear_tag_list, vFp)
+GO(gst_clear_uri, vFp)
 GO(gst_clock_add_observation, iFpLLp)
 GO(gst_clock_add_observation_unapplied, iFpLLppppp)
-//GO(gst_clock_adjust_unlocked, 
-//GO(gst_clock_adjust_with_calibration, 
-//GO(gst_clock_entry_type_get_type, 
-//GO(gst_clock_flags_get_type, 
+GO(gst_clock_adjust_unlocked, LFpL)
+GO(gst_clock_adjust_with_calibration, LFpLLLLL)
+GO(gst_clock_entry_type_get_type, LFv)
+GO(gst_clock_flags_get_type, LFv)
 GO(gst_clock_get_calibration, vFppppp)
 GO(gst_clock_get_internal_time, LFp)
 GO(gst_clock_get_master, pFp)
-//GO(gst_clock_get_resolution, 
-GO(gst_clock_get_time, UFp)
-//GO(gst_clock_get_timeout, 
-//GO(gst_clock_get_type, 
-//GO(gst_clock_id_compare_func, 
+GO(gst_clock_get_resolution, LFp)
+GO(gst_clock_get_time, LFp)
+GO(gst_clock_get_timeout, LFp)
+GO(gst_clock_get_type, LFv)
+GO(gst_clock_id_compare_func, iFpp)
 GO(gst_clock_id_get_clock, pFp)
 GO(gst_clock_id_get_time, LFp)
 GO(gst_clock_id_ref, pFp)
-//GO(gst_clock_id_unref, 
+GO(gst_clock_id_unref, vFp)
 GO(gst_clock_id_unschedule, vFp)
 GO(gst_clock_id_uses_clock, iFpp)
 GO(gst_clock_id_wait, uFpp)
-//GO(gst_clock_id_wait_async, 
+//GOM(gst_clock_id_wait_async, uFEpppp)
 GO(gst_clock_is_synced, iFp)
 GO(gst_clock_new_periodic_id, pFpLL)
 GO(gst_clock_new_single_shot_id, pFpL)
 GO(gst_clock_periodic_id_reinit, iFppLL)
-//GO(gst_clock_return_get_type, 
+GO(gst_clock_return_get_type, LFv)
 GO(gst_clock_set_calibration, vFpLLLL)
 GO(gst_clock_set_master, iFpp)
-//GO(gst_clock_set_resolution, 
+GO(gst_clock_set_resolution, LFpL)
 GO(gst_clock_set_synced, vFpi)
 GO(gst_clock_set_timeout, vFpL)
 GO(gst_clock_single_shot_id_reinit, iFppL)
-//GO(gst_clock_type_get_type, 
+GO(gst_clock_type_get_type, LFv)
 GO(gst_clock_unadjust_unlocked, LFpL)
 GO(gst_clock_unadjust_with_calibration, LFpLLLLL)
 GO(gst_clock_wait_for_sync, iFpL)
 GO(gst_context_copy, pFp)
 GO(gst_context_get_context_type, pFp)
 GO(gst_context_get_structure, pFp)
-//GO(gst_context_get_type, 
+GO(gst_context_get_type, LFv)
 GO(gst_context_has_context_type, iFpp)
 GO(gst_context_is_persistent, iFp)
 GO(gst_context_new, pFpi)
 GO(gst_context_ref, pFp)
 GO(gst_context_replace, iFpp)
-//DATAB(_gst_context_type, 
-//GO(gst_context_unref, 
+DATAB(_gst_context_type, 8)
+GO(gst_context_unref, vFp)
 GO(gst_context_writable_structure, pFp)
 GO(gst_control_binding_get_g_value_array, iFpLLup)
-//GO(gst_control_binding_get_type, 
+GO(gst_control_binding_get_type, LFv)
 GO(gst_control_binding_get_value, pFpL)
 GO(gst_control_binding_get_value_array, iFpLLup)
 GO(gst_control_binding_is_disabled, iFp)
 GO(gst_control_binding_set_disabled, vFpi)
 GO(gst_control_binding_sync_values, iFppLL)
-//GO(gst_control_source_get_type, 
-//GO(gst_control_source_get_value, 
-//GO(gst_control_source_get_value_array, 
-//GO(gst_core_error_get_type, 
-GO(gst_core_error_quark, pFv)
-//GO(gst_date_time_get_day, 
-//GO(gst_date_time_get_hour, 
+GO(gst_control_source_get_type, LFv)
+//GOM(gst_control_source_get_value, iFEpLp)
+//GOM(gst_control_source_get_value_array, iFEpLLup)
+GO(gst_core_error_get_type, LFv)
+GO(gst_core_error_quark, uFv)
+GO(gst_date_time_get_day, iFp)
+GO(gst_date_time_get_hour, iFp)
 GO(gst_date_time_get_microsecond, iFp)
-//GO(gst_date_time_get_minute, 
-//GO(gst_date_time_get_month, 
-//GO(gst_date_time_get_second, 
+GO(gst_date_time_get_minute, iFp)
+GO(gst_date_time_get_month, iFp)
+GO(gst_date_time_get_second, iFp)
 GO(gst_date_time_get_time_zone_offset, fFp)
-//GO(gst_date_time_get_type, 
-//GO(gst_date_time_get_year, 
-//GO(gst_date_time_has_day, 
-//GO(gst_date_time_has_month, 
+GO(gst_date_time_get_type, LFv)
+GO(gst_date_time_get_year, iFp)
+GO(gst_date_time_has_day, iFp)
+GO(gst_date_time_has_month, iFp)
 GO(gst_date_time_has_second, iFp)
-//GO(gst_date_time_has_time, 
-//GO(gst_date_time_has_year, 
+GO(gst_date_time_has_time, iFp)
+GO(gst_date_time_has_year, iFp)
 GO(gst_date_time_new, pFfiiiiid)
 GO(gst_date_time_new_from_g_date_time, pFp)
 GO(gst_date_time_new_from_iso8601_string, pFp)
-//GO(gst_date_time_new_from_unix_epoch_local_time, 
-//GO(gst_date_time_new_from_unix_epoch_local_time_usecs, 
-//GO(gst_date_time_new_from_unix_epoch_utc, 
+GO(gst_date_time_new_from_unix_epoch_local_time, pFl)
+GO(gst_date_time_new_from_unix_epoch_local_time_usecs, pFl)
+GO(gst_date_time_new_from_unix_epoch_utc, pFl)
 GO(gst_date_time_new_from_unix_epoch_utc_usecs, pFl)
 GO(gst_date_time_new_local_time, pFiiiiid)
-//GO(gst_date_time_new_now_local_time, 
+GO(gst_date_time_new_now_local_time, pFv)
 GO(gst_date_time_new_now_utc, pFv)
 GO(gst_date_time_new_y, pFi)
 GO(gst_date_time_new_ym, pFii)
@@ -407,65 +407,65 @@ GO(gst_date_time_new_ymd, pFiii)
 GO(gst_date_time_ref, pFp)
 GO(gst_date_time_to_g_date_time, pFp)
 GO(gst_date_time_to_iso8601_string, pFp)
-DATAB(_gst_date_time_type, sizeof(void*))
+DATAB(_gst_date_time_type, 8)
 GO(gst_date_time_unref, vFp)
-//GO(gst_debug_add_log_function, 
+//GOM(gst_debug_add_log_function, vFEppp)
 GO(gst_debug_add_ring_buffer_logger, vFuu)
 GO(gst_debug_bin_to_dot_data, pFpi)
-//GO(gst_debug_bin_to_dot_file, 
+GO(gst_debug_bin_to_dot_file, vFpip)
 GO(gst_debug_bin_to_dot_file_with_ts, vFpip)
-//GO(gst_debug_category_free, 
+GO(gst_debug_category_free, vFp)
 GO(gst_debug_category_get_color, uFp)
 GO(gst_debug_category_get_description, pFp)
-//GO(gst_debug_category_get_name, 
+GO(gst_debug_category_get_name, pFp)
 GO(gst_debug_category_get_threshold, uFp)
 GO(_gst_debug_category_new, pFpup)
 GO(gst_debug_category_reset_threshold, vFp)
 GO(gst_debug_category_set_threshold, vFpu)
-//GO(gst_debug_color_flags_get_type, 
-//GO(gst_debug_color_mode_get_type, 
+GO(gst_debug_color_flags_get_type, LFv)
+GO(gst_debug_color_mode_get_type, LFv)
 GO(gst_debug_construct_term_color, pFu)
 GO(gst_debug_construct_win_color, iFu)
 GO(_gst_debug_dump_mem, vFpppipppu)
-//DATAB(_gst_debug_enabled, 
+DATAB(_gst_debug_enabled, 4)
 GO(gst_debug_get_all_categories, pFv)
 GO(_gst_debug_get_category, pFp)
 GO(gst_debug_get_color_mode, uFv)
 GO(gst_debug_get_default_threshold, uFv)
 GO(gst_debug_get_stack_trace, pFu)
-//GO(gst_debug_graph_details_get_type, 
-//GO(gst_debug_is_active, 
-//GO(gst_debug_is_colored, 
+GO(gst_debug_graph_details_get_type, LFv)
+GO(gst_debug_is_active, iFv)
+GO(gst_debug_is_colored, iFv)
 GO(gst_debug_level_get_name, pFu)
-//GO(gst_debug_level_get_type, 
-GOM(gst_debug_log, vFEpippippV)
+GO(gst_debug_level_get_type, LFv)
+GOM(gst_debug_log, vFEpuppippV)
 GO(gst_debug_log_default, vFpuppippp)
 GO(gst_debug_log_get_line, pFpuppipp)
-GOM(gst_debug_log_valist, vFEpippippA)
-//GO(gst_debug_message_get, 
-DATAB(_gst_debug_min, sizeof(int))
-//GO(_gst_debug_nameof_funcptr, 
-//GO(gst_debug_print_stack_trace, 
-GO(_gst_debug_register_funcptr, vFpp)
-//GO(gst_debug_remove_log_function, 
+GOM(gst_debug_log_valist, vFEpuppippA)
+GO(gst_debug_message_get, pFp)
+DATAB(_gst_debug_min, 4)
+//GOM(_gst_debug_nameof_funcptr, pFEp)
+GO(gst_debug_print_stack_trace, vFv)
+GOM(_gst_debug_register_funcptr, vFpp)  //no need to wrap it seems, it's the name that get registered
+//GOM(gst_debug_remove_log_function, uFEp)
 GO(gst_debug_remove_log_function_by_data, uFp)
-//GO(gst_debug_remove_ring_buffer_logger, 
+GO(gst_debug_remove_ring_buffer_logger, vFv)
 GO(gst_debug_ring_buffer_logger_get_logs, pFv)
-//GO(gst_debug_set_active, 
-//GO(gst_debug_set_colored, 
+GO(gst_debug_set_active, vFi)
+GO(gst_debug_set_colored, vFi)
 GO(gst_debug_set_color_mode, vFu)
-//GO(gst_debug_set_color_mode_from_string, 
+GO(gst_debug_set_color_mode_from_string, vFp)
 GO(gst_debug_set_default_threshold, vFu)
 GO(gst_debug_set_threshold_for_name, vFpu)
 GO(gst_debug_set_threshold_from_string, vFpi)
 GO(gst_debug_unset_threshold_for_name, vFp)
 GO(gst_deinit, vFv)
 GO(gst_device_create_element, pFpp)
-//GO(gst_device_get_caps, 
+GO(gst_device_get_caps, pFp)
 GO(gst_device_get_device_class, pFp)
-//GO(gst_device_get_display_name, 
+GO(gst_device_get_display_name, pFp)
 GO(gst_device_get_properties, pFp)
-//GO(gst_device_get_type, 
+GO(gst_device_get_type, LFv)
 GO(gst_device_has_classes, iFpp)
 GO(gst_device_has_classesv, iFpp)
 GO(gst_device_monitor_add_filter, uFppp)
@@ -473,19 +473,19 @@ GO(gst_device_monitor_get_bus, pFp)
 GO(gst_device_monitor_get_devices, pFp)
 GO(gst_device_monitor_get_providers, pFp)
 GO(gst_device_monitor_get_show_all_devices, iFp)
-//GO(gst_device_monitor_get_type, 
+GO(gst_device_monitor_get_type, LFv)
 GO(gst_device_monitor_new, pFv)
 GO(gst_device_monitor_remove_filter, iFpu)
 GO(gst_device_monitor_set_show_all_devices, vFpi)
 GO(gst_device_monitor_start, iFp)
-//GO(gst_device_monitor_stop, 
-//GO(gst_device_provider_can_monitor, 
-//GO(gst_device_provider_class_add_metadata, 
-//GO(gst_device_provider_class_add_static_metadata, 
-//GO(gst_device_provider_class_get_metadata, 
-//GO(gst_device_provider_class_set_metadata, 
-//GO(gst_device_provider_class_set_static_metadata, 
-//GO(gst_device_provider_device_add, 
+GO(gst_device_monitor_stop, vFp)
+GO(gst_device_provider_can_monitor, iFp)
+//GOM(gst_device_provider_class_add_metadata, vFEppp)
+//GOM(gst_device_provider_class_add_static_metadata, vFEppp)
+//GOM(gst_device_provider_class_get_metadata, pFEpp)
+//GOM(gst_device_provider_class_set_metadata, vFEppppp)
+//GOM(gst_device_provider_class_set_static_metadata, vFEppppp)
+GO(gst_device_provider_device_add, vFpp)
 GO(gst_device_provider_device_changed, vFppp)
 GO(gst_device_provider_device_remove, vFpp)
 GO(gst_device_provider_factory_find, pFp)
@@ -494,7 +494,7 @@ GO(gst_device_provider_factory_get_by_name, pFp)
 GO(gst_device_provider_factory_get_device_provider_type, LFp)
 GO(gst_device_provider_factory_get_metadata, pFpp)
 GO(gst_device_provider_factory_get_metadata_keys, pFp)
-//GO(gst_device_provider_factory_get_type, 
+GO(gst_device_provider_factory_get_type, LFv)
 GO(gst_device_provider_factory_has_classes, iFpp)
 GO(gst_device_provider_factory_has_classesv, iFpp)
 GO(gst_device_provider_factory_list_get_device_providers, pFu)
@@ -503,37 +503,37 @@ GO(gst_device_provider_get_devices, pFp)
 GO(gst_device_provider_get_factory, pFp)
 GO(gst_device_provider_get_hidden_providers, pFp)
 GO(gst_device_provider_get_metadata, pFpp)
-//GO(gst_device_provider_get_type, 
-//GO(gst_device_provider_hide_provider, 
+GO(gst_device_provider_get_type, LFv)
+GO(gst_device_provider_hide_provider, vFpp)
 GO(gst_device_provider_register, iFppuL)
-//GO(gst_device_provider_start, 
-//GO(gst_device_provider_stop, 
+GO(gst_device_provider_start, iFp)
+GO(gst_device_provider_stop, vFp)
 GO(gst_device_provider_unhide_provider, vFpp)
 GO(gst_device_reconfigure_element, iFpp)
 //DATAB(_gst_disable_registry_cache, 
-//GO(gst_double_range_get_type, 
-//DATAB(_gst_double_range_type, 
-//GO(gst_dynamic_type_factory_get_type, 
+GO(gst_double_range_get_type, LFv)
+DATAB(_gst_double_range_type, 8)
+GO(gst_dynamic_type_factory_get_type, LFv)
 GO(gst_dynamic_type_factory_load, LFp)
 GO(gst_dynamic_type_register, iFpL)
 GO(gst_element_abort_state, vFp)
 GO(gst_element_add_pad, iFpp)
 GO(gst_element_add_property_deep_notify_watch, LFppi)
 GO(gst_element_add_property_notify_watch, LFppi)
-//GOM(gst_element_call_async, vFEpBpB)
+//GOM(gst_element_call_async, vFEpppp)
 GO(gst_element_change_state, uFpu)
 GO(gst_element_class_add_metadata, vFppp)
 GO(gst_element_class_add_pad_template, vFpp)
 GO(gst_element_class_add_static_metadata, vFppp)
 GO(gst_element_class_add_static_pad_template, vFpp)
-GO(gst_element_class_add_static_pad_template_with_gtype, vFppp)
+GO(gst_element_class_add_static_pad_template_with_gtype, vFppL)
 GO(gst_element_class_get_metadata, pFpp)
 GO(gst_element_class_get_pad_template, pFpp)
 GO(gst_element_class_get_pad_template_list, pFp)
 GO(gst_element_class_set_metadata, vFppppp)
 GO(gst_element_class_set_static_metadata, vFppppp)
 GO(gst_element_continue_state, uFpu)
-//GOM(gst_element_create_all_pads, iFEpBp)
+//GOM(gst_element_create_all_pads, vFEp)
 GOM(_gst_element_error_printf, pFEpV)
 GO(gst_element_factory_can_sink_all_caps, iFpp)
 GO(gst_element_factory_can_sink_any_caps, iFpp)
@@ -550,15 +550,15 @@ GO(gst_element_factory_get_type, LFv)
 GO(gst_element_factory_get_uri_protocols, pFp)
 GO(gst_element_factory_get_uri_type, uFp)
 GO(gst_element_factory_has_interface, iFpp)
-GO(gst_element_factory_list_filter, pFppii)
+GO(gst_element_factory_list_filter, pFppui)
 GO(gst_element_factory_list_get_elements, pFLu)
 GO(gst_element_factory_list_is_type, iFpL)
 GO(gst_element_factory_make, pFpp)
 GO(gst_element_flags_get_type, LFv)
-//GOM(gst_element_foreach_pad, iFEpBp)
+//GOM(gst_element_foreach_pad, iFEppp)
 GOM(gst_element_foreach_sink_pad, iFEppp)
-//GOM(gst_element_foreach_src_pad, iFEpBp)
-GO(gst_element_get_base_time, UFp)
+//GOM(gst_element_foreach_src_pad, iFEppp)
+GO(gst_element_get_base_time, LFp)
 GO(gst_element_get_bus, pFp)
 GO(gst_element_get_clock, pFp)
 GO(gst_element_get_compatible_pad, pFppp)
@@ -567,13 +567,13 @@ GO(gst_element_get_context, pFpp)
 GO(gst_element_get_contexts, pFp)
 GO(gst_element_get_context_unlocked, pFpp)
 GO(gst_element_get_current_clock_time, LFp)
-GO(gst_element_get_current_running_time, UFp)
+GO(gst_element_get_current_running_time, LFp)
 GO(gst_element_get_factory, pFp)
 GO(gst_element_get_metadata, pFpp)
 GO(gst_element_get_pad_template, pFpp)
 GO(gst_element_get_pad_template_list, pFp)
-//GO(gst_element_get_request_pad, 
-GO(gst_element_get_start_time, UFp)
+GO(gst_element_get_request_pad, pFpp)
+GO(gst_element_get_start_time, LFp)
 GO(gst_element_get_state, uFpppL)
 GO(gst_element_get_static_pad, pFpp)
 GO(gst_element_get_type, LFv)
@@ -597,8 +597,8 @@ GO(gst_element_provide_clock, pFp)
 GO(gst_element_query, iFpp)
 GO(gst_element_query_convert, iFpulup)
 GO(gst_element_query_duration, iFpup)
-GO(gst_element_query_position, iFpip)
-GO(gst_element_register, iFppup)
+GO(gst_element_query_position, iFpup)
+GO(gst_element_register, iFppuL)
 GO(gst_element_release_request_pad, vFpp)
 GO(gst_element_remove_pad, iFpp)
 GO(gst_element_remove_property_notify_watch, vFpL)
@@ -606,7 +606,7 @@ GO(gst_element_request_pad, pFpppp)
 GO(gst_element_seek, iFpduuulul)
 GO(gst_element_seek_simple, iFpuul)
 GO(gst_element_send_event, iFpp)
-GO(gst_element_set_base_time, vFpU)
+GO(gst_element_set_base_time, vFpL)
 GO(gst_element_set_bus, vFpp)
 GO(gst_element_set_clock, iFpp)
 GO(gst_element_set_context, vFpp)
@@ -622,32 +622,32 @@ GO(gst_element_unlink_pads, vFpppp)
 GO(gst_error_get_message, pFui)
 GO(gst_event_copy, pFp)
 GO(gst_event_copy_segment, vFpp)
-GO(gst_event_get_running_time_offset, IFp)
+GO(gst_event_get_running_time_offset, lFp)
 GO(gst_event_get_seqnum, uFp)
 GO(gst_event_get_structure, pFp)
 GO(gst_event_get_type, LFv)
 GO(gst_event_has_name, iFpp)
-GO(gst_event_has_name_id, iFpp)
-GO(gst_event_new_buffer_size, pFiIIi)
+GO(gst_event_has_name_id, iFpu)
+GO(gst_event_new_buffer_size, pFulli)
 GO(gst_event_new_caps, pFp)
-GO(gst_event_new_custom, pFpp)
+GO(gst_event_new_custom, pFup)
 GO(gst_event_new_eos, pFv)
 GO(gst_event_new_flush_start, pFv)
 GO(gst_event_new_flush_stop, pFi)
-GO(gst_event_new_gap, pFUU)
-GO(gst_event_new_instant_rate_change, pFdi)
-GO(gst_event_new_instant_rate_sync_time, pFdUU)
-GO(gst_event_new_latency, pFU)
+GO(gst_event_new_gap, pFLL)
+GO(gst_event_new_instant_rate_change, pFdu)
+GO(gst_event_new_instant_rate_sync_time, pFdLL)
+GO(gst_event_new_latency, pFL)
 GO(gst_event_new_navigation, pFp)
 GO(gst_event_new_protection, pFppp)
-GO(gst_event_new_qos, pFpdIU)
+GO(gst_event_new_qos, pFudlL)
 GO(gst_event_new_reconfigure, pFv)
-GO(gst_event_new_seek, pFdiiiIiI)
+GO(gst_event_new_seek, pFduuulul)
 GO(gst_event_new_segment, pFp)
-GO(gst_event_new_segment_done, pFiI)
+GO(gst_event_new_segment_done, pFul)
 GO(gst_event_new_select_streams, pFp)
 GO(gst_event_new_sink_message, pFpp)
-GO(gst_event_new_step, pFpUdii)
+GO(gst_event_new_step, pFuLdii)
 GO(gst_event_new_stream_collection, pFp)
 GO(gst_event_new_stream_group_done, pFu)
 GO(gst_event_new_stream_start, pFp)
@@ -658,7 +658,7 @@ GO(gst_event_parse_buffer_size, vFppppp)
 GO(gst_event_parse_caps, vFpp)
 GO(gst_event_parse_flush_stop, vFpp)
 GO(gst_event_parse_gap, vFppp)
-GO(gst_event_parse_group_id, vFpp)
+GO(gst_event_parse_group_id, iFpp)
 GO(gst_event_parse_instant_rate_change, vFppp)
 GO(gst_event_parse_instant_rate_sync_time, vFpppp)
 GO(gst_event_parse_latency, vFpp)
@@ -682,14 +682,14 @@ GO(gst_event_parse_toc_select, vFpp)
 GO(gst_event_ref, pFp)
 GO(gst_event_replace, iFpp)
 GO(gst_event_set_group_id, vFpu)
-GO(gst_event_set_running_time_offset, vFpI)
-GO(gst_event_set_seek_trickmode_interval, vFpU)
+GO(gst_event_set_running_time_offset, vFpl)
+GO(gst_event_set_seek_trickmode_interval, vFpL)
 GO(gst_event_set_seqnum, vFpu)
 GO(gst_event_set_stream, vFpp)
-GO(gst_event_set_stream_flags, vFpi)
+GO(gst_event_set_stream_flags, vFpu)
 GO(gst_event_steal, pFp)
 GO(gst_event_take, iFpp)
-DATAB(_gst_event_type, sizeof(void*))
+DATAB(_gst_event_type, 8)
 GO(gst_event_type_flags_get_type, LFv)
 GO(gst_event_type_get_flags, uFu)
 GO(gst_event_type_get_name, pFu)
@@ -699,9 +699,9 @@ GO(gst_event_unref, vFp)
 GO(gst_event_writable_structure, pFp)
 //DATAB(_gst_executable_path, 
 GO(gst_filename_to_uri, pFpp)
-//GO(gst_flagset_get_type, 
+GO(gst_flagset_get_type, LFv)
 GO(gst_flagset_register, LFL)
-//DATAB(_gst_flagset_type, 
+DATAB(_gst_flagset_type, 8)
 GO(gst_flow_get_name, pFi)
 GO(gst_flow_return_get_type, LFv)
 GO(gst_flow_to_quark, uFi)
@@ -715,84 +715,84 @@ GO(gst_formats_contains, iFpu)
 GO(gst_format_to_quark, uFu)
 GO(gst_fraction_get_type, LFv)
 GO(gst_fraction_range_get_type, LFv)
-DATAB(_gst_fraction_range_type, sizeof(void*))
-DATAB(_gst_fraction_type, sizeof(void*))
+DATAB(_gst_fraction_range_type, 8)
+DATAB(_gst_fraction_type, 8)
 GO(gst_get_main_executable_path, pFv)
-//GO(gst_ghost_pad_activate_mode_default, 
-//GO(gst_ghost_pad_construct, 
-//GO(gst_ghost_pad_get_target, 
+GO(gst_ghost_pad_activate_mode_default, iFppui)
+GO(gst_ghost_pad_construct, iFp)
+GO(gst_ghost_pad_get_target, pFp)
 GO(gst_ghost_pad_get_type, LFv)
-//GO(gst_ghost_pad_internal_activate_mode_default, 
+GO(gst_ghost_pad_internal_activate_mode_default, iFppui)
 GO(gst_ghost_pad_new, pFpp)
-//GO(gst_ghost_pad_new_from_template, 
-//GO(gst_ghost_pad_new_no_target, 
-//GO(gst_ghost_pad_new_no_target_from_template, 
+GO(gst_ghost_pad_new_from_template, pFppp)
+GO(gst_ghost_pad_new_no_target, pFpu)
+GO(gst_ghost_pad_new_no_target_from_template, pFpp)
 GO(gst_ghost_pad_set_target, iFpp)
-//GO(gst_g_thread_get_type, 
-//GO(gst_info_strdup_printf, 
-//GO(gst_info_strdup_vprintf, 
+GO(gst_g_thread_get_type, LFv)
+//GOM(gst_info_strdup_printf, pFEpV)
+//GOM(gst_info_strdup_vprintf, pFEpA)
 GOM(gst_info_vasprintf, iFEppA)
 GOM(gst_init, vFEpp)
 GOM(gst_init_check, iFEppp)
 GO(gst_init_get_option_group, pFv)
-//GO(gst_int64_range_get_type, 
-//DATAB(_gst_int64_range_type, 
+GO(gst_int64_range_get_type, LFv)
+//DATAB(_gst_int64_range_type, 8)
 GO(gst_int_range_get_type, LFv)
-DATAB(_gst_int_range_type, sizeof(void*))
+DATAB(_gst_int_range_type, 8)
 GO(gst_is_caps_features, iFp)
 GO(gst_is_initialized, iFv)
-//GO(gst_iterator_copy, 
-//GO(gst_iterator_filter, 
-//GO(gst_iterator_find_custom, 
-GOM(gst_iterator_fold, iFEpppp)
-//GO(gst_iterator_foreach, 
+GO(gst_iterator_copy, pFp)
+//GOM(gst_iterator_filter, pFEppp)
+//GOM(gst_iterator_find_custom, iFEpppp)
+GOM(gst_iterator_fold, uFEpppp)
+//GOM(gst_iterator_foreach, uFEppp)
 GO(gst_iterator_free, vFp)
-//GO(gst_iterator_get_type, 
-//GO(gst_iterator_item_get_type, 
-//GO(gst_iterator_new, 
-//GO(gst_iterator_new_list, 
+GO(gst_iterator_get_type, LFv)
+GO(gst_iterator_item_get_type, LFv)
+//GOM(gst_iterator_new, pFEuLppppppp)
+//GOM(gst_iterator_new_list, pFELppppp)
 GO(gst_iterator_new_single, pFLp)
-GO(gst_iterator_next, iFpp)
-//GO(gst_iterator_push, 
-//GO(gst_iterator_result_get_type, 
+GO(gst_iterator_next, uFpp)
+GO(gst_iterator_push, vFpp)
+GO(gst_iterator_result_get_type, LFv)
 GO(gst_iterator_resync, vFp)
-//GO(gst_library_error_get_type, 
-GO(gst_library_error_quark, pFv)
-//GO(gst_lock_flags_get_type, 
+GO(gst_library_error_get_type, LFv)
+GO(gst_library_error_quark, uFv)
+GO(gst_lock_flags_get_type, LFv)
 GOM(gst_make_element_message_details, pFEpV)
-//GO(gst_map_flags_get_type, 
-//DATA(gst_memory_alignment, 
-//GO(gst_memory_copy, 
-//GO(gst_memory_flags_get_type, 
-GO(gst_memory_get_sizes, iFppp)
-//GO(gst_memory_get_type, 
+GO(gst_map_flags_get_type, LFv)
+//DATA(gst_memory_alignment, 8)
+GO(gst_memory_copy, pFpll)
+GO(gst_memory_flags_get_type, LFv)
+GO(gst_memory_get_sizes, LFppp)
+GO(gst_memory_get_type, LFv)
 GO(gst_memory_init, vFpuppLLLL)
-//GO(gst_memory_is_span, 
-//GO(gst_memory_is_type, 
-//GO(gst_memory_make_mapped, 
+GO(gst_memory_is_span, iFppp)
+GO(gst_memory_is_type, iFpp)
+GO(gst_memory_make_mapped, pFppu)
 GO(gst_memory_map, iFppu)
-GOM(gst_memory_new_wrapped, pFEipLLLpp)
-//GO(gst_memory_ref, 
-//GO(gst_memory_resize, 
-//GO(gst_memory_share, 
-//DATAB(_gst_memory_type, 
+GOM(gst_memory_new_wrapped, pFEupLLLpp)
+GO(gst_memory_ref, pFp)
+GO(gst_memory_resize, vFplL)
+GO(gst_memory_share, pFpll)
+//DATAB(_gst_memory_type, 8)
 GO(gst_memory_unmap, vFpp)
-//GO(gst_memory_unref, 
+GO(gst_memory_unref, vFp)
 GO(gst_message_add_redirect_entry, vFpppp)
 GO(gst_message_copy, pFp)
-GO(gst_message_get_num_redirect_entries, lFp)
+GO(gst_message_get_num_redirect_entries, LFp)
 GO(gst_message_get_seqnum, uFp)
 GO(gst_message_get_stream_status_object, pFp)
 GO(gst_message_get_structure, pFp)
 GO(gst_message_get_type, LFv)
 GO(gst_message_has_name, iFpp)
 GO(gst_message_new_application, pFpp)
-GO(gst_message_new_async_done, pFpU)
+GO(gst_message_new_async_done, pFpL)
 GO(gst_message_new_async_start, pFp)
 GO(gst_message_new_buffering, pFpi)
 GO(gst_message_new_clock_lost, pFpp)
 GO(gst_message_new_clock_provide, pFppi)
-GO(gst_message_new_custom, pFppp)
+GO(gst_message_new_custom, pFipp)
 GO(gst_message_new_device_added, pFpp)
 GO(gst_message_new_device_changed, pFppp)
 GO(gst_message_new_device_removed, pFpp)
@@ -804,27 +804,27 @@ GO(gst_message_new_error_with_details, pFpppp)
 GO(gst_message_new_have_context, pFpp)
 GO(gst_message_new_info, pFppp)
 GO(gst_message_new_info_with_details, pFpppp)
-GO(gst_message_new_instant_rate_request, pFpp)
+GO(gst_message_new_instant_rate_request, pFpd)
 GO(gst_message_new_latency, pFp)
 GO(gst_message_new_need_context, pFpp)
 GO(gst_message_new_new_clock, pFpp)
-GO(gst_message_new_progress, pFpppp)
+GO(gst_message_new_progress, pFpupp)
 GO(gst_message_new_property_notify, pFppp)
-GO(gst_message_new_qos, pFpiUUUU)
+GO(gst_message_new_qos, pFpiLLLL)
 GO(gst_message_new_redirect, pFpppp)
-GO(gst_message_new_request_state, pFpp)
-GO(gst_message_new_reset_time, pFpU)
-GO(gst_message_new_segment_done, pFppI)
-GO(gst_message_new_segment_start, pFppI)
-GO(gst_message_new_state_changed, pFpiii)
+GO(gst_message_new_request_state, pFpu)
+GO(gst_message_new_reset_time, pFpL)
+GO(gst_message_new_segment_done, pFpul)
+GO(gst_message_new_segment_start, pFpul)
+GO(gst_message_new_state_changed, pFpuuu)
 GO(gst_message_new_state_dirty, pFp)
-GO(gst_message_new_step_done, pFpiUdiiUi)
-GO(gst_message_new_step_start, pFpiiUdii)
+GO(gst_message_new_step_done, pFpuLdiiLi)
+GO(gst_message_new_step_start, pFpiuLdii)
 GO(gst_message_new_stream_collection, pFpp)
 GO(gst_message_new_streams_selected, pFpp)
 GO(gst_message_new_stream_start, pFp)
-GO(gst_message_new_stream_status, pFpip)
-GO(gst_message_new_structure_change, pFpppi)
+GO(gst_message_new_stream_status, pFpup)
+GO(gst_message_new_structure_change, pFpupi)
 GO(gst_message_new_tag, pFpp)
 GO(gst_message_new_toc, pFppi)
 GO(gst_message_new_warning, pFppp)
@@ -851,7 +851,7 @@ GO(gst_message_parse_property_notify, vFpppp)
 GO(gst_message_parse_qos, vFpppppp)
 GO(gst_message_parse_qos_stats, vFpppp)
 GO(gst_message_parse_qos_values, vFpppp)
-GO(gst_message_parse_redirect_entry, vFplppp)
+GO(gst_message_parse_redirect_entry, vFpLppp)
 GO(gst_message_parse_request_state, vFpp)
 GO(gst_message_parse_reset_time, vFpp)
 GO(gst_message_parse_segment_done, vFppp)
@@ -869,17 +869,17 @@ GO(gst_message_parse_warning, vFppp)
 GO(gst_message_parse_warning_details, vFpp)
 GO(gst_message_ref, pFp)
 GO(gst_message_replace, iFpp)
-GO(gst_message_set_buffering_stats, vFpiiiI)
+GO(gst_message_set_buffering_stats, vFpuiil)
 GO(gst_message_set_group_id, vFpu)
-GO(gst_message_set_qos_stats, vFpiUU)
-GO(gst_message_set_qos_values, vFpIdi)
+GO(gst_message_set_qos_stats, vFpuLL)
+GO(gst_message_set_qos_values, vFpldi)
 GO(gst_message_set_seqnum, vFpu)
 GO(gst_message_set_stream_status_object, vFpp)
 GO(gst_message_streams_selected_add, vFpp)
 GO(gst_message_streams_selected_get_size, uFp)
 GO(gst_message_streams_selected_get_stream, pFpu)
 GO(gst_message_take, iFpp)
-DATAB(_gst_message_type, sizeof(void*))
+DATAB(_gst_message_type, 8)
 GO(gst_message_type_get_name, pFi)
 GO(gst_message_type_get_type, LFv)
 GO(gst_message_type_to_quark, uFi)
@@ -888,32 +888,32 @@ GO(gst_message_writable_structure, pFp)
 GO(gst_meta_api_type_get_tags, pFL)
 GO(gst_meta_api_type_has_tag, iFLu)
 GO(gst_meta_api_type_register, LFpp)
-//GO(gst_meta_compare_seqnum, 
-//GO(gst_meta_flags_get_type, 
-//GO(gst_meta_get_info, 
-//GO(gst_meta_get_seqnum, 
-//GO(gst_meta_register, 
-//DATAB(_gst_meta_tag_memory, 
-//DATAB(_gst_meta_transform_copy, 
-//GO(gst_mini_object_add_parent, 
+GO(gst_meta_compare_seqnum, iFpp)
+GO(gst_meta_flags_get_type, LFv)
+GO(gst_meta_get_info, pFp)
+GO(gst_meta_get_seqnum, LFp)
+//GOM(gst_meta_register, pFELpLppp)
+//DATAB(_gst_meta_tag_memory, 4)
+//DATAB(_gst_meta_transform_copy, 4)
+GO(gst_mini_object_add_parent, vFpp)
 GO(gst_mini_object_copy, pFp)
-//GO(gst_mini_object_flags_get_type, 
-GO(gst_mini_object_get_qdata, pFpp)
-//GO(gst_mini_object_init, 
+GO(gst_mini_object_flags_get_type, LFv)
+GO(gst_mini_object_get_qdata, pFpu)
+GOM(gst_mini_object_init, vFEpuLppp)
 GO(gst_mini_object_is_writable, iFp)
-//GO(gst_mini_object_lock, 
+GO(gst_mini_object_lock, iFpu)
 GO(gst_mini_object_make_writable, pFp)
 GO(gst_mini_object_ref, pFp)
-//GO(gst_mini_object_remove_parent, 
+GO(gst_mini_object_remove_parent, vFpp)
 GO(gst_mini_object_replace, iFpp)
-GOM(gst_mini_object_set_qdata, vFEpppp)
-//GO(gst_mini_object_steal, 
-//GO(gst_mini_object_steal_qdata, 
-//GO(gst_mini_object_take, 
-//GO(gst_mini_object_unlock, 
+GOM(gst_mini_object_set_qdata, vFEpupp)
+GO(gst_mini_object_steal, pFp)
+GO(gst_mini_object_steal_qdata, pFpu)
+GO(gst_mini_object_take, iFpp)
+GO(gst_mini_object_unlock, vFpu)
 GO(gst_mini_object_unref, vFp)
-//GO(gst_mini_object_weak_ref, 
-//GO(gst_mini_object_weak_unref, 
+//GOM(gst_mini_object_weak_ref, vFEppp)
+//GOM(gst_mini_object_weak_unref, vFEppp)
 GO(gst_object_add_control_binding, iFpp)
 GO(gst_object_check_uniqueness, iFpp)
 GO(gst_object_default_deep_notify, vFpppp)
@@ -941,12 +941,12 @@ GO(gst_object_set_control_bindings_disabled, vFpi)
 GO(gst_object_set_control_rate, vFpL)
 GO(gst_object_set_name, iFpp)
 GO(gst_object_set_parent, iFpp)
-GO(gst_object_suggest_next_sync, UFp)
+GO(gst_object_suggest_next_sync, LFp)
 GO(gst_object_sync_values, iFpL)
 GO(gst_object_unparent, vFp)
 GO(gst_object_unref, vFp)
-GO(gst_pad_activate_mode, iFpii)
-GOM(gst_pad_add_probe, LFEpippp)
+GO(gst_pad_activate_mode, iFpui)
+GOM(gst_pad_add_probe, LFEpuppp)
 GO(gst_pad_can_link, iFpp)
 GO(gst_pad_chain, iFpp)
 GO(gst_pad_chain_list, iFpp)
@@ -957,23 +957,23 @@ GOM(gst_pad_create_stream_id_printf_valist, pFEpppA)
 GO(gst_pad_direction_get_type, LFv)
 GO(gst_pad_event_default, iFppp)
 GO(gst_pad_flags_get_type, LFv)
-//GOM(gst_pad_forward, iFEpBp)
+//GOM(gst_pad_forward, iFEppp)
 GO(gst_pad_get_allowed_caps, pFp)
 GO(gst_pad_get_current_caps, pFp)
-GO(gst_pad_get_direction, iFp)
+GO(gst_pad_get_direction, uFp)
 GO(gst_pad_get_element_private, pFp)
 GO(gst_pad_get_last_flow_return, iFp)
-GO(gst_pad_get_offset, IFp)
+GO(gst_pad_get_offset, lFp)
 GO(gst_pad_get_pad_template, pFp)
 GO(gst_pad_get_pad_template_caps, pFp)
 GO(gst_pad_get_parent_element, pFp)
 GO(gst_pad_get_peer, pFp)
-GO(gst_pad_get_range, iFpUup)
+GO(gst_pad_get_range, iFpLup)
 GO(gst_pad_get_single_internal_link, pFp)
-GO(gst_pad_get_sticky_event, pFpiu)
+GO(gst_pad_get_sticky_event, pFpuu)
 GO(gst_pad_get_stream, pFp)
 GO(gst_pad_get_stream_id, pFp)
-GO(gst_pad_get_task_state, iFp)
+GO(gst_pad_get_task_state, uFp)
 GO(gst_pad_get_type, LFv)
 GO(gst_pad_has_current_caps, iFp)
 GO(gst_pad_is_active, iFp)
@@ -984,117 +984,117 @@ GO(gst_pad_iterate_internal_links, pFp)
 GO(gst_pad_iterate_internal_links_default, pFpp)
 GO(gst_pad_link, iFpp)
 GO(gst_pad_link_check_get_type, LFv)
-GO(gst_pad_link_full, iFppi)
+GO(gst_pad_link_full, iFppu)
 GO(gst_pad_link_get_name, pFi)
 GO(gst_pad_link_maybe_ghosting, iFpp)
-GO(gst_pad_link_maybe_ghosting_full, iFppi)
+GO(gst_pad_link_maybe_ghosting_full, iFppu)
 GO(gst_pad_link_return_get_type, LFv)
 GO(gst_pad_mark_reconfigure, vFp)
 GO(gst_pad_mode_get_name, pFu)
 GO(gst_pad_mode_get_type, LFv)
 GO(gst_pad_needs_reconfigure, iFp)
-GO(gst_pad_new, pFpi)
+GO(gst_pad_new, pFpu)
 GO(gst_pad_new_from_static_template, pFpp)
 GO(gst_pad_new_from_template, pFpp)
 GO(gst_pad_pause_task, iFp)
 GO(gst_pad_peer_query, iFpp)
 GO(gst_pad_peer_query_accept_caps, iFpp)
 GO(gst_pad_peer_query_caps, pFpp)
-GO(gst_pad_peer_query_convert, iFpiIip)
-GO(gst_pad_peer_query_duration, iFpip)
-GO(gst_pad_peer_query_position, iFpip)
+GO(gst_pad_peer_query_convert, iFpulup)
+GO(gst_pad_peer_query_duration, iFpup)
+GO(gst_pad_peer_query_position, iFpup)
 GO(gst_pad_presence_get_type, LFv)
-//GO(gst_pad_probe_info_get_buffer, 
+GO(gst_pad_probe_info_get_buffer, pFp)
 GO(gst_pad_probe_info_get_buffer_list, pFp)
-//GO(gst_pad_probe_info_get_event, 
-//GO(gst_pad_probe_info_get_query, 
-//GO(gst_pad_probe_return_get_type, 
-//GO(gst_pad_probe_type_get_type, 
+GO(gst_pad_probe_info_get_event, pFp)
+GO(gst_pad_probe_info_get_query, pFp)
+GO(gst_pad_probe_return_get_type, LFv)
+GO(gst_pad_probe_type_get_type, LFv)
 GO(gst_pad_proxy_query_accept_caps, iFpp)
 GO(gst_pad_proxy_query_caps, iFpp)
-GO(gst_pad_pull_range, iFpUup)
+GO(gst_pad_pull_range, iFpLup)
 GO(gst_pad_push, iFpp)
 GO(gst_pad_push_event, iFpp)
 GO(gst_pad_push_list, iFpp)
 GO(gst_pad_query, iFpp)
 GO(gst_pad_query_accept_caps, iFpp)
 GO(gst_pad_query_caps, pFpp)
-GO(gst_pad_query_convert, iFpiIip)
+GO(gst_pad_query_convert, iFpulup)
 GO(gst_pad_query_default, iFppp)
-GO(gst_pad_query_duration, iFppp)
-GO(gst_pad_query_position, iFppp)
+GO(gst_pad_query_duration, iFpup)
+GO(gst_pad_query_position, iFpup)
 GO(gst_pad_remove_probe, vFpL)
 GO(gst_pad_send_event, iFpp)
 GOM(gst_pad_set_activate_function_full, vFEpppp)
 GOM(gst_pad_set_activatemode_function_full, vFEpppp)
 GO(gst_pad_set_active, iFpi)
 GOM(gst_pad_set_chain_function_full, vFEpppp)
-//GOM(gst_pad_set_chain_list_function_full, vFEpBpB)
+//GOM(gst_pad_set_chain_list_function_full, vFEpppp)
 GO(gst_pad_set_element_private, vFpp)
-//GOM(gst_pad_set_event_full_function_full, vFpBpB)
+//GOM(gst_pad_set_event_full_function_full, vFEpppp)
 GOM(gst_pad_set_event_function_full, vFEpppp)
 GOM(gst_pad_set_getrange_function_full, vFEpppp)
 GOM(gst_pad_set_iterate_internal_links_function_full, vFEpppp)
 GOM(gst_pad_set_link_function_full, vFEpppp)
-GO(gst_pad_set_offset, vFpI)
+GO(gst_pad_set_offset, vFpl)
 GOM(gst_pad_set_query_function_full, vFEpppp)
-//GOM(gst_pad_set_unlink_function_full, vFEpBpB)
+//GOM(gst_pad_set_unlink_function_full, vFEpppp)
 GOM(gst_pad_start_task, iFEpppp)
 GOM(gst_pad_sticky_events_foreach, vFEppp)
 GO(gst_pad_stop_task, iFp)
 GO(gst_pad_store_sticky_event, iFpp)
 GO(gst_pad_template_flags_get_type, LFv)
 GO(gst_pad_template_get_caps, pFp)
-//GO(gst_pad_template_get_documentation_caps, 
-//GO(gst_pad_template_get_type, 
-GO(gst_pad_template_new, pFpiip)
-//GO(gst_pad_template_new_from_static_pad_template_with_gtype, 
-GO(gst_pad_template_new_with_gtype, pFpiipL)
-//GO(gst_pad_template_pad_created, 
-//GO(gst_pad_template_set_documentation_caps, 
+GO(gst_pad_template_get_documentation_caps, pFp)
+GO(gst_pad_template_get_type, LFv)
+GO(gst_pad_template_new, pFpuup)
+GO(gst_pad_template_new_from_static_pad_template_with_gtype, pFpL)
+GO(gst_pad_template_new_with_gtype, pFpuupL)
+GO(gst_pad_template_pad_created, vFpp)
+GO(gst_pad_template_set_documentation_caps, vFpp)
 GO(gst_pad_unlink, iFpp)
 GO(gst_pad_use_fixed_caps, vFp)
 GO(gst_param_spec_array, pFppppi)
-//GO(gst_param_spec_array_get_type, 
+GO(gst_param_spec_array_get_type, LFv)
 GO(gst_param_spec_fraction, pFpppiiiiiii)
-//GO(gst_param_spec_fraction_get_type, 
-//GO(gst_parent_buffer_meta_api_get_type, 
-//GO(gst_parent_buffer_meta_get_info, 
+GO(gst_param_spec_fraction_get_type, LFv)
+GO(gst_parent_buffer_meta_api_get_type, LFv)
+GO(gst_parent_buffer_meta_get_info, pFv)
 GO(gst_parse_bin_from_description, pFpip)
 GO(gst_parse_bin_from_description_full, pFpipup)
 GO(gst_parse_context_copy, pFp)
-//GO(gst_parse_context_free, 
+GO(gst_parse_context_free, vFp)
 GO(gst_parse_context_get_missing_elements, pFp)
 GO(gst_parse_context_get_type, LFv)
 GO(gst_parse_context_new, pFv)
-//GO(gst_parse_error_get_type, 
+GO(gst_parse_error_get_type, LFv)
 GO(gst_parse_error_quark, uFv)
-//GO(gst_parse_flags_get_type, 
+GO(gst_parse_flags_get_type, LFv)
 GO(gst_parse_launch, pFpp)
 GO(gst_parse_launch_full, pFppup)
 GO(gst_parse_launchv, pFpp)
 GO(gst_parse_launchv_full, pFppup)
-//GO(gst_pipeline_auto_clock, 
-//GO(gst_pipeline_flags_get_type, 
+GO(gst_pipeline_auto_clock, vFp)
+GO(gst_pipeline_flags_get_type, LFv)
 GO(gst_pipeline_get_auto_flush_bus, iFp)
 GO(gst_pipeline_get_bus, pFp)
-//GO(gst_pipeline_get_clock, 
-//GO(gst_pipeline_get_delay, 
+GO(gst_pipeline_get_clock, pFp)
+GO(gst_pipeline_get_delay, LFp)
 GO(gst_pipeline_get_latency, LFp)
 GO(gst_pipeline_get_pipeline_clock, pFp)
-//GO(gst_pipeline_get_type, 
+GO(gst_pipeline_get_type, LFv)
 GO(gst_pipeline_new, pFp)
 GO(gst_pipeline_set_auto_flush_bus, vFpi)
 GO(gst_pipeline_set_clock, iFpp)
-//GO(gst_pipeline_set_delay, 
+GO(gst_pipeline_set_delay, vFpL)
 GO(gst_pipeline_set_latency, vFpL)
 GO(gst_pipeline_use_clock, vFpp)
 GO(gst_plugin_add_dependency, vFppppu)
 GO(gst_plugin_add_dependency_simple, vFppppu)
-//GO(gst_plugin_api_flags_get_type, 
-//GO(gst_plugin_dependency_flags_get_type, 
-//GO(gst_plugin_error_get_type, 
-//GO(gst_plugin_error_quark, 
+GO(gst_plugin_api_flags_get_type, LFv)
+GO(gst_plugin_dependency_flags_get_type, LFv)
+GO(gst_plugin_error_get_type, LFv)
+GO(gst_plugin_error_quark, uFv)
 GO(gst_plugin_feature_check_version, iFpuuu)
 GO(gst_plugin_feature_get_plugin, pFp)
 GO(gst_plugin_feature_get_plugin_name, pFp)
@@ -1106,39 +1106,39 @@ GO(gst_plugin_feature_list_free, vFp)
 GO(gst_plugin_feature_load, pFp)
 GO(gst_plugin_feature_rank_compare_func, iFpp)
 GO(gst_plugin_feature_set_rank, vFpu)
-//GO(gst_plugin_flags_get_type, 
+GO(gst_plugin_flags_get_type, LFv)
 GO(gst_plugin_get_cache_data, pFp)
-//GO(gst_plugin_get_description, 
-//GO(gst_plugin_get_filename, 
-//GO(gst_plugin_get_license, 
-//GO(gst_plugin_get_name, 
-//GO(gst_plugin_get_origin, 
-//GO(gst_plugin_get_package, 
+GO(gst_plugin_get_description, pFp)
+GO(gst_plugin_get_filename, pFp)
+GO(gst_plugin_get_license, pFp)
+GO(gst_plugin_get_name, pFp)
+GO(gst_plugin_get_origin, pFp)
+GO(gst_plugin_get_package, pFp)
 GO(gst_plugin_get_release_date_string, pFp)
-//GO(gst_plugin_get_source, 
-//GO(gst_plugin_get_type, 
-//GO(gst_plugin_get_version, 
+GO(gst_plugin_get_source, pFp)
+GO(gst_plugin_get_type, LFv)
+GO(gst_plugin_get_version, pFp)
 GO(gst_plugin_is_loaded, iFp)
-//GO(gst_plugin_list_free, 
+GO(gst_plugin_list_free, vFp)
 GO(gst_plugin_load, pFp)
 GO(gst_plugin_load_by_name, pFp)
 //GO(_gst_plugin_loader_client_run, 
 GOM(gst_plugin_load_file, pFEpp)
 GOM(gst_plugin_register_static, iFEiipppppppp)
-//GO(gst_plugin_register_static_full, 
+//GOM(gst_plugin_register_static_full, iFEiippppppppp)
 GO(gst_plugin_set_cache_data, vFpp)
-//GO(gst_poll_add_fd, 
-//GO(gst_poll_fd_can_read, 
-//GO(gst_poll_fd_can_write, 
+GO(gst_poll_add_fd, iFpp)
+GO(gst_poll_fd_can_read, iFpp)
+GO(gst_poll_fd_can_write, iFpp)
 GO(gst_poll_fd_ctl_pri, iFppi)
-//GO(gst_poll_fd_ctl_read, 
-//GO(gst_poll_fd_ctl_write, 
-//GO(gst_poll_fd_has_closed, 
-//GO(gst_poll_fd_has_error, 
+GO(gst_poll_fd_ctl_read, iFppi)
+GO(gst_poll_fd_ctl_write, iFppi)
+GO(gst_poll_fd_has_closed, iFpp)
+GO(gst_poll_fd_has_error, iFpp)
 GO(gst_poll_fd_has_pri, iFpp)
 GO(gst_poll_fd_ignored, vFpp)
 GO(gst_poll_fd_init, vFp)
-//GO(gst_poll_free, 
+GO(gst_poll_free, vFp)
 GO(gst_poll_get_read_gpollfd, vFpp)
 GO(gst_poll_new, pFi)
 GO(gst_poll_new_timer, pFv)
@@ -1148,53 +1148,53 @@ GO(gst_poll_restart, vFp)
 GO(gst_poll_set_controllable, iFpi)
 GO(gst_poll_set_flushing, vFpi)
 GO(gst_poll_wait, iFpL)
-//GO(gst_poll_write_control, 
+GO(gst_poll_write_control, iFp)
 GO(gst_preset_delete_preset, iFpp)
-//GO(gst_preset_get_app_dir, 
+GO(gst_preset_get_app_dir, pFv)
 GO(gst_preset_get_meta, iFpppp)
-//GO(gst_preset_get_preset_names, 
+GO(gst_preset_get_preset_names, pFp)
 GO(gst_preset_get_property_names, pFp)
 GO(gst_preset_get_type, LFv)
 GO(gst_preset_is_editable, iFp)
-//GO(gst_preset_load_preset, 
+GO(gst_preset_load_preset, iFpp)
 GO(gst_preset_rename_preset, iFppp)
-//GO(gst_preset_save_preset, 
+GO(gst_preset_save_preset, iFpp)
 GO(gst_preset_set_app_dir, iFp)
 GO(gst_preset_set_meta, iFpppp)
-//GO(gst_print, 
-//GO(gst_printerr, 
-//GO(gst_printerrln, 
-//GO(gst_println, 
-//GO(gst_progress_type_get_type, 
-//GO(gst_promise_expire, 
-//GO(gst_promise_get_reply, 
-//GO(gst_promise_get_type, 
-//GO(gst_promise_interrupt, 
-//GO(gst_promise_new, 
-//GO(gst_promise_new_with_change_func, 
-//GO(gst_promise_ref, 
-//GO(gst_promise_reply, 
-//GO(gst_promise_result_get_type, 
-//GO(gst_promise_unref, 
-//GO(gst_promise_wait, 
+//GOM(gst_print, vFEpV)
+//GOM(gst_printerr, vFEpV)
+//GOM(gst_printerrln, vFEpV)
+//GOM(gst_println, vFEpV)
+GO(gst_progress_type_get_type, LFv)
+GO(gst_promise_expire, vFp)
+GO(gst_promise_get_reply, pFp)
+GO(gst_promise_get_type, LFv)
+GO(gst_promise_interrupt, vFp)
+GO(gst_promise_new, pFv)
+//GOM(gst_promise_new_with_change_func, pFEppp)
+GO(gst_promise_ref, pFp)
+GO(gst_promise_reply, vFpp)
+GO(gst_promise_result_get_type, LFv)
+GO(gst_promise_unref, vFp)
+GO(gst_promise_wait, uFp)
 GO(gst_protection_filter_systems_by_available_decryptors, pFp)
-//GO(gst_protection_meta_api_get_type, 
-//GO(gst_protection_meta_get_info, 
+GO(gst_protection_meta_api_get_type, LFv)
+GO(gst_protection_meta_get_info, pFv)
 GO(gst_protection_select_system, pFp)
-//GO(gst_proxy_pad_chain_default, 
-//GO(gst_proxy_pad_chain_list_default, 
-//GO(gst_proxy_pad_get_internal, 
-//GO(gst_proxy_pad_getrange_default, 
-//GO(gst_proxy_pad_get_type, 
-//GO(gst_proxy_pad_iterate_internal_links_default, 
-//GO(gst_qos_type_get_type, 
-GO(gst_query_add_allocation_meta, vFppp)
+GO(gst_proxy_pad_chain_default, iFppp)
+GO(gst_proxy_pad_chain_list_default, iFppp)
+GO(gst_proxy_pad_get_internal, pFp)
+GO(gst_proxy_pad_getrange_default, iFppLup)
+GO(gst_proxy_pad_get_type, LFv)
+GO(gst_proxy_pad_iterate_internal_links_default, pFpp)
+GO(gst_qos_type_get_type, LFv)
+GO(gst_query_add_allocation_meta, vFpLp)
 GO(gst_query_add_allocation_param, vFppp)
 GO(gst_query_add_allocation_pool, vFppuuu)
-GO(gst_query_add_buffering_range, iFpII)
-GO(gst_query_add_scheduling_mode, vFpi)
+GO(gst_query_add_buffering_range, iFpll)
+GO(gst_query_add_scheduling_mode, vFpu)
 GO(gst_query_copy, pFp)
-GO(gst_query_find_allocation_meta, iFppp)
+GO(gst_query_find_allocation_meta, iFpLp)
 GO(gst_query_get_n_allocation_metas, uFp)
 GO(gst_query_get_n_allocation_params, uFp)
 GO(gst_query_get_n_allocation_pools, uFp)
@@ -1202,24 +1202,24 @@ GO(gst_query_get_n_buffering_ranges, uFp)
 GO(gst_query_get_n_scheduling_modes, uFp)
 GO(gst_query_get_structure, pFp)
 GO(gst_query_get_type, LFv)
-GO(gst_query_has_scheduling_mode, iFpi)
-GO(gst_query_has_scheduling_mode_with_flags, iFpii)
+GO(gst_query_has_scheduling_mode, iFpu)
+GO(gst_query_has_scheduling_mode_with_flags, iFpuu)
 GO(gst_query_new_accept_caps, pFp)
 GO(gst_query_new_allocation, pFpi)
 GO(gst_query_new_bitrate, pFv)
-GO(gst_query_new_buffering, pFi)
+GO(gst_query_new_buffering, pFu)
 GO(gst_query_new_caps, pFp)
 GO(gst_query_new_context, pFp)
-GO(gst_query_new_convert, pFiIi)
-GO(gst_query_new_custom, pFip)
+GO(gst_query_new_convert, pFulu)
+GO(gst_query_new_custom, pFup)
 GO(gst_query_new_drain, pFv)
-GO(gst_query_new_duration, pFi)
+GO(gst_query_new_duration, pFu)
 GO(gst_query_new_formats, pFv)
 GO(gst_query_new_latency, pFv)
-GO(gst_query_new_position, pFi)
+GO(gst_query_new_position, pFu)
 GO(gst_query_new_scheduling, pFv)
-GO(gst_query_new_seeking, pFi)
-GO(gst_query_new_segment, pFi)
+GO(gst_query_new_seeking, pFu)
+GO(gst_query_new_segment, pFu)
 GO(gst_query_new_uri, pFv)
 GO(gst_query_parse_accept_caps, vFpp)
 GO(gst_query_parse_accept_caps_result, vFpp)
@@ -1236,12 +1236,12 @@ GO(gst_query_parse_convert, vFppppp)
 GO(gst_query_parse_duration, vFppp)
 GO(gst_query_parse_latency, vFpppp)
 GO(gst_query_parse_n_formats, vFpp)
-GO(gst_query_parse_nth_allocation_meta, pFpup)
+GO(gst_query_parse_nth_allocation_meta, LFpup)
 GO(gst_query_parse_nth_allocation_param, vFpupp)
 GO(gst_query_parse_nth_allocation_pool, vFpupppp)
 GO(gst_query_parse_nth_buffering_range, iFpupp)
 GO(gst_query_parse_nth_format, vFpup)
-GO(gst_query_parse_nth_scheduling_mode, iFpu)
+GO(gst_query_parse_nth_scheduling_mode, uFpu)
 GO(gst_query_parse_position, vFppp)
 GO(gst_query_parse_scheduling, vFppppp)
 GO(gst_query_parse_seeking, vFppppp)
@@ -1257,26 +1257,26 @@ GO(gst_query_replace, iFpp)
 GO(gst_query_set_accept_caps_result, vFpi)
 GO(gst_query_set_bitrate, vFpu)
 GO(gst_query_set_buffering_percent, vFpii)
-GO(gst_query_set_buffering_range, vFpiIII)
-GO(gst_query_set_buffering_stats, vFpiiiI)
+GO(gst_query_set_buffering_range, vFpulll)
+GO(gst_query_set_buffering_stats, vFpuiil)
 GO(gst_query_set_caps_result, vFpp)
 GO(gst_query_set_context, vFpp)
-GO(gst_query_set_convert, vFpiIiI)
-GO(gst_query_set_duration, vFpiI)
+GO(gst_query_set_convert, vFpulul)
+GO(gst_query_set_duration, vFpul)
 //GOM(gst_query_set_formats, vFEpiV)
-GO(gst_query_set_formatsv, vFppp)
-GO(gst_query_set_latency, vFpiUU)
+GO(gst_query_set_formatsv, vFpip)
+GO(gst_query_set_latency, vFpiLL)
 GO(gst_query_set_nth_allocation_param, vFpupp)
 GO(gst_query_set_nth_allocation_pool, vFpupuuu)
-GO(gst_query_set_position, vFpiI)
-GO(gst_query_set_scheduling, vFpiiii)
-GO(gst_query_set_seeking, vFpiiII)
-GO(gst_query_set_segment, vFpdiII)
+GO(gst_query_set_position, vFpul)
+GO(gst_query_set_scheduling, vFpuiii)
+GO(gst_query_set_seeking, vFpuill)
+GO(gst_query_set_segment, vFpdull)
 GO(gst_query_set_uri, vFpp)
 GO(gst_query_set_uri_redirection, vFpp)
 GO(gst_query_set_uri_redirection_permanent, vFpi)
 GO(gst_query_take, iFpp)
-//DATAB(_gst_query_type, 
+//DATAB(_gst_query_type, 8)
 GO(gst_query_type_flags_get_type, LFv)
 GO(gst_query_type_get_flags, uFu)
 GO(gst_query_type_get_name, pFu)
@@ -1284,31 +1284,31 @@ GO(gst_query_type_get_type, LFv)
 GO(gst_query_type_to_quark, uFu)
 GO(gst_query_unref, vFp)
 GO(gst_query_writable_structure, pFp)
-//GO(gst_rank_get_type, 
-//GO(gst_reference_timestamp_meta_api_get_type, 
-//GO(gst_reference_timestamp_meta_get_info, 
+GO(gst_rank_get_type, LFv)
+GO(gst_reference_timestamp_meta_api_get_type, LFv)
+GO(gst_reference_timestamp_meta_get_info, pFv)
 GO(gst_registry_add_feature, iFpp)
 GO(gst_registry_add_plugin, iFpp)
 GO(gst_registry_check_feature_version, iFppuuu)
 GOM(gst_registry_feature_filter, pFEppip)
 GO(gst_registry_find_feature, pFppL)
 GO(gst_registry_find_plugin, pFpp)
-//GO(gst_registry_fork_is_enabled, 
+GO(gst_registry_fork_is_enabled, iFv)
 GO(gst_registry_fork_set_enabled, vFi)
 GO(gst_registry_get, pFv)
 GO(gst_registry_get_feature_list, pFpL)
 GO(gst_registry_get_feature_list_by_plugin, pFpp)
 GO(gst_registry_get_feature_list_cookie, uFp)
 GO(gst_registry_get_plugin_list, pFp)
-//GO(gst_registry_get_type, 
+GO(gst_registry_get_type, LFv)
 GO(gst_registry_lookup, pFpp)
 GO(gst_registry_lookup_feature, pFpp)
-//GO(gst_registry_plugin_filter, 
+//GOM(gst_registry_plugin_filter, pFEppip)
 GO(gst_registry_remove_feature, vFpp)
 GO(gst_registry_remove_plugin, vFpp)
 GO(gst_registry_scan_path, iFpp)
-//GO(gst_resource_error_get_type, 
-GO(gst_resource_error_quark, pFv)
+GO(gst_resource_error_get_type, LFv)
+GO(gst_resource_error_quark, uFv)
 GO(gst_sample_copy, pFp)
 GO(gst_sample_get_buffer, pFp)
 GO(gst_sample_get_buffer_list, pFp)
@@ -1318,13 +1318,13 @@ GO(gst_sample_get_segment, pFp)
 GO(gst_sample_get_type, LFv)
 GO(gst_sample_new, pFpppp)
 GO(gst_sample_ref, pFp)
-//GO(gst_sample_set_buffer, 
+GO(gst_sample_set_buffer, vFpp)
 GO(gst_sample_set_buffer_list, vFpp)
-//GO(gst_sample_set_caps, 
+GO(gst_sample_set_caps, vFpp)
 GO(gst_sample_set_info, iFpp)
 GO(gst_sample_set_segment, vFpp)
-DATAB(_gst_sample_type, sizeof(long))
-//GO(gst_sample_unref, 
+DATAB(_gst_sample_type, 8)
+GO(gst_sample_unref, vFp)
 GO(gst_scheduling_flags_get_type, LFv)
 GO(gst_search_mode_get_type, LFv)
 GO(gst_seek_flags_get_type, LFv)
@@ -1342,14 +1342,14 @@ GO(gst_segment_new, pFv)
 GO(gst_segment_offset_running_time, iFpul)
 GO(gst_segment_position_from_running_time, LFpuL)
 GO(gst_segment_position_from_running_time_full, iFpuLp)
-GO(gst_segment_position_from_stream_time, UFpiU)
-GO(gst_segment_position_from_stream_time_full, iFpiUp)
+GO(gst_segment_position_from_stream_time, LFpuL)
+GO(gst_segment_position_from_stream_time_full, iFpuLp)
 GO(gst_segment_set_running_time, iFpuL)
-//GO(gst_segment_to_position, 
-GO(gst_segment_to_running_time, UFpiU)
-GO(gst_segment_to_running_time_full, iFpiUp)
-GO(gst_segment_to_stream_time, UFpiU)
-GO(gst_segment_to_stream_time_full, iFpiUp)
+GO(gst_segment_to_position, LFpuL)
+GO(gst_segment_to_running_time, LFpuL)
+GO(gst_segment_to_running_time_full, iFpuLp)
+GO(gst_segment_to_stream_time, LFpuL)
+GO(gst_segment_to_stream_time_full, iFpuLp)
 GO(gst_segtrap_is_enabled, iFv)
 GO(gst_segtrap_set_enabled, vFi)
 GO(gst_stack_trace_flags_get_type, LFv)
@@ -1366,28 +1366,28 @@ GO(gst_static_pad_template_get_type, LFv)
 GO(gst_stream_collection_add_stream, iFpp)
 GO(gst_stream_collection_get_size, uFp)
 GO(gst_stream_collection_get_stream, pFpu)
-//GO(gst_stream_collection_get_type, 
+GO(gst_stream_collection_get_type, LFv)
 GO(gst_stream_collection_get_upstream_id, pFp)
 GO(gst_stream_collection_new, pFp)
-//GO(gst_stream_error_get_type, 
-GO(gst_stream_error_quark, pFv)
-//GO(gst_stream_flags_get_type, 
+GO(gst_stream_error_get_type, LFv)
+GO(gst_stream_error_quark, uFv)
+GO(gst_stream_flags_get_type, LFv)
 GO(gst_stream_get_caps, pFp)
 GO(gst_stream_get_stream_flags, uFp)
 GO(gst_stream_get_stream_id, pFp)
 GO(gst_stream_get_stream_type, uFp)
 GO(gst_stream_get_tags, pFp)
-//GO(gst_stream_get_type, 
+GO(gst_stream_get_type, LFv)
 GO(gst_stream_new, pFppuu)
 GO(gst_stream_set_caps, vFpp)
 GO(gst_stream_set_stream_flags, vFpu)
 GO(gst_stream_set_stream_type, vFpu)
 GO(gst_stream_set_tags, vFpp)
-//GO(gst_stream_status_type_get_type, 
+GO(gst_stream_status_type_get_type, LFv)
 GO(gst_stream_type_get_name, pFu)
-//GO(gst_stream_type_get_type, 
+GO(gst_stream_type_get_type, LFv)
 GO(gst_structure_can_intersect, iFpp)
-//GO(gst_structure_change_type_get_type, 
+GO(gst_structure_change_type_get_type, LFv)
 GO(gst_structure_copy, pFp)
 GOM(gst_structure_filter_and_map_in_place, vFEppp)
 GO(gst_structure_fixate, vFp)
@@ -1425,23 +1425,23 @@ GO(gst_structure_get_value, pFpp)
 GO(gst_structure_has_field, iFpp)
 GO(gst_structure_has_field_typed, iFppL)
 GO(gst_structure_has_name, iFpp)
-//GOM(gst_structure_id_get, iFEppV)
-//GOM(gst_structure_id_get_valist, iFEppA)
+//GOM(gst_structure_id_get, iFEpuV)
+//GOM(gst_structure_id_get_valist, iFEpuA)
 GO(gst_structure_id_get_value, pFpu)
 GO(gst_structure_id_has_field, iFpu)
 GO(gst_structure_id_has_field_typed, iFpuL)
-//GOM(gst_structure_id_set, iFEppV)
-//GOM(gst_structure_id_set_valist, iFEppA)
+//GOM(gst_structure_id_set, vFEpuV)
+//GOM(gst_structure_id_set_valist, vFEpuA)
 GO(gst_structure_id_set_value, vFpup)
 GO(gst_structure_id_take_value, vFpup)
 GO(gst_structure_intersect, pFpp)
 GO(gst_structure_is_equal, iFpp)
 GO(gst_structure_is_subset, iFpp)
-//GOM(gst_structure_map_in_place, iFEpBp)
+//GOM(gst_structure_map_in_place, iFEppp)
 GOM(gst_structure_new, pFEppV)
 GO(gst_structure_new_empty, pFp)
 GO(gst_structure_new_from_string, pFp)
-//GOM(gst_structure_new_id, pFEppV)
+//GOM(gst_structure_new_id, pFEuuV)
 GO(gst_structure_new_id_empty, pFu)
 GOM(gst_structure_new_valist, pFppA)
 GO(gst_structure_n_fields, iFp)
@@ -1460,22 +1460,22 @@ GO(gst_structure_set_value, vFppp)
 GO(gst_structure_take, iFpp)
 GO(gst_structure_take_value, vFppp)
 GO(gst_structure_to_string, pFp)
-DATAB(_gst_structure_type, sizeof(void*))
-//GO(gst_system_clock_get_type, 
+DATAB(_gst_structure_type, 8)
+GO(gst_system_clock_get_type, LFv)
 GO(gst_system_clock_obtain, pFv)
 GO(gst_system_clock_set_default, vFp)
-//GO(gst_tag_exists, 
-//GO(gst_tag_flag_get_type, 
+GO(gst_tag_exists, iFp)
+GO(gst_tag_flag_get_type, LFv)
 GO(gst_tag_get_description, pFp)
 GO(gst_tag_get_flag, uFp)
-//GO(gst_tag_get_nick, 
+GO(gst_tag_get_nick, pFp)
 GO(gst_tag_get_type, LFp)
-//GO(gst_tag_is_fixed, 
-GOM(gst_tag_list_add, vFEpipV)
-GOM(gst_tag_list_add_valist, vFEpipA)
-GOM(gst_tag_list_add_valist_values, vFEpipA)
-GO(gst_tag_list_add_value, vFpipp)
-GOM(gst_tag_list_add_values, vFEpipV)
+GO(gst_tag_is_fixed, iFp)
+GOM(gst_tag_list_add, vFEpupV)
+GOM(gst_tag_list_add_valist, vFEpupA)
+GOM(gst_tag_list_add_valist_values, vFEpupA)
+GO(gst_tag_list_add_value, vFpupp)
+GOM(gst_tag_list_add_values, vFEpupV)
 GO(gst_tag_list_copy, pFp)
 GO(gst_tag_list_copy_value, iFppp)
 GOM(gst_tag_list_foreach, vFEppp)
@@ -1497,7 +1497,7 @@ GO(gst_tag_list_get_pointer, iFppp)
 GO(gst_tag_list_get_pointer_index, iFppup)
 GO(gst_tag_list_get_sample, iFppp)
 GO(gst_tag_list_get_sample_index, iFppup)
-GO(gst_tag_list_get_scope, iFp)
+GO(gst_tag_list_get_scope, uFp)
 GO(gst_tag_list_get_string, iFppp)
 GO(gst_tag_list_get_string_index, iFppup)
 GO(gst_tag_list_get_tag_size, uFpp)
@@ -1507,10 +1507,10 @@ GO(gst_tag_list_get_uint64, iFppp)
 GO(gst_tag_list_get_uint64_index, iFppup)
 GO(gst_tag_list_get_uint_index, iFppup)
 GO(gst_tag_list_get_value_index, pFppu)
-GO(gst_tag_list_insert, vFppi)
+GO(gst_tag_list_insert, vFppu)
 GO(gst_tag_list_is_empty, iFp)
 GO(gst_tag_list_is_equal, iFpp)
-GO(gst_tag_list_merge, pFppi)
+GO(gst_tag_list_merge, pFppu)
 GOM(gst_tag_list_new, pFEpV)
 GO(gst_tag_list_new_empty, pFv)
 GO(gst_tag_list_new_from_string, pFp)
@@ -1521,52 +1521,52 @@ GO(gst_tag_list_peek_string_index, iFppup)
 GO(gst_tag_list_ref, pFp)
 GO(gst_tag_list_remove_tag, vFpp)
 GO(gst_tag_list_replace, iFpp)
-GO(gst_tag_list_set_scope, vFpi)
+GO(gst_tag_list_set_scope, vFpu)
 GO(gst_tag_list_take, iFpp)
 GO(gst_tag_list_to_string, pFp)
-DATAB(_gst_tag_list_type, sizeof(void*))
+DATAB(_gst_tag_list_type, 8)
 GO(gst_tag_list_unref, vFp)
 GO(gst_tag_merge_mode_get_type, LFv)
-//GO(gst_tag_merge_strings_with_comma, 
-//GO(gst_tag_merge_use_first, 
-//GO(gst_tag_register, 
-//GO(gst_tag_register_static, 
-//GO(gst_tag_scope_get_type, 
-//GO(gst_tag_setter_add_tags, 
-//GO(gst_tag_setter_add_tag_valist, 
-//GO(gst_tag_setter_add_tag_valist_values, 
+GO(gst_tag_merge_strings_with_comma, vFpp)
+GO(gst_tag_merge_use_first, vFpp)
+//GOM(gst_tag_register, vFEpuLppp)
+//GOM(gst_tag_register_static, vFEpuLppp)
+GO(gst_tag_scope_get_type, LFv)
+//GOM(gst_tag_setter_add_tags, vFEpupV)
+//GOM(gst_tag_setter_add_tag_valist, vFEpupA)
+//GOM(gst_tag_setter_add_tag_valist_values, vFEpupA)
 GO(gst_tag_setter_add_tag_value, vFpupp)
-//GO(gst_tag_setter_add_tag_values, 
+//GOM(gst_tag_setter_add_tag_values, vFEpupV)
 GO(gst_tag_setter_get_tag_list, pFp)
 GO(gst_tag_setter_get_tag_merge_mode, uFp)
 GO(gst_tag_setter_get_type, LFv)
-GO(gst_tag_setter_merge_tags, vFppi)
+GO(gst_tag_setter_merge_tags, vFppu)
 GO(gst_tag_setter_reset_tags, vFp)
 GO(gst_tag_setter_set_tag_merge_mode, vFpu)
-//GO(gst_task_cleanup_all, 
-//GO(gst_task_get_pool, 
-//GO(gst_task_get_state, 
+GO(gst_task_cleanup_all, vFv)
+GO(gst_task_get_pool, pFp)
+GO(gst_task_get_state, uFp)
 GO(gst_task_get_type, LFv)
 GO(gst_task_join, iFp)
 GOM(gst_task_new, pFEppp)
 GO(gst_task_pause, iFp)
 GO(gst_task_pool_cleanup, vFp)
 GO(gst_task_pool_get_type, LFv)
-//GO(gst_task_pool_join, 
-//GO(gst_task_pool_new, 
-GO(gst_task_pool_prepare, vFp)
-//GO(gst_task_pool_push, 
-//GO(gst_task_resume, 
-//GO(gst_task_set_enter_callback, 
-//GO(gst_task_set_leave_callback, 
+GO(gst_task_pool_join, vFpp)
+GO(gst_task_pool_new, pFv)
+GO(gst_task_pool_prepare, vFpp)
+//GOM(gst_task_pool_push, pFEpppp)
+GO(gst_task_resume, iFp)
+//GOM(gst_task_set_enter_callback, vFEpppp)
+//GOM(gst_task_set_leave_callback, vFEpppp)
 GO(gst_task_set_lock, vFpp)
 GO(gst_task_set_pool, vFpp)
-//GO(gst_task_set_state, 
+GO(gst_task_set_state, iFpu)
 GO(gst_task_start, iFp)
 GO(gst_task_state_get_type, LFv)
 GO(gst_task_stop, iFp)
 GO(gst_toc_append_entry, vFpp)
-//GO(gst_toc_dump, 
+GO(gst_toc_dump, vFp)
 GO(gst_toc_entry_append_sub_entry, vFpp)
 GO(gst_toc_entry_get_entry_type, iFp)
 GO(gst_toc_entry_get_loop, iFppp)
@@ -1575,87 +1575,87 @@ GO(gst_toc_entry_get_start_stop_times, iFppp)
 GO(gst_toc_entry_get_sub_entries, pFp)
 GO(gst_toc_entry_get_tags, pFp)
 GO(gst_toc_entry_get_toc, pFp)
-//GO(gst_toc_entry_get_type, 
+GO(gst_toc_entry_get_type, LFv)
 GO(gst_toc_entry_get_uid, pFp)
-//GO(gst_toc_entry_is_alternative, 
+GO(gst_toc_entry_is_alternative, iFp)
 GO(gst_toc_entry_is_sequence, iFp)
-GO(gst_toc_entry_merge_tags, vFppi)
+GO(gst_toc_entry_merge_tags, vFppu)
 GO(gst_toc_entry_new, pFip)
 GO(gst_toc_entry_set_loop, vFpui)
 GO(gst_toc_entry_set_start_stop_times, vFpll)
 GO(gst_toc_entry_set_tags, vFpp)
-//DATAB(_gst_toc_entry_type, 
+//DATAB(_gst_toc_entry_type, 8)
 GO(gst_toc_entry_type_get_nick, pFi)
-//GO(gst_toc_entry_type_get_type, 
+GO(gst_toc_entry_type_get_type, LFv)
 GO(gst_toc_find_entry, pFpp)
 GO(gst_toc_get_entries, pFp)
 GO(gst_toc_get_scope, uFp)
 GO(gst_toc_get_tags, pFp)
-//GO(gst_toc_get_type, 
-//GO(gst_toc_loop_type_get_type, 
-//GO(gst_toc_merge_tags, 
+GO(gst_toc_get_type, LFv)
+GO(gst_toc_loop_type_get_type, LFv)
+GO(gst_toc_merge_tags, vFppu)
 GO(gst_toc_new, pFu)
-//GO(gst_toc_scope_get_type, 
-//GO(gst_toc_set_tags, 
+GO(gst_toc_scope_get_type, LFv)
+GO(gst_toc_set_tags, vFpp)
 GO(gst_toc_setter_get_toc, pFp)
 GO(gst_toc_setter_get_type, LFv)
 GO(gst_toc_setter_reset, vFp)
 GO(gst_toc_setter_set_toc, vFpp)
-DATAB(_gst_toc_type, sizeof(void*))
-//GO(gst_tracer_factory_get_list, 
+DATAB(_gst_toc_type, 8)
+GO(gst_tracer_factory_get_list, pFv)
 GO(gst_tracer_factory_get_tracer_type, LFp)
-//GO(gst_tracer_factory_get_type, 
-//GO(gst_tracer_get_type, 
-//GO(gst_tracer_record_get_type, 
-//GO(gst_tracer_record_log, 
-//GO(gst_tracer_record_new, 
+GO(gst_tracer_factory_get_type, LFv)
+GO(gst_tracer_get_type, LFv)
+GO(gst_tracer_record_get_type, LFv)
+//GOM(gst_tracer_record_log, vFEpV)
+//GOM(gst_tracer_record_new, pFEppV)
 GO(gst_tracer_register, iFppL)
-//GO(gst_tracer_value_flags_get_type, 
-//GO(gst_tracer_value_scope_get_type, 
-//GO(gst_tracing_get_active_tracers, 
-//GO(gst_tracing_register_hook, 
-//GO(gst_type_find_factory_call_function, 
-//GO(gst_type_find_factory_get_caps, 
+GO(gst_tracer_value_flags_get_type, LFv)
+GO(gst_tracer_value_scope_get_type, LFv)
+GO(gst_tracing_get_active_tracers, pFv)
+//GOM(gst_tracing_register_hook, vFEppp)
+GO(gst_type_find_factory_call_function, vFpp)
+GO(gst_type_find_factory_get_caps, pFp)
 GO(gst_type_find_factory_get_extensions, pFp)
 GO(gst_type_find_factory_get_list, pFv)
-//GO(gst_type_find_factory_get_type, 
+GO(gst_type_find_factory_get_type, LFv)
 GO(gst_type_find_factory_has_function, iFp)
-GO(gst_type_find_get_length, UFp)
-//GO(gst_type_find_get_type, 
-GO(gst_type_find_peek, pFpUu)
-//GO(gst_type_find_probability_get_type, 
+GO(gst_type_find_get_length, LFp)
+GO(gst_type_find_get_type, LFv)
+GO(gst_type_find_peek, pFplu)
+GO(gst_type_find_probability_get_type, LFv)
 GOM(gst_type_find_register, iFEppuppppp)
 GO(gst_type_find_suggest, vFpup)
-//GO(gst_type_find_suggest_simple, 
+//GOM(gst_type_find_suggest_simple, vFEpuppV)
 GO(gst_type_is_plugin_api, iFLp)
 GO(gst_type_mark_as_plugin_api, vFLu)
 GO(gst_update_registry, iFv)
-//GO(gst_uri_append_path, 
-//GO(gst_uri_append_path_segment, 
-//GO(gst_uri_construct, 
+GO(gst_uri_append_path, iFpp)
+GO(gst_uri_append_path_segment, iFpp)
+GO(gst_uri_construct, pFpp)
 GO(gst_uri_copy, pFp)
 GO(gst_uri_equal, iFpp)
-//GO(gst_uri_error_get_type, 
-GO(gst_uri_error_quark, pFv)
-//GO(gst_uri_from_string, 
+GO(gst_uri_error_get_type, LFv)
+GO(gst_uri_error_quark, uFv)
+GO(gst_uri_from_string, pFp)
 GO(gst_uri_from_string_escaped, pFp)
 GO(gst_uri_from_string_with_base, pFpp)
 GO(gst_uri_get_fragment, pFp)
-//GO(gst_uri_get_host, 
+GO(gst_uri_get_host, pFp)
 GO(gst_uri_get_location, pFp)
 GO(gst_uri_get_media_fragment_table, pFp)
-//GO(gst_uri_get_path, 
-//GO(gst_uri_get_path_segments, 
-//GO(gst_uri_get_path_string, 
+GO(gst_uri_get_path, pFp)
+GO(gst_uri_get_path_segments, pFp)
+GO(gst_uri_get_path_string, pFp)
 GO(gst_uri_get_port, uFp)
-//GO(gst_uri_get_protocol, 
+GO(gst_uri_get_protocol, pFp)
 GO(gst_uri_get_query_keys, pFp)
 GO(gst_uri_get_query_string, pFp)
-//GO(gst_uri_get_query_table, 
+GO(gst_uri_get_query_table, pFp)
 GO(gst_uri_get_query_value, pFpp)
-//GO(gst_uri_get_scheme, 
-//GO(gst_uri_get_type, 
-//GO(gst_uri_get_userinfo, 
+GO(gst_uri_get_scheme, pFp)
+GO(gst_uri_get_type, LFv)
+GO(gst_uri_get_userinfo, pFp)
 GO(gst_uri_handler_get_protocols, pFp)
 GO(gst_uri_handler_get_type, LFv)
 GO(gst_uri_handler_get_uri, pFp)
@@ -1664,35 +1664,35 @@ GO(gst_uri_handler_set_uri, iFppp)
 GO(gst_uri_has_protocol, iFpp)
 GO(gst_uri_is_normalized, iFp)
 GO(gst_uri_is_valid, iFp)
-//GO(gst_uri_is_writable, 
+GO(gst_uri_is_writable, iFp)
 GO(gst_uri_join, pFpp)
 GO(gst_uri_join_strings, pFpp)
-//GO(gst_uri_make_writable, 
+GO(gst_uri_make_writable, pFp)
 GO(gst_uri_new, pFpppuppp)
 GO(gst_uri_new_with_base, pFppppuppp)
 GO(gst_uri_normalize, iFp)
 GO(gst_uri_protocol_is_supported, iFup)
-//GO(gst_uri_protocol_is_valid, 
+GO(gst_uri_protocol_is_valid, iFp)
 GO(gst_uri_query_has_key, iFpp)
 GO(gst_uri_ref, pFp)
-//GO(gst_uri_remove_query_key, 
+GO(gst_uri_remove_query_key, iFpp)
 GO(gst_uri_set_fragment, iFpp)
-//GO(gst_uri_set_host, 
-//GO(gst_uri_set_path, 
+GO(gst_uri_set_host, iFpp)
+GO(gst_uri_set_path, iFpp)
 GO(gst_uri_set_path_segments, iFpp)
-//GO(gst_uri_set_path_string, 
+GO(gst_uri_set_path_string, iFpp)
 GO(gst_uri_set_port, iFpu)
-//GO(gst_uri_set_query_string, 
+GO(gst_uri_set_query_string, iFpp)
 GO(gst_uri_set_query_table, iFpp)
 GO(gst_uri_set_query_value, iFppp)
-//GO(gst_uri_set_scheme, 
-//GO(gst_uri_set_userinfo, 
-//GO(gst_uri_to_string, 
-//GO(gst_uri_type_get_type, 
-//GO(gst_uri_unref, 
-GOM(gst_util_array_binary_search, pFpuLpipp)
+GO(gst_uri_set_scheme, iFpp)
+GO(gst_uri_set_userinfo, iFpp)
+GO(gst_uri_to_string, pFp)
+GO(gst_uri_type_get_type, LFv)
+GO(gst_uri_unref, vFp)
+GOM(gst_util_array_binary_search, pFEpuLpupp)
 GO(gst_util_double_to_fraction, vFdpp)
-//GO(gst_util_dump_buffer, 
+GO(gst_util_dump_buffer, vFp)
 GO(gst_util_dump_mem, vFpu)
 GO(gst_util_fraction_add, iFiiiipp)
 GO(gst_util_fraction_compare, iFiiii)
@@ -1710,62 +1710,62 @@ GO(gst_util_seqnum_next, uFv)
 GO(gst_util_set_object_arg, vFppp)
 GO(gst_util_set_object_array, iFppp)
 GO(gst_util_set_value_from_string, vFpp)
-GO(gst_util_uint64_scale, UFUUU)
+GO(gst_util_uint64_scale, LFLLL)
 GO(gst_util_uint64_scale_ceil, LFLLL)
-GO(gst_util_uint64_scale_int, UFUii)
+GO(gst_util_uint64_scale_int, LFLii)
 GO(gst_util_uint64_scale_int_ceil, LFLii)
-GO(gst_util_uint64_scale_int_round, UFUii)
-GO(gst_util_uint64_scale_round, UFUUU)
+GO(gst_util_uint64_scale_int_round, LFLii)
+GO(gst_util_uint64_scale_round, LFLLL)
 GO(gst_value_array_append_and_take_value, vFpp)
 GO(gst_value_array_append_value, vFpp)
-GO(gst_value_array_get_size, iFp)
-//GO(gst_value_array_get_type, 
+GO(gst_value_array_get_size, uFp)
+GO(gst_value_array_get_type, LFv)
 GO(gst_value_array_get_value, pFpu)
 GO(gst_value_array_init, pFpu)
 GO(gst_value_array_prepend_value, vFpp)
-DATAB(_gst_value_array_type, sizeof(void*))
-//GO(gst_value_can_compare, 
-//GO(gst_value_can_intersect, 
+DATAB(_gst_value_array_type, 8)
+GO(gst_value_can_compare, iFpp)
+GO(gst_value_can_intersect, iFpp)
 GO(gst_value_can_subtract, iFpp)
-//GO(gst_value_can_union, 
+GO(gst_value_can_union, iFpp)
 GO(gst_value_compare, iFpp)
 GO(gst_value_deserialize, iFpp)
 GO(gst_value_fixate, iFpp)
-//GO(gst_value_fraction_multiply, 
-//GO(gst_value_fraction_subtract, 
+GO(gst_value_fraction_multiply, iFppp)
+GO(gst_value_fraction_subtract, iFppp)
 GO(gst_value_get_bitmask, LFp)
 GO(gst_value_get_caps, pFp)
 GO(gst_value_get_caps_features, pFp)
 GO(gst_value_get_double_range_max, dFp)
-//GO(gst_value_get_double_range_min, 
+GO(gst_value_get_double_range_min, dFp)
 GO(gst_value_get_flagset_flags, uFp)
 GO(gst_value_get_flagset_mask, uFp)
 GO(gst_value_get_fraction_denominator, iFp)
 GO(gst_value_get_fraction_numerator, iFp)
 GO(gst_value_get_fraction_range_max, pFp)
 GO(gst_value_get_fraction_range_min, pFp)
-//GO(gst_value_get_int64_range_max, 
-//GO(gst_value_get_int64_range_min, 
+GO(gst_value_get_int64_range_max, lFp)
+GO(gst_value_get_int64_range_min, lFp)
 GO(gst_value_get_int64_range_step, lFp)
 GO(gst_value_get_int_range_max, iFp)
 GO(gst_value_get_int_range_min, iFp)
-//GO(gst_value_get_int_range_step, 
+GO(gst_value_get_int_range_step, iFp)
 GO(gst_value_get_structure, pFp)
 GO(gst_value_init_and_copy, vFpp)
-//GO(gst_value_intersect, 
+GO(gst_value_intersect, iFppp)
 GO(gst_value_is_fixed, iFp)
-//GO(gst_value_is_subset, 
+GO(gst_value_is_subset, iFpp)
 GO(gst_value_list_append_and_take_value, vFpp)
 GO(gst_value_list_append_value, vFpp)
-//GO(gst_value_list_concat, 
+GO(gst_value_list_concat, vFppp)
 GO(gst_value_list_get_size, uFp)
 GO(gst_value_list_get_type, LFv)
 GO(gst_value_list_get_value, pFpu)
-//GO(gst_value_list_init, 
+GO(gst_value_list_init, pFpu)
 GO(gst_value_list_merge, vFppp)
-//GO(gst_value_list_prepend_value, 
-DATAB(_gst_value_list_type, sizeof(void*))
-//GO(gst_value_register, 
+GO(gst_value_list_prepend_value, vFpp)
+DATAB(_gst_value_list_type, 8)
+//GOM(gst_value_register, vFEp)
 GO(gst_value_serialize, pFp)
 GO(gst_value_set_bitmask, vFpL)
 GO(gst_value_set_caps, vFpp)
@@ -1781,8 +1781,8 @@ GO(gst_value_set_int_range, vFpii)
 GO(gst_value_set_int_range_step, vFpiii)
 GO(gst_value_set_structure, vFpp)
 GO(gst_value_subtract, iFppp)
-//GO(gst_value_union, 
+GO(gst_value_union, iFppp)
 GO(gst_version, vFpppp)
 GO(gst_version_string, pFv)
 
-GO(dummy_iFpipLpp, iFpipLpp)    // for gtkclass
\ No newline at end of file
+GO(dummy_iFpipLpp, iFpipLpp)