[WRAPPER] Reworked libasound with new wrapperhelper

6 files changed, 503 insertions, 284 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 150f8924..923347ca 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -69,6 +69,7 @@
 #() uFS
 #() uFb
 #() UFv
+#() UFi
 #() UFu
 #() UFp
 #() fFi
@@ -250,7 +251,6 @@
 #() WFpp
 #() uFEp
 #() uFii
-#() uFiu
 #() uFiS
 #() uFui
 #() uFuu
@@ -301,13 +301,16 @@
 #() DFpp
 #() lFEi
 #() lFii
+#() lFiL
 #() lFip
 #() lFui
 #() lFDD
 #() lFll
 #() lFpi
+#() lFpu
 #() lFpd
 #() lFpl
+#() lFpL
 #() lFpp
 #() LFEL
 #() LFEp
@@ -448,11 +451,13 @@
 #() vFpip
 #() vFpui
 #() vFpuI
+#() vFpuC
 #() vFpuW
 #() vFpuu
 #() vFpuU
 #() vFpuf
 #() vFpud
+#() vFpul
 #() vFpuL
 #() vFpup
 #() vFpUi
@@ -675,6 +680,7 @@
 #() lFlll
 #() lFpli
 #() lFpLu
+#() lFpLL
 #() lFpLp
 #() lFppi
 #() lFppu
@@ -1049,6 +1055,7 @@
 #() iFpiuL
 #() iFpiup
 #() iFpiUp
+#() iFpili
 #() iFpild
 #() iFpipi
 #() iFpipu
@@ -1093,6 +1100,7 @@
 #() iFpLii
 #() iFpLiL
 #() iFpLip
+#() iFpLui
 #() iFpLuu
 #() iFpLup
 #() iFpLlp
@@ -1209,6 +1217,7 @@
 #() lFppii
 #() lFppip
 #() lFppiS
+#() lFpplp
 #() lFpppL
 #() lFpppp
 #() LFEppL
@@ -1616,7 +1625,6 @@
 #() iFpuipi
 #() iFpuipp
 #() iFpuuip
-#() iFpuuui
 #() iFpuuup
 #() iFpuuLL
 #() iFpuuLp
@@ -1639,6 +1647,7 @@
 #() iFpLiup
 #() iFpLilp
 #() iFpLiLi
+#() iFpLuLi
 #() iFpLlpp
 #() iFpLLii
 #() iFpLLup
@@ -2027,8 +2036,10 @@
 #() iFEpilpV
 #() iFEpippi
 #() iFEpIppp
+#() iFEpuipp
 #() iFEpuppp
 #() iFEpUppp
+#() iFEppupp
 #() iFEppppi
 #() iFEppppp
 #() iFiiiipp
@@ -2087,7 +2098,6 @@
 #() iFpuuppp
 #() iFpuLuLu
 #() iFpuLLpp
-#() iFpupuui
 #() iFpupLpL
 #() iFpupLpp
 #() iFpUiipp
@@ -2106,6 +2116,7 @@
 #() iFpLLLLL
 #() iFpLLppp
 #() iFpLpipi
+#() iFpLpLui
 #() iFpLppii
 #() iFpLpppL
 #() iFpLpppp
@@ -2127,6 +2138,7 @@
 #() iFppuIII
 #() iFppuupp
 #() iFppulup
+#() iFppulll
 #() iFppuLpp
 #() iFppupip
 #() iFppuppp
@@ -2421,9 +2433,9 @@
 #() iFpiiiiii
 #() iFpiiiuwp
 #() iFpiiiuup
-#() iFpiiuuiu
 #() iFpiipppp
 #() iFpiuiipp
+#() iFpiuuuiu
 #() iFpiuLiii
 #() iFpiupppp
 #() iFpiLuupp
@@ -2441,7 +2453,6 @@
 #() iFpuiCuCp
 #() iFpuiuupp
 #() iFpupiLpL
-#() iFpupuuui
 #() iFpupuupp
 #() iFpupupui
 #() iFpuppppp
@@ -2453,6 +2464,7 @@
 #() iFpLpiiii
 #() iFpLpiiuu
 #() iFpLpiipi
+#() iFpLpLuLi
 #() iFpLpLpip
 #() iFpLppiii
 #() iFppiiiip
@@ -2682,7 +2694,7 @@
 #() iFpWCuWCuu
 #() iFpuiipppp
 #() iFpuippLpp
-#() iFpuuiiiii
+#() iFpuuiiuuu
 #() iFpuuipppp
 #() iFpuuupupu
 #() iFpuupuupp
@@ -2961,7 +2973,7 @@
 #() iFpuuLiuiiLL
 #() iFpLLpiiuuii
 #() iFpLpLUUUUpL
-#() iFppuuiiiiii
+#() iFppuuiiuuuu
 #() iFppuuiiuupi
 #() iFppLpLpLLpp
 #() iFpppiiipipi
@@ -4127,8 +4139,16 @@ wrappedlibasound:
 - iFp:
   - snd_dlclose
   - snd_lib_error_set_handler
+- pFp:
+  - snd_mixer_class_get_compare
+  - snd_mixer_class_get_event
 - vFpp:
   - snd_mixer_elem_set_callback
+- iFpp:
+  - snd_mixer_class_set_compare
+  - snd_mixer_class_set_event
+  - snd_mixer_class_set_private_free
+  - snd_mixer_set_compare
 - pFppp:
   - snd_dlsym
 - iFpipp:
@@ -4137,6 +4157,10 @@ wrappedlibasound:
   - snd_async_add_pcm_handler
 - pFpipL:
   - snd_dlopen
+- iFpuipp:
+  - snd_mixer_elem_new
+- iFppupp:
+  - snd_pcm_hook_add
 wrappedlibbsd:
 wrappedlibc:
 - vFv:
diff --git a/src/wrapped/generated/wrappedlibasoundtypes.h b/src/wrapped/generated/wrappedlibasoundtypes.h
index b72989d0..1140e702 100644
--- a/src/wrapped/generated/wrappedlibasoundtypes.h
+++ b/src/wrapped/generated/wrappedlibasoundtypes.h
@@ -12,19 +12,31 @@
 #endif
 
 typedef int32_t (*iFp_t)(void*);
+typedef void* (*pFp_t)(void*);
 typedef void (*vFpp_t)(void*, void*);
+typedef int32_t (*iFpp_t)(void*, void*);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
 typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
 typedef void* (*pFpipL_t)(void*, int32_t, void*, uintptr_t);
+typedef int32_t (*iFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
+typedef int32_t (*iFppupp_t)(void*, void*, uint32_t, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(snd_dlclose, iFp_t) \
 	GO(snd_lib_error_set_handler, iFp_t) \
+	GO(snd_mixer_class_get_compare, pFp_t) \
+	GO(snd_mixer_class_get_event, pFp_t) \
 	GO(snd_mixer_elem_set_callback, vFpp_t) \
+	GO(snd_mixer_class_set_compare, iFpp_t) \
+	GO(snd_mixer_class_set_event, iFpp_t) \
+	GO(snd_mixer_class_set_private_free, iFpp_t) \
+	GO(snd_mixer_set_compare, iFpp_t) \
 	GO(snd_dlsym, pFppp_t) \
 	GO(snd_async_add_handler, iFpipp_t) \
 	GO(snd_async_add_pcm_handler, iFpppp_t) \
-	GO(snd_dlopen, pFpipL_t)
+	GO(snd_dlopen, pFpipL_t) \
+	GO(snd_mixer_elem_new, iFpuipp_t) \
+	GO(snd_pcm_hook_add, iFppupp_t)
 
 #endif // __wrappedlibasoundTYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 03523e26..57fae4a8 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -119,6 +119,7 @@ typedef uint32_t (*uFp_t)(void*);
 typedef uint32_t (*uFS_t)(void*);
 typedef uint32_t (*uFb_t)(void*);
 typedef uint64_t (*UFv_t)(void);
+typedef uint64_t (*UFi_t)(int32_t);
 typedef uint64_t (*UFu_t)(uint32_t);
 typedef uint64_t (*UFp_t)(void*);
 typedef float (*fFi_t)(int32_t);
@@ -295,7 +296,6 @@ typedef uint16_t (*WFpi_t)(void*, int32_t);
 typedef uint16_t (*WFpp_t)(void*, void*);
 typedef uint32_t (*uFEp_t)(x64emu_t*, void*);
 typedef uint32_t (*uFii_t)(int32_t, int32_t);
-typedef uint32_t (*uFiu_t)(int32_t, uint32_t);
 typedef uint32_t (*uFiS_t)(int32_t, void*);
 typedef uint32_t (*uFui_t)(uint32_t, int32_t);
 typedef uint32_t (*uFuu_t)(uint32_t, uint32_t);
@@ -339,12 +339,15 @@ typedef double (*dFpd_t)(void*, double);
 typedef double (*dFpp_t)(void*, void*);
 typedef intptr_t (*lFEi_t)(x64emu_t*, int32_t);
 typedef intptr_t (*lFii_t)(int32_t, int32_t);
+typedef intptr_t (*lFiL_t)(int32_t, uintptr_t);
 typedef intptr_t (*lFip_t)(int32_t, void*);
 typedef intptr_t (*lFui_t)(uint32_t, int32_t);
 typedef intptr_t (*lFll_t)(intptr_t, intptr_t);
 typedef intptr_t (*lFpi_t)(void*, int32_t);
+typedef intptr_t (*lFpu_t)(void*, uint32_t);
 typedef intptr_t (*lFpd_t)(void*, double);
 typedef intptr_t (*lFpl_t)(void*, intptr_t);
+typedef intptr_t (*lFpL_t)(void*, uintptr_t);
 typedef intptr_t (*lFpp_t)(void*, void*);
 typedef uintptr_t (*LFEL_t)(x64emu_t*, uintptr_t);
 typedef uintptr_t (*LFEp_t)(x64emu_t*, void*);
@@ -483,11 +486,13 @@ typedef void (*vFpiL_t)(void*, int32_t, uintptr_t);
 typedef void (*vFpip_t)(void*, int32_t, void*);
 typedef void (*vFpui_t)(void*, uint32_t, int32_t);
 typedef void (*vFpuI_t)(void*, uint32_t, int64_t);
+typedef void (*vFpuC_t)(void*, uint32_t, uint8_t);
 typedef void (*vFpuW_t)(void*, uint32_t, uint16_t);
 typedef void (*vFpuu_t)(void*, uint32_t, uint32_t);
 typedef void (*vFpuU_t)(void*, uint32_t, uint64_t);
 typedef void (*vFpuf_t)(void*, uint32_t, float);
 typedef void (*vFpud_t)(void*, uint32_t, double);
+typedef void (*vFpul_t)(void*, uint32_t, intptr_t);
 typedef void (*vFpuL_t)(void*, uint32_t, uintptr_t);
 typedef void (*vFpup_t)(void*, uint32_t, void*);
 typedef void (*vFpUi_t)(void*, uint64_t, int32_t);
@@ -707,6 +712,7 @@ typedef intptr_t (*lFipL_t)(int32_t, void*, uintptr_t);
 typedef intptr_t (*lFlll_t)(intptr_t, intptr_t, intptr_t);
 typedef intptr_t (*lFpli_t)(void*, intptr_t, int32_t);
 typedef intptr_t (*lFpLu_t)(void*, uintptr_t, uint32_t);
+typedef intptr_t (*lFpLL_t)(void*, uintptr_t, uintptr_t);
 typedef intptr_t (*lFpLp_t)(void*, uintptr_t, void*);
 typedef intptr_t (*lFppi_t)(void*, void*, int32_t);
 typedef intptr_t (*lFppu_t)(void*, void*, uint32_t);
@@ -1080,6 +1086,7 @@ typedef int32_t (*iFpiuu_t)(void*, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpiuL_t)(void*, int32_t, uint32_t, uintptr_t);
 typedef int32_t (*iFpiup_t)(void*, int32_t, uint32_t, void*);
 typedef int32_t (*iFpiUp_t)(void*, int32_t, uint64_t, void*);
+typedef int32_t (*iFpili_t)(void*, int32_t, intptr_t, int32_t);
 typedef int32_t (*iFpild_t)(void*, int32_t, intptr_t, double);
 typedef int32_t (*iFpipi_t)(void*, int32_t, void*, int32_t);
 typedef int32_t (*iFpipu_t)(void*, int32_t, void*, uint32_t);
@@ -1124,6 +1131,7 @@ typedef int32_t (*iFplpp_t)(void*, intptr_t, void*, void*);
 typedef int32_t (*iFpLii_t)(void*, uintptr_t, int32_t, int32_t);
 typedef int32_t (*iFpLiL_t)(void*, uintptr_t, int32_t, uintptr_t);
 typedef int32_t (*iFpLip_t)(void*, uintptr_t, int32_t, void*);
+typedef int32_t (*iFpLui_t)(void*, uintptr_t, uint32_t, int32_t);
 typedef int32_t (*iFpLuu_t)(void*, uintptr_t, uint32_t, uint32_t);
 typedef int32_t (*iFpLup_t)(void*, uintptr_t, uint32_t, void*);
 typedef int32_t (*iFpLlp_t)(void*, uintptr_t, intptr_t, void*);
@@ -1239,6 +1247,7 @@ typedef intptr_t (*lFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef intptr_t (*lFppii_t)(void*, void*, int32_t, int32_t);
 typedef intptr_t (*lFppip_t)(void*, void*, int32_t, void*);
 typedef intptr_t (*lFppiS_t)(void*, void*, int32_t, void*);
+typedef intptr_t (*lFpplp_t)(void*, void*, intptr_t, void*);
 typedef intptr_t (*lFpppL_t)(void*, void*, void*, uintptr_t);
 typedef intptr_t (*lFpppp_t)(void*, void*, void*, void*);
 typedef uintptr_t (*LFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
@@ -1645,7 +1654,6 @@ typedef int32_t (*iFpuill_t)(void*, uint32_t, int32_t, intptr_t, intptr_t);
 typedef int32_t (*iFpuipi_t)(void*, uint32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFpuuip_t)(void*, uint32_t, uint32_t, int32_t, void*);
-typedef int32_t (*iFpuuui_t)(void*, uint32_t, uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
 typedef int32_t (*iFpuuLL_t)(void*, uint32_t, uint32_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpuuLp_t)(void*, uint32_t, uint32_t, uintptr_t, void*);
@@ -1668,6 +1676,7 @@ typedef int32_t (*iFplluu_t)(void*, intptr_t, intptr_t, uint32_t, uint32_t);
 typedef int32_t (*iFpLiup_t)(void*, uintptr_t, int32_t, uint32_t, void*);
 typedef int32_t (*iFpLilp_t)(void*, uintptr_t, int32_t, intptr_t, void*);
 typedef int32_t (*iFpLiLi_t)(void*, uintptr_t, int32_t, uintptr_t, int32_t);
+typedef int32_t (*iFpLuLi_t)(void*, uintptr_t, uint32_t, uintptr_t, int32_t);
 typedef int32_t (*iFpLlpp_t)(void*, uintptr_t, intptr_t, void*, void*);
 typedef int32_t (*iFpLLii_t)(void*, uintptr_t, uintptr_t, int32_t, int32_t);
 typedef int32_t (*iFpLLup_t)(void*, uintptr_t, uintptr_t, uint32_t, void*);
@@ -2056,8 +2065,10 @@ typedef int32_t (*iFEpiipV_t)(x64emu_t*, void*, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFEpilpV_t)(x64emu_t*, void*, int32_t, intptr_t, void*, void*);
 typedef int32_t (*iFEpippi_t)(x64emu_t*, void*, int32_t, void*, void*, int32_t);
 typedef int32_t (*iFEpIppp_t)(x64emu_t*, void*, int64_t, void*, void*, void*);
+typedef int32_t (*iFEpuipp_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*);
 typedef int32_t (*iFEpUppp_t)(x64emu_t*, void*, uint64_t, void*, void*, void*);
+typedef int32_t (*iFEppupp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*);
 typedef int32_t (*iFEppppi_t)(x64emu_t*, void*, void*, void*, void*, int32_t);
 typedef int32_t (*iFEppppp_t)(x64emu_t*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFiiiipp_t)(int32_t, int32_t, int32_t, int32_t, void*, void*);
@@ -2115,7 +2126,6 @@ typedef int32_t (*iFpuupuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint32
 typedef int32_t (*iFpuuppp_t)(void*, uint32_t, uint32_t, void*, void*, void*);
 typedef int32_t (*iFpuLuLu_t)(void*, uint32_t, uintptr_t, uint32_t, uintptr_t, uint32_t);
 typedef int32_t (*iFpuLLpp_t)(void*, uint32_t, uintptr_t, uintptr_t, void*, void*);
-typedef int32_t (*iFpupuui_t)(void*, uint32_t, void*, uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFpupLpL_t)(void*, uint32_t, void*, uintptr_t, void*, uintptr_t);
 typedef int32_t (*iFpupLpp_t)(void*, uint32_t, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFpUiipp_t)(void*, uint64_t, int32_t, int32_t, void*, void*);
@@ -2134,6 +2144,7 @@ typedef int32_t (*iFpLLLLu_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t,
 typedef int32_t (*iFpLLLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpLLppp_t)(void*, uintptr_t, uintptr_t, void*, void*, void*);
 typedef int32_t (*iFpLpipi_t)(void*, uintptr_t, void*, int32_t, void*, int32_t);
+typedef int32_t (*iFpLpLui_t)(void*, uintptr_t, void*, uintptr_t, uint32_t, int32_t);
 typedef int32_t (*iFpLppii_t)(void*, uintptr_t, void*, void*, int32_t, int32_t);
 typedef int32_t (*iFpLpppL_t)(void*, uintptr_t, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFpLpppp_t)(void*, uintptr_t, void*, void*, void*, void*);
@@ -2155,6 +2166,7 @@ typedef int32_t (*iFppuipp_t)(void*, void*, uint32_t, int32_t, void*, void*);
 typedef int32_t (*iFppuIII_t)(void*, void*, uint32_t, int64_t, int64_t, int64_t);
 typedef int32_t (*iFppuupp_t)(void*, void*, uint32_t, uint32_t, void*, void*);
 typedef int32_t (*iFppulup_t)(void*, void*, uint32_t, intptr_t, uint32_t, void*);
+typedef int32_t (*iFppulll_t)(void*, void*, uint32_t, intptr_t, intptr_t, intptr_t);
 typedef int32_t (*iFppuLpp_t)(void*, void*, uint32_t, uintptr_t, void*, void*);
 typedef int32_t (*iFppupip_t)(void*, void*, uint32_t, void*, int32_t, void*);
 typedef int32_t (*iFppuppp_t)(void*, void*, uint32_t, void*, void*, void*);
@@ -2449,9 +2461,9 @@ typedef int32_t (*iFuippLpp_t)(uint32_t, int32_t, void*, void*, uintptr_t, void*
 typedef int32_t (*iFpiiiiii_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFpiiiuwp_t)(void*, int32_t, int32_t, int32_t, uint32_t, int16_t, void*);
 typedef int32_t (*iFpiiiuup_t)(void*, int32_t, int32_t, int32_t, uint32_t, uint32_t, void*);
-typedef int32_t (*iFpiiuuiu_t)(void*, int32_t, int32_t, uint32_t, uint32_t, int32_t, uint32_t);
 typedef int32_t (*iFpiipppp_t)(void*, int32_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpiuiipp_t)(void*, int32_t, uint32_t, int32_t, int32_t, void*, void*);
+typedef int32_t (*iFpiuuuiu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t, int32_t, uint32_t);
 typedef int32_t (*iFpiuLiii_t)(void*, int32_t, uint32_t, uintptr_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFpiupppp_t)(void*, int32_t, uint32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpiLuupp_t)(void*, int32_t, uintptr_t, uint32_t, uint32_t, void*, void*);
@@ -2469,7 +2481,6 @@ typedef int32_t (*iFpWppppp_t)(void*, uint16_t, void*, void*, void*, void*, void
 typedef int32_t (*iFpuiCuCp_t)(void*, uint32_t, int32_t, uint8_t, uint32_t, uint8_t, void*);
 typedef int32_t (*iFpuiuupp_t)(void*, uint32_t, int32_t, uint32_t, uint32_t, void*, void*);
 typedef int32_t (*iFpupiLpL_t)(void*, uint32_t, void*, int32_t, uintptr_t, void*, uintptr_t);
-typedef int32_t (*iFpupuuui_t)(void*, uint32_t, void*, uint32_t, uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFpupuupp_t)(void*, uint32_t, void*, uint32_t, uint32_t, void*, void*);
 typedef int32_t (*iFpupupui_t)(void*, uint32_t, void*, uint32_t, void*, uint32_t, int32_t);
 typedef int32_t (*iFpuppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*);
@@ -2481,6 +2492,7 @@ typedef int32_t (*iFpLipupu_t)(void*, uintptr_t, int32_t, void*, uint32_t, void*
 typedef int32_t (*iFpLpiiii_t)(void*, uintptr_t, void*, int32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFpLpiiuu_t)(void*, uintptr_t, void*, int32_t, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpLpiipi_t)(void*, uintptr_t, void*, int32_t, int32_t, void*, int32_t);
+typedef int32_t (*iFpLpLuLi_t)(void*, uintptr_t, void*, uintptr_t, uint32_t, uintptr_t, int32_t);
 typedef int32_t (*iFpLpLpip_t)(void*, uintptr_t, void*, uintptr_t, void*, int32_t, void*);
 typedef int32_t (*iFpLppiii_t)(void*, uintptr_t, void*, void*, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppiiiip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, void*);
@@ -2710,7 +2722,7 @@ typedef int32_t (*iFpCCWWpWu_t)(void*, uint8_t, uint8_t, uint16_t, uint16_t, voi
 typedef int32_t (*iFpWCuWCuu_t)(void*, uint16_t, uint8_t, uint32_t, uint16_t, uint8_t, uint32_t, uint32_t);
 typedef int32_t (*iFpuiipppp_t)(void*, uint32_t, int32_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpuippLpp_t)(void*, uint32_t, int32_t, void*, void*, uintptr_t, void*, void*);
-typedef int32_t (*iFpuuiiiii_t)(void*, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef int32_t (*iFpuuiiuuu_t)(void*, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpuuipppp_t)(void*, uint32_t, uint32_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpuuupupu_t)(void*, uint32_t, uint32_t, uint32_t, void*, uint32_t, void*, uint32_t);
 typedef int32_t (*iFpuupuupp_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint32_t, void*, void*);
@@ -2988,7 +3000,7 @@ typedef int32_t (*iFpCuWCCCCup_t)(void*, uint8_t, uint32_t, uint16_t, uint8_t, u
 typedef int32_t (*iFpuuLiuiiLL_t)(void*, uint32_t, uint32_t, uintptr_t, int32_t, uint32_t, int32_t, int32_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpLLpiiuuii_t)(void*, uintptr_t, uintptr_t, void*, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFpLpLUUUUpL_t)(void*, uintptr_t, void*, uintptr_t, uint64_t, uint64_t, uint64_t, uint64_t, void*, uintptr_t);
-typedef int32_t (*iFppuuiiiiii_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef int32_t (*iFppuuiiuuuu_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppuuiiuupi_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t, void*, int32_t);
 typedef int32_t (*iFppLpLpLLpp_t)(void*, void*, uintptr_t, void*, uintptr_t, void*, uintptr_t, uintptr_t, void*, void*);
 typedef int32_t (*iFpppiiipipi_t)(void*, void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*, int32_t);
@@ -3324,6 +3336,7 @@ void uFp(x64emu_t *emu, uintptr_t fcn) { uFp_t fn = (uFp_t)fcn; R_RAX=(uint32_t)
 void uFS(x64emu_t *emu, uintptr_t fcn) { uFS_t fn = (uFS_t)fcn; R_RAX=(uint32_t)fn(io_convert((void*)R_RDI)); }
 void uFb(x64emu_t *emu, uintptr_t fcn) { uFb_t fn = (uFb_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void UFv(x64emu_t *emu, uintptr_t fcn) { UFv_t fn = (UFv_t)fcn; R_RAX=fn(); }
+void UFi(x64emu_t *emu, uintptr_t fcn) { UFi_t fn = (UFi_t)fcn; R_RAX=fn((int32_t)R_RDI); }
 void UFu(x64emu_t *emu, uintptr_t fcn) { UFu_t fn = (UFu_t)fcn; R_RAX=fn((uint32_t)R_RDI); }
 void UFp(x64emu_t *emu, uintptr_t fcn) { UFp_t fn = (UFp_t)fcn; R_RAX=fn((void*)R_RDI); }
 void fFi(x64emu_t *emu, uintptr_t fcn) { fFi_t fn = (fFi_t)fcn; emu->xmm[0].f[0]=fn((int32_t)R_RDI); }
@@ -3500,7 +3513,6 @@ void WFpi(x64emu_t *emu, uintptr_t fcn) { WFpi_t fn = (WFpi_t)fcn; R_RAX=(unsign
 void WFpp(x64emu_t *emu, uintptr_t fcn) { WFpp_t fn = (WFpp_t)fcn; R_RAX=(unsigned short)fn((void*)R_RDI, (void*)R_RSI); }
 void uFEp(x64emu_t *emu, uintptr_t fcn) { uFEp_t fn = (uFEp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI); }
 void uFii(x64emu_t *emu, uintptr_t fcn) { uFii_t fn = (uFii_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (int32_t)R_RSI); }
-void uFiu(x64emu_t *emu, uintptr_t fcn) { uFiu_t fn = (uFiu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI); }
 void uFiS(x64emu_t *emu, uintptr_t fcn) { uFiS_t fn = (uFiS_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, io_convert((void*)R_RSI)); }
 void uFui(x64emu_t *emu, uintptr_t fcn) { uFui_t fn = (uFui_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
 void uFuu(x64emu_t *emu, uintptr_t fcn) { uFuu_t fn = (uFuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
@@ -3544,12 +3556,15 @@ void dFpd(x64emu_t *emu, uintptr_t fcn) { dFpd_t fn = (dFpd_t)fcn; emu->xmm[0].d
 void dFpp(x64emu_t *emu, uintptr_t fcn) { dFpp_t fn = (dFpp_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI); }
 void lFEi(x64emu_t *emu, uintptr_t fcn) { lFEi_t fn = (lFEi_t)fcn; R_RAX=(intptr_t)fn(emu, (int32_t)R_RDI); }
 void lFii(x64emu_t *emu, uintptr_t fcn) { lFii_t fn = (lFii_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI); }
+void lFiL(x64emu_t *emu, uintptr_t fcn) { lFiL_t fn = (lFiL_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI); }
 void lFip(x64emu_t *emu, uintptr_t fcn) { lFip_t fn = (lFip_t)fcn; R_RAX=(intptr_t)fn((int32_t)R_RDI, (void*)R_RSI); }
 void lFui(x64emu_t *emu, uintptr_t fcn) { lFui_t fn = (lFui_t)fcn; R_RAX=(intptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
 void lFll(x64emu_t *emu, uintptr_t fcn) { lFll_t fn = (lFll_t)fcn; R_RAX=(intptr_t)fn((intptr_t)R_RDI, (intptr_t)R_RSI); }
 void lFpi(x64emu_t *emu, uintptr_t fcn) { lFpi_t fn = (lFpi_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (int32_t)R_RSI); }
+void lFpu(x64emu_t *emu, uintptr_t fcn) { lFpu_t fn = (lFpu_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uint32_t)R_RSI); }
 void lFpd(x64emu_t *emu, uintptr_t fcn) { lFpd_t fn = (lFpd_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, emu->xmm[0].d[0]); }
 void lFpl(x64emu_t *emu, uintptr_t fcn) { lFpl_t fn = (lFpl_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (intptr_t)R_RSI); }
+void lFpL(x64emu_t *emu, uintptr_t fcn) { lFpL_t fn = (lFpL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI); }
 void lFpp(x64emu_t *emu, uintptr_t fcn) { lFpp_t fn = (lFpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI); }
 void LFEL(x64emu_t *emu, uintptr_t fcn) { LFEL_t fn = (LFEL_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI); }
 void LFEp(x64emu_t *emu, uintptr_t fcn) { LFEp_t fn = (LFEp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI); }
@@ -3688,11 +3703,13 @@ void vFpiL(x64emu_t *emu, uintptr_t fcn) { vFpiL_t fn = (vFpiL_t)fcn; fn((void*)
 void vFpip(x64emu_t *emu, uintptr_t fcn) { vFpip_t fn = (vFpip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void vFpui(x64emu_t *emu, uintptr_t fcn) { vFpui_t fn = (vFpui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void vFpuI(x64emu_t *emu, uintptr_t fcn) { vFpuI_t fn = (vFpuI_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int64_t)R_RDX); }
+void vFpuC(x64emu_t *emu, uintptr_t fcn) { vFpuC_t fn = (vFpuC_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint8_t)R_RDX); }
 void vFpuW(x64emu_t *emu, uintptr_t fcn) { vFpuW_t fn = (vFpuW_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX); }
 void vFpuu(x64emu_t *emu, uintptr_t fcn) { vFpuu_t fn = (vFpuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
 void vFpuU(x64emu_t *emu, uintptr_t fcn) { vFpuU_t fn = (vFpuU_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX); }
 void vFpuf(x64emu_t *emu, uintptr_t fcn) { vFpuf_t fn = (vFpuf_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0]); }
 void vFpud(x64emu_t *emu, uintptr_t fcn) { vFpud_t fn = (vFpud_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0]); }
+void vFpul(x64emu_t *emu, uintptr_t fcn) { vFpul_t fn = (vFpul_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX); }
 void vFpuL(x64emu_t *emu, uintptr_t fcn) { vFpuL_t fn = (vFpuL_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX); }
 void vFpup(x64emu_t *emu, uintptr_t fcn) { vFpup_t fn = (vFpup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void vFpUi(x64emu_t *emu, uintptr_t fcn) { vFpUi_t fn = (vFpUi_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX); }
@@ -3912,6 +3929,7 @@ void lFipL(x64emu_t *emu, uintptr_t fcn) { lFipL_t fn = (lFipL_t)fcn; R_RAX=(int
 void lFlll(x64emu_t *emu, uintptr_t fcn) { lFlll_t fn = (lFlll_t)fcn; R_RAX=(intptr_t)fn((intptr_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void lFpli(x64emu_t *emu, uintptr_t fcn) { lFpli_t fn = (lFpli_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX); }
 void lFpLu(x64emu_t *emu, uintptr_t fcn) { lFpLu_t fn = (lFpLu_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX); }
+void lFpLL(x64emu_t *emu, uintptr_t fcn) { lFpLL_t fn = (lFpLL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 void lFpLp(x64emu_t *emu, uintptr_t fcn) { lFpLp_t fn = (lFpLp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void lFppi(x64emu_t *emu, uintptr_t fcn) { lFppi_t fn = (lFppi_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void lFppu(x64emu_t *emu, uintptr_t fcn) { lFppu_t fn = (lFppu_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
@@ -4285,6 +4303,7 @@ void iFpiuu(x64emu_t *emu, uintptr_t fcn) { iFpiuu_t fn = (iFpiuu_t)fcn; R_RAX=(
 void iFpiuL(x64emu_t *emu, uintptr_t fcn) { iFpiuL_t fn = (iFpiuL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpiup(x64emu_t *emu, uintptr_t fcn) { iFpiup_t fn = (iFpiup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void iFpiUp(x64emu_t *emu, uintptr_t fcn) { iFpiUp_t fn = (iFpiUp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX); }
+void iFpili(x64emu_t *emu, uintptr_t fcn) { iFpili_t fn = (iFpili_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX); }
 void iFpild(x64emu_t *emu, uintptr_t fcn) { iFpild_t fn = (iFpild_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, emu->xmm[0].d[0]); }
 void iFpipi(x64emu_t *emu, uintptr_t fcn) { iFpipi_t fn = (iFpipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void iFpipu(x64emu_t *emu, uintptr_t fcn) { iFpipu_t fn = (iFpipu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
@@ -4329,6 +4348,7 @@ void iFplpp(x64emu_t *emu, uintptr_t fcn) { iFplpp_t fn = (iFplpp_t)fcn; R_RAX=(
 void iFpLii(x64emu_t *emu, uintptr_t fcn) { iFpLii_t fn = (iFpLii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFpLiL(x64emu_t *emu, uintptr_t fcn) { iFpLiL_t fn = (iFpLiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpLip(x64emu_t *emu, uintptr_t fcn) { iFpLip_t fn = (iFpLip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void iFpLui(x64emu_t *emu, uintptr_t fcn) { iFpLui_t fn = (iFpLui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void iFpLuu(x64emu_t *emu, uintptr_t fcn) { iFpLuu_t fn = (iFpLuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void iFpLup(x64emu_t *emu, uintptr_t fcn) { iFpLup_t fn = (iFpLup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void iFpLlp(x64emu_t *emu, uintptr_t fcn) { iFpLlp_t fn = (iFpLlp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
@@ -4444,6 +4464,7 @@ void lFpLpp(x64emu_t *emu, uintptr_t fcn) { lFpLpp_t fn = (lFpLpp_t)fcn; R_RAX=(
 void lFppii(x64emu_t *emu, uintptr_t fcn) { lFppii_t fn = (lFppii_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void lFppip(x64emu_t *emu, uintptr_t fcn) { lFppip_t fn = (lFppip_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void lFppiS(x64emu_t *emu, uintptr_t fcn) { lFppiS_t fn = (lFppiS_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, io_convert((void*)R_RCX)); }
+void lFpplp(x64emu_t *emu, uintptr_t fcn) { lFpplp_t fn = (lFpplp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
 void lFpppL(x64emu_t *emu, uintptr_t fcn) { lFpppL_t fn = (lFpppL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void lFpppp(x64emu_t *emu, uintptr_t fcn) { lFpppp_t fn = (lFpppp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void LFEppL(x64emu_t *emu, uintptr_t fcn) { LFEppL_t fn = (LFEppL_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
@@ -4850,7 +4871,6 @@ void iFpuill(x64emu_t *emu, uintptr_t fcn) { iFpuill_t fn = (iFpuill_t)fcn; R_RA
 void iFpuipi(x64emu_t *emu, uintptr_t fcn) { iFpuipi_t fn = (iFpuipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFpuipp(x64emu_t *emu, uintptr_t fcn) { iFpuipp_t fn = (iFpuipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpuuip(x64emu_t *emu, uintptr_t fcn) { iFpuuip_t fn = (iFpuuip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
-void iFpuuui(x64emu_t *emu, uintptr_t fcn) { iFpuuui_t fn = (iFpuuui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8); }
 void iFpuuup(x64emu_t *emu, uintptr_t fcn) { iFpuuup_t fn = (iFpuuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpuuLL(x64emu_t *emu, uintptr_t fcn) { iFpuuLL_t fn = (iFpuuLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
 void iFpuuLp(x64emu_t *emu, uintptr_t fcn) { iFpuuLp_t fn = (iFpuuLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
@@ -4873,6 +4893,7 @@ void iFplluu(x64emu_t *emu, uintptr_t fcn) { iFplluu_t fn = (iFplluu_t)fcn; R_RA
 void iFpLiup(x64emu_t *emu, uintptr_t fcn) { iFpLiup_t fn = (iFpLiup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpLilp(x64emu_t *emu, uintptr_t fcn) { iFpLilp_t fn = (iFpLilp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8); }
 void iFpLiLi(x64emu_t *emu, uintptr_t fcn) { iFpLiLi_t fn = (iFpLiLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8); }
+void iFpLuLi(x64emu_t *emu, uintptr_t fcn) { iFpLuLi_t fn = (iFpLuLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8); }
 void iFpLlpp(x64emu_t *emu, uintptr_t fcn) { iFpLlpp_t fn = (iFpLlpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpLLii(x64emu_t *emu, uintptr_t fcn) { iFpLLii_t fn = (iFpLLii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void iFpLLup(x64emu_t *emu, uintptr_t fcn) { iFpLLup_t fn = (iFpLLup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
@@ -5261,8 +5282,10 @@ void iFEpiipV(x64emu_t *emu, uintptr_t fcn) { iFEpiipV_t fn = (iFEpiipV_t)fcn; R
 void iFEpilpV(x64emu_t *emu, uintptr_t fcn) { iFEpilpV_t fn = (iFEpilpV_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
 void iFEpippi(x64emu_t *emu, uintptr_t fcn) { iFEpippi_t fn = (iFEpippi_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFEpIppp(x64emu_t *emu, uintptr_t fcn) { iFEpIppp_t fn = (iFEpIppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFEpuipp(x64emu_t *emu, uintptr_t fcn) { iFEpuipp_t fn = (iFEpuipp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEpuppp(x64emu_t *emu, uintptr_t fcn) { iFEpuppp_t fn = (iFEpuppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEpUppp(x64emu_t *emu, uintptr_t fcn) { iFEpUppp_t fn = (iFEpUppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFEppupp(x64emu_t *emu, uintptr_t fcn) { iFEppupp_t fn = (iFEppupp_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 iFEppppi(x64emu_t *emu, uintptr_t fcn) { iFEppppi_t fn = (iFEppppi_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFEppppp(x64emu_t *emu, uintptr_t fcn) { iFEppppp_t fn = (iFEppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFiiiipp(x64emu_t *emu, uintptr_t fcn) { iFiiiipp_t fn = (iFiiiipp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5320,7 +5343,6 @@ void iFpuupuu(x64emu_t *emu, uintptr_t fcn) { iFpuupuu_t fn = (iFpuupuu_t)fcn; R
 void iFpuuppp(x64emu_t *emu, uintptr_t fcn) { iFpuuppp_t fn = (iFpuuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpuLuLu(x64emu_t *emu, uintptr_t fcn) { iFpuLuLu_t fn = (iFpuLuLu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9); }
 void iFpuLLpp(x64emu_t *emu, uintptr_t fcn) { iFpuLLpp_t fn = (iFpuLLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
-void iFpupuui(x64emu_t *emu, uintptr_t fcn) { iFpupuui_t fn = (iFpupuui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); }
 void iFpupLpL(x64emu_t *emu, uintptr_t fcn) { iFpupLpL_t fn = (iFpupLpL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void iFpupLpp(x64emu_t *emu, uintptr_t fcn) { iFpupLpp_t fn = (iFpupLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpUiipp(x64emu_t *emu, uintptr_t fcn) { iFpUiipp_t fn = (iFpUiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5339,6 +5361,7 @@ void iFpLLLLu(x64emu_t *emu, uintptr_t fcn) { iFpLLLLu_t fn = (iFpLLLLu_t)fcn; R
 void iFpLLLLL(x64emu_t *emu, uintptr_t fcn) { iFpLLLLL_t fn = (iFpLLLLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); }
 void iFpLLppp(x64emu_t *emu, uintptr_t fcn) { iFpLLppp_t fn = (iFpLLppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpLpipi(x64emu_t *emu, uintptr_t fcn) { iFpLpipi_t fn = (iFpLpipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
+void iFpLpLui(x64emu_t *emu, uintptr_t fcn) { iFpLpLui_t fn = (iFpLpLui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); }
 void iFpLppii(x64emu_t *emu, uintptr_t fcn) { iFpLppii_t fn = (iFpLppii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFpLpppL(x64emu_t *emu, uintptr_t fcn) { iFpLpppL_t fn = (iFpLpppL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void iFpLpppp(x64emu_t *emu, uintptr_t fcn) { iFpLpppp_t fn = (iFpLpppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5360,6 +5383,7 @@ void iFppuipp(x64emu_t *emu, uintptr_t fcn) { iFppuipp_t fn = (iFppuipp_t)fcn; R
 void iFppuIII(x64emu_t *emu, uintptr_t fcn) { iFppuIII_t fn = (iFppuIII_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
 void iFppuupp(x64emu_t *emu, uintptr_t fcn) { iFppuupp_t fn = (iFppuupp_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 iFppulup(x64emu_t *emu, uintptr_t fcn) { iFppulup_t fn = (iFppulup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (intptr_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
+void iFppulll(x64emu_t *emu, uintptr_t fcn) { iFppulll_t fn = (iFppulll_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9); }
 void iFppuLpp(x64emu_t *emu, uintptr_t fcn) { iFppuLpp_t fn = (iFppuLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFppupip(x64emu_t *emu, uintptr_t fcn) { iFppupip_t fn = (iFppupip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void iFppuppp(x64emu_t *emu, uintptr_t fcn) { iFppuppp_t fn = (iFppuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5654,9 +5678,9 @@ void iFuippLpp(x64emu_t *emu, uintptr_t fcn) { iFuippLpp_t fn = (iFuippLpp_t)fcn
 void iFpiiiiii(x64emu_t *emu, uintptr_t fcn) { iFpiiiiii_t fn = (iFpiiiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpiiiuwp(x64emu_t *emu, uintptr_t fcn) { iFpiiiuwp_t fn = (iFpiiiuwp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int16_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiiiuup(x64emu_t *emu, uintptr_t fcn) { iFpiiiuup_t fn = (iFpiiiuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
-void iFpiiuuiu(x64emu_t *emu, uintptr_t fcn) { iFpiiuuiu_t fn = (iFpiiuuiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFpiipppp(x64emu_t *emu, uintptr_t fcn) { iFpiipppp_t fn = (iFpiipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiuiipp(x64emu_t *emu, uintptr_t fcn) { iFpiuiipp_t fn = (iFpiuiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void iFpiuuuiu(x64emu_t *emu, uintptr_t fcn) { iFpiuuuiu_t fn = (iFpiuuuiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFpiuLiii(x64emu_t *emu, uintptr_t fcn) { iFpiuLiii_t fn = (iFpiuLiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpiupppp(x64emu_t *emu, uintptr_t fcn) { iFpiupppp_t fn = (iFpiupppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpiLuupp(x64emu_t *emu, uintptr_t fcn) { iFpiLuupp_t fn = (iFpiLuupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -5674,7 +5698,6 @@ void iFpWppppp(x64emu_t *emu, uintptr_t fcn) { iFpWppppp_t fn = (iFpWppppp_t)fcn
 void iFpuiCuCp(x64emu_t *emu, uintptr_t fcn) { iFpuiCuCp_t fn = (iFpuiCuCp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (uint32_t)R_R8, (uint8_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpuiuupp(x64emu_t *emu, uintptr_t fcn) { iFpuiuupp_t fn = (iFpuiuupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpupiLpL(x64emu_t *emu, uintptr_t fcn) { iFpupiLpL_t fn = (iFpupiLpL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8)); }
-void iFpupuuui(x64emu_t *emu, uintptr_t fcn) { iFpupuuui_t fn = (iFpupuuui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpupuupp(x64emu_t *emu, uintptr_t fcn) { iFpupuupp_t fn = (iFpupuupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpupupui(x64emu_t *emu, uintptr_t fcn) { iFpupupui_t fn = (iFpupupui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpuppppp(x64emu_t *emu, uintptr_t fcn) { iFpuppppp_t fn = (iFpuppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -5686,6 +5709,7 @@ void iFpLipupu(x64emu_t *emu, uintptr_t fcn) { iFpLipupu_t fn = (iFpLipupu_t)fcn
 void iFpLpiiii(x64emu_t *emu, uintptr_t fcn) { iFpLpiiii_t fn = (iFpLpiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpLpiiuu(x64emu_t *emu, uintptr_t fcn) { iFpLpiiuu_t fn = (iFpLpiiuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFpLpiipi(x64emu_t *emu, uintptr_t fcn) { iFpLpiipi_t fn = (iFpLpiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
+void iFpLpLuLi(x64emu_t *emu, uintptr_t fcn) { iFpLpLuLi_t fn = (iFpLpLuLi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpLpLpip(x64emu_t *emu, uintptr_t fcn) { iFpLpLpip_t fn = (iFpLpLpip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpLppiii(x64emu_t *emu, uintptr_t fcn) { iFpLppiii_t fn = (iFpLppiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFppiiiip(x64emu_t *emu, uintptr_t fcn) { iFppiiiip_t fn = (iFppiiiip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -5915,7 +5939,7 @@ void iFpCCWWpWu(x64emu_t *emu, uintptr_t fcn) { iFpCCWWpWu_t fn = (iFpCCWWpWu_t)
 void iFpWCuWCuu(x64emu_t *emu, uintptr_t fcn) { iFpWCuWCuu_t fn = (iFpWCuWCuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (uint16_t)R_R8, (uint8_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpuiipppp(x64emu_t *emu, uintptr_t fcn) { iFpuiipppp_t fn = (iFpuiipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuippLpp(x64emu_t *emu, uintptr_t fcn) { iFpuippLpp_t fn = (iFpuippLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void iFpuuiiiii(x64emu_t *emu, uintptr_t fcn) { iFpuuiiiii_t fn = (iFpuuiiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
+void iFpuuiiuuu(x64emu_t *emu, uintptr_t fcn) { iFpuuiiuuu_t fn = (iFpuuiiuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpuuipppp(x64emu_t *emu, uintptr_t fcn) { iFpuuipppp_t fn = (iFpuuipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuuupupu(x64emu_t *emu, uintptr_t fcn) { iFpuuupupu_t fn = (iFpuuupupu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpuupuupp(x64emu_t *emu, uintptr_t fcn) { iFpuupuupp_t fn = (iFpuupuupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -6193,7 +6217,7 @@ void iFpCuWCCCCup(x64emu_t *emu, uintptr_t fcn) { iFpCuWCCCCup_t fn = (iFpCuWCCC
 void iFpuuLiuiiLL(x64emu_t *emu, uintptr_t fcn) { iFpuuLiuiiLL_t fn = (iFpuuLiuiiLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24), *(uintptr_t*)(R_RSP + 32)); }
 void iFpLLpiiuuii(x64emu_t *emu, uintptr_t fcn) { iFpLLpiiuuii_t fn = (iFpLLpiiuuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void iFpLpLUUUUpL(x64emu_t *emu, uintptr_t fcn) { iFpLpLUUUUpL_t fn = (iFpLpLUUUUpL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(uintptr_t*)(R_RSP + 32)); }
-void iFppuuiiiiii(x64emu_t *emu, uintptr_t fcn) { iFppuuiiiiii_t fn = (iFppuuiiiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
+void iFppuuiiuuuu(x64emu_t *emu, uintptr_t fcn) { iFppuuiiuuuu_t fn = (iFppuuiiuuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
 void iFppuuiiuupi(x64emu_t *emu, uintptr_t fcn) { iFppuuiiuupi_t fn = (iFppuuiiuupi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void iFppLpLpLLpp(x64emu_t *emu, uintptr_t fcn) { iFppLpLpLLpp_t fn = (iFppLpLpLLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFpppiiipipi(x64emu_t *emu, uintptr_t fcn) { iFpppiiipipi_t fn = (iFpppiiipipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
@@ -6532,6 +6556,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFL) return 1;
 	if (fun == &uFp) return 1;
 	if (fun == &UFv) return 1;
+	if (fun == &UFi) return 1;
 	if (fun == &UFu) return 1;
 	if (fun == &UFp) return 1;
 	if (fun == &fFi) return -1;
@@ -6665,7 +6690,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &WFpi) return 1;
 	if (fun == &WFpp) return 1;
 	if (fun == &uFii) return 1;
-	if (fun == &uFiu) return 1;
 	if (fun == &uFui) return 1;
 	if (fun == &uFuu) return 1;
 	if (fun == &uFup) return 1;
@@ -6700,12 +6724,15 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &dFpd) return -2;
 	if (fun == &dFpp) return -1;
 	if (fun == &lFii) return 1;
+	if (fun == &lFiL) return 1;
 	if (fun == &lFip) return 1;
 	if (fun == &lFui) return 1;
 	if (fun == &lFll) return 1;
 	if (fun == &lFpi) return 1;
+	if (fun == &lFpu) return 1;
 	if (fun == &lFpd) return 2;
 	if (fun == &lFpl) return 1;
+	if (fun == &lFpL) return 1;
 	if (fun == &lFpp) return 1;
 	if (fun == &LFUp) return 1;
 	if (fun == &LFLi) return 1;
@@ -6815,11 +6842,13 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpip) return 1;
 	if (fun == &vFpui) return 1;
 	if (fun == &vFpuI) return 1;
+	if (fun == &vFpuC) return 1;
 	if (fun == &vFpuW) return 1;
 	if (fun == &vFpuu) return 1;
 	if (fun == &vFpuU) return 1;
 	if (fun == &vFpuf) return 2;
 	if (fun == &vFpud) return 2;
+	if (fun == &vFpul) return 1;
 	if (fun == &vFpuL) return 1;
 	if (fun == &vFpup) return 1;
 	if (fun == &vFpUi) return 1;
@@ -6999,6 +7028,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFlll) return 1;
 	if (fun == &lFpli) return 1;
 	if (fun == &lFpLu) return 1;
+	if (fun == &lFpLL) return 1;
 	if (fun == &lFpLp) return 1;
 	if (fun == &lFppi) return 1;
 	if (fun == &lFppu) return 1;
@@ -7288,6 +7318,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpiuL) return 1;
 	if (fun == &iFpiup) return 1;
 	if (fun == &iFpiUp) return 1;
+	if (fun == &iFpili) return 1;
 	if (fun == &iFpild) return 2;
 	if (fun == &iFpipi) return 1;
 	if (fun == &iFpipu) return 1;
@@ -7330,6 +7361,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpLii) return 1;
 	if (fun == &iFpLiL) return 1;
 	if (fun == &iFpLip) return 1;
+	if (fun == &iFpLui) return 1;
 	if (fun == &iFpLuu) return 1;
 	if (fun == &iFpLup) return 1;
 	if (fun == &iFpLlp) return 1;
@@ -7422,6 +7454,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFpLpp) return 1;
 	if (fun == &lFppii) return 1;
 	if (fun == &lFppip) return 1;
+	if (fun == &lFpplp) return 1;
 	if (fun == &lFpppL) return 1;
 	if (fun == &lFpppp) return 1;
 	if (fun == &LFipLL) return 1;
@@ -7744,7 +7777,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpuipi) return 1;
 	if (fun == &iFpuipp) return 1;
 	if (fun == &iFpuuip) return 1;
-	if (fun == &iFpuuui) return 1;
 	if (fun == &iFpuuup) return 1;
 	if (fun == &iFpuuLL) return 1;
 	if (fun == &iFpuuLp) return 1;
@@ -7767,6 +7799,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpLiup) return 1;
 	if (fun == &iFpLilp) return 1;
 	if (fun == &iFpLiLi) return 1;
+	if (fun == &iFpLuLi) return 1;
 	if (fun == &iFpLlpp) return 1;
 	if (fun == &iFpLLii) return 1;
 	if (fun == &iFpLLup) return 1;
@@ -8132,7 +8165,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpuuppp) return 1;
 	if (fun == &iFpuLuLu) return 1;
 	if (fun == &iFpuLLpp) return 1;
-	if (fun == &iFpupuui) return 1;
 	if (fun == &iFpupLpL) return 1;
 	if (fun == &iFpupLpp) return 1;
 	if (fun == &iFpUiipp) return 1;
@@ -8151,6 +8183,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpLLLLL) return 1;
 	if (fun == &iFpLLppp) return 1;
 	if (fun == &iFpLpipi) return 1;
+	if (fun == &iFpLpLui) return 1;
 	if (fun == &iFpLppii) return 1;
 	if (fun == &iFpLpppL) return 1;
 	if (fun == &iFpLpppp) return 1;
@@ -8172,6 +8205,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppuIII) return 1;
 	if (fun == &iFppuupp) return 1;
 	if (fun == &iFppulup) return 1;
+	if (fun == &iFppulll) return 1;
 	if (fun == &iFppuLpp) return 1;
 	if (fun == &iFppupip) return 1;
 	if (fun == &iFppuppp) return 1;
@@ -8468,8 +8502,10 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &dFpd) return -3;
 	if (fun == &dFpp) return -1;
 	if (fun == &lFll) return 1;
+	if (fun == &lFpu) return 1;
 	if (fun == &lFpd) return 3;
 	if (fun == &lFpl) return 1;
+	if (fun == &lFpL) return 1;
 	if (fun == &lFpp) return 1;
 	if (fun == &LFUp) return 1;
 	if (fun == &LFLL) return 1;
@@ -8523,11 +8559,13 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFLpL) return 1;
 	if (fun == &vFLpp) return 1;
 	if (fun == &vFpuI) return 1;
+	if (fun == &vFpuC) return 1;
 	if (fun == &vFpuW) return 1;
 	if (fun == &vFpuu) return 1;
 	if (fun == &vFpuU) return 1;
 	if (fun == &vFpuf) return 3;
 	if (fun == &vFpud) return 3;
+	if (fun == &vFpul) return 1;
 	if (fun == &vFpuL) return 1;
 	if (fun == &vFpup) return 1;
 	if (fun == &vFpUu) return 1;
@@ -8589,6 +8627,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &dFppp) return -1;
 	if (fun == &lFlll) return 1;
 	if (fun == &lFpLu) return 1;
+	if (fun == &lFpLL) return 1;
 	if (fun == &lFpLp) return 1;
 	if (fun == &lFppu) return 1;
 	if (fun == &lFppL) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index c91b5345..6b283f6b 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -106,6 +106,7 @@ void uFp(x64emu_t *emu, uintptr_t fnc);
 void uFS(x64emu_t *emu, uintptr_t fnc);
 void uFb(x64emu_t *emu, uintptr_t fnc);
 void UFv(x64emu_t *emu, uintptr_t fnc);
+void UFi(x64emu_t *emu, uintptr_t fnc);
 void UFu(x64emu_t *emu, uintptr_t fnc);
 void UFp(x64emu_t *emu, uintptr_t fnc);
 void fFi(x64emu_t *emu, uintptr_t fnc);
@@ -287,7 +288,6 @@ void WFpi(x64emu_t *emu, uintptr_t fnc);
 void WFpp(x64emu_t *emu, uintptr_t fnc);
 void uFEp(x64emu_t *emu, uintptr_t fnc);
 void uFii(x64emu_t *emu, uintptr_t fnc);
-void uFiu(x64emu_t *emu, uintptr_t fnc);
 void uFiS(x64emu_t *emu, uintptr_t fnc);
 void uFui(x64emu_t *emu, uintptr_t fnc);
 void uFuu(x64emu_t *emu, uintptr_t fnc);
@@ -338,13 +338,16 @@ void DFDp(x64emu_t *emu, uintptr_t fnc);
 void DFpp(x64emu_t *emu, uintptr_t fnc);
 void lFEi(x64emu_t *emu, uintptr_t fnc);
 void lFii(x64emu_t *emu, uintptr_t fnc);
+void lFiL(x64emu_t *emu, uintptr_t fnc);
 void lFip(x64emu_t *emu, uintptr_t fnc);
 void lFui(x64emu_t *emu, uintptr_t fnc);
 void lFDD(x64emu_t *emu, uintptr_t fnc);
 void lFll(x64emu_t *emu, uintptr_t fnc);
 void lFpi(x64emu_t *emu, uintptr_t fnc);
+void lFpu(x64emu_t *emu, uintptr_t fnc);
 void lFpd(x64emu_t *emu, uintptr_t fnc);
 void lFpl(x64emu_t *emu, uintptr_t fnc);
+void lFpL(x64emu_t *emu, uintptr_t fnc);
 void lFpp(x64emu_t *emu, uintptr_t fnc);
 void LFEL(x64emu_t *emu, uintptr_t fnc);
 void LFEp(x64emu_t *emu, uintptr_t fnc);
@@ -485,11 +488,13 @@ void vFpiL(x64emu_t *emu, uintptr_t fnc);
 void vFpip(x64emu_t *emu, uintptr_t fnc);
 void vFpui(x64emu_t *emu, uintptr_t fnc);
 void vFpuI(x64emu_t *emu, uintptr_t fnc);
+void vFpuC(x64emu_t *emu, uintptr_t fnc);
 void vFpuW(x64emu_t *emu, uintptr_t fnc);
 void vFpuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuU(x64emu_t *emu, uintptr_t fnc);
 void vFpuf(x64emu_t *emu, uintptr_t fnc);
 void vFpud(x64emu_t *emu, uintptr_t fnc);
+void vFpul(x64emu_t *emu, uintptr_t fnc);
 void vFpuL(x64emu_t *emu, uintptr_t fnc);
 void vFpup(x64emu_t *emu, uintptr_t fnc);
 void vFpUi(x64emu_t *emu, uintptr_t fnc);
@@ -712,6 +717,7 @@ void lFipL(x64emu_t *emu, uintptr_t fnc);
 void lFlll(x64emu_t *emu, uintptr_t fnc);
 void lFpli(x64emu_t *emu, uintptr_t fnc);
 void lFpLu(x64emu_t *emu, uintptr_t fnc);
+void lFpLL(x64emu_t *emu, uintptr_t fnc);
 void lFpLp(x64emu_t *emu, uintptr_t fnc);
 void lFppi(x64emu_t *emu, uintptr_t fnc);
 void lFppu(x64emu_t *emu, uintptr_t fnc);
@@ -1086,6 +1092,7 @@ void iFpiuu(x64emu_t *emu, uintptr_t fnc);
 void iFpiuL(x64emu_t *emu, uintptr_t fnc);
 void iFpiup(x64emu_t *emu, uintptr_t fnc);
 void iFpiUp(x64emu_t *emu, uintptr_t fnc);
+void iFpili(x64emu_t *emu, uintptr_t fnc);
 void iFpild(x64emu_t *emu, uintptr_t fnc);
 void iFpipi(x64emu_t *emu, uintptr_t fnc);
 void iFpipu(x64emu_t *emu, uintptr_t fnc);
@@ -1130,6 +1137,7 @@ void iFplpp(x64emu_t *emu, uintptr_t fnc);
 void iFpLii(x64emu_t *emu, uintptr_t fnc);
 void iFpLiL(x64emu_t *emu, uintptr_t fnc);
 void iFpLip(x64emu_t *emu, uintptr_t fnc);
+void iFpLui(x64emu_t *emu, uintptr_t fnc);
 void iFpLuu(x64emu_t *emu, uintptr_t fnc);
 void iFpLup(x64emu_t *emu, uintptr_t fnc);
 void iFpLlp(x64emu_t *emu, uintptr_t fnc);
@@ -1246,6 +1254,7 @@ void lFpLpp(x64emu_t *emu, uintptr_t fnc);
 void lFppii(x64emu_t *emu, uintptr_t fnc);
 void lFppip(x64emu_t *emu, uintptr_t fnc);
 void lFppiS(x64emu_t *emu, uintptr_t fnc);
+void lFpplp(x64emu_t *emu, uintptr_t fnc);
 void lFpppL(x64emu_t *emu, uintptr_t fnc);
 void lFpppp(x64emu_t *emu, uintptr_t fnc);
 void LFEppL(x64emu_t *emu, uintptr_t fnc);
@@ -1653,7 +1662,6 @@ void iFpuill(x64emu_t *emu, uintptr_t fnc);
 void iFpuipi(x64emu_t *emu, uintptr_t fnc);
 void iFpuipp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuip(x64emu_t *emu, uintptr_t fnc);
-void iFpuuui(x64emu_t *emu, uintptr_t fnc);
 void iFpuuup(x64emu_t *emu, uintptr_t fnc);
 void iFpuuLL(x64emu_t *emu, uintptr_t fnc);
 void iFpuuLp(x64emu_t *emu, uintptr_t fnc);
@@ -1676,6 +1684,7 @@ void iFplluu(x64emu_t *emu, uintptr_t fnc);
 void iFpLiup(x64emu_t *emu, uintptr_t fnc);
 void iFpLilp(x64emu_t *emu, uintptr_t fnc);
 void iFpLiLi(x64emu_t *emu, uintptr_t fnc);
+void iFpLuLi(x64emu_t *emu, uintptr_t fnc);
 void iFpLlpp(x64emu_t *emu, uintptr_t fnc);
 void iFpLLii(x64emu_t *emu, uintptr_t fnc);
 void iFpLLup(x64emu_t *emu, uintptr_t fnc);
@@ -2064,8 +2073,10 @@ void iFEpiipV(x64emu_t *emu, uintptr_t fnc);
 void iFEpilpV(x64emu_t *emu, uintptr_t fnc);
 void iFEpippi(x64emu_t *emu, uintptr_t fnc);
 void iFEpIppp(x64emu_t *emu, uintptr_t fnc);
+void iFEpuipp(x64emu_t *emu, uintptr_t fnc);
 void iFEpuppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpUppp(x64emu_t *emu, uintptr_t fnc);
+void iFEppupp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppi(x64emu_t *emu, uintptr_t fnc);
 void iFEppppp(x64emu_t *emu, uintptr_t fnc);
 void iFiiiipp(x64emu_t *emu, uintptr_t fnc);
@@ -2124,7 +2135,6 @@ void iFpuupuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuuppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuLuLu(x64emu_t *emu, uintptr_t fnc);
 void iFpuLLpp(x64emu_t *emu, uintptr_t fnc);
-void iFpupuui(x64emu_t *emu, uintptr_t fnc);
 void iFpupLpL(x64emu_t *emu, uintptr_t fnc);
 void iFpupLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpUiipp(x64emu_t *emu, uintptr_t fnc);
@@ -2143,6 +2153,7 @@ void iFpLLLLu(x64emu_t *emu, uintptr_t fnc);
 void iFpLLLLL(x64emu_t *emu, uintptr_t fnc);
 void iFpLLppp(x64emu_t *emu, uintptr_t fnc);
 void iFpLpipi(x64emu_t *emu, uintptr_t fnc);
+void iFpLpLui(x64emu_t *emu, uintptr_t fnc);
 void iFpLppii(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppL(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppp(x64emu_t *emu, uintptr_t fnc);
@@ -2164,6 +2175,7 @@ void iFppuipp(x64emu_t *emu, uintptr_t fnc);
 void iFppuIII(x64emu_t *emu, uintptr_t fnc);
 void iFppuupp(x64emu_t *emu, uintptr_t fnc);
 void iFppulup(x64emu_t *emu, uintptr_t fnc);
+void iFppulll(x64emu_t *emu, uintptr_t fnc);
 void iFppuLpp(x64emu_t *emu, uintptr_t fnc);
 void iFppupip(x64emu_t *emu, uintptr_t fnc);
 void iFppuppp(x64emu_t *emu, uintptr_t fnc);
@@ -2458,9 +2470,9 @@ void iFuippLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiuwp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiuup(x64emu_t *emu, uintptr_t fnc);
-void iFpiiuuiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiuiipp(x64emu_t *emu, uintptr_t fnc);
+void iFpiuuuiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiuLiii(x64emu_t *emu, uintptr_t fnc);
 void iFpiupppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiLuupp(x64emu_t *emu, uintptr_t fnc);
@@ -2478,7 +2490,6 @@ void iFpWppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiCuCp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpupiLpL(x64emu_t *emu, uintptr_t fnc);
-void iFpupuuui(x64emu_t *emu, uintptr_t fnc);
 void iFpupuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpupupui(x64emu_t *emu, uintptr_t fnc);
 void iFpuppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2490,6 +2501,7 @@ void iFpLipupu(x64emu_t *emu, uintptr_t fnc);
 void iFpLpiiii(x64emu_t *emu, uintptr_t fnc);
 void iFpLpiiuu(x64emu_t *emu, uintptr_t fnc);
 void iFpLpiipi(x64emu_t *emu, uintptr_t fnc);
+void iFpLpLuLi(x64emu_t *emu, uintptr_t fnc);
 void iFpLpLpip(x64emu_t *emu, uintptr_t fnc);
 void iFpLppiii(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiip(x64emu_t *emu, uintptr_t fnc);
@@ -2719,7 +2731,7 @@ void iFpCCWWpWu(x64emu_t *emu, uintptr_t fnc);
 void iFpWCuWCuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuiipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuippLpp(x64emu_t *emu, uintptr_t fnc);
-void iFpuuiiiii(x64emu_t *emu, uintptr_t fnc);
+void iFpuuiiuuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuuipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuupupu(x64emu_t *emu, uintptr_t fnc);
 void iFpuupuupp(x64emu_t *emu, uintptr_t fnc);
@@ -2998,7 +3010,7 @@ void iFpCuWCCCCup(x64emu_t *emu, uintptr_t fnc);
 void iFpuuLiuiiLL(x64emu_t *emu, uintptr_t fnc);
 void iFpLLpiiuuii(x64emu_t *emu, uintptr_t fnc);
 void iFpLpLUUUUpL(x64emu_t *emu, uintptr_t fnc);
-void iFppuuiiiiii(x64emu_t *emu, uintptr_t fnc);
+void iFppuuiiuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuuiiuupi(x64emu_t *emu, uintptr_t fnc);
 void iFppLpLpLLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiipipi(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedlibasound.c b/src/wrapped/wrappedlibasound.c
index f9919cc5..481a7d1b 100644
--- a/src/wrapped/wrappedlibasound.c
+++ b/src/wrapped/wrappedlibasound.c
@@ -32,7 +32,7 @@ static void default_error_handler(const char *file, int line, const char *functi
 }
 
 #define ADDED_INIT() \
-    my_snd_lib_error = AddCheckBridge(my_context->system, vFpipipV, default_error_handler, 0, "ASoundCustomErrorHandler");
+    my_snd_lib_error = AddCheckBridge(my_lib->w.bridge, vFpipipV, default_error_handler, 0, "ASoundCustomErrorHandler");
 
 #define ADDED_FINI() \
     my_snd_lib_error = 0;   // no removing of bridge
@@ -89,6 +89,94 @@ static void* findElemFct(void* fct)
     printf_log(LOG_NONE, "Warning, no more slot for Asound Elem callback\n");
     return NULL;
 }
+// snd_pcm_hook_func_t
+#define GO(A)   \
+static uintptr_t my_pcm_hook_fct_##A = 0;                       \
+static int my_pcm_hook_##A(void* a)                             \
+{                                                               \
+    return (int)RunFunctionFmt(my_pcm_hook_fct_##A, "p", a);    \
+}
+SUPER()
+#undef GO
+static void* findPCMHookFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_pcm_hook_fct_##A == (uintptr_t)fct) return my_elem_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_pcm_hook_fct_##A == 0) {my_pcm_hook_fct_##A = (uintptr_t)fct; return my_pcm_hook_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for Asound PCMHook callback\n");
+    return NULL;
+}
+//  snd_mixer_compare_t
+#define GO(A)   \
+static uintptr_t my_mixer_compare_fct_##A = 0;                       \
+static int my_mixer_compare_##A(void* a)                             \
+{                                                               \
+    return (int)RunFunctionFmt(my_mixer_compare_fct_##A, "p", a);    \
+}
+SUPER()
+#undef GO
+static void* findMixerCompareFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_mixer_compare_fct_##A == (uintptr_t)fct) return my_elem_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_mixer_compare_fct_##A == 0) {my_mixer_compare_fct_##A = (uintptr_t)fct; return my_mixer_compare_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for Asound Mixer Compare callback\n");
+    return NULL;
+}
+//  private_free
+#define GO(A)   \
+static uintptr_t my_private_free_fct_##A = 0;                       \
+static int my_private_free_##A(void* a)                             \
+{                                                               \
+    return (int)RunFunctionFmt(my_private_free_fct_##A, "p", a);    \
+}
+SUPER()
+#undef GO
+static void* findPrivateFreeFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_private_free_fct_##A == (uintptr_t)fct) return my_elem_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_private_free_fct_##A == 0) {my_private_free_fct_##A = (uintptr_t)fct; return my_private_free_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for Asound PrivateFree callback\n");
+    return NULL;
+}
+//  snd_mixer_event_t
+#define GO(A)   \
+static uintptr_t my_mixer_event_fct_##A = 0;                                \
+static int my_mixer_event_##A(void* a, uint32_t b, void* c, void* d)        \
+{                                                                           \
+    return (int)RunFunctionFmt(my_mixer_event_fct_##A, "pupp", a, b, c, d); \
+}
+SUPER()
+#undef GO
+static void* findMixerEventFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_mixer_event_fct_##A == (uintptr_t)fct) return my_elem_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_mixer_event_fct_##A == 0) {my_mixer_event_fct_##A = (uintptr_t)fct; return my_mixer_event_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for Asound MixerEvent callback\n");
+    return NULL;
+}
 
 
 EXPORT int my_snd_async_add_handler(x64emu_t *emu, void *handler, int fd, void* callback, void *private_data)
@@ -142,6 +230,50 @@ EXPORT void my_snd_mixer_elem_set_callback(x64emu_t* emu, void* handler, void* f
     my->snd_mixer_elem_set_callback(handler, findElemFct(f));
 }
 
+EXPORT int my_snd_pcm_hook_add(x64emu_t* emu, void* hook, void* pcm, uint32_t type, void* f, void* data)
+{
+    return my->snd_pcm_hook_add(hook, pcm, type, findPCMHookFct(f), data);
+}
+
+EXPORT int my_snd_mixer_set_compare(x64emu_t* emu, void* mixer, void* f)
+{
+    return my->snd_mixer_set_compare(mixer, findMixerCompareFct(f));
+}
+
+EXPORT int my_snd_mixer_elem_new(x64emu_t* emu, void* elem, uint32_t type, int weight, void* data, void* f)
+{
+    return my->snd_mixer_elem_new(elem, type, weight, data, findPrivateFreeFct(f));
+}
+
+EXPORT void* my_snd_mixer_class_get_event(x64emu_t* emu, void* class)
+{
+    void* ret = my->snd_mixer_class_get_event(class);
+    AddAutomaticBridge(my_lib->w.bridge, iFpupp, ret, 0, "snd_event_t");
+    return ret;
+}
+
+EXPORT void* my_snd_mixer_class_get_compare(x64emu_t* emu, void* class)
+{
+    void* ret = my->snd_mixer_class_get_compare(class);
+    AddAutomaticBridge(my_lib->w.bridge, iFpp, ret, 0, "snd_mixer_compare_t");
+    return ret;
+}
+
+EXPORT int my_snd_mixer_class_set_event(x64emu_t* emu, void* class, void* f)
+{
+    return my->snd_mixer_class_set_event(class, findMixerEventFct(f));
+}
+
+EXPORT int my_snd_mixer_class_set_private_free(x64emu_t* emu, void* class, void* f)
+{
+    return my->snd_mixer_class_set_private_free(class, findPrivateFreeFct(f));
+}
+
+EXPORT int my_snd_mixer_class_set_compare(x64emu_t* emu, void* class, void* f)
+{
+    return my->snd_mixer_class_set_compare(class, findMixerCompareFct(f));
+}
+
 void* my_dlopen(x64emu_t* emu, void *filename, int flag);   // defined in wrappedlibdl.c
 char* my_dlerror(x64emu_t* emu);
 int my_dlclose(x64emu_t* emu, void *handle);
diff --git a/src/wrapped/wrappedlibasound_private.h b/src/wrapped/wrappedlibasound_private.h
index ab6e05bb..a1228d1b 100644
--- a/src/wrapped/wrappedlibasound_private.h
+++ b/src/wrapped/wrappedlibasound_private.h
@@ -1,5 +1,5 @@
-#if !(defined(GO) && defined(GOM) && defined(GO2))
-#error meh!
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error Meh...
 #endif
 
 DATAB(alsa_lisp_nil, 4)
@@ -63,9 +63,9 @@ GOM(snd_dlopen, pFEpipL)
 GOM(snd_dlsym, pFEppp)
 GOM(snd_dlclose, iFEp)
 GOM(snd_async_add_handler, iFEpipp)
-//GO(snd_async_del_handler, iFp)
-//GO(snd_async_handler_get_fd, iFp)
-//GO(snd_async_handler_get_signo, iFp)
+GO(snd_async_del_handler, iFp)
+GO(snd_async_handler_get_fd, iFp)
+GO(snd_async_handler_get_signo, iFp)
 GO(snd_async_handler_get_callback_private, pFp)
 GO(snd_shm_area_create, pFip)
 GO(snd_shm_area_share, pFp)
@@ -73,19 +73,19 @@ GO(snd_shm_area_destroy, iFp)
 GO(snd_user_file, iFpp)
 GO(snd_input_stdio_open, iFppp)
 GO(snd_input_stdio_attach, iFppi)
-GO(snd_input_buffer_open, iFppu)
+GO(snd_input_buffer_open, iFppl)
 GO(snd_input_close, iFp)
-//GO(snd_input_scanf, iFppV)
-GO(snd_input_gets, pFppu)
+//GOM(snd_input_scanf, iFppV)
+GO(snd_input_gets, pFppL)
 GO(snd_input_getc, iFp)
 GO(snd_input_ungetc, iFpi)
 GO(snd_output_stdio_open, iFppp)
 GO(snd_output_stdio_attach, iFppi)
 GO(snd_output_buffer_open, iFp)
-GO(snd_output_buffer_string, uFpp)
+GO(snd_output_buffer_string, LFpp)
 GO(snd_output_close, iFp)
-//GO(snd_output_printf, iFppV)
-//GO(snd_output_vprintf, iFppV)
+//GOM(snd_output_printf, iFppV)
+//GOM(snd_output_vprintf, iFppA)
 GO(snd_output_puts, iFpp)
 GO(snd_output_putc, iFpi)
 GO(snd_output_flush, iFp)
@@ -100,7 +100,7 @@ GO(snd_config_update_r, iFppp)
 GO(snd_config_update_free, iFp)
 GO(snd_config_update_free_global, iFv)
 GO(snd_config_search, iFppp)
-//GO(snd_config_searchv, iFppV)
+//GOM(snd_config_searchv, iFppV)
 GO(snd_config_search_definition, iFpppp)
 GO(snd_config_expand, iFppppp)
 GO(snd_config_evaluate, iFpppp)
@@ -108,21 +108,21 @@ GO(snd_config_add, iFpp)
 GO(snd_config_delete, iFp)
 GO(snd_config_delete_compound_members, iFp)
 GO(snd_config_copy, iFpp)
-GO(snd_config_make, iFppi)
+GO(snd_config_make, iFppu)
 GO(snd_config_make_integer, iFpp)
 GO(snd_config_make_integer64, iFpp)
 GO(snd_config_make_real, iFpp)
 GO(snd_config_make_string, iFpp)
 GO(snd_config_make_pointer, iFpp)
 GO(snd_config_make_compound, iFppi)
-GO(snd_config_imake_integer, iFppi)
+GO(snd_config_imake_integer, iFppl)
 GO(snd_config_imake_integer64, iFppI)
 GO(snd_config_imake_real, iFppd)
 GO(snd_config_imake_string, iFppp)
 GO(snd_config_imake_pointer, iFppp)
-GO(snd_config_get_type, iFp)
+GO(snd_config_get_type, uFp)
 GO(snd_config_set_id, iFpp)
-GO(snd_config_set_integer, iFpi)
+GO(snd_config_set_integer, iFpl)
 GO(snd_config_set_integer64, iFpI)
 GO(snd_config_set_real, iFpd)
 GO(snd_config_set_string, iFpp)
@@ -150,9 +150,9 @@ GO(snd_device_name_get_hint, pFpp)
 GO(snd_device_name_hint, iFipp)
 GO(snd_names_list, iFpp)
 GO(snd_names_list_free, vFp)
-GO(snd_pcm_format_mask_sizeof, uFv)
-GO(snd_pcm_subformat_mask_sizeof, uFv)
-GO(snd_pcm_status_sizeof, uFv)
+GO(snd_pcm_format_mask_sizeof, LFv)
+GO(snd_pcm_subformat_mask_sizeof, LFv)
+GO(snd_pcm_status_sizeof, LFv)
 GOM(snd_async_add_pcm_handler, iFEpppp)
 GO(snd_async_handler_get_pcm, pFp)
 GO(snd_pcm_access_mask_any, vFp)
@@ -161,24 +161,24 @@ GO(snd_pcm_access_mask_empty, iFp)
 GO(snd_pcm_access_mask_free, vFp)
 GO(snd_pcm_access_mask_malloc, iFp)
 GO(snd_pcm_access_mask_none, vFp)
-GO(snd_pcm_access_mask_reset, vFpi)
-GO(snd_pcm_access_mask_set, vFpi)
-GO(snd_pcm_access_mask_test, iFpi)
-GO(snd_pcm_access_name, pFi)
-GO(snd_pcm_area_copy, iFpupuui)
-GO(snd_pcm_area_silence, iFpuui)
-GO(snd_pcm_areas_copy, iFpupuuui)
-GO(snd_pcm_areas_silence, iFpuuui)
-GO(snd_pcm_avail, iFp)
+GO(snd_pcm_access_mask_reset, vFpu)
+GO(snd_pcm_access_mask_set, vFpu)
+GO(snd_pcm_access_mask_test, iFpu)
+GO(snd_pcm_access_name, pFu)
+GO(snd_pcm_area_copy, iFpLpLui)
+GO(snd_pcm_area_silence, iFpLui)
+GO(snd_pcm_areas_copy, iFpLpLuLi)
+GO(snd_pcm_areas_silence, iFpLuLi)
+GO(snd_pcm_avail, lFp)
 GO(snd_pcm_avail_delay, iFppp)
-GO(snd_pcm_avail_update, iFp)
+GO(snd_pcm_avail_update, lFp)
 GO(snd_pcm_build_linear_format, iFiiii)
-GO(snd_pcm_bytes_to_frames, iFpu)
-GO(snd_pcm_bytes_to_samples, iFpu)
-GO(snd_pcm_chmap_type_name, pFi)
-GO(snd_pcm_chmap_name, pFi)
-GO(snd_pcm_chmap_long_name, pFi)
-GO(snd_pcm_chmap_print, iFpup)
+GO(snd_pcm_bytes_to_frames, lFpl)
+GO(snd_pcm_bytes_to_samples, lFpl)
+GO(snd_pcm_chmap_type_name, pFu)
+GO(snd_pcm_chmap_name, pFu)
+GO(snd_pcm_chmap_long_name, pFu)
+GO(snd_pcm_chmap_print, iFpLp)
 GO(snd_pcm_chmap_from_string, uFp)
 GO(snd_pcm_chmap_parse_string, pFp)
 GO(snd_pcm_close, iFp)
@@ -208,19 +208,19 @@ GO(snd_pcm_format_name, pFi)
 GO(snd_pcm_format_physical_width, iFi)
 GO(snd_pcm_format_set_silence, iFipu)
 GO(snd_pcm_format_signed, iFi)
-GO(snd_pcm_format_silence, iFi)
-GO(snd_pcm_format_silence_16, iFi)
-GO(snd_pcm_format_silence_32, iFi)
-GO(snd_pcm_format_silence_64, iFi)
-GO(snd_pcm_format_size, uFiu)
+GO(snd_pcm_format_silence, CFi)
+GO(snd_pcm_format_silence_16, WFi)
+GO(snd_pcm_format_silence_32, uFi)
+GO(snd_pcm_format_silence_64, UFi)
+GO(snd_pcm_format_size, lFiL)
 GO(snd_pcm_format_unsigned, iFi)
 GO(snd_pcm_format_value, iFp)
 GO(snd_pcm_format_width, iFi)
-GO(snd_pcm_forward, iFpu)
-GO(snd_pcm_frames_to_bytes, uFpi)
+GO(snd_pcm_forward, lFpL)
+GO(snd_pcm_frames_to_bytes, lFpl)
 GO(snd_pcm_get_params, iFppp)
 GO(snd_pcm_get_chmap, pFp)
-GO(snd_pcm_hook_add, iFppipp)
+GOM(snd_pcm_hook_add, iFEppupp)
 GO(snd_pcm_hook_get_pcm, pFp)
 GO(snd_pcm_hook_get_private, pFp)
 GO(snd_pcm_hook_remove, iFp)
@@ -279,11 +279,11 @@ GO(snd_pcm_hw_params_is_double, iFp)
 GO(snd_pcm_hw_params_is_half_duplex, iFp)
 GO(snd_pcm_hw_params_is_joint_duplex, iFp)
 GO(snd_pcm_hw_params_malloc, iFp)
-GO(snd_pcm_hw_params_set_access, iFppi)
+GO(snd_pcm_hw_params_set_access, iFppu)
 GO(snd_pcm_hw_params_set_access_first, iFppp)
 GO(snd_pcm_hw_params_set_access_last, iFppp)
 GO(snd_pcm_hw_params_set_access_mask, iFppp)
-GO(snd_pcm_hw_params_set_buffer_size, iFppu)
+GO(snd_pcm_hw_params_set_buffer_size, iFppL)
 GO(snd_pcm_hw_params_set_buffer_size_first, iFppp)
 GO(snd_pcm_hw_params_set_buffer_size_last, iFppp)
 GO(snd_pcm_hw_params_set_buffer_size_max, iFppp)
@@ -309,7 +309,7 @@ GO(snd_pcm_hw_params_set_format, iFppi)
 GO(snd_pcm_hw_params_set_format_first, iFppp)
 GO(snd_pcm_hw_params_set_format_last, iFppp)
 GO(snd_pcm_hw_params_set_format_mask, iFppp)
-GO(snd_pcm_hw_params_set_period_size, iFppui)
+GO(snd_pcm_hw_params_set_period_size, iFppLi)
 GO(snd_pcm_hw_params_set_period_size_first, iFpppp)
 GO(snd_pcm_hw_params_set_period_size_integer, iFpp)
 GO(snd_pcm_hw_params_set_period_size_last, iFpppp)
@@ -351,12 +351,12 @@ GO(snd_pcm_hw_params_set_tick_time_max, iFpppp)
 GO(snd_pcm_hw_params_set_tick_time_min, iFpppp)
 GO(snd_pcm_hw_params_set_tick_time_minmax, iFpppppp)
 GO(snd_pcm_hw_params_set_tick_time_near, iFpppp)
-GO(snd_pcm_hw_params_test_access, iFppi)
-GO(snd_pcm_hw_params_test_buffer_size, iFppu)
+GO(snd_pcm_hw_params_test_access, iFppu)
+GO(snd_pcm_hw_params_test_buffer_size, iFppL)
 GO(snd_pcm_hw_params_test_buffer_time, iFppui)
 GO(snd_pcm_hw_params_test_channels, iFppu)
 GO(snd_pcm_hw_params_test_format, iFppi)
-GO(snd_pcm_hw_params_test_period_size, iFppui)
+GO(snd_pcm_hw_params_test_period_size, iFppLi)
 GO(snd_pcm_hw_params_test_period_time, iFppui)
 GO(snd_pcm_hw_params_test_periods, iFppui)
 GO(snd_pcm_hw_params_test_rate, iFppui)
@@ -367,86 +367,86 @@ GO(snd_pcm_info, iFpp)
 GO(snd_pcm_info_copy, vFpp)
 GO(snd_pcm_info_free, vFp)
 GO(snd_pcm_info_get_card, iFp)
-GO(snd_pcm_info_get_class, iFp)
+GO(snd_pcm_info_get_class, uFp)
 GO(snd_pcm_info_get_device, uFp)
 GO(snd_pcm_info_get_id, pFp)
 GO(snd_pcm_info_get_name, pFp)
-GO(snd_pcm_info_get_stream, iFp)
-GO(snd_pcm_info_get_subclass, iFp)
+GO(snd_pcm_info_get_stream, uFp)
+GO(snd_pcm_info_get_subclass, uFp)
 GO(snd_pcm_info_get_subdevice, uFp)
 GO(snd_pcm_info_get_subdevice_name, pFp)
 GO(snd_pcm_info_get_subdevices_avail, uFp)
 GO(snd_pcm_info_get_subdevices_count, uFp)
-GO(snd_pcm_info_get_sync, pFp)
+GO(snd_pcm_info_get_sync, HFp)
 GO(snd_pcm_info_malloc, iFp)
-GO(snd_pcm_info_sizeof, uFv)
-GO(snd_pcm_access_mask_sizeof, uFv)
+GO(snd_pcm_info_sizeof, LFv)
+GO(snd_pcm_access_mask_sizeof, LFv)
 GO(snd_pcm_info_set_device, vFpu)
-GO(snd_pcm_info_set_stream, vFpi)
+GO(snd_pcm_info_set_stream, vFpu)
 GO(snd_pcm_info_set_subdevice, vFpu)
 GO(snd_pcm_link, iFpp)
 GO(snd_pcm_meter_add_scope, iFpp)
-GO(snd_pcm_meter_get_boundary, uFp)
-GO(snd_pcm_meter_get_bufsize, uFp)
+GO(snd_pcm_meter_get_boundary, LFp)
+GO(snd_pcm_meter_get_bufsize, LFp)
 GO(snd_pcm_meter_get_channels, uFp)
-GO(snd_pcm_meter_get_now, uFp)
+GO(snd_pcm_meter_get_now, LFp)
 GO(snd_pcm_meter_get_rate, uFp)
 GO(snd_pcm_meter_search_scope, pFpp)
 GO(snd_pcm_mmap_begin, iFpppp)
-GO(snd_pcm_mmap_commit, iFpuu)
-GO(snd_pcm_mmap_readi, iFppu)
-GO(snd_pcm_mmap_readn, iFppu)
-GO(snd_pcm_mmap_writei, iFppu)
-GO(snd_pcm_mmap_writen, iFppu)
+GO(snd_pcm_mmap_commit, lFpLL)
+GO(snd_pcm_mmap_readi, lFppL)
+GO(snd_pcm_mmap_readn, lFppL)
+GO(snd_pcm_mmap_writei, lFppL)
+GO(snd_pcm_mmap_writen, lFppL)
 GO(snd_pcm_name, pFp)
 GO(snd_pcm_nonblock, iFpi)
-GO(snd_pcm_open, iFppii)
-GO(snd_pcm_open_lconf, iFppiip)
+GO(snd_pcm_open, iFppui)
+GO(snd_pcm_open_lconf, iFppuip)
 GO(snd_pcm_pause, iFpi)
 GO(snd_pcm_poll_descriptors, iFppu)
 GO(snd_pcm_poll_descriptors_count, iFp)
 GO(snd_pcm_poll_descriptors_revents, iFppup)
 GO(snd_pcm_prepare, iFp)
-GO(snd_pcm_readi, iFppu)
-GO(snd_pcm_readn, iFppu)
+GO(snd_pcm_readi, lFppL)
+GO(snd_pcm_readn, lFppL)
 GO(snd_pcm_recover, iFpii)
 GO(snd_pcm_reset, iFp)
 GO(snd_pcm_resume, iFp)
-GO(snd_pcm_rewind, iFpu)
-GO(snd_pcm_samples_to_bytes, uFpi)
+GO(snd_pcm_rewind, lFpL)
+GO(snd_pcm_samples_to_bytes, lFpl)
 //GOM(snd_pcm_scope_get_callback_private, pFEp)
 GO(snd_pcm_scope_get_name, pFp)
 GO(snd_pcm_scope_malloc, iFp)
 GO(snd_pcm_scope_s16_get_channel_buffer, pFpu)
 GO(snd_pcm_scope_s16_open, iFppp)
 //GOM(snd_pcm_scope_set_callback_private, vFEpp)
-GO(snd_pcm_hw_params_sizeof, uFv)
-GO(snd_pcm_sw_params_sizeof, uFv)
+GO(snd_pcm_hw_params_sizeof, LFv)
+GO(snd_pcm_sw_params_sizeof, LFv)
 GO(snd_pcm_hw_params_is_monotonic, iFp)
 GO(snd_pcm_scope_set_name, vFpp)
 //GOM(snd_pcm_scope_set_ops, vFEpp)
 GO(snd_pcm_set_chmap, iFpp)
-GO(snd_pcm_set_params, iFpiiuuiu)
+GO(snd_pcm_set_params, iFpiuuuiu)
 GO(snd_pcm_start, iFp)
-GO(snd_pcm_start_mode_name, pFi)
-GO(snd_pcm_state, iFp)
-GO(snd_pcm_state_name, pFi)
+GO(snd_pcm_start_mode_name, pFu)
+GO(snd_pcm_state, uFp)
+GO(snd_pcm_state_name, pFu)
 GO(snd_pcm_status, iFpp)
 GO(snd_pcm_status_copy, vFpp)
 GO(snd_pcm_status_dump, iFpp)
 GO(snd_pcm_status_free, vFp)
-GO(snd_pcm_status_get_avail, uFp)
-GO(snd_pcm_status_get_avail_max, uFp)
-GO(snd_pcm_status_get_delay, iFp)
+GO(snd_pcm_status_get_avail, LFp)
+GO(snd_pcm_status_get_avail_max, LFp)
+GO(snd_pcm_status_get_delay, lFp)
 GO(snd_pcm_status_get_htstamp, vFpp)
-GO(snd_pcm_status_get_overrange, uFp)
-GO(snd_pcm_status_get_state, iFp)
+GO(snd_pcm_status_get_overrange, LFp)
+GO(snd_pcm_status_get_state, uFp)
 GO(snd_pcm_status_get_trigger_htstamp, vFpp)
 GO(snd_pcm_status_get_trigger_tstamp, vFpp)
 GO(snd_pcm_status_get_tstamp, vFpp)
 GO(snd_pcm_status_malloc, iFp)
-GO(snd_pcm_stream, iFp)
-GO(snd_pcm_stream_name, pFi)
+GO(snd_pcm_stream, uFp)
+GO(snd_pcm_stream_name, pFu)
 GO(snd_pcm_subformat_description, pFi)
 GO(snd_pcm_subformat_mask_any, vFp)
 GO(snd_pcm_subformat_mask_copy, vFpp)
@@ -468,35 +468,35 @@ GO(snd_pcm_sw_params_get_boundary, iFpp)
 GO(snd_pcm_sw_params_get_silence_size, iFpp)
 GO(snd_pcm_sw_params_get_silence_threshold, iFpp)
 GO(snd_pcm_sw_params_get_sleep_min, iFpp)
-GO(snd_pcm_sw_params_get_start_mode, iFp)
+GO(snd_pcm_sw_params_get_start_mode, uFp)
 GO(snd_pcm_sw_params_get_start_threshold, iFpp)
 GO(snd_pcm_sw_params_get_stop_threshold, iFpp)
 GO(snd_pcm_sw_params_get_tstamp_mode, iFpp)
 GO(snd_pcm_sw_params_get_xfer_align, iFpp)
-GO(snd_pcm_sw_params_get_xrun_mode, iFp)
+GO(snd_pcm_sw_params_get_xrun_mode, uFp)
 GO(snd_pcm_sw_params_malloc, iFp)
-GO(snd_pcm_sw_params_set_avail_min, iFppu)
+GO(snd_pcm_sw_params_set_avail_min, iFppL)
 GO(snd_pcm_sw_params_set_period_event, iFppi)
-GO(snd_pcm_sw_params_set_silence_size, iFppu)
-GO(snd_pcm_sw_params_set_silence_threshold, iFppu)
+GO(snd_pcm_sw_params_set_silence_size, iFppL)
+GO(snd_pcm_sw_params_set_silence_threshold, iFppL)
 GO(snd_pcm_sw_params_set_sleep_min, iFppu)
-GO(snd_pcm_sw_params_set_start_mode, iFppi)
-GO(snd_pcm_sw_params_set_start_threshold, iFppu)
-GO(snd_pcm_sw_params_set_stop_threshold, iFppu)
-GO(snd_pcm_sw_params_set_tstamp_mode, iFppi)
-GO(snd_pcm_sw_params_set_tstamp_type, iFppi)
-GO(snd_pcm_sw_params_set_xfer_align, iFppu)
-GO(snd_pcm_sw_params_set_xrun_mode, iFppi)
-GO(snd_pcm_tstamp_mode_name, pFi)
-GO(snd_pcm_type, iFp)
-GO(snd_pcm_type_name, pFi)
+GO(snd_pcm_sw_params_set_start_mode, iFppu)
+GO(snd_pcm_sw_params_set_start_threshold, iFppL)
+GO(snd_pcm_sw_params_set_stop_threshold, iFppL)
+GO(snd_pcm_sw_params_set_tstamp_mode, iFppu)
+GO(snd_pcm_sw_params_set_tstamp_type, iFppu)
+GO(snd_pcm_sw_params_set_xfer_align, iFppL)
+GO(snd_pcm_sw_params_set_xrun_mode, iFppu)
+GO(snd_pcm_tstamp_mode_name, pFu)
+GO(snd_pcm_type, uFp)
+GO(snd_pcm_type_name, pFu)
 GO(snd_pcm_unlink, iFp)
 GO(snd_pcm_wait, iFpi)
-GO(snd_pcm_writei, iFppu)
-GO(snd_pcm_writen, iFppu)
-GO(snd_pcm_xrun_mode_name, pFi)
-GO(snd_spcm_init, iFpuuiiiii)
-GO(snd_spcm_init_duplex, iFppuuiiiiii)
+GO(snd_pcm_writei, lFppL)
+GO(snd_pcm_writen, lFppL)
+GO(snd_pcm_xrun_mode_name, pFu)
+GO(snd_spcm_init, iFpuuiiuuu)
+GO(snd_spcm_init_duplex, iFppuuiiuuuu)
 GO(snd_spcm_init_get_params, iFpppp)
 GO(snd_rawmidi_open, iFpppi)
 GO(snd_rawmidi_open_lconf, iFpppip)
@@ -505,13 +505,13 @@ GO(snd_rawmidi_poll_descriptors_count, iFp)
 GO(snd_rawmidi_poll_descriptors, iFppu)
 GO(snd_rawmidi_poll_descriptors_revents, iFppup)
 GO(snd_rawmidi_nonblock, iFpi)
-GO(snd_rawmidi_info_sizeof, uFv)
+GO(snd_rawmidi_info_sizeof, LFv)
 GO(snd_rawmidi_info_malloc, iFp)
 GO(snd_rawmidi_info_free, vFp)
 GO(snd_rawmidi_info_copy, vFpp)
 GO(snd_rawmidi_info_get_device, uFp)
 GO(snd_rawmidi_info_get_subdevice, uFp)
-GO(snd_rawmidi_info_get_stream, iFp)
+GO(snd_rawmidi_info_get_stream, uFp)
 GO(snd_rawmidi_info_get_card, iFp)
 GO(snd_rawmidi_info_get_flags, uFp)
 GO(snd_rawmidi_info_get_id, pFp)
@@ -521,35 +521,35 @@ GO(snd_rawmidi_info_get_subdevices_count, uFp)
 GO(snd_rawmidi_info_get_subdevices_avail, uFp)
 GO(snd_rawmidi_info_set_device, vFpu)
 GO(snd_rawmidi_info_set_subdevice, vFpu)
-GO(snd_rawmidi_info_set_stream, vFpi)
+GO(snd_rawmidi_info_set_stream, vFpu)
 GO(snd_rawmidi_info, iFpp)
-GO(snd_rawmidi_params_sizeof, uFv)
+GO(snd_rawmidi_params_sizeof, LFv)
 GO(snd_rawmidi_params_malloc, iFp)
 GO(snd_rawmidi_params_free, vFp)
 GO(snd_rawmidi_params_copy, vFpp)
-GO(snd_rawmidi_params_set_buffer_size, iFppu)
-GO(snd_rawmidi_params_get_buffer_size, uFp)
-GO(snd_rawmidi_params_set_avail_min, iFppu)
-GO(snd_rawmidi_params_get_avail_min, uFp)
+GO(snd_rawmidi_params_set_buffer_size, iFppL)
+GO(snd_rawmidi_params_get_buffer_size, LFp)
+GO(snd_rawmidi_params_set_avail_min, iFppL)
+GO(snd_rawmidi_params_get_avail_min, LFp)
 GO(snd_rawmidi_params_set_no_active_sensing, iFppi)
 GO(snd_rawmidi_params_get_no_active_sensing, iFp)
 GO(snd_rawmidi_params, iFpp)
 GO(snd_rawmidi_params_current, iFpp)
-GO(snd_rawmidi_status_sizeof, uFv)
+GO(snd_rawmidi_status_sizeof, LFv)
 GO(snd_rawmidi_status_malloc, iFp)
 GO(snd_rawmidi_status_free, vFp)
 GO(snd_rawmidi_status_copy, vFpp)
 GO(snd_rawmidi_status_get_tstamp, vFpp)
-GO(snd_rawmidi_status_get_avail, uFp)
-GO(snd_rawmidi_status_get_xruns, uFp)
+GO(snd_rawmidi_status_get_avail, LFp)
+GO(snd_rawmidi_status_get_xruns, LFp)
 GO(snd_rawmidi_status, iFpp)
 GO(snd_rawmidi_drain, iFp)
 GO(snd_rawmidi_drop, iFp)
-GO(snd_rawmidi_write, uFppu)
-GO(snd_rawmidi_read, uFppu)
+GO(snd_rawmidi_write, lFppL)
+GO(snd_rawmidi_read, lFppL)
 GO(snd_rawmidi_name, pFp)
-GO(snd_rawmidi_type, iFp)
-GO(snd_rawmidi_stream, iFp)
+GO(snd_rawmidi_type, uFp)
+GO(snd_rawmidi_stream, uFp)
 GO(snd_timer_query_open, iFppi)
 GO(snd_timer_query_open_lconf, iFppip)
 GO(snd_timer_query_close, iFp)
@@ -560,8 +560,8 @@ GO(snd_timer_query_status, iFpp)
 GO(snd_timer_open, iFppi)
 GO(snd_timer_open_lconf, iFppip)
 GO(snd_timer_close, iFp)
-//GO(snd_async_add_timer_handler, iFppPp)
-//GO(snd_async_handler_get_timer, pFp)
+//GOM(snd_async_add_timer_handler, iFpppp)
+GO(snd_async_handler_get_timer, pFp)
 GO(snd_timer_poll_descriptors_count, iFp)
 GO(snd_timer_poll_descriptors, iFppu)
 GO(snd_timer_poll_descriptors_revents, iFppup)
@@ -571,8 +571,8 @@ GO(snd_timer_status, iFpp)
 GO(snd_timer_start, iFp)
 GO(snd_timer_stop, iFp)
 GO(snd_timer_continue, iFp)
-GO(snd_timer_read, uFppu)
-GO(snd_timer_id_sizeof, uFv)
+GO(snd_timer_read, lFppL)
+GO(snd_timer_id_sizeof, LFv)
 GO(snd_timer_id_malloc, iFp)
 GO(snd_timer_id_free, vFp)
 GO(snd_timer_id_copy, vFpp)
@@ -586,7 +586,7 @@ GO(snd_timer_id_set_device, vFpi)
 GO(snd_timer_id_get_device, iFp)
 GO(snd_timer_id_set_subdevice, vFpi)
 GO(snd_timer_id_get_subdevice, iFp)
-GO(snd_timer_ginfo_sizeof, uFv)
+GO(snd_timer_ginfo_sizeof, LFv)
 GO(snd_timer_ginfo_malloc, iFp)
 GO(snd_timer_ginfo_free, vFp)
 GO(snd_timer_ginfo_copy, vFpp)
@@ -596,11 +596,11 @@ GO(snd_timer_ginfo_get_flags, uFp)
 GO(snd_timer_ginfo_get_card, iFp)
 GO(snd_timer_ginfo_get_id, pFp)
 GO(snd_timer_ginfo_get_name, pFp)
-GO(snd_timer_ginfo_get_resolution, iFp)
-GO(snd_timer_ginfo_get_resolution_min, iFp)
-GO(snd_timer_ginfo_get_resolution_max, iFp)
+GO(snd_timer_ginfo_get_resolution, LFp)
+GO(snd_timer_ginfo_get_resolution_min, LFp)
+GO(snd_timer_ginfo_get_resolution_max, LFp)
 GO(snd_timer_ginfo_get_clients, uFp)
-GO(snd_timer_info_sizeof, uFv)
+GO(snd_timer_info_sizeof, LFv)
 GO(snd_timer_info_malloc, iFp)
 GO(snd_timer_info_free, vFp)
 GO(snd_timer_info_copy, vFpp)
@@ -608,8 +608,8 @@ GO(snd_timer_info_is_slave, iFp)
 GO(snd_timer_info_get_card, iFp)
 GO(snd_timer_info_get_id, pFp)
 GO(snd_timer_info_get_name, pFp)
-GO(snd_timer_info_get_resolution, iFp)
-GO(snd_timer_params_sizeof, uFv)
+GO(snd_timer_info_get_resolution, lFp)
+GO(snd_timer_params_sizeof, LFv)
 GO(snd_timer_params_malloc, iFp)
 GO(snd_timer_params_free, vFp)
 GO(snd_timer_params_copy, vFpp)
@@ -619,22 +619,22 @@ GO(snd_timer_params_set_exclusive, iFpi)
 GO(snd_timer_params_get_exclusive, iFp)
 GO(snd_timer_params_set_early_event, iFpi)
 GO(snd_timer_params_get_early_event, iFp)
-GO(snd_timer_params_set_ticks, vFpi)
-GO(snd_timer_params_get_ticks, iFp)
-GO(snd_timer_params_set_queue_size, vFpi)
-GO(snd_timer_params_get_queue_size, iFp)
+GO(snd_timer_params_set_ticks, vFpl)
+GO(snd_timer_params_get_ticks, lFp)
+GO(snd_timer_params_set_queue_size, vFpl)
+GO(snd_timer_params_get_queue_size, lFp)
 GO(snd_timer_params_set_filter, vFpu)
 GO(snd_timer_params_get_filter, uFp)
-GO(snd_timer_status_sizeof, uFv)
+GO(snd_timer_status_sizeof, LFv)
 GO(snd_timer_status_malloc, iFp)
 GO(snd_timer_status_free, vFp)
 GO(snd_timer_status_copy, vFpp)
-GO(snd_timer_status_get_timestamp, iFp)
-GO(snd_timer_status_get_resolution, iFp)
-GO(snd_timer_status_get_lost, iFp)
-GO(snd_timer_status_get_overrun, iFp)
-GO(snd_timer_status_get_queue, iFp)
-GO(snd_timer_info_get_ticks, iFp)
+GO(snd_timer_status_get_timestamp, HFp)
+GO(snd_timer_status_get_resolution, lFp)
+GO(snd_timer_status_get_lost, lFp)
+GO(snd_timer_status_get_overrun, lFp)
+GO(snd_timer_status_get_queue, lFp)
+GO(snd_timer_info_get_ticks, lFp)
 GO(snd_hwdep_open, iFppi)
 GO(snd_hwdep_close, iFp)
 GO(snd_hwdep_poll_descriptors, iFppu)
@@ -644,10 +644,10 @@ GO(snd_hwdep_info, iFpp)
 GO(snd_hwdep_dsp_status, iFpp)
 GO(snd_hwdep_dsp_load, iFpp)
 GO(snd_hwdep_ioctl, iFpup)
-GO(snd_hwdep_write, uFppu)
-GO(snd_hwdep_read, uFppu)
-GO(snd_hwdep_info_sizeof, uFv)
-GO(snd_hwdep_dsp_status_sizeof, uFv)
+GO(snd_hwdep_write, lFppL)
+GO(snd_hwdep_read, lFppL)
+GO(snd_hwdep_info_sizeof, LFv)
+GO(snd_hwdep_dsp_status_sizeof, LFv)
 GO(snd_hwdep_dsp_status_malloc, iFp)
 GO(snd_hwdep_dsp_status_free, vFp)
 GO(snd_hwdep_dsp_status_copy, vFpp)
@@ -656,18 +656,18 @@ GO(snd_hwdep_dsp_status_get_id, pFp)
 GO(snd_hwdep_dsp_status_get_num_dsps, uFp)
 GO(snd_hwdep_dsp_status_get_dsp_loaded, uFp)
 GO(snd_hwdep_dsp_status_get_chip_ready, uFp)
-GO(snd_hwdep_dsp_image_sizeof, uFv)
+GO(snd_hwdep_dsp_image_sizeof, LFv)
 GO(snd_hwdep_dsp_image_malloc, iFp)
 GO(snd_hwdep_dsp_image_free, vFp)
 GO(snd_hwdep_dsp_image_copy, vFpp)
 GO(snd_hwdep_dsp_image_get_index, uFp)
 GO(snd_hwdep_dsp_image_get_name, pFp)
 GO(snd_hwdep_dsp_image_get_image, pFp)
-GO(snd_hwdep_dsp_image_get_length, uFp)
+GO(snd_hwdep_dsp_image_get_length, LFp)
 GO(snd_hwdep_dsp_image_set_index, vFpu)
 GO(snd_hwdep_dsp_image_set_name, vFpp)
 GO(snd_hwdep_dsp_image_set_image, vFpp)
-GO(snd_hwdep_dsp_image_set_length, vFpu)
+GO(snd_hwdep_dsp_image_set_length, vFpL)
 GO(snd_card_load, iFi)
 GO(snd_card_next, iFp)
 GO(snd_card_get_index, iFp)
@@ -677,8 +677,8 @@ GO(snd_ctl_open, iFppi)
 GO(snd_ctl_open_lconf, iFppip)
 GO(snd_ctl_close, iFp)
 GO(snd_ctl_nonblock, iFpi)
-//GO(snd_async_add_ctl_handler, iFppPp)
-//GO(snd_async_handler_get_ctl, pFp)
+//GOM(snd_async_add_ctl_handler, iFpppp)
+GO(snd_async_handler_get_ctl, pFp)
 GO(snd_ctl_poll_descriptors_count, iFp)
 GO(snd_ctl_poll_descriptors, iFppu)
 GO(snd_ctl_poll_descriptors_revents, iFppup)
@@ -706,38 +706,38 @@ GO(snd_ctl_get_power_state, iFpp)
 GO(snd_ctl_read, iFpp)
 GO(snd_ctl_wait, iFpi)
 GO(snd_ctl_name, pFp)
-GO(snd_ctl_type, iFp)
-GO(snd_ctl_elem_type_name, pFi)
-GO(snd_ctl_elem_iface_name, pFi)
-GO(snd_ctl_event_type_name, pFi)
+GO(snd_ctl_type, uFp)
+GO(snd_ctl_elem_type_name, pFu)
+GO(snd_ctl_elem_iface_name, pFu)
+GO(snd_ctl_event_type_name, pFu)
 GO(snd_ctl_event_elem_get_mask, uFp)
 GO(snd_ctl_event_elem_get_numid, uFp)
 GO(snd_ctl_event_elem_get_id, vFpp)
-GO(snd_ctl_event_elem_get_interface, iFp)
+GO(snd_ctl_event_elem_get_interface, uFp)
 GO(snd_ctl_event_elem_get_device, uFp)
 GO(snd_ctl_event_elem_get_subdevice, uFp)
 GO(snd_ctl_event_elem_get_name, pFp)
 GO(snd_ctl_event_elem_get_index, uFp)
 GO(snd_ctl_elem_list_alloc_space, iFpu)
 GO(snd_ctl_elem_list_free_space, vFp)
-GO(snd_ctl_elem_id_sizeof, uFv)
+GO(snd_ctl_elem_id_sizeof, LFv)
 GO(snd_ctl_elem_id_malloc, iFp)
 GO(snd_ctl_elem_id_free, vFp)
 GO(snd_ctl_elem_id_clear, vFp)
 GO(snd_ctl_elem_id_copy, vFpp)
 GO(snd_ctl_elem_id_get_numid, uFp)
-GO(snd_ctl_elem_id_get_interface, iFp)
+GO(snd_ctl_elem_id_get_interface, uFp)
 GO(snd_ctl_elem_id_get_device, uFp)
 GO(snd_ctl_elem_id_get_subdevice, uFp)
 GO(snd_ctl_elem_id_get_name, pFp)
 GO(snd_ctl_elem_id_get_index, uFp)
 GO(snd_ctl_elem_id_set_numid, vFpu)
-GO(snd_ctl_elem_id_set_interface, vFpi)
+GO(snd_ctl_elem_id_set_interface, vFpu)
 GO(snd_ctl_elem_id_set_device, vFpu)
 GO(snd_ctl_elem_id_set_subdevice, vFpu)
 GO(snd_ctl_elem_id_set_name, vFpp)
 GO(snd_ctl_elem_id_set_index, vFpu)
-GO(snd_ctl_card_info_sizeof, uFv)
+GO(snd_ctl_card_info_sizeof, LFv)
 GO(snd_ctl_card_info_malloc, iFp)
 GO(snd_ctl_card_info_free, vFp)
 GO(snd_ctl_card_info_clear, vFp)
@@ -749,13 +749,13 @@ GO(snd_ctl_card_info_get_name, pFp)
 GO(snd_ctl_card_info_get_longname, pFp)
 GO(snd_ctl_card_info_get_mixername, pFp)
 GO(snd_ctl_card_info_get_components, pFp)
-GO(snd_ctl_event_sizeof, uFv)
+GO(snd_ctl_event_sizeof, LFv)
 GO(snd_ctl_event_malloc, iFp)
 GO(snd_ctl_event_free, vFp)
 GO(snd_ctl_event_clear, vFp)
 GO(snd_ctl_event_copy, vFpp)
-GO(snd_ctl_event_get_type, iFp)
-GO(snd_ctl_elem_list_sizeof, uFv)
+GO(snd_ctl_event_get_type, uFp)
+GO(snd_ctl_elem_list_sizeof, LFv)
 GO(snd_ctl_elem_list_malloc, iFp)
 GO(snd_ctl_elem_list_free, vFp)
 GO(snd_ctl_elem_list_clear, vFp)
@@ -765,17 +765,17 @@ GO(snd_ctl_elem_list_get_used, uFp)
 GO(snd_ctl_elem_list_get_count, uFp)
 GO(snd_ctl_elem_list_get_id, vFpup)
 GO(snd_ctl_elem_list_get_numid, uFpu)
-GO(snd_ctl_elem_list_get_interface, iFpu)
+GO(snd_ctl_elem_list_get_interface, uFpu)
 GO(snd_ctl_elem_list_get_device, uFpu)
 GO(snd_ctl_elem_list_get_subdevice, uFpu)
 GO(snd_ctl_elem_list_get_name, pFpu)
 GO(snd_ctl_elem_list_get_index, uFpu)
-GO(snd_ctl_elem_info_sizeof, uFv)
+GO(snd_ctl_elem_info_sizeof, LFv)
 GO(snd_ctl_elem_info_malloc, iFp)
 GO(snd_ctl_elem_info_free, vFp)
 GO(snd_ctl_elem_info_clear, vFp)
 GO(snd_ctl_elem_info_copy, vFpp)
-GO(snd_ctl_elem_info_get_type, iFp)
+GO(snd_ctl_elem_info_get_type, uFp)
 GO(snd_ctl_elem_info_is_readable, iFp)
 GO(snd_ctl_elem_info_is_writable, iFp)
 GO(snd_ctl_elem_info_is_volatile, iFp)
@@ -788,9 +788,9 @@ GO(snd_ctl_elem_info_is_owner, iFp)
 GO(snd_ctl_elem_info_is_user, iFp)
 GO(snd_ctl_elem_info_get_owner, iFp)
 GO(snd_ctl_elem_info_get_count, uFp)
-GO(snd_ctl_elem_info_get_min, iFp)
-GO(snd_ctl_elem_info_get_max, iFp)
-GO(snd_ctl_elem_info_get_step, iFp)
+GO(snd_ctl_elem_info_get_min, lFp)
+GO(snd_ctl_elem_info_get_max, lFp)
+GO(snd_ctl_elem_info_get_step, lFp)
 GO(snd_ctl_elem_info_get_min64, IFp)
 GO(snd_ctl_elem_info_get_max64, IFp)
 GO(snd_ctl_elem_info_get_step64, IFp)
@@ -801,53 +801,53 @@ GO(snd_ctl_elem_info_get_dimensions, iFp)
 GO(snd_ctl_elem_info_get_dimension, iFpu)
 GO(snd_ctl_elem_info_get_id, vFpp)
 GO(snd_ctl_elem_info_get_numid, uFp)
-GO(snd_ctl_elem_info_get_interface, iFp)
+GO(snd_ctl_elem_info_get_interface, uFp)
 GO(snd_ctl_elem_info_get_device, uFp)
 GO(snd_ctl_elem_info_get_subdevice, uFp)
 GO(snd_ctl_elem_info_get_name, pFp)
 GO(snd_ctl_elem_info_get_index, uFp)
 GO(snd_ctl_elem_info_set_id, vFpp)
 GO(snd_ctl_elem_info_set_numid, vFpu)
-GO(snd_ctl_elem_info_set_interface, vFpi)
+GO(snd_ctl_elem_info_set_interface, vFpu)
 GO(snd_ctl_elem_info_set_device, vFpu)
 GO(snd_ctl_elem_info_set_subdevice, vFpu)
 GO(snd_ctl_elem_info_set_name, vFpp)
 GO(snd_ctl_elem_info_set_index, vFpu)
-GO(snd_ctl_elem_add_integer, iFppuiii)
+GO(snd_ctl_elem_add_integer, iFppulll)
 GO(snd_ctl_elem_add_integer64, iFppuIII)
 GO(snd_ctl_elem_add_boolean, iFppu)
 GO(snd_ctl_elem_add_iec958, iFpp)
 GO(snd_ctl_elem_remove, iFpp)
-GO(snd_ctl_elem_value_sizeof, uFv)
+GO(snd_ctl_elem_value_sizeof, LFv)
 GO(snd_ctl_elem_value_malloc, iFp)
 GO(snd_ctl_elem_value_free, vFp)
 GO(snd_ctl_elem_value_clear, vFp)
 GO(snd_ctl_elem_value_copy, vFpp)
 GO(snd_ctl_elem_value_get_id, vFpp)
 GO(snd_ctl_elem_value_get_numid, uFp)
-GO(snd_ctl_elem_value_get_interface, iFp)
+GO(snd_ctl_elem_value_get_interface, uFp)
 GO(snd_ctl_elem_value_get_device, uFp)
 GO(snd_ctl_elem_value_get_subdevice, uFp)
 GO(snd_ctl_elem_value_get_name, pFp)
 GO(snd_ctl_elem_value_get_index, uFp)
 GO(snd_ctl_elem_value_set_id, vFpp)
 GO(snd_ctl_elem_value_set_numid, vFpu)
-GO(snd_ctl_elem_value_set_interface, vFpi)
+GO(snd_ctl_elem_value_set_interface, vFpu)
 GO(snd_ctl_elem_value_set_device, vFpu)
 GO(snd_ctl_elem_value_set_subdevice, vFpu)
 GO(snd_ctl_elem_value_set_name, vFpp)
 GO(snd_ctl_elem_value_set_index, vFpu)
 GO(snd_ctl_elem_value_get_boolean, iFpu)
-GO(snd_ctl_elem_value_get_integer, iFpu)
+GO(snd_ctl_elem_value_get_integer, lFpu)
 GO(snd_ctl_elem_value_get_integer64, IFpu)
 GO(snd_ctl_elem_value_get_enumerated, uFpu)
 GO(snd_ctl_elem_value_get_byte, CFpu)
-GO(snd_ctl_elem_value_set_boolean, vFpui)
-GO(snd_ctl_elem_value_set_integer, vFpui)
+GO(snd_ctl_elem_value_set_boolean, vFpul)
+GO(snd_ctl_elem_value_set_integer, vFpul)
 GO(snd_ctl_elem_value_set_integer64, vFpuI)
 GO(snd_ctl_elem_value_set_enumerated, vFpuu)
-GO(snd_ctl_elem_value_set_byte, vFpuu)
-GO(snd_ctl_elem_set_bytes, vFppu)
+GO(snd_ctl_elem_value_set_byte, vFpuC)
+GO(snd_ctl_elem_set_bytes, vFppL)
 GO(snd_ctl_elem_value_get_bytes, pFp)
 GO(snd_ctl_elem_value_get_iec958, vFpp)
 GO(snd_ctl_elem_value_set_iec958, vFpp)
@@ -860,16 +860,16 @@ GO(snd_hctl_poll_descriptors_count, iFp)
 GO(snd_hctl_poll_descriptors, iFppu)
 GO(snd_hctl_poll_descriptors_revents, iFppup)
 GO(snd_hctl_get_count, uFp)
-GO(snd_hctl_set_compare, iFpp)
+//GOM(snd_hctl_set_compare, iFpp)
 GO(snd_hctl_first_elem, pFp)
 GO(snd_hctl_last_elem, pFp)
 GO(snd_hctl_find_elem, pFpp)
-//GO(snd_hctl_set_callback, vFpP)
-//GO(snd_hctl_set_callback_private, vFpp)
-//GO(snd_hctl_get_callback_private, pFp)
+//GOM(snd_hctl_set_callback, vFpp)
+GO(snd_hctl_set_callback_private, vFpp)
+GO(snd_hctl_get_callback_private, pFp)
 GO(snd_hctl_load, iFp)
 GO(snd_hctl_free, iFp)
-//GO(snd_hctl_handle_events, iFp)
+GO(snd_hctl_handle_events, iFp)
 GO(snd_hctl_name, pFp)
 GO(snd_hctl_wait, iFpi)
 GO(snd_hctl_ctl, pFp)
@@ -884,14 +884,14 @@ GO(snd_hctl_elem_tlv_command, iFpp)
 GO(snd_hctl_elem_get_hctl, pFp)
 GO(snd_hctl_elem_get_id, vFpp)
 GO(snd_hctl_elem_get_numid, uFp)
-GO(snd_hctl_elem_get_interface, iFp)
+GO(snd_hctl_elem_get_interface, uFp)
 GO(snd_hctl_elem_get_device, uFp)
 GO(snd_hctl_elem_get_subdevice, uFp)
 GO(snd_hctl_elem_get_name, pFp)
 GO(snd_hctl_elem_get_index, uFp)
-//GO(snd_hctl_elem_set_callback, vFpP)
-//GO(snd_hctl_elem_get_callback_private, pFp)
-//GO(snd_hctl_elem_set_callback_private, vFpp)
+//GOM(snd_hctl_elem_set_callback, vFpp)
+GO(snd_hctl_elem_get_callback_private, pFp)
+GO(snd_hctl_elem_set_callback_private, vFpp)
 GO(snd_sctl_build, iFppppi)
 GO(snd_sctl_free, iFp)
 GO(snd_sctl_install, iFp)
@@ -912,10 +912,10 @@ GO(snd_mixer_poll_descriptors_revents, iFppup)
 GO(snd_mixer_load, iFp)
 GO(snd_mixer_free, vFp)
 GO(snd_mixer_wait, iFpi)
-GO(snd_mixer_set_compare, iFpp)
-//GO(snd_mixer_set_callback, vFpP)
-//GO(snd_mixer_get_callback_private, pFp)
-//GO(snd_mixer_set_callback_private, vFpp)
+GOM(snd_mixer_set_compare, iFEpp)
+//GOM(snd_mixer_set_callback, vFpp)
+GO(snd_mixer_get_callback_private, pFp)
+GO(snd_mixer_set_callback_private, vFpp)
 GO(snd_mixer_get_count, uFp)
 GO(snd_mixer_class_unregister, iFp)
 GO(snd_mixer_elem_next, pFp)
@@ -923,11 +923,11 @@ GO(snd_mixer_elem_prev, pFp)
 GOM(snd_mixer_elem_set_callback, vFEpp)
 GO(snd_mixer_elem_get_callback_private, pFp)
 GO(snd_mixer_elem_set_callback_private, vFpp)
-GO(snd_mixer_elem_get_type, iFp)
-//GO(snd_mixer_class_register, iFpp)
+GO(snd_mixer_elem_get_type, uFp)
+GO(snd_mixer_class_register, iFpp)
 GO(snd_mixer_add_elem, iFpp)
 GO(snd_mixer_remove_elem, iFpp)
-GO(snd_mixer_elem_new, iFpiipp)
+GOM(snd_mixer_elem_new, iFEpuipp)
 GO(snd_mixer_elem_add, iFpp)
 GO(snd_mixer_elem_remove, iFp)
 GO(snd_mixer_elem_free, vFp)
@@ -937,18 +937,18 @@ GO(snd_mixer_elem_attach, iFpp)
 GO(snd_mixer_elem_detach, iFpp)
 GO(snd_mixer_elem_empty, iFp)
 GO(snd_mixer_elem_get_private, pFp)
-GO(snd_mixer_class_sizeof, uFv)
+GO(snd_mixer_class_sizeof, LFv)
 GO(snd_mixer_class_malloc, iFp)
 GO(snd_mixer_class_free, vFp)
 GO(snd_mixer_class_copy, vFpp)
 GO(snd_mixer_class_get_mixer, pFp)
-GO(snd_mixer_class_get_event, pFp)
+GOM(snd_mixer_class_get_event, pFEp)
 GO(snd_mixer_class_get_private, pFp)
-GO(snd_mixer_class_get_compare, pFp)
-GO(snd_mixer_class_set_event, iFpp)
+GOM(snd_mixer_class_get_compare, pFEp)
+GOM(snd_mixer_class_set_event, iFEpp)
 GO(snd_mixer_class_set_private, iFpp)
-GO(snd_mixer_class_set_private_free, iFpp)
-GO(snd_mixer_class_set_compare, iFpp)
+GOM(snd_mixer_class_set_private_free, iFEpp)
+GOM(snd_mixer_class_set_compare, iFEpp)
 GO(snd_mixer_selem_channel_name, pFi)
 GO(snd_mixer_selem_register, iFppp)
 GO(snd_mixer_selem_get_id, vFpp)
@@ -980,32 +980,32 @@ GO(snd_mixer_selem_get_playback_dB, iFpip)
 GO(snd_mixer_selem_get_capture_dB, iFpip)
 GO(snd_mixer_selem_get_playback_switch, iFpip)
 GO(snd_mixer_selem_get_capture_switch, iFpip)
-GO(snd_mixer_selem_set_playback_volume, iFpii)
-GO(snd_mixer_selem_set_capture_volume, iFpii)
-GO(snd_mixer_selem_set_playback_dB, iFpiii)
-GO(snd_mixer_selem_set_capture_dB, iFpiii)
-GO(snd_mixer_selem_set_playback_volume_all, iFpi)
-GO(snd_mixer_selem_set_capture_volume_all, iFpi)
-GO(snd_mixer_selem_set_playback_dB_all, iFpii)
-GO(snd_mixer_selem_set_capture_dB_all, iFpii)
+GO(snd_mixer_selem_set_playback_volume, iFpil)
+GO(snd_mixer_selem_set_capture_volume, iFpil)
+GO(snd_mixer_selem_set_playback_dB, iFpili)
+GO(snd_mixer_selem_set_capture_dB, iFpili)
+GO(snd_mixer_selem_set_playback_volume_all, iFpl)
+GO(snd_mixer_selem_set_capture_volume_all, iFpl)
+GO(snd_mixer_selem_set_playback_dB_all, iFpli)
+GO(snd_mixer_selem_set_capture_dB_all, iFpli)
 GO(snd_mixer_selem_set_playback_switch, iFpii)
 GO(snd_mixer_selem_set_capture_switch, iFpii)
 GO(snd_mixer_selem_set_playback_switch_all, iFpi)
 GO(snd_mixer_selem_set_capture_switch_all, iFpi)
 GO(snd_mixer_selem_get_playback_volume_range, iFppp)
 GO(snd_mixer_selem_get_playback_dB_range, iFppp)
-GO(snd_mixer_selem_set_playback_volume_range, iFpii)
+GO(snd_mixer_selem_set_playback_volume_range, iFpll)
 GO(snd_mixer_selem_get_capture_volume_range, iFppp)
 GO(snd_mixer_selem_get_capture_dB_range, iFppp)
-GO(snd_mixer_selem_set_capture_volume_range, iFpii)
+GO(snd_mixer_selem_set_capture_volume_range, iFpll)
 GO(snd_mixer_selem_is_enumerated, iFp)
 GO(snd_mixer_selem_is_enum_playback, iFp)
 GO(snd_mixer_selem_is_enum_capture, iFp)
 GO(snd_mixer_selem_get_enum_items, iFp)
-GO(snd_mixer_selem_get_enum_item_name, iFpuup)
+GO(snd_mixer_selem_get_enum_item_name, iFpuLp)
 GO(snd_mixer_selem_get_enum_item, iFpip)
 GO(snd_mixer_selem_set_enum_item, iFpiu)
-GO(snd_mixer_selem_id_sizeof, uFv)
+GO(snd_mixer_selem_id_sizeof, LFv)
 GO(snd_mixer_selem_id_malloc, iFp)
 GO(snd_mixer_selem_id_free, vFp)
 GO(snd_mixer_selem_id_copy, vFpp)
@@ -1016,18 +1016,18 @@ GO(snd_mixer_selem_id_set_index, vFpu)
 GO(snd_seq_open, iFppii)
 GO(snd_seq_open_lconf, iFppiip)
 GO(snd_seq_name, pFp)
-GO(snd_seq_type, iFp)
+GO(snd_seq_type, uFp)
 GO(snd_seq_close, iFp)
 GO(snd_seq_poll_descriptors_count, iFpw)
 GO(snd_seq_poll_descriptors, iFppuw)
 GO(snd_seq_poll_descriptors_revents, iFppup)
 GO(snd_seq_nonblock, iFpi)
 GO(snd_seq_client_id, iFp)
-GO(snd_seq_get_output_buffer_size, uFp)
-GO(snd_seq_get_input_buffer_size, uFp)
-GO(snd_seq_set_output_buffer_size, iFpu)
-GO(snd_seq_set_input_buffer_size, iFpu)
-GO(snd_seq_system_info_sizeof, uFv)
+GO(snd_seq_get_output_buffer_size, LFp)
+GO(snd_seq_get_input_buffer_size, LFp)
+GO(snd_seq_set_output_buffer_size, iFpL)
+GO(snd_seq_set_input_buffer_size, iFpL)
+GO(snd_seq_system_info_sizeof, LFv)
 GO(snd_seq_system_info_malloc, iFp)
 GO(snd_seq_system_info_free, vFp)
 GO(snd_seq_system_info_copy, vFpp)
@@ -1038,12 +1038,12 @@ GO(snd_seq_system_info_get_channels, iFp)
 GO(snd_seq_system_info_get_cur_clients, iFp)
 GO(snd_seq_system_info_get_cur_queues, iFp)
 GO(snd_seq_system_info, iFpp)
-GO(snd_seq_client_info_sizeof, uFv)
+GO(snd_seq_client_info_sizeof, LFv)
 GO(snd_seq_client_info_malloc, iFp)
 GO(snd_seq_client_info_free, vFp)
 GO(snd_seq_client_info_copy, vFpp)
 GO(snd_seq_client_info_get_client, iFp)
-GO(snd_seq_client_info_get_type, iFp)
+GO(snd_seq_client_info_get_type, uFp)
 GO(snd_seq_client_info_get_name, pFp)
 GO(snd_seq_client_info_get_broadcast_filter, iFp)
 GO(snd_seq_client_info_get_error_bounce, iFp)
@@ -1059,22 +1059,22 @@ GO(snd_seq_get_client_info, iFpp)
 GO(snd_seq_get_any_client_info, iFpip)
 GO(snd_seq_set_client_info, iFpp)
 GO(snd_seq_query_next_client, iFpp)
-GO(snd_seq_client_pool_sizeof, uFv)
+GO(snd_seq_client_pool_sizeof, LFv)
 GO(snd_seq_client_pool_malloc, iFp)
 GO(snd_seq_client_pool_free, vFp)
 GO(snd_seq_client_pool_copy, vFpp)
 GO(snd_seq_client_pool_get_client, iFp)
-GO(snd_seq_client_pool_get_output_pool, uFp)
-GO(snd_seq_client_pool_get_input_pool, uFp)
-GO(snd_seq_client_pool_get_output_room, uFp)
-GO(snd_seq_client_pool_get_output_free, uFp)
-GO(snd_seq_client_pool_get_input_free, uFp)
-GO(snd_seq_client_pool_set_output_pool, vFpu)
-GO(snd_seq_client_pool_set_input_pool, vFpu)
-GO(snd_seq_client_pool_set_output_room, vFpu)
+GO(snd_seq_client_pool_get_output_pool, LFp)
+GO(snd_seq_client_pool_get_input_pool, LFp)
+GO(snd_seq_client_pool_get_output_room, LFp)
+GO(snd_seq_client_pool_get_output_free, LFp)
+GO(snd_seq_client_pool_get_input_free, LFp)
+GO(snd_seq_client_pool_set_output_pool, vFpL)
+GO(snd_seq_client_pool_set_input_pool, vFpL)
+GO(snd_seq_client_pool_set_output_room, vFpL)
 GO(snd_seq_get_client_pool, iFpp)
 GO(snd_seq_set_client_pool, iFpp)
-GO(snd_seq_port_info_sizeof, uFv)
+GO(snd_seq_port_info_sizeof, LFv)
 GO(snd_seq_port_info_malloc, iFp)
 GO(snd_seq_port_info_free, vFp)
 GO(snd_seq_port_info_copy, vFpp)
@@ -1112,7 +1112,7 @@ GO(snd_seq_get_port_info, iFpip)
 GO(snd_seq_get_any_port_info, iFpiip)
 GO(snd_seq_set_port_info, iFpip)
 GO(snd_seq_query_next_port, iFpp)
-GO(snd_seq_port_subscribe_sizeof, uFv)
+GO(snd_seq_port_subscribe_sizeof, LFv)
 GO(snd_seq_port_subscribe_malloc, iFp)
 GO(snd_seq_port_subscribe_free, vFp)
 GO(snd_seq_port_subscribe_copy, vFpp)
@@ -1131,14 +1131,14 @@ GO(snd_seq_port_subscribe_set_time_real, vFpi)
 GO(snd_seq_get_port_subscription, iFpp)
 GO(snd_seq_subscribe_port, iFpp)
 GO(snd_seq_unsubscribe_port, iFpp)
-GO(snd_seq_query_subscribe_sizeof, uFv)
+GO(snd_seq_query_subscribe_sizeof, LFv)
 GO(snd_seq_query_subscribe_malloc, iFp)
 GO(snd_seq_query_subscribe_free, vFp)
 GO(snd_seq_query_subscribe_copy, vFpp)
 GO(snd_seq_query_subscribe_get_client, iFp)
 GO(snd_seq_query_subscribe_get_port, iFp)
 GO(snd_seq_query_subscribe_get_root, pFp)
-GO(snd_seq_query_subscribe_get_type, iFp)
+GO(snd_seq_query_subscribe_get_type, uFp)
 GO(snd_seq_query_subscribe_get_index, iFp)
 GO(snd_seq_query_subscribe_get_num_subs, iFp)
 GO(snd_seq_query_subscribe_get_addr, pFp)
@@ -1149,10 +1149,10 @@ GO(snd_seq_query_subscribe_get_time_real, iFp)
 GO(snd_seq_query_subscribe_set_client, vFpi)
 GO(snd_seq_query_subscribe_set_port, vFpi)
 GO(snd_seq_query_subscribe_set_root, vFpp)
-GO(snd_seq_query_subscribe_set_type, vFpi)
+GO(snd_seq_query_subscribe_set_type, vFpu)
 GO(snd_seq_query_subscribe_set_index, vFpi)
 GO(snd_seq_query_port_subscribers, iFpp)
-GO(snd_seq_queue_info_sizeof, uFv)
+GO(snd_seq_queue_info_sizeof, LFv)
 GO(snd_seq_queue_info_malloc, iFp)
 GO(snd_seq_queue_info_free, vFp)
 GO(snd_seq_queue_info_copy, vFpp)
@@ -1174,7 +1174,7 @@ GO(snd_seq_set_queue_info, iFpip)
 GO(snd_seq_query_named_queue, iFpp)
 GO(snd_seq_get_queue_usage, iFpi)
 GO(snd_seq_set_queue_usage, iFpii)
-GO(snd_seq_queue_status_sizeof, uFv)
+GO(snd_seq_queue_status_sizeof, LFv)
 GO(snd_seq_queue_status_malloc, iFp)
 GO(snd_seq_queue_status_free, vFp)
 GO(snd_seq_queue_status_copy, vFpp)
@@ -1184,7 +1184,7 @@ GO(snd_seq_queue_status_get_tick_time, uFp)
 GO(snd_seq_queue_status_get_real_time, pFp)
 GO(snd_seq_queue_status_get_status, uFp)
 GO(snd_seq_get_queue_status, iFpip)
-GO(snd_seq_queue_tempo_sizeof, uFv)
+GO(snd_seq_queue_tempo_sizeof, LFv)
 GO(snd_seq_queue_tempo_malloc, iFp)
 GO(snd_seq_queue_tempo_free, vFp)
 GO(snd_seq_queue_tempo_copy, vFpp)
@@ -1199,21 +1199,21 @@ GO(snd_seq_queue_tempo_set_skew, vFpu)
 GO(snd_seq_queue_tempo_set_skew_base, vFpu)
 GO(snd_seq_get_queue_tempo, iFpip)
 GO(snd_seq_set_queue_tempo, iFpip)
-GO(snd_seq_queue_timer_sizeof, uFv)
+GO(snd_seq_queue_timer_sizeof, LFv)
 GO(snd_seq_queue_timer_malloc, iFp)
 GO(snd_seq_queue_timer_free, vFp)
 GO(snd_seq_queue_timer_copy, vFpp)
 GO(snd_seq_queue_timer_get_queue, iFp)
-GO(snd_seq_queue_timer_get_type, iFp)
+GO(snd_seq_queue_timer_get_type, uFp)
 GO(snd_seq_queue_timer_get_id, pFp)
 GO(snd_seq_queue_timer_get_resolution, uFp)
-GO(snd_seq_queue_timer_set_type, vFpi)
+GO(snd_seq_queue_timer_set_type, vFpu)
 GO(snd_seq_queue_timer_set_id, vFpp)
 GO(snd_seq_queue_timer_set_resolution, vFpu)
 GO(snd_seq_get_queue_timer, iFpip)
 GO(snd_seq_set_queue_timer, iFpip)
 GO(snd_seq_free_event, iFp)
-GO(snd_seq_event_length, uFp)
+GO(snd_seq_event_length, lFp)
 GO(snd_seq_event_output, iFpp)
 GO(snd_seq_event_output_buffer, iFpp)
 GO(snd_seq_event_output_direct, iFpp)
@@ -1226,7 +1226,7 @@ GO(snd_seq_drop_output, iFp)
 GO(snd_seq_drop_output_buffer, iFp)
 GO(snd_seq_drop_input, iFp)
 GO(snd_seq_drop_input_buffer, iFp)
-GO(snd_seq_remove_events_sizeof, uFv)
+GO(snd_seq_remove_events_sizeof, LFv)
 GO(snd_seq_remove_events_malloc, iFp)
 GO(snd_seq_remove_events_free, vFp)
 GO(snd_seq_remove_events_copy, vFpp)
@@ -1248,16 +1248,16 @@ GO(snd_seq_remove_events, iFpp)
 GO(snd_seq_set_bit, vFip)
 GO(snd_seq_change_bit, iFip)
 GO(snd_seq_get_bit, iFip)
-GO(snd_midi_event_new, iFup)
-GO(snd_midi_event_resize_buffer, iFpu)
+GO(snd_midi_event_new, iFLp)
+GO(snd_midi_event_resize_buffer, iFpL)
 GO(snd_midi_event_free, vFp)
 GO(snd_midi_event_init, vFp)
 GO(snd_midi_event_reset_encode, vFp)
 GO(snd_midi_event_reset_decode, vFp)
 GO(snd_midi_event_no_status, vFpi)
-GO(snd_midi_event_encode, iFppip)
+GO(snd_midi_event_encode, lFpplp)
 GO(snd_midi_event_encode_byte, iFpip)
-GO(snd_midi_event_decode, iFppip)
+GO(snd_midi_event_decode, lFpplp)
 GO(snd_seq_control_queue, iFpiiip)
 GO(snd_seq_create_simple_port, iFppuu)
 GO(snd_seq_delete_simple_port, iFpi)
@@ -1267,13 +1267,13 @@ GO(snd_seq_disconnect_from, iFpiii)
 GO(snd_seq_disconnect_to, iFpiii)
 GO(snd_seq_set_client_name, iFpp)
 GO(snd_seq_set_client_event_filter, iFpi)
-GO(snd_seq_set_client_pool_output_room, iFpu)
-GO(snd_seq_set_client_pool_input, iFpu)
+GO(snd_seq_set_client_pool_output_room, iFpL)
+GO(snd_seq_set_client_pool_input, iFpL)
 GO(snd_seq_reset_pool_output, iFp)
 GO(snd_seq_reset_pool_input, iFp)
 GO(snd_seq_sync_output_queue, iFp)
 GO(snd_seq_parse_address, iFppp)
 
-GO(snd_hwdep_info_get_iface, iFp)
-DATAM(snd_lib_error, 4)
-GO(superdummy_error_handler, vFpipipV)   // dummy to have the bridge definition
\ No newline at end of file
+GO(snd_hwdep_info_get_iface, uFp)
+DATAM(snd_lib_error, 8)
+GO(superdummy_error_handler, vFpipipV)    // dummy to have the bridge definition