[WRAPPER] Reworked wrapping glib-2.0 (stil with new wrapperhelper)

6 files changed, 506 insertions, 492 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index f654bcc4..41e4ab4a 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -15,6 +15,7 @@
 #() vFS
 #() vFb
 #() cFv
+#() cFc
 #() cFi
 #() cFu
 #() cFf
@@ -22,6 +23,7 @@
 #() wFp
 #() iFE
 #() iFv
+#() iFc
 #() iFw
 #() iFi
 #() iFI
@@ -333,11 +335,12 @@
 #() pFli
 #() pFll
 #() pFlp
+#() pFLc
 #() pFLi
-#() pFLC
 #() pFLu
 #() pFLL
 #() pFLp
+#() pFpc
 #() pFpi
 #() pFpC
 #() pFpW
@@ -543,7 +546,6 @@
 #() iFpil
 #() iFpiL
 #() iFpip
-#() iFpIi
 #() iFpII
 #() iFpCp
 #() iFpWp
@@ -579,6 +581,7 @@
 #() iFppl
 #() iFppL
 #() iFppp
+#() iFpOi
 #() iFpOu
 #() iFSIi
 #() iFSli
@@ -627,6 +630,7 @@
 #() uFpup
 #() uFpfu
 #() uFpli
+#() uFplu
 #() uFpLu
 #() uFpLL
 #() uFpLp
@@ -758,7 +762,7 @@
 #() pFpUu
 #() pFpdu
 #() pFpdd
-#() pFplC
+#() pFplc
 #() pFplu
 #() pFpll
 #() pFplp
@@ -766,9 +770,9 @@
 #() pFpLu
 #() pFpLL
 #() pFpLp
+#() pFppc
 #() pFppi
 #() pFppI
-#() pFppC
 #() pFppu
 #() pFppU
 #() pFppf
@@ -1050,7 +1054,6 @@
 #() iFpipL
 #() iFpipp
 #() iFpipV
-#() iFpIip
 #() iFpCCC
 #() iFpCpi
 #() iFpCpp
@@ -1158,6 +1161,7 @@
 #() uFpupu
 #() uFpupp
 #() uFpubp
+#() uFplup
 #() uFppiu
 #() uFppip
 #() uFppuu
@@ -1687,6 +1691,7 @@
 #() IFppIII
 #() uFEippp
 #() uFEpipp
+#() uFEpupp
 #() uFEppuu
 #() uFEpppp
 #() uFEpppV
@@ -1707,6 +1712,7 @@
 #() uFppuup
 #() uFppupp
 #() uFpplip
+#() uFpplpp
 #() uFppLpp
 #() uFppppL
 #() uFppppp
@@ -1742,11 +1748,11 @@
 #() LFppLpL
 #() LFpppii
 #() LFppppp
+#() pFEuipV
+#() pFEuipA
 #() pFEpiii
 #() pFEpipL
 #() pFEpipp
-#() pFEpipV
-#() pFEpipA
 #() pFEpupp
 #() pFEpUpp
 #() pFEpLpp
@@ -1862,7 +1868,6 @@
 #() vFEpupup
 #() vFEpuppp
 #() vFEpLLpp
-#() vFEppipV
 #() vFEppupp
 #() vFEpppLp
 #() vFEppppp
@@ -2278,8 +2283,8 @@
 #() iWpuiiii
 #() iWpppppi
 #() iWpppppu
-#() vFEpiiipp
 #() vFEpuipuV
+#() vFEpuuipp
 #() vFEpupppp
 #() vFEppippp
 #() vFEpppLpp
@@ -2463,7 +2468,6 @@
 #() iFppuuppp
 #() iFppupupp
 #() iFppliupp
-#() iFppLiipp
 #() iFppLippp
 #() iFppLuuii
 #() iFppLLLLu
@@ -2485,7 +2489,7 @@
 #() iFppppppu
 #() iFppppppp
 #() uFEiipppp
-#() uFEpiippp
+#() uFEpiuppp
 #() uFEpuuppp
 #() uFEpppppp
 #() uFiiiuuuu
@@ -2509,7 +2513,7 @@
 #() pFEpupppp
 #() pFEpLiiiI
 #() pFEpLiiil
-#() pFEppuipp
+#() pFEppLipp
 #() pFEppppip
 #() pFEpppppi
 #() pFifffppp
@@ -2548,7 +2552,6 @@
 #() pFppupuuu
 #() pFppliuip
 #() pFpplipup
-#() pFppLipip
 #() pFppLLiLi
 #() pFpppccci
 #() pFpppiiii
@@ -2736,7 +2739,7 @@
 #() pFEiplllpp
 #() pFEipLLLpp
 #() pFEpiuCppp
-#() pFEppLiiip
+#() pFEppLiiup
 #() pFEpppuipV
 #() pFEpppppiV
 #() pFEppppppi
@@ -2817,7 +2820,7 @@
 #() vFppiiiiupi
 #() vFppiiipiii
 #() vFppiupiiii
-#() vFppippDpDC
+#() vFppippDpDc
 #() vFppipppiii
 #() vFppuippiip
 #() vFppuuiiiii
@@ -2835,7 +2838,7 @@
 #() vFpppppippp
 #() iFEpiiiiipi
 #() iFEppuppppp
-#() iFEpppipppp
+#() iFEpppupppp
 #() iFEppplPPPP
 #() iFEpppppupp
 #() iFEppppppuu
@@ -3015,7 +3018,7 @@
 #() vFppppppppppp
 #() iFEiipppppppp
 #() iFEppLpLpLLpp
-#() iFEpppipppppp
+#() iFEpppupppppp
 #() iFEppppiiiiuu
 #() iFEpppppppppp
 #() iFiiiiiiiiiip
@@ -3058,7 +3061,7 @@
 #() vFppuupppiiiiu
 #() vFpppiiiiiiuii
 #() vFpppppppppppp
-#() iFEpppippppppp
+#() iFEpppuppppppp
 #() iFEppppiiiiuui
 #() iFpipllipppppp
 #() iFpipppppppppp
@@ -3082,7 +3085,7 @@
 #() vFuffffffffffff
 #() vFpipppiiiiiiuu
 #() vFpippppppppppp
-#() vFpuppppppppppp
+#() vFpLppppppppppp
 #() vFppiiiiiiuiuii
 #() vFppuuppiiiiuii
 #() vFppuupppuiiiii
@@ -3616,6 +3619,7 @@ wrappedglib2:
   - g_ptr_array_foreach
   - g_ptr_array_sort_with_data
   - g_queue_foreach
+  - g_slist_foreach
   - g_static_private_set
 - vFppV:
   - g_string_append_printf
@@ -3649,7 +3653,6 @@ wrappedglib2:
   - g_once_impl
   - g_queue_find_custom
   - g_slist_find_custom
-  - g_slist_foreach
   - g_slist_insert_sorted
   - g_slist_sort_with_data
   - g_thread_new
@@ -3671,16 +3674,16 @@ wrappedglib2:
 - uFippp:
   - g_idle_add_full
 - uFpipp:
-  - g_io_add_watch
   - g_log_set_handler
-- pFpipp:
-  - g_markup_parse_context_new
-- pFpipV:
+- uFpupp:
+  - g_io_add_watch
+- pFuipV:
   - g_error_new
-- pFpipA:
+- pFuipA:
   - g_error_new_valist
 - pFpupp:
   - g_datalist_id_dup_data
+  - g_markup_parse_context_new
 - pFpLpp:
   - g_bytes_new_with_free_func
 - pFppip:
@@ -3692,7 +3695,7 @@ wrappedglib2:
   - g_thread_try_new
 - vFpiLpp:
   - g_qsort_with_data
-- vFppipV:
+- vFpuipV:
   - g_set_error
 - uFiippp:
   - g_child_watch_add_full
@@ -3701,21 +3704,21 @@ wrappedglib2:
   - g_timeout_add_seconds_full
 - pFppppp:
   - g_option_group_new
-- vFpiiipp:
+- vFpuuipp:
   - g_node_traverse
 - iFpupppp:
   - g_datalist_id_replace_data
-- uFpiippp:
+- uFpiuppp:
   - g_io_add_watch_full
-- pFppuipp:
+- pFppLipp:
   - g_variant_new_from_data
-- pFppLiiip:
+- pFppLiiup:
   - g_thread_create_full
-- iFpppipppp:
+- iFpppupppp:
   - g_spawn_async
-- iFpppipppppp:
+- iFpppupppppp:
   - g_spawn_sync
-- iFpppippppppp:
+- iFpppuppppppp:
   - g_spawn_async_with_pipes
 wrappedgmodule2:
 wrappedgmp:
diff --git a/src/wrapped/generated/wrappedglib2types.h b/src/wrapped/generated/wrappedglib2types.h
index b0aaf915..69a770b8 100644
--- a/src/wrapped/generated/wrappedglib2types.h
+++ b/src/wrapped/generated/wrappedglib2types.h
@@ -43,26 +43,26 @@ typedef int32_t (*iFpLpV_t)(void*, uintptr_t, void*, ...);
 typedef int32_t (*iFpLpA_t)(void*, uintptr_t, void*, va_list);
 typedef uint32_t (*uFippp_t)(int32_t, void*, void*, void*);
 typedef uint32_t (*uFpipp_t)(void*, int32_t, void*, void*);
-typedef void* (*pFpipp_t)(void*, int32_t, void*, void*);
-typedef void* (*pFpipV_t)(void*, int32_t, void*, ...);
-typedef void* (*pFpipA_t)(void*, int32_t, void*, va_list);
+typedef uint32_t (*uFpupp_t)(void*, uint32_t, void*, void*);
+typedef void* (*pFuipV_t)(uint32_t, int32_t, void*, ...);
+typedef void* (*pFuipA_t)(uint32_t, int32_t, void*, va_list);
 typedef void* (*pFpupp_t)(void*, uint32_t, void*, void*);
 typedef void* (*pFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef void* (*pFppip_t)(void*, void*, int32_t, void*);
 typedef void* (*pFpppp_t)(void*, void*, void*, void*);
 typedef void (*vFpiLpp_t)(void*, int32_t, uintptr_t, void*, void*);
-typedef void (*vFppipV_t)(void*, void*, int32_t, void*, ...);
+typedef void (*vFpuipV_t)(void*, uint32_t, int32_t, void*, ...);
 typedef uint32_t (*uFiippp_t)(int32_t, int32_t, void*, void*, void*);
 typedef uint32_t (*uFiuppp_t)(int32_t, uint32_t, void*, void*, void*);
 typedef void* (*pFppppp_t)(void*, void*, void*, void*, void*);
-typedef void (*vFpiiipp_t)(void*, int32_t, int32_t, int32_t, void*, void*);
+typedef void (*vFpuuipp_t)(void*, uint32_t, uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
-typedef uint32_t (*uFpiippp_t)(void*, int32_t, int32_t, void*, void*, void*);
-typedef void* (*pFppuipp_t)(void*, void*, uint32_t, int32_t, void*, void*);
-typedef void* (*pFppLiiip_t)(void*, void*, uintptr_t, int32_t, int32_t, int32_t, void*);
-typedef int32_t (*iFpppipppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*);
-typedef int32_t (*iFpppipppppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*);
-typedef int32_t (*iFpppippppppp_t)(void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFpiuppp_t)(void*, int32_t, uint32_t, void*, void*, void*);
+typedef void* (*pFppLipp_t)(void*, void*, uintptr_t, int32_t, void*, void*);
+typedef void* (*pFppLiiup_t)(void*, void*, uintptr_t, int32_t, int32_t, uint32_t, void*);
+typedef int32_t (*iFpppupppp_t)(void*, void*, void*, uint32_t, void*, void*, void*, void*);
+typedef int32_t (*iFpppupppppp_t)(void*, void*, void*, uint32_t, void*, void*, void*, void*, void*, void*);
+typedef int32_t (*iFpppuppppppp_t)(void*, void*, void*, uint32_t, void*, void*, void*, void*, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(g_atexit, vFp_t) \
@@ -113,6 +113,7 @@ typedef int32_t (*iFpppippppppp_t)(void*, void*, void*, int32_t, void*, void*, v
 	GO(g_ptr_array_foreach, vFppp_t) \
 	GO(g_ptr_array_sort_with_data, vFppp_t) \
 	GO(g_queue_foreach, vFppp_t) \
+	GO(g_slist_foreach, vFppp_t) \
 	GO(g_static_private_set, vFppp_t) \
 	GO(g_string_append_printf, vFppV_t) \
 	GO(g_string_printf, vFppV_t) \
@@ -138,7 +139,6 @@ typedef int32_t (*iFpppippppppp_t)(void*, void*, void*, int32_t, void*, void*, v
 	GO(g_once_impl, pFppp_t) \
 	GO(g_queue_find_custom, pFppp_t) \
 	GO(g_slist_find_custom, pFppp_t) \
-	GO(g_slist_foreach, pFppp_t) \
 	GO(g_slist_insert_sorted, pFppp_t) \
 	GO(g_slist_sort_with_data, pFppp_t) \
 	GO(g_thread_new, pFppp_t) \
@@ -151,12 +151,12 @@ typedef int32_t (*iFpppippppppp_t)(void*, void*, void*, int32_t, void*, void*, v
 	GO(g_snprintf, iFpLpV_t) \
 	GO(g_vsnprintf, iFpLpA_t) \
 	GO(g_idle_add_full, uFippp_t) \
-	GO(g_io_add_watch, uFpipp_t) \
 	GO(g_log_set_handler, uFpipp_t) \
-	GO(g_markup_parse_context_new, pFpipp_t) \
-	GO(g_error_new, pFpipV_t) \
-	GO(g_error_new_valist, pFpipA_t) \
+	GO(g_io_add_watch, uFpupp_t) \
+	GO(g_error_new, pFuipV_t) \
+	GO(g_error_new_valist, pFuipA_t) \
 	GO(g_datalist_id_dup_data, pFpupp_t) \
+	GO(g_markup_parse_context_new, pFpupp_t) \
 	GO(g_bytes_new_with_free_func, pFpLpp_t) \
 	GO(g_thread_create, pFppip_t) \
 	GO(g_hash_table_new_full, pFpppp_t) \
@@ -164,18 +164,18 @@ typedef int32_t (*iFpppippppppp_t)(void*, void*, void*, int32_t, void*, void*, v
 	GO(g_slist_insert_sorted_with_data, pFpppp_t) \
 	GO(g_thread_try_new, pFpppp_t) \
 	GO(g_qsort_with_data, vFpiLpp_t) \
-	GO(g_set_error, vFppipV_t) \
+	GO(g_set_error, vFpuipV_t) \
 	GO(g_child_watch_add_full, uFiippp_t) \
 	GO(g_timeout_add_full, uFiuppp_t) \
 	GO(g_timeout_add_seconds_full, uFiuppp_t) \
 	GO(g_option_group_new, pFppppp_t) \
-	GO(g_node_traverse, vFpiiipp_t) \
+	GO(g_node_traverse, vFpuuipp_t) \
 	GO(g_datalist_id_replace_data, iFpupppp_t) \
-	GO(g_io_add_watch_full, uFpiippp_t) \
-	GO(g_variant_new_from_data, pFppuipp_t) \
-	GO(g_thread_create_full, pFppLiiip_t) \
-	GO(g_spawn_async, iFpppipppp_t) \
-	GO(g_spawn_sync, iFpppipppppp_t) \
-	GO(g_spawn_async_with_pipes, iFpppippppppp_t)
+	GO(g_io_add_watch_full, uFpiuppp_t) \
+	GO(g_variant_new_from_data, pFppLipp_t) \
+	GO(g_thread_create_full, pFppLiiup_t) \
+	GO(g_spawn_async, iFpppupppp_t) \
+	GO(g_spawn_sync, iFpppupppppp_t) \
+	GO(g_spawn_async_with_pipes, iFpppuppppppp_t)
 
 #endif // __wrappedglib2TYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index deb7b1f2..c7398cd2 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -66,6 +66,7 @@ typedef void (*vFp_t)(void*);
 typedef void (*vFS_t)(void*);
 typedef void (*vFb_t)(void*);
 typedef int8_t (*cFv_t)(void);
+typedef int8_t (*cFc_t)(int8_t);
 typedef int8_t (*cFi_t)(int32_t);
 typedef int8_t (*cFu_t)(uint32_t);
 typedef int8_t (*cFf_t)(float);
@@ -73,6 +74,7 @@ typedef int8_t (*cFp_t)(void*);
 typedef int16_t (*wFp_t)(void*);
 typedef int32_t (*iFE_t)(x64emu_t*);
 typedef int32_t (*iFv_t)(void);
+typedef int32_t (*iFc_t)(int8_t);
 typedef int32_t (*iFw_t)(int16_t);
 typedef int32_t (*iFi_t)(int32_t);
 typedef int32_t (*iFI_t)(int64_t);
@@ -370,11 +372,12 @@ typedef void* (*pFdd_t)(double, double);
 typedef void* (*pFli_t)(intptr_t, int32_t);
 typedef void* (*pFll_t)(intptr_t, intptr_t);
 typedef void* (*pFlp_t)(intptr_t, void*);
+typedef void* (*pFLc_t)(uintptr_t, int8_t);
 typedef void* (*pFLi_t)(uintptr_t, int32_t);
-typedef void* (*pFLC_t)(uintptr_t, uint8_t);
 typedef void* (*pFLu_t)(uintptr_t, uint32_t);
 typedef void* (*pFLL_t)(uintptr_t, uintptr_t);
 typedef void* (*pFLp_t)(uintptr_t, void*);
+typedef void* (*pFpc_t)(void*, int8_t);
 typedef void* (*pFpi_t)(void*, int32_t);
 typedef void* (*pFpC_t)(void*, uint8_t);
 typedef void* (*pFpW_t)(void*, uint16_t);
@@ -578,7 +581,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, int32_t);
 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*);
@@ -614,6 +616,7 @@ typedef int32_t (*iFppd_t)(void*, void*, double);
 typedef int32_t (*iFppl_t)(void*, void*, intptr_t);
 typedef int32_t (*iFppL_t)(void*, void*, uintptr_t);
 typedef int32_t (*iFppp_t)(void*, void*, void*);
+typedef int32_t (*iFpOi_t)(void*, int32_t, int32_t);
 typedef int32_t (*iFpOu_t)(void*, int32_t, uint32_t);
 typedef int32_t (*iFSIi_t)(void*, int64_t, int32_t);
 typedef int32_t (*iFSli_t)(void*, intptr_t, int32_t);
@@ -662,6 +665,7 @@ typedef uint32_t (*uFpuL_t)(void*, uint32_t, uintptr_t);
 typedef uint32_t (*uFpup_t)(void*, uint32_t, void*);
 typedef uint32_t (*uFpfu_t)(void*, float, uint32_t);
 typedef uint32_t (*uFpli_t)(void*, intptr_t, int32_t);
+typedef uint32_t (*uFplu_t)(void*, intptr_t, uint32_t);
 typedef uint32_t (*uFpLu_t)(void*, uintptr_t, uint32_t);
 typedef uint32_t (*uFpLL_t)(void*, uintptr_t, uintptr_t);
 typedef uint32_t (*uFpLp_t)(void*, uintptr_t, void*);
@@ -789,7 +793,7 @@ 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, uint8_t);
+typedef void* (*pFplc_t)(void*, intptr_t, int8_t);
 typedef void* (*pFplu_t)(void*, intptr_t, uint32_t);
 typedef void* (*pFpll_t)(void*, intptr_t, intptr_t);
 typedef void* (*pFplp_t)(void*, intptr_t, void*);
@@ -797,9 +801,9 @@ typedef void* (*pFpLi_t)(void*, uintptr_t, int32_t);
 typedef void* (*pFpLu_t)(void*, uintptr_t, uint32_t);
 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* (*pFppC_t)(void*, void*, uint8_t);
 typedef void* (*pFppu_t)(void*, void*, uint32_t);
 typedef void* (*pFppU_t)(void*, void*, uint64_t);
 typedef void* (*pFppf_t)(void*, void*, float);
@@ -1081,7 +1085,6 @@ typedef int32_t (*iFpipu_t)(void*, int32_t, void*, uint32_t);
 typedef int32_t (*iFpipL_t)(void*, int32_t, void*, uintptr_t);
 typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
 typedef int32_t (*iFpipV_t)(void*, int32_t, void*, void*);
-typedef int32_t (*iFpIip_t)(void*, int64_t, int32_t, void*);
 typedef int32_t (*iFpCCC_t)(void*, uint8_t, uint8_t, uint8_t);
 typedef int32_t (*iFpCpi_t)(void*, uint8_t, void*, int32_t);
 typedef int32_t (*iFpCpp_t)(void*, uint8_t, void*, void*);
@@ -1188,6 +1191,7 @@ typedef uint32_t (*uFpupi_t)(void*, uint32_t, void*, int32_t);
 typedef uint32_t (*uFpupu_t)(void*, uint32_t, void*, uint32_t);
 typedef uint32_t (*uFpupp_t)(void*, uint32_t, void*, void*);
 typedef uint32_t (*uFpubp_t)(void*, uint32_t, void*, void*);
+typedef uint32_t (*uFplup_t)(void*, intptr_t, uint32_t, void*);
 typedef uint32_t (*uFppiu_t)(void*, void*, int32_t, uint32_t);
 typedef uint32_t (*uFppip_t)(void*, void*, int32_t, void*);
 typedef uint32_t (*uFppuu_t)(void*, void*, uint32_t, uint32_t);
@@ -1716,6 +1720,7 @@ typedef int32_t (*iFSppLp_t)(void*, void*, void*, uintptr_t, void*);
 typedef int64_t (*IFppIII_t)(void*, void*, int64_t, int64_t, int64_t);
 typedef uint32_t (*uFEippp_t)(x64emu_t*, int32_t, void*, void*, void*);
 typedef uint32_t (*uFEpipp_t)(x64emu_t*, void*, int32_t, void*, void*);
+typedef uint32_t (*uFEpupp_t)(x64emu_t*, void*, uint32_t, void*, void*);
 typedef uint32_t (*uFEppuu_t)(x64emu_t*, void*, void*, uint32_t, uint32_t);
 typedef uint32_t (*uFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
 typedef uint32_t (*uFEpppV_t)(x64emu_t*, void*, void*, void*, void*);
@@ -1736,6 +1741,7 @@ typedef uint32_t (*uFppipp_t)(void*, void*, int32_t, void*, void*);
 typedef uint32_t (*uFppuup_t)(void*, void*, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFppupp_t)(void*, void*, uint32_t, void*, void*);
 typedef uint32_t (*uFpplip_t)(void*, void*, intptr_t, int32_t, void*);
+typedef uint32_t (*uFpplpp_t)(void*, void*, intptr_t, void*, void*);
 typedef uint32_t (*uFppLpp_t)(void*, void*, uintptr_t, void*, void*);
 typedef uint32_t (*uFppppL_t)(void*, void*, void*, void*, uintptr_t);
 typedef uint32_t (*uFppppp_t)(void*, void*, void*, void*, void*);
@@ -1771,11 +1777,11 @@ typedef uintptr_t (*LFppLLp_t)(void*, void*, uintptr_t, uintptr_t, void*);
 typedef uintptr_t (*LFppLpL_t)(void*, void*, uintptr_t, void*, uintptr_t);
 typedef uintptr_t (*LFpppii_t)(void*, void*, void*, int32_t, int32_t);
 typedef uintptr_t (*LFppppp_t)(void*, void*, void*, void*, void*);
+typedef void* (*pFEuipV_t)(x64emu_t*, uint32_t, int32_t, void*, void*);
+typedef void* (*pFEuipA_t)(x64emu_t*, uint32_t, int32_t, void*, void*);
 typedef void* (*pFEpiii_t)(x64emu_t*, void*, int32_t, int32_t, int32_t);
 typedef void* (*pFEpipL_t)(x64emu_t*, void*, int32_t, void*, uintptr_t);
 typedef void* (*pFEpipp_t)(x64emu_t*, void*, int32_t, void*, void*);
-typedef void* (*pFEpipV_t)(x64emu_t*, void*, int32_t, void*, void*);
-typedef void* (*pFEpipA_t)(x64emu_t*, void*, int32_t, void*, void*);
 typedef void* (*pFEpupp_t)(x64emu_t*, void*, uint32_t, void*, void*);
 typedef void* (*pFEpUpp_t)(x64emu_t*, void*, uint64_t, void*, void*);
 typedef void* (*pFEpLpp_t)(x64emu_t*, void*, uintptr_t, void*, void*);
@@ -1891,7 +1897,6 @@ typedef void (*vFEpuipA_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*);
 typedef void (*vFEpupup_t)(x64emu_t*, void*, uint32_t, void*, uint32_t, void*);
 typedef void (*vFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*);
 typedef void (*vFEpLLpp_t)(x64emu_t*, void*, uintptr_t, uintptr_t, void*, void*);
-typedef void (*vFEppipV_t)(x64emu_t*, void*, void*, int32_t, void*, void*);
 typedef void (*vFEppupp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*);
 typedef void (*vFEpppLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, void*);
 typedef void (*vFEppppp_t)(x64emu_t*, void*, void*, void*, void*, void*);
@@ -2306,8 +2311,8 @@ typedef int32_t (*iWpiuppu_t)(void*, int32_t, uint32_t, void*, void*, uint32_t);
 typedef int32_t (*iWpuiiii_t)(void*, uint32_t, int32_t, int32_t, int32_t, int32_t);
 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 (*vFEpiiipp_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, void*, void*);
 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 (*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*);
@@ -2491,7 +2496,6 @@ typedef int32_t (*iFppuippp_t)(void*, void*, uint32_t, int32_t, void*, void*, vo
 typedef int32_t (*iFppuuppp_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*);
 typedef int32_t (*iFppupupp_t)(void*, void*, uint32_t, void*, uint32_t, void*, void*);
 typedef int32_t (*iFppliupp_t)(void*, void*, intptr_t, int32_t, uint32_t, void*, void*);
-typedef int32_t (*iFppLiipp_t)(void*, void*, uintptr_t, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFppLippp_t)(void*, void*, uintptr_t, int32_t, void*, void*, void*);
 typedef int32_t (*iFppLuuii_t)(void*, void*, uintptr_t, uint32_t, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFppLLLLu_t)(void*, void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uint32_t);
@@ -2513,7 +2517,7 @@ typedef int32_t (*iFpppppLp_t)(void*, void*, void*, void*, void*, uintptr_t, voi
 typedef int32_t (*iFppppppu_t)(void*, void*, void*, void*, void*, void*, uint32_t);
 typedef int32_t (*iFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFEiipppp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*);
-typedef uint32_t (*uFEpiippp_t)(x64emu_t*, void*, int32_t, int32_t, void*, void*, void*);
+typedef uint32_t (*uFEpiuppp_t)(x64emu_t*, void*, int32_t, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFEpuuppp_t)(x64emu_t*, void*, uint32_t, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFEpppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFiiiuuuu_t)(int32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -2537,7 +2541,7 @@ typedef uintptr_t (*LFpLLppuu_t)(void*, uintptr_t, uintptr_t, void*, void*, uint
 typedef void* (*pFEpupppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*);
 typedef void* (*pFEpLiiiI_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, int32_t, int64_t);
 typedef void* (*pFEpLiiil_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, int32_t, intptr_t);
-typedef void* (*pFEppuipp_t)(x64emu_t*, void*, void*, uint32_t, int32_t, void*, void*);
+typedef void* (*pFEppLipp_t)(x64emu_t*, void*, void*, uintptr_t, int32_t, void*, void*);
 typedef void* (*pFEppppip_t)(x64emu_t*, void*, void*, void*, void*, int32_t, void*);
 typedef void* (*pFEpppppi_t)(x64emu_t*, void*, void*, void*, void*, void*, int32_t);
 typedef void* (*pFifffppp_t)(int32_t, float, float, float, void*, void*, void*);
@@ -2576,7 +2580,6 @@ typedef void* (*pFppuLLip_t)(void*, void*, uint32_t, uintptr_t, uintptr_t, int32
 typedef void* (*pFppupuuu_t)(void*, void*, uint32_t, void*, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFppliuip_t)(void*, void*, intptr_t, int32_t, uint32_t, int32_t, void*);
 typedef void* (*pFpplipup_t)(void*, void*, intptr_t, int32_t, void*, uint32_t, void*);
-typedef void* (*pFppLipip_t)(void*, void*, uintptr_t, int32_t, void*, int32_t, void*);
 typedef void* (*pFppLLiLi_t)(void*, void*, uintptr_t, uintptr_t, int32_t, uintptr_t, int32_t);
 typedef void* (*pFpppccci_t)(void*, void*, void*, int8_t, int8_t, int8_t, int32_t);
 typedef void* (*pFpppiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t);
@@ -2764,7 +2767,7 @@ typedef uintptr_t (*LFpLpuuLLu_t)(void*, uintptr_t, void*, uint32_t, uint32_t, u
 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* (*pFEpiuCppp_t)(x64emu_t*, void*, int32_t, uint32_t, uint8_t, void*, void*, void*);
-typedef void* (*pFEppLiiip_t)(x64emu_t*, void*, void*, uintptr_t, int32_t, int32_t, int32_t, 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*);
 typedef void* (*pFEppppppi_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, int32_t);
@@ -2862,7 +2865,7 @@ typedef void (*vFppppipiip_t)(void*, void*, void*, void*, int32_t, void*, int32_
 typedef void (*vFpppppippp_t)(void*, void*, void*, void*, void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFEpiiiiipi_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFEppuppppp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*, void*, void*, void*);
-typedef int32_t (*iFEpppipppp_t)(x64emu_t*, void*, void*, void*, int32_t, void*, void*, void*, void*);
+typedef int32_t (*iFEpppupppp_t)(x64emu_t*, void*, void*, void*, uint32_t, void*, void*, void*, void*);
 typedef int32_t (*iFEppplPPPP_t)(x64emu_t*, void*, void*, void*, intptr_t, void*, void*, void*, void*);
 typedef int32_t (*iFEpppppupp_t)(x64emu_t*, void*, void*, void*, void*, void*, uint32_t, void*, void*);
 typedef int32_t (*iFEppppppuu_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, uint32_t, uint32_t);
@@ -3042,7 +3045,7 @@ typedef void (*vFppupppuiiii_t)(void*, void*, uint32_t, void*, void*, void*, uin
 typedef void (*vFppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEiipppppppp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEppLpLpLLpp_t)(x64emu_t*, void*, void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, uintptr_t, void*, void*);
-typedef int32_t (*iFEpppipppppp_t)(x64emu_t*, void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*);
+typedef int32_t (*iFEpppupppppp_t)(x64emu_t*, void*, void*, void*, uint32_t, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEppppiiiiuu_t)(x64emu_t*, void*, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFEpppppppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFiiiiiiiiiip_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*);
@@ -3085,7 +3088,7 @@ typedef void (*vFppuuppuiiiii_t)(void*, void*, uint32_t, uint32_t, void*, void*,
 typedef void (*vFppuupppiiiiu_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t);
 typedef void (*vFpppiiiiiiuii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFpppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
-typedef int32_t (*iFEpppippppppp_t)(x64emu_t*, void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef int32_t (*iFEpppuppppppp_t)(x64emu_t*, void*, void*, void*, uint32_t, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEppppiiiiuui_t)(x64emu_t*, void*, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFpipllipppppp_t)(void*, int32_t, void*, intptr_t, intptr_t, int32_t, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpipppppppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
@@ -3109,7 +3112,7 @@ typedef void (*vFuUuuuuuuuuuuu_t)(uint32_t, uint64_t, uint32_t, uint32_t, uint32
 typedef void (*vFuffffffffffff_t)(uint32_t, float, float, float, float, float, float, float, float, float, float, float, float);
 typedef void (*vFpipppiiiiiiuu_t)(void*, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t);
 typedef void (*vFpippppppppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
-typedef void (*vFpuppppppppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
+typedef void (*vFpLppppppppppp_t)(void*, uintptr_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFppiiiiiiuiuii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFppuuppiiiiuii_t)(void*, void*, uint32_t, uint32_t, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFppuupppuiiiii_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
@@ -3196,7 +3199,7 @@ typedef void* (*pFDip_t)(long double, int32_t, void*);
 typedef int32_t (*iFpLpD_t)(void*, uintptr_t, void*, long double);
 typedef void* (*pFDipp_t)(long double, int32_t, void*, void*);
 typedef int32_t (*iFDipppL_t)(long double, int32_t, void*, void*, void*, uintptr_t);
-typedef void (*vFppippDpDC_t)(void*, void*, int32_t, void*, void*, long double, void*, long double, uint8_t);
+typedef void (*vFppippDpDc_t)(void*, void*, int32_t, void*, void*, long double, void*, long double, int8_t);
 #else // HAVE_LD80BITS
 typedef int32_t (*iFD_t)(double);
 typedef double (*DFD_t)(double);
@@ -3221,7 +3224,7 @@ typedef void* (*pFDip_t)(double, int32_t, void*);
 typedef int32_t (*iFpLpD_t)(void*, uintptr_t, void*, double);
 typedef void* (*pFDipp_t)(double, int32_t, void*, void*);
 typedef int32_t (*iFDipppL_t)(double, int32_t, void*, void*, void*, uintptr_t);
-typedef void (*vFppippDpDC_t)(void*, void*, int32_t, void*, void*, double, void*, double, uint8_t);
+typedef void (*vFppippDpDc_t)(void*, void*, int32_t, void*, void*, double, void*, double, int8_t);
 #endif
 
 #if defined(NOALIGN)
@@ -3265,6 +3268,7 @@ void vFp(x64emu_t *emu, uintptr_t fcn) { vFp_t fn = (vFp_t)fcn; fn((void*)R_RDI)
 void vFS(x64emu_t *emu, uintptr_t fcn) { vFS_t fn = (vFS_t)fcn; fn(io_convert((void*)R_RDI)); }
 void vFb(x64emu_t *emu, uintptr_t fcn) { vFb_t fn = (vFb_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); fn(aligned_xcb); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void cFv(x64emu_t *emu, uintptr_t fcn) { cFv_t fn = (cFv_t)fcn; R_RAX=fn(); }
+void cFc(x64emu_t *emu, uintptr_t fcn) { cFc_t fn = (cFc_t)fcn; R_RAX=fn((int8_t)R_RDI); }
 void cFi(x64emu_t *emu, uintptr_t fcn) { cFi_t fn = (cFi_t)fcn; R_RAX=fn((int32_t)R_RDI); }
 void cFu(x64emu_t *emu, uintptr_t fcn) { cFu_t fn = (cFu_t)fcn; R_RAX=fn((uint32_t)R_RDI); }
 void cFf(x64emu_t *emu, uintptr_t fcn) { cFf_t fn = (cFf_t)fcn; R_RAX=fn(emu->xmm[0].f[0]); }
@@ -3272,6 +3276,7 @@ void cFp(x64emu_t *emu, uintptr_t fcn) { cFp_t fn = (cFp_t)fcn; R_RAX=fn((void*)
 void wFp(x64emu_t *emu, uintptr_t fcn) { wFp_t fn = (wFp_t)fcn; R_RAX=fn((void*)R_RDI); }
 void iFE(x64emu_t *emu, uintptr_t fcn) { iFE_t fn = (iFE_t)fcn; R_RAX=(int32_t)fn(emu); }
 void iFv(x64emu_t *emu, uintptr_t fcn) { iFv_t fn = (iFv_t)fcn; R_RAX=(int32_t)fn(); }
+void iFc(x64emu_t *emu, uintptr_t fcn) { iFc_t fn = (iFc_t)fcn; R_RAX=(int32_t)fn((int8_t)R_RDI); }
 void iFw(x64emu_t *emu, uintptr_t fcn) { iFw_t fn = (iFw_t)fcn; R_RAX=(int32_t)fn((int16_t)R_RDI); }
 void iFi(x64emu_t *emu, uintptr_t fcn) { iFi_t fn = (iFi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI); }
 void iFI(x64emu_t *emu, uintptr_t fcn) { iFI_t fn = (iFI_t)fcn; R_RAX=(int32_t)fn((int64_t)R_RDI); }
@@ -3569,11 +3574,12 @@ void pFdd(x64emu_t *emu, uintptr_t fcn) { pFdd_t fn = (pFdd_t)fcn; R_RAX=(uintpt
 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); }
 void pFlp(x64emu_t *emu, uintptr_t fcn) { pFlp_t fn = (pFlp_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, (void*)R_RSI); }
+void pFLc(x64emu_t *emu, uintptr_t fcn) { pFLc_t fn = (pFLc_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (int8_t)R_RSI); }
 void pFLi(x64emu_t *emu, uintptr_t fcn) { pFLi_t fn = (pFLi_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (int32_t)R_RSI); }
-void pFLC(x64emu_t *emu, uintptr_t fcn) { pFLC_t fn = (pFLC_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint8_t)R_RSI); }
 void pFLu(x64emu_t *emu, uintptr_t fcn) { pFLu_t fn = (pFLu_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint32_t)R_RSI); }
 void pFLL(x64emu_t *emu, uintptr_t fcn) { pFLL_t fn = (pFLL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void pFLp(x64emu_t *emu, uintptr_t fcn) { pFLp_t fn = (pFLp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
+void pFpc(x64emu_t *emu, uintptr_t fcn) { pFpc_t fn = (pFpc_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int8_t)R_RSI); }
 void pFpi(x64emu_t *emu, uintptr_t fcn) { pFpi_t fn = (pFpi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI); }
 void pFpC(x64emu_t *emu, uintptr_t fcn) { pFpC_t fn = (pFpC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint8_t)R_RSI); }
 void pFpW(x64emu_t *emu, uintptr_t fcn) { pFpW_t fn = (pFpW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI); }
@@ -3777,7 +3783,6 @@ void iFpid(x64emu_t *emu, uintptr_t fcn) { iFpid_t fn = (iFpid_t)fcn; R_RAX=(int
 void iFpil(x64emu_t *emu, uintptr_t fcn) { iFpil_t fn = (iFpil_t)fcn; R_RAX=(int32_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=(int32_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=(int32_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=(int32_t)fn((void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
 void iFpII(x64emu_t *emu, uintptr_t fcn) { iFpII_t fn = (iFpII_t)fcn; R_RAX=(int32_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=(int32_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=(int32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
@@ -3813,6 +3818,7 @@ void iFppd(x64emu_t *emu, uintptr_t fcn) { iFppd_t fn = (iFppd_t)fcn; R_RAX=(int
 void iFppl(x64emu_t *emu, uintptr_t fcn) { iFppl_t fn = (iFppl_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX); }
 void iFppL(x64emu_t *emu, uintptr_t fcn) { iFppL_t fn = (iFppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void iFppp(x64emu_t *emu, uintptr_t fcn) { iFppp_t fn = (iFppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void iFpOi(x64emu_t *emu, uintptr_t fcn) { iFpOi_t fn = (iFpOi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (int32_t)R_RDX); }
 void iFpOu(x64emu_t *emu, uintptr_t fcn) { iFpOu_t fn = (iFpOu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, of_convert((int32_t)R_RSI), (uint32_t)R_RDX); }
 void iFSIi(x64emu_t *emu, uintptr_t fcn) { iFSIi_t fn = (iFSIi_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (int64_t)R_RSI, (int32_t)R_RDX); }
 void iFSli(x64emu_t *emu, uintptr_t fcn) { iFSli_t fn = (iFSli_t)fcn; R_RAX=(int32_t)fn(io_convert((void*)R_RDI), (intptr_t)R_RSI, (int32_t)R_RDX); }
@@ -3861,6 +3867,7 @@ void uFpuL(x64emu_t *emu, uintptr_t fcn) { uFpuL_t fn = (uFpuL_t)fcn; R_RAX=(uin
 void uFpup(x64emu_t *emu, uintptr_t fcn) { uFpup_t fn = (uFpup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void uFpfu(x64emu_t *emu, uintptr_t fcn) { uFpfu_t fn = (uFpfu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, emu->xmm[0].f[0], (uint32_t)R_RSI); }
 void uFpli(x64emu_t *emu, uintptr_t fcn) { uFpli_t fn = (uFpli_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX); }
+void uFplu(x64emu_t *emu, uintptr_t fcn) { uFplu_t fn = (uFplu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX); }
 void uFpLu(x64emu_t *emu, uintptr_t fcn) { uFpLu_t fn = (uFpLu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX); }
 void uFpLL(x64emu_t *emu, uintptr_t fcn) { uFpLL_t fn = (uFpLL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 void uFpLp(x64emu_t *emu, uintptr_t fcn) { uFpLp_t fn = (uFpLp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
@@ -3988,7 +3995,7 @@ void pFpUi(x64emu_t *emu, uintptr_t fcn) { pFpUi_t fn = (pFpUi_t)fcn; R_RAX=(uin
 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, (uint8_t)R_RDX); }
+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); }
 void pFplu(x64emu_t *emu, uintptr_t fcn) { pFplu_t fn = (pFplu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX); }
 void pFpll(x64emu_t *emu, uintptr_t fcn) { pFpll_t fn = (pFpll_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void pFplp(x64emu_t *emu, uintptr_t fcn) { pFplp_t fn = (pFplp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX); }
@@ -3996,9 +4003,9 @@ void pFpLi(x64emu_t *emu, uintptr_t fcn) { pFpLi_t fn = (pFpLi_t)fcn; R_RAX=(uin
 void pFpLu(x64emu_t *emu, uintptr_t fcn) { pFpLu_t fn = (pFpLu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX); }
 void pFpLL(x64emu_t *emu, uintptr_t fcn) { pFpLL_t fn = (pFpLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 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 pFppC(x64emu_t *emu, uintptr_t fcn) { pFppC_t fn = (pFppC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint8_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]); }
@@ -4280,7 +4287,6 @@ void iFpipu(x64emu_t *emu, uintptr_t fcn) { iFpipu_t fn = (iFpipu_t)fcn; R_RAX=(
 void iFpipL(x64emu_t *emu, uintptr_t fcn) { iFpipL_t fn = (iFpipL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFpipp(x64emu_t *emu, uintptr_t fcn) { iFpipp_t fn = (iFpipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpipV(x64emu_t *emu, uintptr_t fcn) { iFpipV_t fn = (iFpipV_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
-void iFpIip(x64emu_t *emu, uintptr_t fcn) { iFpIip_t fn = (iFpIip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFpCCC(x64emu_t *emu, uintptr_t fcn) { iFpCCC_t fn = (iFpCCC_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX); }
 void iFpCpi(x64emu_t *emu, uintptr_t fcn) { iFpCpi_t fn = (iFpCpi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void iFpCpp(x64emu_t *emu, uintptr_t fcn) { iFpCpp_t fn = (iFpCpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -4387,6 +4393,7 @@ void uFpupi(x64emu_t *emu, uintptr_t fcn) { uFpupi_t fn = (uFpupi_t)fcn; R_RAX=(
 void uFpupu(x64emu_t *emu, uintptr_t fcn) { uFpupu_t fn = (uFpupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void uFpupp(x64emu_t *emu, uintptr_t fcn) { uFpupp_t fn = (uFpupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFpubp(x64emu_t *emu, uintptr_t fcn) { uFpubp_t fn = (uFpubp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDX); R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, aligned_xcb, (void*)R_RCX); unalign_xcb_connection(aligned_xcb, (void*)R_RDX); }
+void uFplup(x64emu_t *emu, uintptr_t fcn) { uFplup_t fn = (uFplup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void uFppiu(x64emu_t *emu, uintptr_t fcn) { uFppiu_t fn = (uFppiu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void uFppip(x64emu_t *emu, uintptr_t fcn) { uFppip_t fn = (uFppip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void uFppuu(x64emu_t *emu, uintptr_t fcn) { uFppuu_t fn = (uFppuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
@@ -4915,6 +4922,7 @@ void iFSppLp(x64emu_t *emu, uintptr_t fcn) { iFSppLp_t fn = (iFSppLp_t)fcn; R_RA
 void IFppIII(x64emu_t *emu, uintptr_t fcn) { IFppIII_t fn = (IFppIII_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void uFEippp(x64emu_t *emu, uintptr_t fcn) { uFEippp_t fn = (uFEippp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFEpipp(x64emu_t *emu, uintptr_t fcn) { uFEpipp_t fn = (uFEpipp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void uFEpupp(x64emu_t *emu, uintptr_t fcn) { uFEpupp_t fn = (uFEpupp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFEppuu(x64emu_t *emu, uintptr_t fcn) { uFEppuu_t fn = (uFEppuu_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void uFEpppp(x64emu_t *emu, uintptr_t fcn) { uFEpppp_t fn = (uFEpppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFEpppV(x64emu_t *emu, uintptr_t fcn) { uFEpppV_t fn = (uFEpppV_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
@@ -4935,6 +4943,7 @@ void uFppipp(x64emu_t *emu, uintptr_t fcn) { uFppipp_t fn = (uFppipp_t)fcn; R_RA
 void uFppuup(x64emu_t *emu, uintptr_t fcn) { uFppuup_t fn = (uFppuup_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 uFppupp(x64emu_t *emu, uintptr_t fcn) { uFppupp_t fn = (uFppupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFpplip(x64emu_t *emu, uintptr_t fcn) { uFpplip_t fn = (uFpplip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
+void uFpplpp(x64emu_t *emu, uintptr_t fcn) { uFpplpp_t fn = (uFpplpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFppLpp(x64emu_t *emu, uintptr_t fcn) { uFppLpp_t fn = (uFppLpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFppppL(x64emu_t *emu, uintptr_t fcn) { uFppppL_t fn = (uFppppL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void uFppppp(x64emu_t *emu, uintptr_t fcn) { uFppppp_t fn = (uFppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -4970,11 +4979,11 @@ void LFppLLp(x64emu_t *emu, uintptr_t fcn) { LFppLLp_t fn = (LFppLLp_t)fcn; R_RA
 void LFppLpL(x64emu_t *emu, uintptr_t fcn) { LFppLpL_t fn = (LFppLpL_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 LFpppii(x64emu_t *emu, uintptr_t fcn) { LFpppii_t fn = (LFpppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void LFppppp(x64emu_t *emu, uintptr_t fcn) { LFppppp_t fn = (LFppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void pFEuipV(x64emu_t *emu, uintptr_t fcn) { pFEuipV_t fn = (pFEuipV_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
+void pFEuipA(x64emu_t *emu, uintptr_t fcn) { pFEuipA_t fn = (pFEuipA_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFEpiii(x64emu_t *emu, uintptr_t fcn) { pFEpiii_t fn = (pFEpiii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFEpipL(x64emu_t *emu, uintptr_t fcn) { pFEpipL_t fn = (pFEpipL_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void pFEpipp(x64emu_t *emu, uintptr_t fcn) { pFEpipp_t fn = (pFEpipp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
-void pFEpipV(x64emu_t *emu, uintptr_t fcn) { pFEpipV_t fn = (pFEpipV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
-void pFEpipA(x64emu_t *emu, uintptr_t fcn) { pFEpipA_t fn = (pFEpipA_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFEpupp(x64emu_t *emu, uintptr_t fcn) { pFEpupp_t fn = (pFEpupp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFEpUpp(x64emu_t *emu, uintptr_t fcn) { pFEpUpp_t fn = (pFEpUpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFEpLpp(x64emu_t *emu, uintptr_t fcn) { pFEpLpp_t fn = (pFEpLpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -5090,7 +5099,6 @@ void vFEpuipA(x64emu_t *emu, uintptr_t fcn) { vFEpuipA_t fn = (vFEpuipA_t)fcn; f
 void vFEpupup(x64emu_t *emu, uintptr_t fcn) { vFEpupup_t fn = (vFEpupup_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void vFEpuppp(x64emu_t *emu, uintptr_t fcn) { vFEpuppp_t fn = (vFEpuppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEpLLpp(x64emu_t *emu, uintptr_t fcn) { vFEpLLpp_t fn = (vFEpLLpp_t)fcn; fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void vFEppipV(x64emu_t *emu, uintptr_t fcn) { vFEppipV_t fn = (vFEppipV_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
 void vFEppupp(x64emu_t *emu, uintptr_t fcn) { vFEppupp_t fn = (vFEppupp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEpppLp(x64emu_t *emu, uintptr_t fcn) { vFEpppLp_t fn = (vFEpppLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void vFEppppp(x64emu_t *emu, uintptr_t fcn) { vFEppppp_t fn = (vFEppppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5505,8 +5513,8 @@ void iWpiuppu(x64emu_t *emu, uintptr_t fcn) { iWpiuppu_t fn = (iWpiuppu_t)fcn; R
 void iWpuiiii(x64emu_t *emu, uintptr_t fcn) { iWpuiiii_t fn = (iWpuiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (uint32_t)R_RDX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 void iWpppppi(x64emu_t *emu, uintptr_t fcn) { iWpppppi_t fn = (iWpppppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (void*)R_RDX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 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 vFEpiiipp(x64emu_t *emu, uintptr_t fcn) { vFEpiiipp_t fn = (vFEpiiipp_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 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 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); }
@@ -5690,7 +5698,6 @@ void iFppuippp(x64emu_t *emu, uintptr_t fcn) { iFppuippp_t fn = (iFppuippp_t)fcn
 void iFppuuppp(x64emu_t *emu, uintptr_t fcn) { iFppuuppp_t fn = (iFppuuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFppupupp(x64emu_t *emu, uintptr_t fcn) { iFppupupp_t fn = (iFppupupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFppliupp(x64emu_t *emu, uintptr_t fcn) { iFppliupp_t fn = (iFppliupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void iFppLiipp(x64emu_t *emu, uintptr_t fcn) { iFppLiipp_t fn = (iFppLiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFppLippp(x64emu_t *emu, uintptr_t fcn) { iFppLippp_t fn = (iFppLippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFppLuuii(x64emu_t *emu, uintptr_t fcn) { iFppLuuii_t fn = (iFppLuuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFppLLLLu(x64emu_t *emu, uintptr_t fcn) { iFppLLLLu_t fn = (iFppLLLLu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
@@ -5712,7 +5719,7 @@ void iFpppppLp(x64emu_t *emu, uintptr_t fcn) { iFpppppLp_t fn = (iFpppppLp_t)fcn
 void iFppppppu(x64emu_t *emu, uintptr_t fcn) { iFppppppu_t fn = (iFppppppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFppppppp(x64emu_t *emu, uintptr_t fcn) { iFppppppp_t fn = (iFppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFEiipppp(x64emu_t *emu, uintptr_t fcn) { uFEiipppp_t fn = (uFEiipppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
-void uFEpiippp(x64emu_t *emu, uintptr_t fcn) { uFEpiippp_t fn = (uFEpiippp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void uFEpiuppp(x64emu_t *emu, uintptr_t fcn) { uFEpiuppp_t fn = (uFEpiuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFEpuuppp(x64emu_t *emu, uintptr_t fcn) { uFEpuuppp_t fn = (uFEpuuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFEpppppp(x64emu_t *emu, uintptr_t fcn) { uFEpppppp_t fn = (uFEpppppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFiiiuuuu(x64emu_t *emu, uintptr_t fcn) { uFiiiuuuu_t fn = (uFiiiuuuu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
@@ -5736,7 +5743,7 @@ void LFpLLppuu(x64emu_t *emu, uintptr_t fcn) { LFpLLppuu_t fn = (LFpLLppuu_t)fcn
 void pFEpupppp(x64emu_t *emu, uintptr_t fcn) { pFEpupppp_t fn = (pFEpupppp_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*)R_R9); }
 void pFEpLiiiI(x64emu_t *emu, uintptr_t fcn) { pFEpLiiiI_t fn = (pFEpLiiiI_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int64_t)R_R9); }
 void pFEpLiiil(x64emu_t *emu, uintptr_t fcn) { pFEpLiiil_t fn = (pFEpLiiil_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (intptr_t)R_R9); }
-void pFEppuipp(x64emu_t *emu, uintptr_t fcn) { pFEppuipp_t fn = (pFEppuipp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void pFEppLipp(x64emu_t *emu, uintptr_t fcn) { pFEppLipp_t fn = (pFEppLipp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFEppppip(x64emu_t *emu, uintptr_t fcn) { pFEppppip_t fn = (pFEppppip_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void pFEpppppi(x64emu_t *emu, uintptr_t fcn) { pFEpppppi_t fn = (pFEpppppi_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 pFifffppp(x64emu_t *emu, uintptr_t fcn) { pFifffppp_t fn = (pFifffppp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -5775,7 +5782,6 @@ void pFppuLLip(x64emu_t *emu, uintptr_t fcn) { pFppuLLip_t fn = (pFppuLLip_t)fcn
 void pFppupuuu(x64emu_t *emu, uintptr_t fcn) { pFppupuuu_t fn = (pFppupuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void pFppliuip(x64emu_t *emu, uintptr_t fcn) { pFppliuip_t fn = (pFppliuip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFpplipup(x64emu_t *emu, uintptr_t fcn) { pFpplipup_t fn = (pFpplipup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
-void pFppLipip(x64emu_t *emu, uintptr_t fcn) { pFppLipip_t fn = (pFppLipip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFppLLiLi(x64emu_t *emu, uintptr_t fcn) { pFppLLiLi_t fn = (pFppLLiLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8, (uintptr_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFpppccci(x64emu_t *emu, uintptr_t fcn) { pFpppccci_t fn = (pFpppccci_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int8_t)R_RCX, (int8_t)R_R8, (int8_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFpppiiii(x64emu_t *emu, uintptr_t fcn) { pFpppiiii_t fn = (pFpppiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
@@ -5963,7 +5969,7 @@ void LFpLpuuLLu(x64emu_t *emu, uintptr_t fcn) { LFpLpuuLLu_t fn = (LFpLpuuLLu_t)
 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 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 pFEppLiiip(x64emu_t *emu, uintptr_t fcn) { pFEppLiiip_t fn = (pFEppLiiip_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, (int32_t)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)); }
 void pFEppppppi(x64emu_t *emu, uintptr_t fcn) { pFEppppppi_t fn = (pFEppppppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
@@ -6061,7 +6067,7 @@ void vFppppipiip(x64emu_t *emu, uintptr_t fcn) { vFppppipiip_t fn = (vFppppipiip
 void vFpppppippp(x64emu_t *emu, uintptr_t fcn) { vFpppppippp_t fn = (vFpppppippp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFEpiiiiipi(x64emu_t *emu, uintptr_t fcn) { iFEpiiiiipi_t fn = (iFEpiiiiipi_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void iFEppuppppp(x64emu_t *emu, uintptr_t fcn) { iFEppuppppp_t fn = (iFEppuppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void iFEpppipppp(x64emu_t *emu, uintptr_t fcn) { iFEpppipppp_t fn = (iFEpppipppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void iFEpppupppp(x64emu_t *emu, uintptr_t fcn) { iFEpppupppp_t fn = (iFEpppupppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFEppplPPPP(x64emu_t *emu, uintptr_t fcn) { iFEppplPPPP_t fn = (iFEppplPPPP_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFEpppppupp(x64emu_t *emu, uintptr_t fcn) { iFEpppppupp_t fn = (iFEpppppupp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFEppppppuu(x64emu_t *emu, uintptr_t fcn) { iFEppppppuu_t fn = (iFEppppppuu_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
@@ -6241,7 +6247,7 @@ void vFppupppuiiii(x64emu_t *emu, uintptr_t fcn) { vFppupppuiiii_t fn = (vFppupp
 void vFppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFppppppppppp_t fn = (vFppppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFEiipppppppp(x64emu_t *emu, uintptr_t fcn) { iFEiipppppppp_t fn = (iFEiipppppppp_t)fcn; R_RAX=(int32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFEppLpLpLLpp(x64emu_t *emu, uintptr_t fcn) { iFEppLpLpLLpp_t fn = (iFEppLpLpLLpp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
-void iFEpppipppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppipppppp_t fn = (iFEpppipppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
+void iFEpppupppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppupppppp_t fn = (iFEpppupppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFEppppiiiiuu(x64emu_t *emu, uintptr_t fcn) { iFEppppiiiiuu_t fn = (iFEppppiiiiuu_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
 void iFEpppppppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppppppppp_t fn = (iFEpppppppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFiiiiiiiiiip(x64emu_t *emu, uintptr_t fcn) { iFiiiiiiiiiip_t fn = (iFiiiiiiiiiip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(void**)(R_RSP + 40)); }
@@ -6284,7 +6290,7 @@ void vFppuuppuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuppuiiiii_t fn = (vFppu
 void vFppuupppiiiiu(x64emu_t *emu, uintptr_t fcn) { vFppuupppiiiiu_t fn = (vFppuupppiiiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48)); }
 void vFpppiiiiiiuii(x64emu_t *emu, uintptr_t fcn) { vFpppiiiiiiuii_t fn = (vFpppiiiiiiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 void vFpppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpppppppppppp_t fn = (vFpppppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
-void iFEpppippppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppippppppp_t fn = (iFEpppippppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
+void iFEpppuppppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppuppppppp_t fn = (iFEpppuppppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFEppppiiiiuui(x64emu_t *emu, uintptr_t fcn) { iFEppppiiiiuui_t fn = (iFEppppiiiiuui_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void iFpipllipppppp(x64emu_t *emu, uintptr_t fcn) { iFpipllipppppp_t fn = (iFpipllipppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void iFpipppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpipppppppppp_t fn = (iFpipppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
@@ -6308,7 +6314,7 @@ void vFuUuuuuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFuUuuuuuuuuuuu_t fn = (vFu
 void vFuffffffffffff(x64emu_t *emu, uintptr_t fcn) { vFuffffffffffff_t fn = (vFuffffffffffff_t)fcn; fn((uint32_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0], emu->xmm[6].f[0], emu->xmm[7].f[0], *(float*)(R_RSP + 8), *(float*)(R_RSP + 16), *(float*)(R_RSP + 24), *(float*)(R_RSP + 32)); }
 void vFpipppiiiiiiuu(x64emu_t *emu, uintptr_t fcn) { vFpipppiiiiiiuu_t fn = (vFpipppiiiiiiuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(uint32_t*)(R_RSP + 56)); }
 void vFpippppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpippppppppppp_t fn = (vFpippppppppppp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
-void vFpuppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpuppppppppppp_t fn = (vFpuppppppppppp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
+void vFpLppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpLppppppppppp_t fn = (vFpLppppppppppp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void vFppiiiiiiuiuii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiiuiuii_t fn = (vFppiiiiiiuiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
 void vFppuuppiiiiuii(x64emu_t *emu, uintptr_t fcn) { vFppuuppiiiiuii_t fn = (vFppuuppiiiiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
 void vFppuupppuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuupppuiiiii_t fn = (vFppuupppuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
@@ -6395,7 +6401,7 @@ void pFDip(x64emu_t *emu, uintptr_t fcn) { pFDip_t fn = (pFDip_t)fcn; R_RAX=(uin
 void iFpLpD(x64emu_t *emu, uintptr_t fcn) { iFpLpD_t fn = (iFpLpD_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, LD2localLD((void*)(R_RSP + 8))); }
 void pFDipp(x64emu_t *emu, uintptr_t fcn) { pFDipp_t fn = (pFDipp_t)fcn; R_RAX=(uintptr_t)fn(LD2localLD((void*)(R_RSP + 8)), (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFDipppL(x64emu_t *emu, uintptr_t fcn) { iFDipppL_t fn = (iFDipppL_t)fcn; R_RAX=(int32_t)fn(LD2localLD((void*)(R_RSP + 8)), (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
-void vFppippDpDC(x64emu_t *emu, uintptr_t fcn) { vFppippDpDC_t fn = (vFppippDpDC_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, LD2localLD((void*)(R_RSP + 8)), (void*)R_R9, LD2localLD((void*)(R_RSP + 24)), *(uint8_t*)(R_RSP + 40)); }
+void vFppippDpDc(x64emu_t *emu, uintptr_t fcn) { vFppippDpDc_t fn = (vFppippDpDc_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, LD2localLD((void*)(R_RSP + 8)), (void*)R_R9, LD2localLD((void*)(R_RSP + 24)), *(int8_t*)(R_RSP + 40)); }
 #else // HAVE_LD80BITS
 void iFD(x64emu_t *emu, uintptr_t fcn) { iFD_t fn = (iFD_t)fcn; R_RAX=(int32_t)fn(FromLD((void*)(R_RSP + 8))); }
 void DFD(x64emu_t *emu, uintptr_t fcn) { DFD_t fn = (DFD_t)fcn; double db=fn(FromLD((void*)(R_RSP + 8))); fpu_do_push(emu); ST0val = db; }
@@ -6420,7 +6426,7 @@ void pFDip(x64emu_t *emu, uintptr_t fcn) { pFDip_t fn = (pFDip_t)fcn; R_RAX=(uin
 void iFpLpD(x64emu_t *emu, uintptr_t fcn) { iFpLpD_t fn = (iFpLpD_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, FromLD((void*)(R_RSP + 8))); }
 void pFDipp(x64emu_t *emu, uintptr_t fcn) { pFDipp_t fn = (pFDipp_t)fcn; R_RAX=(uintptr_t)fn(FromLD((void*)(R_RSP + 8)), (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFDipppL(x64emu_t *emu, uintptr_t fcn) { iFDipppL_t fn = (iFDipppL_t)fcn; R_RAX=(int32_t)fn(FromLD((void*)(R_RSP + 8)), (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
-void vFppippDpDC(x64emu_t *emu, uintptr_t fcn) { vFppippDpDC_t fn = (vFppippDpDC_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, FromLD((void*)(R_RSP + 8)), (void*)R_R9, FromLD((void*)(R_RSP + 24)), *(uint8_t*)(R_RSP + 40)); }
+void vFppippDpDc(x64emu_t *emu, uintptr_t fcn) { vFppippDpDc_t fn = (vFppippDpDc_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, FromLD((void*)(R_RSP + 8)), (void*)R_R9, FromLD((void*)(R_RSP + 24)), *(int8_t*)(R_RSP + 40)); }
 #endif
 
 #if defined(NOALIGN)
@@ -6474,12 +6480,14 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFL) return 1;
 	if (fun == &vFp) return 1;
 	if (fun == &cFv) return 1;
+	if (fun == &cFc) return 1;
 	if (fun == &cFi) return 1;
 	if (fun == &cFu) return 1;
 	if (fun == &cFf) return 2;
 	if (fun == &cFp) return 1;
 	if (fun == &wFp) return 1;
 	if (fun == &iFv) return 1;
+	if (fun == &iFc) return 1;
 	if (fun == &iFw) return 1;
 	if (fun == &iFi) return 1;
 	if (fun == &iFI) return 1;
@@ -6714,11 +6722,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFli) return 1;
 	if (fun == &pFll) return 1;
 	if (fun == &pFlp) return 1;
+	if (fun == &pFLc) return 1;
 	if (fun == &pFLi) return 1;
-	if (fun == &pFLC) return 1;
 	if (fun == &pFLu) return 1;
 	if (fun == &pFLL) return 1;
 	if (fun == &pFLp) return 1;
+	if (fun == &pFpc) return 1;
 	if (fun == &pFpi) return 1;
 	if (fun == &pFpC) return 1;
 	if (fun == &pFpW) return 1;
@@ -6880,7 +6889,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 == &iFpII) return 1;
 	if (fun == &iFpCp) return 1;
 	if (fun == &iFpWp) return 1;
@@ -6951,6 +6959,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpup) return 1;
 	if (fun == &uFpfu) return 2;
 	if (fun == &uFpli) return 1;
+	if (fun == &uFplu) return 1;
 	if (fun == &uFpLu) return 1;
 	if (fun == &uFpLL) return 1;
 	if (fun == &uFpLp) return 1;
@@ -7057,7 +7066,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpUu) return 1;
 	if (fun == &pFpdu) return 2;
 	if (fun == &pFpdd) return 3;
-	if (fun == &pFplC) return 1;
+	if (fun == &pFplc) return 1;
 	if (fun == &pFplu) return 1;
 	if (fun == &pFpll) return 1;
 	if (fun == &pFplp) return 1;
@@ -7065,9 +7074,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpLu) return 1;
 	if (fun == &pFpLL) return 1;
 	if (fun == &pFpLp) return 1;
+	if (fun == &pFppc) return 1;
 	if (fun == &pFppi) return 1;
 	if (fun == &pFppI) return 1;
-	if (fun == &pFppC) return 1;
 	if (fun == &pFppu) return 1;
 	if (fun == &pFppU) return 1;
 	if (fun == &pFppf) return 2;
@@ -7278,7 +7287,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpipu) return 1;
 	if (fun == &iFpipL) return 1;
 	if (fun == &iFpipp) return 1;
-	if (fun == &iFpIip) return 1;
 	if (fun == &iFpCCC) return 1;
 	if (fun == &iFpCpi) return 1;
 	if (fun == &iFpCpp) return 1;
@@ -7373,6 +7381,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpupi) return 1;
 	if (fun == &uFpupu) return 1;
 	if (fun == &uFpupp) return 1;
+	if (fun == &uFplup) return 1;
 	if (fun == &uFppiu) return 1;
 	if (fun == &uFppip) return 1;
 	if (fun == &uFppuu) return 1;
@@ -7819,6 +7828,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFppuup) return 1;
 	if (fun == &uFppupp) return 1;
 	if (fun == &uFpplip) return 1;
+	if (fun == &uFpplpp) return 1;
 	if (fun == &uFppLpp) return 1;
 	if (fun == &uFppppL) return 1;
 	if (fun == &uFppppp) return 1;
@@ -8465,7 +8475,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFdd) return 5;
 	if (fun == &pFll) return 1;
 	if (fun == &pFlp) return 1;
-	if (fun == &pFLC) return 1;
 	if (fun == &pFLu) return 1;
 	if (fun == &pFLL) return 1;
 	if (fun == &pFLp) return 1;
@@ -8551,6 +8560,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpuL) return 1;
 	if (fun == &uFpup) return 1;
 	if (fun == &uFpfu) return 3;
+	if (fun == &uFplu) return 1;
 	if (fun == &uFpLu) return 1;
 	if (fun == &uFpLL) return 1;
 	if (fun == &uFpLp) return 1;
@@ -8610,7 +8620,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpUu) return 1;
 	if (fun == &pFpdu) return 3;
 	if (fun == &pFpdd) return 5;
-	if (fun == &pFplC) return 1;
 	if (fun == &pFplu) return 1;
 	if (fun == &pFpll) return 1;
 	if (fun == &pFplp) return 1;
@@ -8618,7 +8627,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpLL) return 1;
 	if (fun == &pFpLp) return 1;
 	if (fun == &pFppI) return 1;
-	if (fun == &pFppC) return 1;
 	if (fun == &pFppu) return 1;
 	if (fun == &pFppU) return 1;
 	if (fun == &pFppf) return 3;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 4db79127..8996c9f1 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -52,6 +52,7 @@ void vFp(x64emu_t *emu, uintptr_t fnc);
 void vFS(x64emu_t *emu, uintptr_t fnc);
 void vFb(x64emu_t *emu, uintptr_t fnc);
 void cFv(x64emu_t *emu, uintptr_t fnc);
+void cFc(x64emu_t *emu, uintptr_t fnc);
 void cFi(x64emu_t *emu, uintptr_t fnc);
 void cFu(x64emu_t *emu, uintptr_t fnc);
 void cFf(x64emu_t *emu, uintptr_t fnc);
@@ -59,6 +60,7 @@ void cFp(x64emu_t *emu, uintptr_t fnc);
 void wFp(x64emu_t *emu, uintptr_t fnc);
 void iFE(x64emu_t *emu, uintptr_t fnc);
 void iFv(x64emu_t *emu, uintptr_t fnc);
+void iFc(x64emu_t *emu, uintptr_t fnc);
 void iFw(x64emu_t *emu, uintptr_t fnc);
 void iFi(x64emu_t *emu, uintptr_t fnc);
 void iFI(x64emu_t *emu, uintptr_t fnc);
@@ -370,11 +372,12 @@ void pFdd(x64emu_t *emu, uintptr_t fnc);
 void pFli(x64emu_t *emu, uintptr_t fnc);
 void pFll(x64emu_t *emu, uintptr_t fnc);
 void pFlp(x64emu_t *emu, uintptr_t fnc);
+void pFLc(x64emu_t *emu, uintptr_t fnc);
 void pFLi(x64emu_t *emu, uintptr_t fnc);
-void pFLC(x64emu_t *emu, uintptr_t fnc);
 void pFLu(x64emu_t *emu, uintptr_t fnc);
 void pFLL(x64emu_t *emu, uintptr_t fnc);
 void pFLp(x64emu_t *emu, uintptr_t fnc);
+void pFpc(x64emu_t *emu, uintptr_t fnc);
 void pFpi(x64emu_t *emu, uintptr_t fnc);
 void pFpC(x64emu_t *emu, uintptr_t fnc);
 void pFpW(x64emu_t *emu, uintptr_t fnc);
@@ -580,7 +583,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 iFpII(x64emu_t *emu, uintptr_t fnc);
 void iFpCp(x64emu_t *emu, uintptr_t fnc);
 void iFpWp(x64emu_t *emu, uintptr_t fnc);
@@ -616,6 +618,7 @@ void iFppd(x64emu_t *emu, uintptr_t fnc);
 void iFppl(x64emu_t *emu, uintptr_t fnc);
 void iFppL(x64emu_t *emu, uintptr_t fnc);
 void iFppp(x64emu_t *emu, uintptr_t fnc);
+void iFpOi(x64emu_t *emu, uintptr_t fnc);
 void iFpOu(x64emu_t *emu, uintptr_t fnc);
 void iFSIi(x64emu_t *emu, uintptr_t fnc);
 void iFSli(x64emu_t *emu, uintptr_t fnc);
@@ -664,6 +667,7 @@ void uFpuL(x64emu_t *emu, uintptr_t fnc);
 void uFpup(x64emu_t *emu, uintptr_t fnc);
 void uFpfu(x64emu_t *emu, uintptr_t fnc);
 void uFpli(x64emu_t *emu, uintptr_t fnc);
+void uFplu(x64emu_t *emu, uintptr_t fnc);
 void uFpLu(x64emu_t *emu, uintptr_t fnc);
 void uFpLL(x64emu_t *emu, uintptr_t fnc);
 void uFpLp(x64emu_t *emu, uintptr_t fnc);
@@ -795,7 +799,7 @@ 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);
+void pFplc(x64emu_t *emu, uintptr_t fnc);
 void pFplu(x64emu_t *emu, uintptr_t fnc);
 void pFpll(x64emu_t *emu, uintptr_t fnc);
 void pFplp(x64emu_t *emu, uintptr_t fnc);
@@ -803,9 +807,9 @@ void pFpLi(x64emu_t *emu, uintptr_t fnc);
 void pFpLu(x64emu_t *emu, uintptr_t fnc);
 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 pFppC(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);
@@ -1087,7 +1091,6 @@ void iFpipu(x64emu_t *emu, uintptr_t fnc);
 void iFpipL(x64emu_t *emu, uintptr_t fnc);
 void iFpipp(x64emu_t *emu, uintptr_t fnc);
 void iFpipV(x64emu_t *emu, uintptr_t fnc);
-void iFpIip(x64emu_t *emu, uintptr_t fnc);
 void iFpCCC(x64emu_t *emu, uintptr_t fnc);
 void iFpCpi(x64emu_t *emu, uintptr_t fnc);
 void iFpCpp(x64emu_t *emu, uintptr_t fnc);
@@ -1195,6 +1198,7 @@ void uFpupi(x64emu_t *emu, uintptr_t fnc);
 void uFpupu(x64emu_t *emu, uintptr_t fnc);
 void uFpupp(x64emu_t *emu, uintptr_t fnc);
 void uFpubp(x64emu_t *emu, uintptr_t fnc);
+void uFplup(x64emu_t *emu, uintptr_t fnc);
 void uFppiu(x64emu_t *emu, uintptr_t fnc);
 void uFppip(x64emu_t *emu, uintptr_t fnc);
 void uFppuu(x64emu_t *emu, uintptr_t fnc);
@@ -1724,6 +1728,7 @@ void iFSppLp(x64emu_t *emu, uintptr_t fnc);
 void IFppIII(x64emu_t *emu, uintptr_t fnc);
 void uFEippp(x64emu_t *emu, uintptr_t fnc);
 void uFEpipp(x64emu_t *emu, uintptr_t fnc);
+void uFEpupp(x64emu_t *emu, uintptr_t fnc);
 void uFEppuu(x64emu_t *emu, uintptr_t fnc);
 void uFEpppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpppV(x64emu_t *emu, uintptr_t fnc);
@@ -1744,6 +1749,7 @@ void uFppipp(x64emu_t *emu, uintptr_t fnc);
 void uFppuup(x64emu_t *emu, uintptr_t fnc);
 void uFppupp(x64emu_t *emu, uintptr_t fnc);
 void uFpplip(x64emu_t *emu, uintptr_t fnc);
+void uFpplpp(x64emu_t *emu, uintptr_t fnc);
 void uFppLpp(x64emu_t *emu, uintptr_t fnc);
 void uFppppL(x64emu_t *emu, uintptr_t fnc);
 void uFppppp(x64emu_t *emu, uintptr_t fnc);
@@ -1779,11 +1785,11 @@ void LFppLLp(x64emu_t *emu, uintptr_t fnc);
 void LFppLpL(x64emu_t *emu, uintptr_t fnc);
 void LFpppii(x64emu_t *emu, uintptr_t fnc);
 void LFppppp(x64emu_t *emu, uintptr_t fnc);
+void pFEuipV(x64emu_t *emu, uintptr_t fnc);
+void pFEuipA(x64emu_t *emu, uintptr_t fnc);
 void pFEpiii(x64emu_t *emu, uintptr_t fnc);
 void pFEpipL(x64emu_t *emu, uintptr_t fnc);
 void pFEpipp(x64emu_t *emu, uintptr_t fnc);
-void pFEpipV(x64emu_t *emu, uintptr_t fnc);
-void pFEpipA(x64emu_t *emu, uintptr_t fnc);
 void pFEpupp(x64emu_t *emu, uintptr_t fnc);
 void pFEpUpp(x64emu_t *emu, uintptr_t fnc);
 void pFEpLpp(x64emu_t *emu, uintptr_t fnc);
@@ -1899,7 +1905,6 @@ void vFEpuipA(x64emu_t *emu, uintptr_t fnc);
 void vFEpupup(x64emu_t *emu, uintptr_t fnc);
 void vFEpuppp(x64emu_t *emu, uintptr_t fnc);
 void vFEpLLpp(x64emu_t *emu, uintptr_t fnc);
-void vFEppipV(x64emu_t *emu, uintptr_t fnc);
 void vFEppupp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppLp(x64emu_t *emu, uintptr_t fnc);
 void vFEppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2315,8 +2320,8 @@ void iWpiuppu(x64emu_t *emu, uintptr_t fnc);
 void iWpuiiii(x64emu_t *emu, uintptr_t fnc);
 void iWpppppi(x64emu_t *emu, uintptr_t fnc);
 void iWpppppu(x64emu_t *emu, uintptr_t fnc);
-void vFEpiiipp(x64emu_t *emu, uintptr_t fnc);
 void vFEpuipuV(x64emu_t *emu, uintptr_t fnc);
+void vFEpuuipp(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);
@@ -2500,7 +2505,6 @@ void iFppuippp(x64emu_t *emu, uintptr_t fnc);
 void iFppuuppp(x64emu_t *emu, uintptr_t fnc);
 void iFppupupp(x64emu_t *emu, uintptr_t fnc);
 void iFppliupp(x64emu_t *emu, uintptr_t fnc);
-void iFppLiipp(x64emu_t *emu, uintptr_t fnc);
 void iFppLippp(x64emu_t *emu, uintptr_t fnc);
 void iFppLuuii(x64emu_t *emu, uintptr_t fnc);
 void iFppLLLLu(x64emu_t *emu, uintptr_t fnc);
@@ -2522,7 +2526,7 @@ void iFpppppLp(x64emu_t *emu, uintptr_t fnc);
 void iFppppppu(x64emu_t *emu, uintptr_t fnc);
 void iFppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFEiipppp(x64emu_t *emu, uintptr_t fnc);
-void uFEpiippp(x64emu_t *emu, uintptr_t fnc);
+void uFEpiuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpuuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpppppp(x64emu_t *emu, uintptr_t fnc);
 void uFiiiuuuu(x64emu_t *emu, uintptr_t fnc);
@@ -2546,7 +2550,7 @@ void LFpLLppuu(x64emu_t *emu, uintptr_t fnc);
 void pFEpupppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiiI(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiil(x64emu_t *emu, uintptr_t fnc);
-void pFEppuipp(x64emu_t *emu, uintptr_t fnc);
+void pFEppLipp(x64emu_t *emu, uintptr_t fnc);
 void pFEppppip(x64emu_t *emu, uintptr_t fnc);
 void pFEpppppi(x64emu_t *emu, uintptr_t fnc);
 void pFifffppp(x64emu_t *emu, uintptr_t fnc);
@@ -2585,7 +2589,6 @@ void pFppuLLip(x64emu_t *emu, uintptr_t fnc);
 void pFppupuuu(x64emu_t *emu, uintptr_t fnc);
 void pFppliuip(x64emu_t *emu, uintptr_t fnc);
 void pFpplipup(x64emu_t *emu, uintptr_t fnc);
-void pFppLipip(x64emu_t *emu, uintptr_t fnc);
 void pFppLLiLi(x64emu_t *emu, uintptr_t fnc);
 void pFpppccci(x64emu_t *emu, uintptr_t fnc);
 void pFpppiiii(x64emu_t *emu, uintptr_t fnc);
@@ -2773,7 +2776,7 @@ void LFpLpuuLLu(x64emu_t *emu, uintptr_t fnc);
 void pFEiplllpp(x64emu_t *emu, uintptr_t fnc);
 void pFEipLLLpp(x64emu_t *emu, uintptr_t fnc);
 void pFEpiuCppp(x64emu_t *emu, uintptr_t fnc);
-void pFEppLiiip(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);
 void pFEppppppi(x64emu_t *emu, uintptr_t fnc);
@@ -2854,7 +2857,7 @@ void vFppiiiiipi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiupi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiipiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiupiiii(x64emu_t *emu, uintptr_t fnc);
-void vFppippDpDC(x64emu_t *emu, uintptr_t fnc);
+void vFppippDpDc(x64emu_t *emu, uintptr_t fnc);
 void vFppipppiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuippiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuiiiii(x64emu_t *emu, uintptr_t fnc);
@@ -2872,7 +2875,7 @@ void vFppppipiip(x64emu_t *emu, uintptr_t fnc);
 void vFpppppippp(x64emu_t *emu, uintptr_t fnc);
 void iFEpiiiiipi(x64emu_t *emu, uintptr_t fnc);
 void iFEppuppppp(x64emu_t *emu, uintptr_t fnc);
-void iFEpppipppp(x64emu_t *emu, uintptr_t fnc);
+void iFEpppupppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppplPPPP(x64emu_t *emu, uintptr_t fnc);
 void iFEpppppupp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppppuu(x64emu_t *emu, uintptr_t fnc);
@@ -3052,7 +3055,7 @@ void vFppupppuiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEiipppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppLpLpLLpp(x64emu_t *emu, uintptr_t fnc);
-void iFEpppipppppp(x64emu_t *emu, uintptr_t fnc);
+void iFEpppupppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppiiiiuu(x64emu_t *emu, uintptr_t fnc);
 void iFEpppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFiiiiiiiiiip(x64emu_t *emu, uintptr_t fnc);
@@ -3095,7 +3098,7 @@ void vFppuuppuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuupppiiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpppiiiiiiuii(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppp(x64emu_t *emu, uintptr_t fnc);
-void iFEpppippppppp(x64emu_t *emu, uintptr_t fnc);
+void iFEpppuppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppiiiiuui(x64emu_t *emu, uintptr_t fnc);
 void iFpipllipppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpipppppppppp(x64emu_t *emu, uintptr_t fnc);
@@ -3119,7 +3122,7 @@ void vFuUuuuuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFuffffffffffff(x64emu_t *emu, uintptr_t fnc);
 void vFpipppiiiiiiuu(x64emu_t *emu, uintptr_t fnc);
 void vFpippppppppppp(x64emu_t *emu, uintptr_t fnc);
-void vFpuppppppppppp(x64emu_t *emu, uintptr_t fnc);
+void vFpLppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiiiuiuii(x64emu_t *emu, uintptr_t fnc);
 void vFppuuppiiiiuii(x64emu_t *emu, uintptr_t fnc);
 void vFppuupppuiiiii(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedglib2.c b/src/wrapped/wrappedglib2.c
index be455568..0917ed42 100644
--- a/src/wrapped/wrappedglib2.c
+++ b/src/wrapped/wrappedglib2.c
@@ -945,17 +945,17 @@ EXPORT void* my_g_hash_table_find(x64emu_t* emu, void* table, void* f, void* dat
     return my->g_hash_table_find(table, findGHRFuncFct(f), data);
 }
 
-EXPORT int my_g_spawn_async_with_pipes(x64emu_t* emu, void* dir, void* argv, void* envp, int flags, void* f, void* data, void* child, void* input, void* output, void* err, void* error)
+EXPORT int my_g_spawn_async_with_pipes(x64emu_t* emu, void* dir, void* argv, void* envp, uint32_t flags, void* f, void* data, void* child, void* input, void* output, void* err, void* error)
 {
     return my->g_spawn_async_with_pipes(dir, argv, envp, flags, findSpawnChildSetupFct(f), data, child, input, output, err, error);
 }
 
-EXPORT int my_g_spawn_async(x64emu_t* emu, void* dir, void* argv, void* envp, int flags, void* f, void* data, void* child, void* error)
+EXPORT int my_g_spawn_async(x64emu_t* emu, void* dir, void* argv, void* envp, uint32_t flags, void* f, void* data, void* child, void* error)
 {
     return my->g_spawn_async(dir, argv, envp, flags, findSpawnChildSetupFct(f), data, child, error);
 }
 
-EXPORT int my_g_spawn_sync(x64emu_t* emu, void* dir, void* argv, void* envp, int flags, void* f, void* data, void* input, void* output, void* status, void* error)
+EXPORT int my_g_spawn_sync(x64emu_t* emu, void* dir, void* argv, void* envp, uint32_t flags, void* f, void* data, void* input, void* output, void* status, void* error)
 {
     return my->g_spawn_sync(dir, argv, envp, flags, findSpawnChildSetupFct(f), data, input, output, status, error);
 }
@@ -1021,7 +1021,7 @@ EXPORT void* my_g_thread_create(x64emu_t* emu, void* func, void* data, int joina
     return my->g_thread_create(my_prepare_thread(emu, func, data, 0, &et), et, joinable, error);
 }
 
-EXPORT void* my_g_thread_create_full(x64emu_t* emu, void* func, void* data, unsigned long stack, int joinable, int bound, int priority, void* error)
+EXPORT void* my_g_thread_create_full(x64emu_t* emu, void* func, void* data, unsigned long stack, int joinable, int bound, uint32_t priority, void* error)
 {
     void* et = NULL;
     return my->g_thread_create_full(my_prepare_thread(emu, func, data, stack, &et), et, stack, joinable, bound, priority, error);
@@ -1117,12 +1117,12 @@ EXPORT void* my_g_log_set_default_handler(x64emu_t *emu, void* f, void* data)
     return reverseGLogFuncFct(my->g_log_set_default_handler(findGLogFuncFct(f), data));
 }
 
-EXPORT uint32_t my_g_io_add_watch_full(x64emu_t* emu, void* channel, int priority, int cond, void* f, void* data, void* notify)
+EXPORT uint32_t my_g_io_add_watch_full(x64emu_t* emu, void* channel, int priority, uint32_t cond, void* f, void* data, void* notify)
 {
     return my->g_io_add_watch_full(channel, priority, cond, findGIOFuncFct(f), data, findDestroyFct(notify));
 }
 
-EXPORT uint32_t my_g_io_add_watch(x64emu_t* emu, void* channel, int cond, void* f, void* data)
+EXPORT uint32_t my_g_io_add_watch(x64emu_t* emu, void* channel, uint32_t cond, void* f, void* data)
 {
     return my->g_io_add_watch(channel, cond, findGIOFuncFct(f), data);
 }
@@ -1204,7 +1204,7 @@ EXPORT uint32_t my_g_log_set_handler(x64emu_t *emu, void* domain, int level, voi
     return my->g_log_set_handler(domain, level, findGLogFuncFct(f), data);
 }
 
-EXPORT void my_g_set_error(x64emu_t *emu, void* err, void* domain, int code, void* fmt, uintptr_t* stack)
+EXPORT void my_g_set_error(x64emu_t *emu, void* err, void* domain, uint32_t code, void* fmt, uintptr_t* stack)
 {
     char buf[1000];
     myStackAlign(emu, fmt, stack, emu->scratch, R_EAX, 4);
@@ -1213,13 +1213,13 @@ EXPORT void my_g_set_error(x64emu_t *emu, void* err, void* domain, int code, voi
     my->g_set_error_literal(err, domain, code, buf);
 }
 
-EXPORT void* my_g_error_new(x64emu_t* emu, void* domain, int code, void* fmt, uintptr_t* b)
+EXPORT void* my_g_error_new(x64emu_t* emu, uint32_t domain, int code, void* fmt, uintptr_t* b)
 {
     myStackAlign(emu, fmt, b, emu->scratch, R_EAX, 3);
     PREPARE_VALIST;
     return my->g_error_new_valist(domain, code, fmt, VARARGS);
 }
-EXPORT void* my_g_error_new_valist(x64emu_t* emu, void* domain, int code, void* fmt, x64_va_list_t V)
+EXPORT void* my_g_error_new_valist(x64emu_t* emu, uint32_t domain, int code, void* fmt, x64_va_list_t V)
 {
     #ifdef CONVERT_VALIST
     CONVERT_VALIST(V);
@@ -1393,7 +1393,7 @@ EXPORT void* my_g_strconcat(x64emu_t* emu, void* first, uintptr_t* data)
     return p;
 }
 
-EXPORT void* my_g_markup_parse_context_new(x64emu_t* emu, void* parser, int flags, void* data, void* destroy)
+EXPORT void* my_g_markup_parse_context_new(x64emu_t* emu, void* parser, uint32_t flags, void* data, void* destroy)
 {
     return my->g_markup_parse_context_new(parser, flags, data, findDestroyFct(destroy));
 }
diff --git a/src/wrapped/wrappedglib2_private.h b/src/wrapped/wrappedglib2_private.h
index 7c62b550..deee3912 100644
--- a/src/wrapped/wrappedglib2_private.h
+++ b/src/wrapped/wrappedglib2_private.h
@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 //GO(__aeabi_d2lz, 
@@ -24,21 +24,21 @@ GO(g_array_sized_new, pFiiuu)
 GOM(g_array_sort, vFEpp)
 GOM(g_array_sort_with_data, vFEppp)
 GO(g_array_unref, vFp)
-GO(g_ascii_digit_value, iFC)
+GO(g_ascii_digit_value, iFc)
 GO(g_ascii_dtostr, pFpid)
 GO(g_ascii_formatd, pFpipd)
 GO(g_ascii_strcasecmp, iFpp)
-GO(g_ascii_strdown, pFpi)
+GO(g_ascii_strdown, pFpl)
 GO(g_ascii_strncasecmp, iFppL)
 GO(g_ascii_strtod, dFpp)
 GO(g_ascii_strtoll, lFppu)
 GO(g_ascii_strtoull, LFppu)
 GO(g_ascii_strup, pFpl)
-GO(g_ascii_tolower, CFC)
-GO(g_ascii_toupper, CFC)
-GO(g_ascii_xdigit_value, iFC)
+GO(g_ascii_tolower, cFc)
+GO(g_ascii_toupper, cFc)
+GO(g_ascii_xdigit_value, iFc)
 GO(g_assertion_message, vFppipp)
-GOD(g_assertion_message_cmpnum, vFppippDpDC, my_g_assertion_message_cmpnum)
+GOD(g_assertion_message_cmpnum, vFppippDpDc, my_g_assertion_message_cmpnum)
 GO(g_assertion_message_cmpstr, vFppippppp)
 GO(g_assertion_message_error, vFppipppui)
 GO(g_assertion_message_expr, vFppipp)
@@ -47,20 +47,20 @@ GO(g_async_queue_length, iFp)
 GO(g_async_queue_length_unlocked, iFp)
 GO(g_async_queue_lock, vFp)
 GO(g_async_queue_new, pFv)
-//GO(g_async_queue_new_full, 
+//GOM(g_async_queue_new_full, pFp)
 GO(g_async_queue_pop, pFp)
-//GO(g_async_queue_pop_unlocked, 
+GO(g_async_queue_pop_unlocked, pFp)
 GO(g_async_queue_push, vFpp)
-//GO(g_async_queue_push_sorted, 
-//GO(g_async_queue_push_sorted_unlocked, 
+//GOM(g_async_queue_push_sorted, vFpppp)
+//GOM(g_async_queue_push_sorted_unlocked, vFpppp)
 GO(g_async_queue_push_unlocked, vFpp)
 GO(g_async_queue_ref, pFp)
-//GO(g_async_queue_ref_unlocked, 
-//GO(g_async_queue_sort, 
-//GO(g_async_queue_sort_unlocked, 
-//GO(g_async_queue_timed_pop, 
+GO(g_async_queue_ref_unlocked, vFp)
+//GOM(g_async_queue_sort, vFppp)
+//GOM(g_async_queue_sort_unlocked, vFppp)
+GO(g_async_queue_timed_pop, pFpp)
 GO(g_async_queue_timed_pop_unlocked, pFpp)
-GO(g_async_queue_timeout_pop, pFpU)
+GO(g_async_queue_timeout_pop, pFpL)
 GO(g_async_queue_timeout_pop_unlocked, pFpL)
 GO(g_async_queue_try_pop, pFp)
 GO(g_async_queue_try_pop_unlocked, pFp)
@@ -68,21 +68,21 @@ GO(g_async_queue_unlock, vFp)
 GO(g_async_queue_unref, vFp)
 GO(g_async_queue_unref_and_unlock, vFp)
 GO2(g_atexit, vFEp, my_atexit)
-//GO(g_atomic_int_add, 
-//GO(g_atomic_int_and, 
+GO(g_atomic_int_add, iFpi)
+GO(g_atomic_int_and, uFpu)
 GO(g_atomic_int_compare_and_exchange, iFpii)
 GO(g_atomic_int_dec_and_test, iFp)
 GO(g_atomic_int_exchange_and_add, iFpi)
 GO(g_atomic_int_get, iFp)
 GO(g_atomic_int_inc, vFp)
-//GO(g_atomic_int_or, 
-//GO(g_atomic_int_set, 
+GO(g_atomic_int_or, uFpu)
+GO(g_atomic_int_set, vFpi)
 GO(g_atomic_int_xor, uFpu)
 GO(g_atomic_pointer_add, lFpl)
-//GO(g_atomic_pointer_and, 
+GO(g_atomic_pointer_and, LFpL)
 GO(g_atomic_pointer_compare_and_exchange, iFppp)
 GO(g_atomic_pointer_get, pFp)
-//GO(g_atomic_pointer_or, 
+GO(g_atomic_pointer_or, LFpL)
 GO(g_atomic_pointer_set, vFpp)
 GO(g_atomic_pointer_xor, LFpL)
 GO(g_base64_decode, pFpp)
@@ -92,53 +92,53 @@ GO(g_base64_encode, pFpL)
 GO(g_base64_encode_close, LFippp)
 GO(g_base64_encode_step, LFpLippp)
 GO(g_basename, pFp)
-//GO(g_bit_lock, 
-GO(g_bit_nth_lsf, iFii)
+GO(g_bit_lock, vFpi)
+GO(g_bit_nth_lsf, iFLi)
 GO(g_bit_nth_msf, iFLi)
 GO(g_bit_storage, uFL)
 GO(g_bit_trylock, iFpi)
 GO(g_bit_unlock, vFpi)
-//GO(g_blow_chunks, 
-//GO(g_bookmark_file_add_application, 
+GO(g_blow_chunks, vFv)
+GO(g_bookmark_file_add_application, vFpppp)
 GO(g_bookmark_file_add_group, vFppp)
-//GO(g_bookmark_file_error_quark, 
-//GO(g_bookmark_file_free, 
-//GO(g_bookmark_file_get_added, 
+GO(g_bookmark_file_error_quark, uFv)
+GO(g_bookmark_file_free, vFp)
+GO(g_bookmark_file_get_added, lFppp)
 GO(g_bookmark_file_get_app_info, iFppppppp)
 GO(g_bookmark_file_get_applications, pFpppp)
-//GO(g_bookmark_file_get_description, 
-//GO(g_bookmark_file_get_groups, 
+GO(g_bookmark_file_get_description, pFppp)
+GO(g_bookmark_file_get_groups, pFpppp)
 GO(g_bookmark_file_get_icon, iFppppp)
-//GO(g_bookmark_file_get_is_private, 
+GO(g_bookmark_file_get_is_private, iFppp)
 GO(g_bookmark_file_get_mime_type, pFppp)
-//GO(g_bookmark_file_get_modified, 
+GO(g_bookmark_file_get_modified, lFppp)
 GO(g_bookmark_file_get_size, iFp)
-//GO(g_bookmark_file_get_title, 
+GO(g_bookmark_file_get_title, pFppp)
 GO(g_bookmark_file_get_uris, pFpp)
 GO(g_bookmark_file_get_visited, lFppp)
-//GO(g_bookmark_file_has_application, 
-//GO(g_bookmark_file_has_group, 
+GO(g_bookmark_file_has_application, iFpppp)
+GO(g_bookmark_file_has_group, iFpppp)
 GO(g_bookmark_file_has_item, iFpp)
 GO(g_bookmark_file_load_from_data, iFppLp)
 GO(g_bookmark_file_load_from_data_dirs, iFpppp)
-//GO(g_bookmark_file_load_from_file, 
+GO(g_bookmark_file_load_from_file, iFppp)
 GO(g_bookmark_file_move_item, iFpppp)
 GO(g_bookmark_file_new, pFv)
-//GO(g_bookmark_file_remove_application, 
-//GO(g_bookmark_file_remove_group, 
+GO(g_bookmark_file_remove_application, iFpppp)
+GO(g_bookmark_file_remove_group, iFpppp)
 GO(g_bookmark_file_remove_item, iFppp)
-//GO(g_bookmark_file_set_added, 
+GO(g_bookmark_file_set_added, vFppl)
 GO(g_bookmark_file_set_app_info, iFppppilp)
-//GO(g_bookmark_file_set_description, 
+GO(g_bookmark_file_set_description, vFppp)
 GO(g_bookmark_file_set_groups, vFpppL)
 GO(g_bookmark_file_set_icon, vFpppp)
 GO(g_bookmark_file_set_is_private, vFppi)
-//GO(g_bookmark_file_set_mime_type, 
-//GO(g_bookmark_file_set_modified, 
-//GO(g_bookmark_file_set_title, 
+GO(g_bookmark_file_set_mime_type, vFppp)
+GO(g_bookmark_file_set_modified, vFppl)
+GO(g_bookmark_file_set_title, vFppp)
 GO(g_bookmark_file_set_visited, vFppl)
 GO(g_bookmark_file_to_data, pFppp)
-//GO(g_bookmark_file_to_file, 
+GO(g_bookmark_file_to_file, iFppp)
 GOM(g_build_filename, pFEpV)
 GO(g_build_filenamev, pFp)
 GOM(g_build_path, pFEppV) // wrap using g_build_pathv
@@ -155,8 +155,8 @@ GO(g_byte_array_remove_index_fast, pFpu)
 GO(g_byte_array_remove_range, pFpuu)
 GO(g_byte_array_set_size, pFpu)
 GO(g_byte_array_sized_new, pFu)
-//GOM(g_byte_array_sort, vFpB)
-//GOM(g_byte_array_sort_with_data, vFpBp)
+//GOM(g_byte_array_sort, vFpp)
+//GOM(g_byte_array_sort_with_data, vFppp)
 GO(g_byte_array_unref, vFp)
 GO(g_bytes_compare, iFpp)
 GO(g_bytes_equal, iFpp)
@@ -174,17 +174,17 @@ GO(g_bytes_unref_to_array, pFp)
 GO(g_bytes_unref_to_data, pFpp)
 GO(g_cache_destroy, vFp)
 GO(g_cache_insert, pFpp)
-//GO(g_cache_key_foreach, 
-//GO(g_cache_new, 
+//GOM(g_cache_key_foreach, vFppp)
+//GOM(g_cache_new, pFppppppp)
 GO(g_cache_remove, vFpp)
-//GO(g_cache_value_foreach, 
+//GOM(g_cache_value_foreach, vFppp)
 GO(g_chdir, iFp)
 GO(g_checksum_copy, pFp)
 GO(g_checksum_free, vFp)
 GO(g_checksum_get_digest, vFppp)
 GO(g_checksum_get_string, pFp)
 GO(g_checksum_new, pFu)
-//GO(g_checksum_reset, 
+GO(g_checksum_reset, vFp)
 GO(g_checksum_type_get_length, lFu)
 GO(g_checksum_update, vFppl)
 GOM(g_child_watch_add, uFEipp)
@@ -194,7 +194,7 @@ GO(g_chmod, iFpi)
 GO(g_clear_error, vFp)
 //GOM(g_clear_pointer, vFEpp)
 GO(g_close, iFip)
-GO(g_completion_add_items, vFpp)
+GO(g_completion_add_items, vFpp)    // need wrapping?: GCompletion structure contains 2 callback
 GO(g_completion_clear_items, vFp)
 GO(g_completion_complete, pFppp)
 GO(g_completion_complete_utf8, pFppp)
@@ -217,7 +217,7 @@ GO(g_cond_timed_wait, iFppp)
 GO(g_cond_wait, vFpp)
 GO(g_cond_wait_until, iFppl)
 GO(g_convert, pFplppppp)
-//GO(g_convert_error_quark, 
+GO(g_convert_error_quark, uFv)
 GO(g_convert_with_fallback, pFplpppppp)
 GO(g_convert_with_iconv, pFplpppp)
 GO(g_creat, iFpi)
@@ -234,10 +234,10 @@ GO(g_datalist_init, vFp)
 GO(g_datalist_set_flags, vFpu)
 GO(g_datalist_unset_flags, vFpu)
 GO(g_dataset_destroy, vFp)
-//GO(g_dataset_foreach, 
-//GO(g_dataset_id_get_data, 
+//GOM(g_dataset_foreach, vFppp)
+GO(g_dataset_id_get_data, pFpu)
 GO(g_dataset_id_remove_no_notify, pFpu)
-//GO(g_dataset_id_set_data_full, 
+//GOM(g_dataset_id_set_data_full, vFpupp)
 GO(g_date_add_days, vFpu)
 GO(g_date_add_months, vFpu)
 GO(g_date_add_years, vFpu)
@@ -252,7 +252,7 @@ GO(g_date_get_days_in_month, CFuW)
 GO(g_date_get_iso8601_week_of_year, uFp)
 GO(g_date_get_julian, uFp)
 GO(g_date_get_monday_week_of_year, uFp)
-GO(g_date_get_monday_weeks_in_year, CFp)
+GO(g_date_get_monday_weeks_in_year, CFW)
 GO(g_date_get_month, uFp)
 GO(g_date_get_sunday_week_of_year, uFp)
 GO(g_date_get_sunday_weeks_in_year, CFW)
@@ -279,47 +279,47 @@ GO(g_date_subtract_days, vFpu)
 GO(g_date_subtract_months, vFpu)
 GO(g_date_subtract_years, vFpu)
 GO(g_date_time_add, pFpl)
-//GO(g_date_time_add_days, 
+GO(g_date_time_add_days, pFpi)
 GO(g_date_time_add_full, pFpiiiiid)
-//GO(g_date_time_add_hours, 
+GO(g_date_time_add_hours, pFpi)
 GO(g_date_time_add_minutes, pFpi)
-//GO(g_date_time_add_months, 
+GO(g_date_time_add_months, pFpi)
 GO(g_date_time_add_seconds, pFpd)
-//GO(g_date_time_add_weeks, 
-//GO(g_date_time_add_years, 
-//GO(g_date_time_compare, 
+GO(g_date_time_add_weeks, pFpi)
+GO(g_date_time_add_years, pFpi)
+GO(g_date_time_compare, iFpp)
 GO(g_date_time_difference, lFpp)
-//GO(g_date_time_equal, 
+GO(g_date_time_equal, iFpp)
 GO(g_date_time_format, pFpp)
-//GO(g_date_time_get_day_of_month, 
-//GO(g_date_time_get_day_of_week, 
-//GO(g_date_time_get_day_of_year, 
-//GO(g_date_time_get_hour, 
+GO(g_date_time_get_day_of_month, iFp)
+GO(g_date_time_get_day_of_week, iFp)
+GO(g_date_time_get_day_of_year, iFp)
+GO(g_date_time_get_hour, iFp)
 GO(g_date_time_get_microsecond, iFp)
-//GO(g_date_time_get_minute, 
-//GO(g_date_time_get_month, 
-//GO(g_date_time_get_second, 
+GO(g_date_time_get_minute, iFp)
+GO(g_date_time_get_month, iFp)
+GO(g_date_time_get_second, iFp)
 GO(g_date_time_get_seconds, dFp)
 GO(g_date_time_get_timezone_abbreviation, pFp)
 GO(g_date_time_get_utc_offset, lFp)
-//GO(g_date_time_get_week_numbering_year, 
-//GO(g_date_time_get_week_of_year, 
-//GO(g_date_time_get_year, 
+GO(g_date_time_get_week_numbering_year, iFp)
+GO(g_date_time_get_week_of_year, iFp)
+GO(g_date_time_get_year, iFp)
 GO(g_date_time_get_ymd, vFpppp)
-//GO(g_date_time_hash, 
+GO(g_date_time_hash, uFp)
 GO(g_date_time_is_daylight_savings, iFp)
 GO(g_date_time_new, pFpiiiiid)
-//GO(g_date_time_new_from_timeval_local, 
+GO(g_date_time_new_from_timeval_local, pFp)
 GO(g_date_time_new_from_timeval_utc, pFp)
-//GO(g_date_time_new_from_unix_local, 
+GO(g_date_time_new_from_unix_local, pFl)
 GO(g_date_time_new_from_unix_utc, pFl)
-//GO(g_date_time_new_local, 
+GO(g_date_time_new_local, pFiiiiid)
 GO(g_date_time_new_now, pFp)
 GO(g_date_time_new_now_local, pFv)
 GO(g_date_time_new_now_utc, pFv)
 GO(g_date_time_new_utc, pFiiiiid)
 GO(g_date_time_ref, pFp)
-//GO(g_date_time_to_local, 
+GO(g_date_time_to_local, pFp)
 GO(g_date_time_to_timeval, iFpp)
 GO(g_date_time_to_timezone, pFpp)
 GO(g_date_time_to_unix, lFp)
@@ -353,23 +353,23 @@ GO(g_environ_unsetenv, pFpp)
 GO(g_error_copy, pFp)
 GO(g_error_free, vFp)
 GO(g_error_matches, iFpui)
-GOM(g_error_new, pFEpipV)
+GOM(g_error_new, pFEuipV)
 GO(g_error_new_literal, pFuip)
-GOM(g_error_new_valist, pFEpipA)
+GOM(g_error_new_valist, pFEuipA)
 GO(g_file_error_from_errno, uFi)
-GO(g_file_error_quark, pFv)
+GO(g_file_error_quark, uFv)
 GO(g_file_get_contents, iFpppp)
 GO(g_filename_display_basename, pFp)
 GO(g_filename_display_name, pFp)
 GO(g_filename_from_uri, pFppp)
 GO(g_filename_from_utf8, pFplppp)
 GO(g_filename_to_uri, pFppp)
-GO(g_filename_to_utf8, pFpippp)
+GO(g_filename_to_utf8, pFplppp)
 GO(g_file_open_tmp, iFppp)
 GO(g_file_read_link, pFpp)
 GO(g_file_set_contents, iFpplp)
 GO(g_file_test, iFpu)
-GO(g_find_program_in_path, pFp) // need wrap?
+GO(g_find_program_in_path, pFp)
 GO(g_fopen, pFpp)
 GO(g_format_size, pFL)
 GO(g_format_size_for_display, pFl)
@@ -382,15 +382,15 @@ GO(g_get_charset, iFp)
 GO(g_get_codeset, pFv)
 GO(g_get_current_dir, pFv)
 GO(g_get_current_time, vFp)
-GO(g_getenv, pFp)       // should wrap?
+GO(g_getenv, pFp)
 GO(g_get_environ, pFv)
 GO(g_get_filename_charsets, iFp)
 GO(g_get_home_dir, pFv)
 GO(g_get_host_name, pFv)
 GO(g_get_language_names, pFv)
 GO(g_get_locale_variants, pFp)
-GO(g_get_monotonic_time, IFv)
-//GO(g_get_num_processors, 
+GO(g_get_monotonic_time, lFv)
+GO(g_get_num_processors, uFv)
 GO(g_get_prgname, pFv)
 GO(g_get_real_name, pFv)
 GO(g_get_real_time, lFv)
@@ -437,88 +437,88 @@ GO(g_hmac_get_digest, vFppp)
 GO(g_hmac_get_string, pFp)
 GO(g_hmac_new, pFupL)
 GO(g_hmac_ref, pFp)
-//GO(g_hmac_unref, 
+GO(g_hmac_unref, vFp)
 GO(g_hmac_update, vFppl)
-//GO(g_hook_alloc, 
-//GO(g_hook_compare_ids, 
-//GO(g_hook_destroy, 
-//GO(g_hook_destroy_link, 
-//GO(g_hook_find, 
-//GO(g_hook_find_data, 
-//GO(g_hook_find_func, 
-//GO(g_hook_find_func_data, 
-//GO(g_hook_first_valid, 
-//GO(g_hook_free, 
-//GO(g_hook_get, 
-//GO(g_hook_insert_before, 
-//GO(g_hook_insert_sorted, 
-//GO(g_hook_list_clear, 
-//GO(g_hook_list_init, 
-//GO(g_hook_list_invoke, 
-//GO(g_hook_list_invoke_check, 
-//GO(g_hook_list_marshal, 
-//GO(g_hook_list_marshal_check, 
-//GO(g_hook_next_valid, 
-//GO(g_hook_prepend, 
-//GO(g_hook_ref, 
-//GO(g_hook_unref, 
-//GO(g_hostname_is_ascii_encoded, 
-//GO(g_hostname_is_ip_address, 
-//GO(g_hostname_is_non_ascii, 
-//GO(g_hostname_to_ascii, 
-//GO(g_hostname_to_unicode, 
+//GOM(g_hook_alloc, pFp)
+//GOM(g_hook_compare_ids, iFpp)
+//GOM(g_hook_destroy, iFpL)
+//GOM(g_hook_destroy_link, vFpp)
+//GOM(g_hook_find, pFpipp)
+//GOM(g_hook_find_data, pFpip)
+//GOM(g_hook_find_func, pFpip)
+//GOM(g_hook_find_func_data, pFpipp)
+//GOM(g_hook_first_valid, pFpi)
+//GOM(g_hook_free, vFpp)
+//GOM(g_hook_get, pFpL)
+//GOM(g_hook_insert_before, vFppp)
+//GOM(g_hook_insert_sorted, vFppp)
+//GOM(g_hook_list_clear, vFp)
+//GOM(g_hook_list_init, vFpu)
+//GOM(g_hook_list_invoke, vFpi)
+//GOM(g_hook_list_invoke_check, vFpi)
+//GOM(g_hook_list_marshal, vFpipp)
+//GOM(g_hook_list_marshal_check, vFpipp)
+//GOM(g_hook_next_valid, pFppi)
+//GOM(g_hook_prepend, vFpp)
+//GOM(g_hook_ref, pFpp)
+//GOM(g_hook_unref, vFpp)
+GO(g_hostname_is_ascii_encoded, iFp)
+GO(g_hostname_is_ip_address, iFp)
+GO(g_hostname_is_non_ascii, iFp)
+GO(g_hostname_to_ascii, pFp)
+GO(g_hostname_to_unicode, pFp)
 GO(g_iconv, LFppppp)
 GO(g_iconv_close, iFp)
 GO(g_iconv_open, pFpp)
 GOM(g_idle_add, uFEpp)
 GOM(g_idle_add_full, uFEippp)
 GO(g_idle_remove_by_data, iFp)
-GO(g_idle_source_new, pFv)
+GO(g_idle_source_new, pFv)  // should wrap?
 GO(g_int64_equal, iFpp)
 GO(g_int64_hash, uFp)
 GO(g_int_equal, iFpp)
 GO(g_intern_static_string, pFp)
 GO(g_intern_string, pFp)
 GO(g_int_hash, uFp)
-GOM(g_io_add_watch, uFEpipp)
-GOM(g_io_add_watch_full, uFEpiippp)
+GOM(g_io_add_watch, uFEpupp)
+GOM(g_io_add_watch_full, uFEpiuppp)
 GO(g_io_channel_close, vFp)
 GO(g_io_channel_error_from_errno, uFi)
-GO(g_io_channel_error_quark, pFv)
-GO(g_io_channel_flush, iFpp)
-GO(g_io_channel_get_buffer_condition, iFp)
+GO(g_io_channel_error_quark, uFv)
+GO(g_io_channel_flush, uFpp) //should wrap?
+GO(g_io_channel_get_buffer_condition, uFp)
 GO(g_io_channel_get_buffered, iFp)
-GO(g_io_channel_get_buffer_size, iFp)
+GO(g_io_channel_get_buffer_size, LFp)
 GO(g_io_channel_get_close_on_unref, iFp)
 GO(g_io_channel_get_encoding, pFp)
-GO(g_io_channel_get_flags, iFp)
+GO(g_io_channel_get_flags, uFp)
 GO(g_io_channel_get_line_term, pFpp)
 GO(g_io_channel_init, vFp)
 GO(g_io_channel_new_file, pFppp)
-GO(g_io_channel_read, iFppLp)
-GO(g_io_channel_read_chars, iFpplpp)
-GO(g_io_channel_read_line, iFppppp)
-GO(g_io_channel_read_line_string, iFpppp)
-GO(g_io_channel_read_to_end, iFpppp)
-GO(g_io_channel_read_unichar, iFppp)
+GO(g_io_channel_read, uFppLp)
+GO(g_io_channel_read_chars, uFppLpp)
+GO(g_io_channel_read_line, uFppppp)
+GO(g_io_channel_read_line_string, uFpppp)
+GO(g_io_channel_read_to_end, uFpppp)
+GO(g_io_channel_read_unichar, uFppp)
 GO(g_io_channel_ref, pFp)
-GO(g_io_channel_seek, iFpIi)
-GO(g_io_channel_seek_position, iFpIip)
+GO(g_io_channel_seek, uFplu)
+GO(g_io_channel_seek_position, uFplup)
 GO(g_io_channel_set_buffered, vFpi)
 GO(g_io_channel_set_buffer_size, vFpL)
 GO(g_io_channel_set_close_on_unref, vFpi)
-GO(g_io_channel_set_encoding, iFppp)
-GO(g_io_channel_set_flags, iFpip)
+GO(g_io_channel_set_encoding, uFppp)
+GO(g_io_channel_set_flags, uFpup)
 GO(g_io_channel_set_line_term, vFppi)
-GO(g_io_channel_shutdown, iFpip)
+GO(g_io_channel_shutdown, uFpip)
 GO(g_io_channel_unix_get_fd, iFp)
 GO(g_io_channel_unix_new, pFi)
 GO(g_io_channel_unref, vFp)
-GO(g_io_channel_write, iFppLp)
-GO(g_io_channel_write_chars, iFpplpp)
-GO(g_io_channel_write_unichar, iFpup)
-GO(g_io_create_watch, pFpp)
-GO(g_key_file_error_quark, pFv)
+GO(g_io_channel_write, uFppLp)
+GO(g_io_channel_write_chars, uFpplpp)
+GO(g_io_channel_write_unichar, uFpup)
+GO(g_io_create_watch, pFpu)
+GO(g_key_file_error_quark, uFv)
 GO(g_key_file_free, vFp)
 GO(g_key_file_get_boolean, iFpppp)
 GO(g_key_file_get_boolean_list, pFppppp)
@@ -557,7 +557,7 @@ GO(g_key_file_set_double_list, vFppppL)
 GO(g_key_file_set_int64, vFpppl)
 GO(g_key_file_set_integer, vFpppi)
 GO(g_key_file_set_integer_list, vFppppL)
-GO(g_key_file_set_list_separator, vFpC)
+GO(g_key_file_set_list_separator, vFpc)
 GO(g_key_file_set_locale_string, vFppppp)
 GO(g_key_file_set_locale_string_list, vFpppppL)
 GO(g_key_file_set_string, vFpppp)
@@ -574,7 +574,7 @@ GO(g_list_alloc, pFv)
 GO(g_list_append, pFpp)
 GO(g_list_concat, pFpp)
 GO(g_list_copy, pFp)
-//GOM(g_list_copy_deep, pFEpBp)
+//GOM(g_list_copy_deep, pFEppp)
 GO(g_list_delete_link, pFpp)
 GO(g_listenv, pFv)
 GO(g_list_find, pFpp)
@@ -594,10 +594,10 @@ GO(g_list_length, uFp)
 GO(g_list_nth, pFpu)
 GO(g_list_nth_data, pFpu)
 GO(g_list_nth_prev, pFpu)
-//GO(g_list_pop_allocator, 
+GO(g_list_pop_allocator, vFv)
 GO(g_list_position, iFpp)
 GO(g_list_prepend, pFpp)
-//GO(g_list_push_allocator, 
+GO(g_list_push_allocator, vFp)
 GO(g_list_remove, pFpp)
 GO(g_list_remove_all, pFpp)
 GO(g_list_remove_link, pFpp)
@@ -623,12 +623,12 @@ GO(g_main_context_check, iFpipi)
 GO(g_main_context_default, pFv)
 GO(g_main_context_dispatch, vFp)
 //GOM(g_main_context_find_source_by_funcs_user_data, pFEppp)   // 2nd is a GSourceFuncs structures with callbacks..
-GO(g_main_context_find_source_by_id, pFpu)
-GO(g_main_context_find_source_by_user_data, pFpp)
+GO(g_main_context_find_source_by_id, pFpu)  // sould wrap?
+GO(g_main_context_find_source_by_user_data, pFpp)   // sould wrap?
 GOM(g_main_context_get_poll_func, pFEp)
 GO(g_main_context_get_thread_default, pFv)
 //GOM(g_main_context_invoke, vFppp)  // 2nd is GSourceFuncs
-//GOM(g_main_context_invoke_full, vFpippB)  // 3rd is GSourceFuncs
+//GOM(g_main_context_invoke_full, vFpippp)  // 3rd is GSourceFuncs
 GO(g_main_context_is_owner, iFp)
 GO(g_main_context_iteration, iFpi)
 GO(g_main_context_new, pFv)
@@ -666,8 +666,8 @@ GO(g_mapped_file_new, pFpip)
 GO(g_mapped_file_new_from_fd, pFiip)
 GO(g_mapped_file_ref, pFp)
 GO(g_mapped_file_unref, vFp)
-//GO(g_markup_collect_attributes, 
-//GO(g_markup_error_quark, 
+//GOM(g_markup_collect_attributes, iFppppupV)
+GO(g_markup_error_quark, uFv)
 GO(g_markup_escape_text, pFpl)
 GO(g_markup_parse_context_end_parse, iFpp)
 GO(g_markup_parse_context_free, vFp)
@@ -675,12 +675,12 @@ GO(g_markup_parse_context_get_element, pFp)
 GO(g_markup_parse_context_get_element_stack, pFp)
 GO(g_markup_parse_context_get_position, vFppp)
 GO(g_markup_parse_context_get_user_data, pFp)
-GOM(g_markup_parse_context_new, pFEpipp)
+GOM(g_markup_parse_context_new, pFEpupp)
 GO(g_markup_parse_context_parse, iFpplp)
-//GO(g_markup_parse_context_pop, 
-//GO(g_markup_parse_context_push, 
+GO(g_markup_parse_context_pop, pFp)
+//GOM(g_markup_parse_context_push, vFppp)
 GO(g_markup_parse_context_ref, pFp)
-//GO(g_markup_parse_context_unref, 
+GO(g_markup_parse_context_unref, vFp)
 GOM(g_markup_printf_escaped, pFEpV)
 GOM(g_markup_vprintf_escaped, pFEpA)
 GO(g_match_info_expand_references, pFppp)
@@ -698,19 +698,19 @@ GO(g_match_info_matches, iFp)
 GO(g_match_info_next, iFpp)
 GO(g_match_info_ref, pFp)
 GO(g_match_info_unref, vFp)
-//GO(g_mem_chunk_alloc, 
+GO(g_mem_chunk_alloc, pFp)
 GO(g_mem_chunk_alloc0, pFp)
-//GO(g_mem_chunk_clean, 
-//GO(g_mem_chunk_destroy, 
+GO(g_mem_chunk_clean, vFp)
+GO(g_mem_chunk_destroy, vFp)
 GO(g_mem_chunk_free, vFpp)
-//GO(g_mem_chunk_info, 
+GO(g_mem_chunk_info, vFv)
 GO(g_mem_chunk_new, pFpiLi)
 GO(g_mem_chunk_print, vFp)
-//GO(g_mem_chunk_reset, 
+GO(g_mem_chunk_reset, vFp)
 GO(g_memdup, pFpu)
 GO(g_mem_is_system_malloc, iFv)
 GO(g_mem_profile, vFv)
-//GOM(g_mem_set_vtable, vFEp)   // VMemTable needs wrapping
+//GOM(g_mem_set_vtable, vFEp)
 GO(g_mkdir, iFpi)
 GO(g_mkdir_with_parents, iFpi)
 GO(g_mkdtemp, pFp)
@@ -726,32 +726,32 @@ GO(g_mutex_trylock, iFp)
 GO(g_mutex_unlock, vFp)
 GO(g_node_child_index, iFpp)
 GO(g_node_child_position, iFpp)
-//GO(g_node_children_foreach, 
-//GO(g_node_copy, 
+//GOM(g_node_children_foreach, vFpupp)
+GO(g_node_copy, pFp)
 GOM(g_node_copy_deep, pFEppp)
-//GO(g_node_depth, 
+GO(g_node_depth, uFp)
 GO(g_node_destroy, vFp)
 GO(g_node_find, pFpuup)
 GO(g_node_find_child, pFpup)
-//GO(g_node_first_sibling, 
+GO(g_node_first_sibling, pFp)
 GO(g_node_get_root, pFp)
 GO(g_node_insert, pFpip)
 GO(g_node_insert_after, pFppp)
 GO(g_node_insert_before, pFppp)
 GO(g_node_is_ancestor, iFpp)
-//GO(g_node_last_child, 
+GO(g_node_last_child, pFp)
 GO(g_node_last_sibling, pFp)
-//GO(g_node_max_height, 
+GO(g_node_max_height, uFp)
 GO(g_node_n_children, uFp)
 GO(g_node_new, pFp)
 GO(g_node_n_nodes, uFpu)
 GO(g_node_nth_child, pFpu)
-//GO(g_node_pop_allocator, 
+GO(g_node_pop_allocator, vFv)
 GO(g_node_prepend, pFpp)
 GO(g_node_push_allocator, vFp)
-//GO(g_node_reverse_children, 
-GOM(g_node_traverse, vFEpiiipp)
-//GO(g_node_unlink, 
+GO(g_node_reverse_children, vFp)
+GOM(g_node_traverse, vFEpuuipp)
+GO(g_node_unlink, vFp)
 GO(g_nullify_pointer, vFp)
 GOM(g_once_impl, pFEppp)
 GO(g_once_init_enter, iFp)
@@ -761,7 +761,7 @@ GO(g_once_init_leave, vFpL)
 GO(g_once_init_leave_pointer, vFpp)
 GO(g_on_error_query, vFp)
 GO(g_on_error_stack_trace, vFp)
-GO(g_open, iFpii)
+GO(g_open, iFpOi)
 GO(g_option_context_add_group, vFpp)
 GOM(g_option_context_add_main_entries, vFEppp)
 GO(g_option_context_free, vFp)
@@ -781,16 +781,16 @@ GO(g_option_context_set_ignore_unknown_options, vFpi)
 GO(g_option_context_set_main_group, vFpp)
 GO(g_option_context_set_strict_posix, vFpi) // 2.44+
 GO(g_option_context_set_summary, vFpp)
-//GOM(g_option_context_set_translate_func, vFEpBpB)
+//GOM(g_option_context_set_translate_func, vFEpppp)
 GO(g_option_context_set_translation_domain, vFpp)
-GO(g_option_error_quark, pFv)
+GO(g_option_error_quark, uFv)
 GO(g_option_group_add_entries, vFpp)
 GO(g_option_group_free, vFp)
 GOM(g_option_group_new, pFEppppp)
 GO(g_option_group_ref, pFp) // 2.44+
-//GOM(g_option_group_set_error_hook, vFEpB)
+//GOM(g_option_group_set_error_hook, vFEpp)
 GOM(g_option_group_set_parse_hooks, vFEppp)
-//GOM(g_option_group_set_translate_func, vFEpBpB)
+//GOM(g_option_group_set_translate_func, vFEpppp)
 GO(g_option_group_set_translation_domain, vFpp)
 GO(g_option_group_unref, vFp)   // 2.44+
 GO(g_parse_debug_string, uFppu)
@@ -804,11 +804,11 @@ GO(g_pattern_match_string, iFpp)
 GO(g_pattern_spec_equal, iFpp)
 GO(g_pattern_spec_free, vFp)
 GO(g_pattern_spec_new, pFp)
-//GO(g_pointer_bit_lock, 
+GO(g_pointer_bit_lock, vFpi)
 GO(g_pointer_bit_trylock, iFpi)
 GO(g_pointer_bit_unlock, vFpi)
 GO(g_poll, iFpui)
-//GO(g_prefix_error, vFpppppppppp)    //vaarg, should align?
+//GOM(g_prefix_error, vFppV)
 GOM(g_print, vFEpV)
 GOM(g_printerr, vFEpV)
 GOM(g_printf, iFEpV)
@@ -818,7 +818,7 @@ GOM(g_private_new, pFEp)
 GO(g_private_replace, vFpp)
 GO(g_private_set, vFpp)
 GO(g_propagate_error, vFpp)
-//GO(g_propagate_prefixed_error, vFpppppppppppp)  //vaarg, should align?
+//GOM(g_propagate_prefixed_error, vFpppV)
 GO(g_ptr_array_add, vFpp)
 GOM(g_ptr_array_foreach, vFEppp)
 GO(g_ptr_array_free, pFpi)
@@ -827,7 +827,7 @@ GO(g_ptr_array_new, pFv)
 GOM(g_ptr_array_new_full, pFEup)
 GOM(g_ptr_array_new_with_free_func, pFEp)
 GO(g_ptr_array_ref, pFp)
-GO(g_ptr_array_remove, vFpp)
+GO(g_ptr_array_remove, iFpp)
 GO(g_ptr_array_remove_fast, iFpp)
 GO(g_ptr_array_remove_index, pFpu)
 GO(g_ptr_array_remove_index_fast, pFpu)
@@ -844,14 +844,14 @@ GO(g_quark_from_string, uFp)
 GO(g_quark_to_string, pFu)
 GO(g_quark_try_string, uFp)
 GO(g_queue_clear, vFp)
-//GOM(g_queue_clear_full, vFEpB)    // 2.60+
+//GOM(g_queue_clear_full, vFEpp)    // 2.60+
 GO(g_queue_copy, pFp)
 GO(g_queue_delete_link, vFpp)
 GO(g_queue_find, pFpp)
 GOM(g_queue_find_custom, pFEppp)
 GOM(g_queue_foreach, vFEppp)
 GO(g_queue_free, vFp)
-//GOM(g_queue_free_full, vFEpB)
+//GOM(g_queue_free_full, vFEpp)
 GO(g_queue_get_length, uFp)
 GO(g_queue_index, iFpp)
 GO(g_queue_init, vFp)
@@ -859,7 +859,7 @@ GO(g_queue_insert_after, vFppp)
 GO(g_queue_insert_after_link, vFppp)    // 2.62+
 GO(g_queue_insert_before, vFppp)
 GO(g_queue_insert_before_link, vFppp)   // 2.62+
-//GOM(g_queue_insert_sorted, vFEppBp)
+//GOM(g_queue_insert_sorted, vFEpppp)
 GO(g_queue_is_empty, iFp)
 GO(g_queue_link_index, iFpp)
 GO(g_queue_new, pFv)
@@ -883,8 +883,8 @@ GO(g_queue_push_tail, vFpp)
 GO(g_queue_push_tail_link, vFpp)
 GO(g_queue_remove, iFpp)
 GO(g_queue_remove_all, uFpp)
-GO(g_queue_reverse, pFp)
-//GOM(g_queue_sort, vFEpBp)
+GO(g_queue_reverse, vFp)
+//GOM(g_queue_sort, vFEppp)
 GO(g_queue_unlink, vFpp)
 GO(g_rand_copy, pFp)
 GO(g_rand_double, dFp)
@@ -910,7 +910,7 @@ GO(g_rec_mutex_lock, vFp)
 GO(g_rec_mutex_trylock, iFp)
 GO(g_rec_mutex_unlock, vFp)
 GO(g_regex_check_replacement, iFppp)
-//GO(g_regex_error_quark, 
+GO(g_regex_error_quark, uFv)
 GO(g_regex_escape_nul, pFpi)
 GO(g_regex_escape_string, pFpi)
 GO(g_regex_get_capture_count, iFp)
@@ -921,108 +921,108 @@ GO(g_regex_get_max_backref, iFp)
 GO(g_regex_get_max_lookbehind, iFp)
 GO(g_regex_get_pattern, pFp)
 GO(g_regex_get_string_number, iFpp)
-GO(g_regex_match, iFppip)
+GO(g_regex_match, iFppup)
 GO(g_regex_match_all, iFppup)
 GO(g_regex_match_all_full, iFppliupp)
-GO(g_regex_match_full, iFppLiipp)
+GO(g_regex_match_full, iFppliupp)
 GO(g_regex_match_simple, iFppuu)
 GO(g_regex_new, pFpuup)
 GO(g_regex_ref, pFp)
-GO(g_regex_replace, pFppLipip)
-//GOM(g_regex_replace_eval, pFEppLiiBpp)
+GO(g_regex_replace, pFpplipup)
+//GOM(g_regex_replace_eval, pFEppliuppp)
 GO(g_regex_replace_literal, pFpplipup)
 GO(g_regex_split, pFppu)
 GO(g_regex_split_full, pFppliuip)
 GO(g_regex_split_simple, pFppuu)
 GO(g_regex_unref, vFp)
 GO(g_relation_count, iFppi)
-//GO(g_relation_delete, 
-//GO(g_relation_destroy, 
-//GO(g_relation_exists, 
-//GO(g_relation_index, 
-//GO(g_relation_insert, 
+GO(g_relation_delete, iFppi)
+GO(g_relation_destroy, vFp)
+//GOM(g_relation_exists, iFpV)
+//GOM(g_relation_index, vFpipp)
+//GOM(g_relation_insert, vFpV)
 GO(g_relation_new, pFi)
 GO(g_relation_print, vFp)
 GO(g_relation_select, pFppi)
-//GO(g_reload_user_special_dirs_cache, 
+GO(g_reload_user_special_dirs_cache, vFv)
 GO(g_remove, iFp)
 GO(g_rename, iFpp)
 GO(g_return_if_fail_warning, vFppp)
 GO(g_rmdir, iFp)
-//GO(g_rw_lock_clear, 
-//GO(g_rw_lock_init, 
-//GO(g_rw_lock_reader_lock, 
+GO(g_rw_lock_clear, vFp)
+GO(g_rw_lock_init, vFp)
+GO(g_rw_lock_reader_lock, vFp)
 GO(g_rw_lock_reader_trylock, iFp)
 GO(g_rw_lock_reader_unlock, vFp)
-//GO(g_rw_lock_writer_lock, 
-//GO(g_rw_lock_writer_trylock, 
-//GO(g_rw_lock_writer_unlock, 
-//GO(g_scanner_cur_line, 
-//GO(g_scanner_cur_position, 
-//GO(g_scanner_cur_token, 
-//GO(g_scanner_cur_value, 
-//GO(g_scanner_destroy, 
-//GO(g_scanner_eof, 
-//GO(g_scanner_error, 
-//GO(g_scanner_get_next_token, 
-//GO(g_scanner_input_file, 
-//GO(g_scanner_input_text, 
-//GO(g_scanner_lookup_symbol, 
-//GO(g_scanner_new, 
-//GO(g_scanner_peek_next_token, 
-//GO(g_scanner_scope_add_symbol, 
-//GO(g_scanner_scope_foreach_symbol, 
-//GO(g_scanner_scope_lookup_symbol, 
-//GO(g_scanner_scope_remove_symbol, 
-//GO(g_scanner_set_scope, 
-//GO(g_scanner_sync_file_offset, 
-//GO(g_scanner_unexp_token, 
-//GO(g_scanner_warn, 
-//GO(g_sequence_append, 
-//GO(g_sequence_foreach, 
-//GO(g_sequence_foreach_range, 
-//GO(g_sequence_free, 
+GO(g_rw_lock_writer_lock, vFp)
+GO(g_rw_lock_writer_trylock, iFp)
+GO(g_rw_lock_writer_unlock, vFp)
+//GOM(g_scanner_cur_line, uFp)
+//GOM(g_scanner_cur_position, uFp)
+//GOM(g_scanner_cur_token, uFp)
+//GOM(g_scanner_cur_value, UFp)
+//GOM(g_scanner_destroy, vFp)
+//GOM(g_scanner_eof, iFp)
+//GOM(g_scanner_error, vFppV)
+//GOM(g_scanner_get_next_token, uFp)
+//GOM(g_scanner_input_file, vFpi)
+//GOM(g_scanner_input_text, vFppu)
+//GOM(g_scanner_lookup_symbol, pFpp)
+//GOM(g_scanner_new, pFp)
+//GOM(g_scanner_peek_next_token, uFp)
+//GOM(g_scanner_scope_add_symbol, vFpupp)
+//GOM(g_scanner_scope_foreach_symbol, vFpupp)
+//GOM(g_scanner_scope_lookup_symbol, pFpup)
+//GOM(g_scanner_scope_remove_symbol, vFpup)
+//GOM(g_scanner_set_scope, uFpu)
+//GOM(g_scanner_sync_file_offset, vFp)
+//GOM(g_scanner_unexp_token, vFpuppppi)
+//GOM(g_scanner_warn, vFppV)
+GO(g_sequence_append, pFpp)
+//GOM(g_sequence_foreach, vFppp)
+//GOM(g_sequence_foreach_range, vFpppp)
+GO(g_sequence_free, vFp)
 GO(g_sequence_get, pFp)
-//GO(g_sequence_get_begin_iter, 
+GO(g_sequence_get_begin_iter, pFp)
 GO(g_sequence_get_end_iter, pFp)
 GO(g_sequence_get_iter_at_pos, pFpi)
 GO(g_sequence_get_length, iFp)
 GO(g_sequence_insert_before, pFpp)
-//GO(g_sequence_insert_sorted, 
-//GO(g_sequence_insert_sorted_iter, 
+//GOM(g_sequence_insert_sorted, pFpppp)
+//GOM(g_sequence_insert_sorted_iter, pFpppp)
 GO(g_sequence_iter_compare, iFpp)
 GO(g_sequence_iter_get_position, iFp)
 GO(g_sequence_iter_get_sequence, pFp)
-//GO(g_sequence_iter_is_begin, 
+GO(g_sequence_iter_is_begin, iFp)
 GO(g_sequence_iter_is_end, iFp)
 GO(g_sequence_iter_move, pFpi)
-//GO(g_sequence_iter_next, 
+GO(g_sequence_iter_next, pFp)
 GO(g_sequence_iter_prev, pFp)
-//GO(g_sequence_lookup, 
-//GO(g_sequence_lookup_iter, 
-//GO(g_sequence_move, 
+//GOM(g_sequence_lookup, pFpppp)
+//GOM(g_sequence_lookup_iter, pFpppp)
+GO(g_sequence_move, vFpp)
 GO(g_sequence_move_range, vFppp)
-//GO(g_sequence_new, 
+//GOM(g_sequence_new, pFp)
 GO(g_sequence_prepend, pFpp)
 GO(g_sequence_range_get_midpoint, pFpp)
 GO(g_sequence_remove, vFp)
 GO(g_sequence_remove_range, vFpp)
-//GO(g_sequence_search, 
-//GO(g_sequence_search_iter, 
+//GOM(g_sequence_search, pFpppp)
+//GOM(g_sequence_search_iter, pFpppp)
 GO(g_sequence_set, vFpp)
-//GO(g_sequence_sort, 
-//GO(g_sequence_sort_changed, 
-//GO(g_sequence_sort_changed_iter, 
-//GO(g_sequence_sort_iter, 
-//GO(g_sequence_swap, 
+//GOM(g_sequence_sort, vFppp)
+//GOM(g_sequence_sort_changed, vFppp)
+//GOM(g_sequence_sort_changed_iter, vFppp)
+//GOM(g_sequence_sort_iter, vFppp)
+GO(g_sequence_swap, vFpp)
 GO(g_set_application_name, vFp)
 GO(g_setenv, iFppi)
-GOM(g_set_error, vFEppipV)
+GOM(g_set_error, vFEpuipV)
 GO(g_set_error_literal, vFpuip)
 GO(g_set_prgname, vFp)
 GOM(g_set_printerr_handler, pFEp)
 GOM(g_set_print_handler, pFEp)
-//GO(g_shell_error_quark, 
+GO(g_shell_error_quark, uFv)
 GO(g_shell_parse_argv, iFpppp)
 GO(g_shell_quote, pFp)
 GO(g_shell_unquote, pFpp)
@@ -1042,7 +1042,7 @@ GO(g_slist_copy, pFp)
 GO(g_slist_delete_link, pFpp)
 GO(g_slist_find, pFpp)
 GOM(g_slist_find_custom, pFEppp)
-GOM(g_slist_foreach, pFEppp)
+GOM(g_slist_foreach, vFEppp)
 GO(g_slist_free, vFp)
 GO(g_slist_free_1, vFp)
 GOM(g_slist_free_full, vFEpp)
@@ -1055,10 +1055,10 @@ GO(g_slist_last, pFp)
 GO(g_slist_length, uFp)
 GO(g_slist_nth, pFpu)
 GO(g_slist_nth_data, pFpu)
-//GO(g_slist_pop_allocator, 
+GO(g_slist_pop_allocator, vFv)
 GO(g_slist_position, iFpp)
 GO(g_slist_prepend, pFpp)
-//GO(g_slist_push_allocator, 
+GO(g_slist_push_allocator, vFp)
 GO(g_slist_remove, pFpp)
 GO(g_slist_remove_all, pFpp)
 GO(g_slist_remove_link, pFpp)
@@ -1066,9 +1066,9 @@ GO(g_slist_reverse, pFp)
 GOM(g_slist_sort, pFEpp)
 GOM(g_slist_sort_with_data, pFEppp)
 GOM(g_snprintf, iFEpLpV)
-GO(g_source_add_child_source, vFpp)
+GO(g_source_add_child_source, vFpp)  //should wrap?
 GO(g_source_add_poll, vFpp)
-GO(g_source_add_unix_fd, pFpii)
+GO(g_source_add_unix_fd, pFpiu)
 GO(g_source_attach, uFpp)
 GO(g_source_destroy, vFp)
 GO(g_source_get_can_recurse, iFp)
@@ -1077,12 +1077,12 @@ GO(g_source_get_current_time, vFpp)
 GO(g_source_get_id, uFp)
 GO(g_source_get_name, pFp)
 GO(g_source_get_priority, iFp)
-GO(g_source_get_ready_time, IFp)
-GO(g_source_get_time, IFp)
+GO(g_source_get_ready_time, lFp)
+GO(g_source_get_time, lFp)
 GO(g_source_is_destroyed, iFp)
-GO(g_source_modify_unix_fd, vFppi)
+GO(g_source_modify_unix_fd, vFppu)
 GOM(g_source_new, pFEpu)
-GO(g_source_query_unix_fd, iFpp)
+GO(g_source_query_unix_fd, uFpp)
 GO(g_source_ref, pFp)
 GO(g_source_remove, iFu)
 GOM(g_source_remove_by_funcs_user_data, iFEpp)
@@ -1091,24 +1091,24 @@ GO(g_source_remove_child_source, vFpp)
 GO(g_source_remove_poll, vFpp)
 GO(g_source_remove_unix_fd, vFpp)
 GOM(g_source_set_callback, vFEpppp)
-//GOM(g_source_set_callback_indirect, vFEppB)
+//GOM(g_source_set_callback_indirect, vFEppp)
 GO(g_source_set_can_recurse, vFpi)
 GOM(g_source_set_funcs, vFEpp)
 GO(g_source_set_name, vFpp)
 GO(g_source_set_name_by_id, vFup)
 GO(g_source_set_priority, vFpi)
-GO(g_source_set_ready_time, vFpI)
+GO(g_source_set_ready_time, vFpl)
 GO(g_source_unref, vFp)
 GO(g_spaced_primes_closest, uFu)
-GOM(g_spawn_async, iFEpppipppp)
-GOM(g_spawn_async_with_pipes, iFEpppippppppp)
+GOM(g_spawn_async, iFEpppupppp)
+GOM(g_spawn_async_with_pipes, iFEpppuppppppp)
 GO(g_spawn_check_exit_status, iFip)
 GO(g_spawn_close_pid, vFi)
 GO(g_spawn_command_line_async, iFpp)
 GO(g_spawn_command_line_sync, iFppppp)
-GO(g_spawn_error_quark, pFv)
-GO(g_spawn_exit_error_quark, pFv)
-GOM(g_spawn_sync, iFEpppipppppp)
+GO(g_spawn_error_quark, uFv)
+GO(g_spawn_exit_error_quark, uFv)
+GOM(g_spawn_sync, iFEpppupppppp)
 GOM(g_sprintf, iFEppV)
 GO(g_stat, iFpp)
 GO(g_static_mutex_free, vFp)
@@ -1134,14 +1134,14 @@ GO(g_static_rw_lock_writer_lock, vFp)
 GO(g_static_rw_lock_writer_trylock, iFp)
 GO(g_static_rw_lock_writer_unlock, vFp)
 GO(g_stpcpy, pFpp)
-GO(g_strcanon, pFppC)
+GO(g_strcanon, pFppc)
 GO(g_strcasecmp, iFpp)
 GO(g_strchomp, pFp)
 GO(g_strchug, pFp)
 GO(g_strcmp0, iFpp)
 GO(g_strcompress, pFp)
 GOM(g_strconcat, pFEpV)    //vaarg, no va_list equivalent...
-GO(g_strdelimit, pFppC)
+GO(g_strdelimit, pFppc)
 GO(g_strdown, pFp)
 GO(g_strdup, pFp)
 GOM(g_strdup_printf, pFEpV)
@@ -1155,7 +1155,7 @@ GO(g_str_hash, uFp)
 GO(g_str_has_prefix, iFpp)
 GO(g_str_has_suffix, iFpp)
 GO(g_string_append, pFpp)
-GO(g_string_append_c, pFpC)
+GO(g_string_append_c, pFpc)
 GO(g_string_append_len, pFppl)
 GOM(g_string_append_printf, vFEppV)
 GO(g_string_append_unichar, pFpu)
@@ -1177,7 +1177,7 @@ GO(g_string_free, pFpi)
 GO(g_string_free_to_bytes, pFp)
 GO(g_string_hash, uFp)
 GO(g_string_insert, pFplp)
-GO(g_string_insert_c, pFplC)
+GO(g_string_insert_c, pFplc)
 GO(g_string_insert_len, pFplpl)
 GO(g_string_insert_unichar, pFplu)
 GO(g_string_new, pFp)
@@ -1185,7 +1185,7 @@ GO(g_string_new_len, pFpl)
 GO(g_string_overwrite, pFpLp)
 GO(g_string_overwrite_len, pFpLpl)
 GO(g_string_prepend, pFpp)
-GO(g_string_prepend_c, pFpC)
+GO(g_string_prepend_c, pFpc)
 GO(g_string_prepend_len, pFppl)
 GO(g_string_prepend_unichar, pFpu)
 GOM(g_string_printf, vFEppV)
@@ -1199,99 +1199,99 @@ GO(g_str_is_ascii, iFp)
 GOM(g_strjoin, pFEpV)
 GOM(g_strjoinv, pFEpp)
 GO(g_strlcat, LFppL)
-GO(g_strlcpy, uFppu)
+GO(g_strlcpy, LFppL)
 GO(g_str_match_string, iFppi)
 GO(g_strncasecmp, iFppu)
 GO(g_strndup, pFpL)
-GO(g_strnfill, pFLC)
+GO(g_strnfill, pFLc)
 GO(g_strreverse, pFp)
 GO(g_strrstr, pFpp)
 GO(g_strrstr_len, pFplp)
 GO(g_strsignal, pFi)
 GO(g_strsplit, pFppi)
 GO(g_strsplit_set, pFppi)
-GO(g_strstr_len, pFpip)
+GO(g_strstr_len, pFplp)
 GO(g_str_to_ascii, pFpp)
 GO(g_strtod, dFpp)
 GO(g_str_tokenize_and_fold, pFppp)
 GO(g_strup, pFp)
 GO(g_strv_contains, iFpp)
 GO(g_strv_length, uFp)
-//GO(g_test_add_data_func, 
-//GO(g_test_add_data_func_full, 
-//GO(g_test_add_func, 
-//GO(g_test_add_vtable, 
+//GOM(g_test_add_data_func, vFppp)
+//GOM(g_test_add_data_func_full, vFpppp)
+//GOM(g_test_add_func, vFpp)
+//GOM(g_test_add_vtable, vFpLpppp)
 GO(g_test_assert_expected_messages_internal, vFppip)
-//GO(g_test_bug, 
-//GO(g_test_bug_base, 
-//GO(g_test_build_filename, 
-//GO(g_test_create_case, 
+GO(g_test_bug, vFp)
+GO(g_test_bug_base, vFp)
+//GOM(g_test_build_filename, pFupV)
+//GOM(g_test_create_case, pFpLpppp)
 GO(g_test_create_suite, pFp)
 GO(g_test_expect_message, vFpip)
-//GO(g_test_fail, 
-//GO(g_test_failed, 
+GO(g_test_fail, vFv)
+GO(g_test_failed, iFv)
 GO(g_test_get_dir, pFu)
-//GO(g_test_get_filename, 
+//GOM(g_test_get_filename, pFupV)
 GO(g_test_get_root, pFv)
-//GO(g_test_incomplete, 
-//GO(g_test_init, 
+GO(g_test_incomplete, vFp)
+//GOM(g_test_init, vFppV)
 GO(g_test_log_buffer_free, vFp)
 GO(g_test_log_buffer_new, pFv)
 GO(g_test_log_buffer_pop, pFp)
 GO(g_test_log_buffer_push, vFpup)
 GO(g_test_log_msg_free, vFp)
-//GO(g_test_log_set_fatal_handler, 
+//GOM(g_test_log_set_fatal_handler, vFpp)
 GO(g_test_log_type_name, pFu)
-//GO(g_test_maximized_result, 
-//GO(g_test_message, 
-//GO(g_test_minimized_result, 
-//GO(g_test_queue_destroy, 
-//GO(g_test_queue_free, 
+//GOM(g_test_maximized_result, vFdpV)
+//GOM(g_test_message, vFpV)
+//GOM(g_test_minimized_result, vFdpV)
+//GOM(g_test_queue_destroy, vFpp)
+GO(g_test_queue_free, vFp)
 GO(g_test_rand_double, dFv)
 GO(g_test_rand_double_range, dFdd)
 GO(g_test_rand_int, iFv)
 GO(g_test_rand_int_range, iFii)
-//GO(g_test_run, 
+GO(g_test_run, iFv)
 GO(g_test_run_suite, iFp)
-//GO(g_test_set_nonfatal_assertions, 
+GO(g_test_set_nonfatal_assertions, vFv)
 GO(g_test_skip, vFp)
-//GO(g_test_subprocess, 
+GO(g_test_subprocess, iFv)
 GO(g_test_suite_add, vFpp)
 GO(g_test_suite_add_suite, vFpp)
-//GO(g_test_timer_elapsed, 
-//GO(g_test_timer_last, 
-//GO(g_test_timer_start, 
+GO(g_test_timer_elapsed, dFv)
+GO(g_test_timer_last, dFv)
+GO(g_test_timer_start, vFv)
 GO(g_test_trap_assertions, vFppipLp)
 GO(g_test_trap_fork, iFLu)
-//GO(g_test_trap_has_passed, 
-//GO(g_test_trap_reached_timeout, 
+GO(g_test_trap_has_passed, iFv)
+GO(g_test_trap_reached_timeout, iFv)
 GO(g_test_trap_subprocess, vFpLu)
 GOM(g_thread_create, pFEppip)
-GOM(g_thread_create_full, pFEppLiiip)
-GO(g_thread_error_quark, pFv)
+GOM(g_thread_create_full, pFEppLiiup)
+GO(g_thread_error_quark, uFv)
 GO(g_thread_exit, vFp)
 GOM(g_thread_foreach, vFEpp)
 GO(g_thread_get_initialized, iFv)
 //GO(g_thread_init_glib, 
 GO(g_thread_join, pFp)
 GOM(g_thread_new, pFEppp)
-//GO(g_thread_pool_free, 
+//GOM(g_thread_pool_free, vFpii)
 GO(g_thread_pool_get_max_idle_time, uFv)
-//GO(g_thread_pool_get_max_threads, 
+//GOM(g_thread_pool_get_max_threads, iFp)
 GO(g_thread_pool_get_max_unused_threads, iFv)
-//GO(g_thread_pool_get_num_threads, 
-//GO(g_thread_pool_get_num_unused_threads, 
-//GO(g_thread_pool_new, 
-//GO(g_thread_pool_push, 
+//GOM(g_thread_pool_get_num_threads, uFp)
+GO(g_thread_pool_get_num_unused_threads, uFv)
+//GOM(g_thread_pool_new, pFppiip)
+//GOM(g_thread_pool_push, iFppp)
 GO(g_thread_pool_set_max_idle_time, vFu)
-//GO(g_thread_pool_set_max_threads, 
+//GOM(g_thread_pool_set_max_threads, iFpip)
 GO(g_thread_pool_set_max_unused_threads, vFi)
-//GO(g_thread_pool_set_sort_function, 
-//GO(g_thread_pool_stop_unused_threads, 
-//GO(g_thread_pool_unprocessed, 
+//GOM(g_thread_pool_set_sort_function, vFppp)
+GO(g_thread_pool_stop_unused_threads, vFv)
+//GOM(g_thread_pool_unprocessed, uFp)
 GO(g_thread_ref, pFp)
 GO(g_thread_self, pFv)
-GO(g_thread_set_priority, vFpi)
+GO(g_thread_set_priority, vFpu)
 GOM(g_thread_try_new, pFEpppp)
 GO(g_thread_unref, vFp)
 GO(g_thread_yield, vFv)
@@ -1301,13 +1301,13 @@ GOM(g_timeout_add_seconds, uFEupp)
 GOM(g_timeout_add_seconds_full, uFEiuppp)
 GO(g_timeout_source_new, pFu)
 GO(g_timeout_source_new_seconds, pFu)
-//GO(g_timer_continue, 
-//GO(g_timer_destroy, 
+GO(g_timer_continue, vFp)
+GO(g_timer_destroy, vFp)
 GO(g_timer_elapsed, dFpp)
 GO(g_timer_new, pFv)
-//GO(g_timer_reset, 
-//GO(g_timer_start, 
-//GO(g_timer_stop, 
+GO(g_timer_reset, vFp)
+GO(g_timer_start, vFp)
+GO(g_timer_stop, vFp)
 GO(g_time_val_add, vFpl)
 GO(g_time_val_from_iso8601, iFpp)
 GO(g_time_val_to_iso8601, pFp)
@@ -1316,32 +1316,32 @@ GO(g_time_zone_find_interval, iFpul)
 GO(g_time_zone_get_abbreviation, pFpi)
 GO(g_time_zone_get_offset, iFpi)
 GO(g_time_zone_is_dst, iFpi)
-//GO(g_time_zone_new, 
+GO(g_time_zone_new, pFp)
 GO(g_time_zone_new_local, pFv)
-//GO(g_time_zone_new_utc, 
+GO(g_time_zone_new_utc, pFv)
 GO(g_time_zone_ref, pFp)
-//GO(g_time_zone_unref, 
+GO(g_time_zone_unref, vFp)
 GO(g_trash_stack_height, uFp)
 GO(g_trash_stack_peek, pFp)
 GO(g_trash_stack_pop, pFp)
 GO(g_trash_stack_push, vFpp)
-//GO(g_tree_destroy, 
-//GO(g_tree_foreach, 
-//GO(g_tree_height, 
-//GO(g_tree_insert, 
+GO(g_tree_destroy, vFp)
+//GOM(g_tree_foreach, vFppp)
+GO(g_tree_height, iFp)
+GO(g_tree_insert, vFppp)
 GO(g_tree_lookup, pFpp)
 GO(g_tree_lookup_extended, iFpppp)
-//GO(g_tree_new, 
-//GO(g_tree_new_full, 
-//GO(g_tree_new_with_data, 
+//GOM(g_tree_new, pFp)
+//GOM(g_tree_new_full, pFpppp)
+//GOM(g_tree_new_with_data, pFpp)
 GO(g_tree_nnodes, iFp)
 GO(g_tree_ref, pFp)
-//GO(g_tree_remove, 
+GO(g_tree_remove, iFpp)
 GO(g_tree_replace, vFppp)
-//GO(g_tree_search, 
+//GOM(g_tree_search, pFppp)
 GO(g_tree_steal, iFpp)
-//GO(g_tree_traverse, 
-//GO(g_tree_unref, 
+//GOM(g_tree_traverse, vFppup)
+GO(g_tree_unref, vFp)
 GO(g_try_malloc, pFL)
 GO(g_try_malloc0, pFL)
 GO(g_try_malloc0_n, pFLL)
@@ -1388,32 +1388,32 @@ GO(g_unicode_canonical_decomposition, pFup)
 GO(g_unicode_canonical_ordering, vFpL)
 GO(g_unicode_script_from_iso15924, iFu)
 GO(g_unicode_script_to_iso15924, uFi)
-//GO(g_unix_error_quark, 
-//GO(g_unix_fd_add, 
-//GO(g_unix_fd_add_full, 
-GO(g_unix_fd_source_new, pFii)
+GO(g_unix_error_quark, uFv)
+//GOM(g_unix_fd_add, uFiupp)
+//GOM(g_unix_fd_add_full, uFiiuppp)
+GO(g_unix_fd_source_new, pFiu)
 GO(g_unix_open_pipe, iFpip)
-//GO(g_unix_set_fd_nonblocking, 
-//GO(g_unix_signal_add, 
-//GO(g_unix_signal_add_full, 
-//GO(g_unix_signal_source_new, 
+GO(g_unix_set_fd_nonblocking, iFiip)
+//GOM(g_unix_signal_add, uFipp)
+//GOM(g_unix_signal_add_full, uFiippp)
+//GOM(g_unix_signal_source_new, pFi)
 GO(g_unlink, iFp)
 GO(g_unsetenv, vFp)
 GO(g_uri_escape_string, pFppi)
 GO(g_uri_list_extract_uris, pFp)
-GO(g_uri_parse, pFpip)
+GO(g_uri_parse, pFpup)
 GO(g_uri_parse_scheme, pFp)
-GO(g_uri_to_string_partial, pFpi)
+GO(g_uri_to_string_partial, pFpu)
 GO(g_uri_unescape_segment, pFppp)
 GO(g_uri_unescape_string, pFpp)
 GO(g_uri_unref, vFp)
 GO(g_usleep, vFL)
 GO(g_utf16_to_ucs4, pFplppp)
 GO(g_utf16_to_utf8, pFplppp)
-GO(g_utf8_casefold, pFpi)
+GO(g_utf8_casefold, pFpl)
 GO(g_utf8_collate, iFpp)
-GO(g_utf8_collate_key, pFpi)
-GO(g_utf8_collate_key_for_filename, pFpi)
+GO(g_utf8_collate_key, pFpl)
+GO(g_utf8_collate_key_for_filename, pFpl)
 GO(g_utf8_find_next_char, pFpp)
 GO(g_utf8_find_prev_char, pFpp)
 GO(g_utf8_get_char, uFp)
@@ -1422,21 +1422,21 @@ GO(g_utf8_normalize, pFplu)
 GO(g_utf8_offset_to_pointer, pFpl)
 GO(g_utf8_pointer_to_offset, lFpp)
 GO(g_utf8_prev_char, pFp)
-GO(g_utf8_strchr, pFpiu)
-GO(g_utf8_strdown, pFpi)
+GO(g_utf8_strchr, pFplu)
+GO(g_utf8_strdown, pFpl)
 GO(g_utf8_strlen, lFpl)
 GO(g_utf8_strncpy, pFppL)
 GO(g_utf8_strrchr, pFplu)
-GO(g_utf8_strreverse, pFpi)
-GO(g_utf8_strup, pFpi)
+GO(g_utf8_strreverse, pFpl)
+GO(g_utf8_strup, pFpl)
 GO(g_utf8_substring, pFpll)
 GO(g_utf8_to_ucs4, pFplppp)
 GO(g_utf8_to_ucs4_fast, pFplp)
 GO(g_utf8_to_utf16, pFplppp)
 GO(g_utf8_validate, iFplp)
-GO(g_utime, iFpp)
+GO(g_utime, iFpp) // Warning: failed to confirm
 GOM(g_variant_builder_add, vFEppV)
-//GO(g_variant_builder_add_parsed, vFppppppppppp) //vaarg
+//GOM(g_variant_builder_add_parsed, vFppV)
 GO(g_variant_builder_add_value, vFpp)
 GO(g_variant_builder_clear, vFp)
 GO(g_variant_builder_close, vFp)
@@ -1454,9 +1454,9 @@ GO(g_variant_dict_clear, vFp)
 GO(g_variant_dict_contains, iFpp)
 GO(g_variant_dict_end, pFp)
 GO(g_variant_dict_init, vFpp)
-//GO(g_variant_dict_insert, vFpppppppppppppp) //vaarg
+//GOM(g_variant_dict_insert, vFpppV)
 GO(g_variant_dict_insert_value, vFppp)
-//GO(g_variant_dict_lookup, iFppppppppppppp)  //vaarg
+//GOM(g_variant_dict_lookup, iFpppV)
 GO(g_variant_dict_lookup_value, pFppp)
 GO(g_variant_dict_new, pFp)
 GO(g_variant_dict_ref, pFp)
@@ -1475,7 +1475,7 @@ GO(g_variant_get_boolean, iFp)
 GO(g_variant_get_byte, CFp)
 GO(g_variant_get_bytestring, pFp)
 GO(g_variant_get_bytestring_array, pFpp)
-GO(g_variant_get_child, vFpuppppppppppp)    //vaarg here, only pointers so should be ok
+GO(g_variant_get_child, vFpLppppppppppp)    //vaarg here, only pointers so should be ok
 GO(g_variant_get_child_value, pFpL)
 GO(g_variant_get_data, pFp)
 GO(g_variant_get_data_as_bytes, pFp)
@@ -1515,7 +1515,7 @@ GO(g_variant_iter_next, iFpppppppppppp) // vaarg here, only pointers so should b
 GO(g_variant_iter_next_value, pFp)
 GO(g_variant_lookup, iFpppppppppppp)    // vaarg
 GO(g_variant_lookup_value, pFppp)
-GO(g_variant_n_children, uFp)
+GO(g_variant_n_children, LFp)
 GOM(g_variant_new, pFEpV)
 GO(g_variant_new_array, pFppL)
 GO(g_variant_new_boolean, pFi)
@@ -1526,20 +1526,20 @@ GO(g_variant_new_dict_entry, pFpp)
 GO(g_variant_new_double, pFd)
 GO(g_variant_new_fixed_array, pFppLL)
 GO(g_variant_new_from_bytes, pFppi)
-GOM(g_variant_new_from_data, pFEppuipp)
+GOM(g_variant_new_from_data, pFEppLipp)
 GO(g_variant_new_handle, pFi)
 GO(g_variant_new_int16, pFw)
 GO(g_variant_new_int32, pFi)
 GO(g_variant_new_int64, pFl)
 GO(g_variant_new_maybe, pFpp)
 GO(g_variant_new_object_path, pFp)
-GO(g_variant_new_objv, pFpi)
-//GO2(g_variant_new_parsed, pFEpV, my_g_variant_new_parsed_va)
+GO(g_variant_new_objv, pFpl)
+//GOM(g_variant_new_parsed, pFpV)
 GOM(g_variant_new_parsed_va, pFEpp)
-//GO(g_variant_new_printf,  // needs alignment.....
+//GOM(g_variant_new_printf, pFpV)
 GO(g_variant_new_signature, pFp)
 GO(g_variant_new_string, pFp)
-GO(g_variant_new_strv, pFpi)
+GO(g_variant_new_strv, pFpl)
 GO(g_variant_new_take_string, pFp)
 GO(g_variant_new_tuple, pFpL)
 GO(g_variant_new_uint16, pFW)
@@ -1549,8 +1549,8 @@ GOM(g_variant_new_va, pFEppp)
 GO(g_variant_new_variant, pFp)
 GO(g_variant_parse, pFppppp)
 GO(g_variant_parse_error_print_context, pFpp)
-//GO(g_variant_parse_error_quark, 
-//GO(g_variant_parser_get_error_quark, 
+GO(g_variant_parse_error_quark, uFv)
+GO(g_variant_parser_get_error_quark, uFv)
 GO(g_variant_print, pFpi)
 GO(g_variant_print_string, pFppi)
 GO(g_variant_ref, pFp)
@@ -1569,9 +1569,9 @@ GO(g_variant_take_ref, pFp)
 GO(g_variant_type_checked_, pFp)
 GO(g_variant_type_copy, pFp)
 GO(g_variant_type_dup_string, pFp)
-//GO(g_variant_type_element, 
+GO(g_variant_type_element, pFp)
 GO(g_variant_type_equal, iFpp)
-//GO(g_variant_type_first, 
+GO(g_variant_type_first, pFp)
 GO(g_variant_type_free, vFp)
 GO(g_variant_type_get_string_length, LFp)
 GO(g_variant_type_hash, uFp)