about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/generated/functions_list.txt19
-rw-r--r--src/wrapped/generated/wrapper.c48
-rw-r--r--src/wrapped/generated/wrapper.h19
-rwxr-xr-xsrc/wrapped/wrappedcairo_private.h250
-rw-r--r--src/wrapped/wrappedcairogobject_private.h66
5 files changed, 228 insertions, 174 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index d8fc8900..f1417e05 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -644,6 +644,7 @@
 #() pFpUi
 #() pFpUp
 #() pFpdu
+#() pFpdd
 #() pFplC
 #() pFplu
 #() pFpll
@@ -780,6 +781,7 @@
 #() vFpipp
 #() vFpIdi
 #() vFpCuW
+#() vFpuii
 #() vFpuip
 #() vFpuui
 #() vFpuuu
@@ -800,6 +802,7 @@
 #() vFpddd
 #() vFplll
 #() vFplpp
+#() vFpLii
 #() vFpLLL
 #() vFppii
 #() vFppiu
@@ -1094,6 +1097,7 @@
 #() pFpuuC
 #() pFpuuu
 #() pFpuup
+#() pFpudd
 #() pFpuLL
 #() pFpupi
 #() pFpupu
@@ -1448,6 +1452,7 @@
 #() uFpCCCC
 #() uFpWuip
 #() uFpuuuu
+#() uFpuupp
 #() uFpupuu
 #() uFppiip
 #() uFppipp
@@ -1522,16 +1527,19 @@
 #() pFpuuWW
 #() pFpuuuu
 #() pFpuuup
+#() pFpupii
 #() pFpuppp
 #() pFpUdii
 #() pFpdddd
 #() pFplppp
+#() pFpLpii
 #() pFppiii
 #() pFppiip
 #() pFppiup
 #() pFppipi
 #() pFppipp
 #() pFppWpp
+#() pFppuii
 #() pFppuuu
 #() pFppuup
 #() pFppupp
@@ -1862,12 +1870,14 @@
 #() pFpuuUUU
 #() pFpupppp
 #() pFplpppp
+#() pFpLppii
 #() pFppiiii
 #() pFppiCCC
 #() pFppiupp
 #() pFppipip
 #() pFppippi
 #() pFppippp
+#() pFppupii
 #() pFppuppp
 #() pFpplppp
 #() pFpppiup
@@ -2010,13 +2020,11 @@
 #() iFpipippp
 #() iFpippLpp
 #() iFpippppW
-#() iFpippppp
 #() iFpIIpppp
 #() iFpWppppW
 #() iFpuiCuCp
 #() iFpuiuupp
 #() iFpuuiuui
-#() iFpuupppp
 #() iFpupiLpL
 #() iFpupuuui
 #() iFpupupui
@@ -2064,8 +2072,11 @@
 #() uFEpppppp
 #() uFiiiuuuu
 #() uFuippppp
+#() uFpippppp
+#() uFpuupppp
 #() uFppiuppp
 #() uFppuuuup
+#() uFppppppp
 #() LFEppLppU
 #() LFEpppppu
 #() pFEpLiiii
@@ -2170,7 +2181,7 @@
 #() vFpUuuUUUi
 #() vFppiiiiii
 #() vFppiiipii
-#() vFppipipii
+#() vFppipipiu
 #() vFppipppui
 #() vFppippppi
 #() vFppippppp
@@ -2408,13 +2419,13 @@
 #() iFpippddiidd
 #() iFpCuWCCCCup
 #() iFpuupiuiipp
-#() iFpddpippppp
 #() iFppuuiiiiii
 #() iFppuuiiuupi
 #() iFpppiiipipi
 #() iFpppLLipppp
 #() iFppppiiuuii
 #() iFpppppppipi
+#() uFpddpippppp
 #() uFpppppppppp
 #() pFEiippppppp
 #() pFEpiiiiiipp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 77353554..37741dc2 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -680,6 +680,7 @@ typedef void* (*pFpup_t)(void*, uint32_t, void*);
 typedef void* (*pFpUi_t)(void*, uint64_t, int32_t);
 typedef void* (*pFpUp_t)(void*, uint64_t, void*);
 typedef void* (*pFpdu_t)(void*, double, uint32_t);
+typedef void* (*pFpdd_t)(void*, double, double);
 typedef void* (*pFplC_t)(void*, intptr_t, uint8_t);
 typedef void* (*pFplu_t)(void*, intptr_t, uint32_t);
 typedef void* (*pFpll_t)(void*, intptr_t, intptr_t);
@@ -816,6 +817,7 @@ typedef void (*vFpipi_t)(void*, int32_t, void*, int32_t);
 typedef void (*vFpipp_t)(void*, int32_t, void*, void*);
 typedef void (*vFpIdi_t)(void*, int64_t, double, int32_t);
 typedef void (*vFpCuW_t)(void*, uint8_t, uint32_t, uint16_t);
+typedef void (*vFpuii_t)(void*, uint32_t, int32_t, int32_t);
 typedef void (*vFpuip_t)(void*, uint32_t, int32_t, void*);
 typedef void (*vFpuui_t)(void*, uint32_t, uint32_t, int32_t);
 typedef void (*vFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
@@ -836,6 +838,7 @@ typedef void (*vFpddi_t)(void*, double, double, int32_t);
 typedef void (*vFpddd_t)(void*, double, double, double);
 typedef void (*vFplll_t)(void*, intptr_t, intptr_t, intptr_t);
 typedef void (*vFplpp_t)(void*, intptr_t, void*, void*);
+typedef void (*vFpLii_t)(void*, uintptr_t, int32_t, int32_t);
 typedef void (*vFpLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t);
 typedef void (*vFppii_t)(void*, void*, int32_t, int32_t);
 typedef void (*vFppiu_t)(void*, void*, int32_t, uint32_t);
@@ -1130,6 +1133,7 @@ typedef void* (*pFpuWp_t)(void*, uint32_t, uint16_t, void*);
 typedef void* (*pFpuuC_t)(void*, uint32_t, uint32_t, uint8_t);
 typedef void* (*pFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpuup_t)(void*, uint32_t, uint32_t, void*);
+typedef void* (*pFpudd_t)(void*, uint32_t, double, double);
 typedef void* (*pFpuLL_t)(void*, uint32_t, uintptr_t, uintptr_t);
 typedef void* (*pFpupi_t)(void*, uint32_t, void*, int32_t);
 typedef void* (*pFpupu_t)(void*, uint32_t, void*, uint32_t);
@@ -1484,6 +1488,7 @@ typedef uint32_t (*uFuiiii_t)(uint32_t, int32_t, int32_t, int32_t, int32_t);
 typedef uint32_t (*uFpCCCC_t)(void*, uint8_t, uint8_t, uint8_t, uint8_t);
 typedef uint32_t (*uFpWuip_t)(void*, uint16_t, uint32_t, int32_t, void*);
 typedef uint32_t (*uFpuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef uint32_t (*uFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
 typedef uint32_t (*uFpupuu_t)(void*, uint32_t, void*, uint32_t, uint32_t);
 typedef uint32_t (*uFppiip_t)(void*, void*, int32_t, int32_t, void*);
 typedef uint32_t (*uFppipp_t)(void*, void*, int32_t, void*, void*);
@@ -1558,16 +1563,19 @@ typedef void* (*pFpuuip_t)(void*, uint32_t, uint32_t, int32_t, void*);
 typedef void* (*pFpuuWW_t)(void*, uint32_t, uint32_t, uint16_t, uint16_t);
 typedef void* (*pFpuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
+typedef void* (*pFpupii_t)(void*, uint32_t, void*, int32_t, int32_t);
 typedef void* (*pFpuppp_t)(void*, uint32_t, void*, void*, void*);
 typedef void* (*pFpUdii_t)(void*, uint64_t, double, int32_t, int32_t);
 typedef void* (*pFpdddd_t)(void*, double, double, double, double);
 typedef void* (*pFplppp_t)(void*, intptr_t, void*, void*, void*);
+typedef void* (*pFpLpii_t)(void*, uintptr_t, void*, int32_t, int32_t);
 typedef void* (*pFppiii_t)(void*, void*, int32_t, int32_t, int32_t);
 typedef void* (*pFppiip_t)(void*, void*, int32_t, int32_t, void*);
 typedef void* (*pFppiup_t)(void*, void*, int32_t, uint32_t, void*);
 typedef void* (*pFppipi_t)(void*, void*, int32_t, void*, int32_t);
 typedef void* (*pFppipp_t)(void*, void*, int32_t, void*, void*);
 typedef void* (*pFppWpp_t)(void*, void*, uint16_t, void*, void*);
+typedef void* (*pFppuii_t)(void*, void*, uint32_t, int32_t, int32_t);
 typedef void* (*pFppuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFppuup_t)(void*, void*, uint32_t, uint32_t, void*);
 typedef void* (*pFppupp_t)(void*, void*, uint32_t, void*, void*);
@@ -1898,12 +1906,14 @@ typedef void* (*pFpuuupu_t)(void*, uint32_t, uint32_t, uint32_t, void*, uint32_t
 typedef void* (*pFpuuUUU_t)(void*, uint32_t, uint32_t, uint64_t, uint64_t, uint64_t);
 typedef void* (*pFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
 typedef void* (*pFplpppp_t)(void*, intptr_t, void*, void*, void*, void*);
+typedef void* (*pFpLppii_t)(void*, uintptr_t, void*, void*, int32_t, int32_t);
 typedef void* (*pFppiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFppiCCC_t)(void*, void*, int32_t, uint8_t, uint8_t, uint8_t);
 typedef void* (*pFppiupp_t)(void*, void*, int32_t, uint32_t, void*, void*);
 typedef void* (*pFppipip_t)(void*, void*, int32_t, void*, int32_t, void*);
 typedef void* (*pFppippi_t)(void*, void*, int32_t, void*, void*, int32_t);
 typedef void* (*pFppippp_t)(void*, void*, int32_t, void*, void*, void*);
+typedef void* (*pFppupii_t)(void*, void*, uint32_t, void*, int32_t, int32_t);
 typedef void* (*pFppuppp_t)(void*, void*, uint32_t, void*, void*, void*);
 typedef void* (*pFpplppp_t)(void*, void*, intptr_t, void*, void*, void*);
 typedef void* (*pFpppiup_t)(void*, void*, void*, int32_t, uint32_t, void*);
@@ -2046,13 +2056,11 @@ typedef int32_t (*iFpipipip_t)(void*, int32_t, void*, int32_t, void*, int32_t, v
 typedef int32_t (*iFpipippp_t)(void*, int32_t, void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFpippLpp_t)(void*, int32_t, void*, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFpippppW_t)(void*, int32_t, void*, void*, void*, void*, uint16_t);
-typedef int32_t (*iFpippppp_t)(void*, int32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpIIpppp_t)(void*, int64_t, int64_t, void*, void*, void*, void*);
 typedef int32_t (*iFpWppppW_t)(void*, uint16_t, void*, void*, void*, void*, uint16_t);
 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 (*iFpuuiuui_t)(void*, uint32_t, uint32_t, int32_t, uint32_t, uint32_t, int32_t);
-typedef int32_t (*iFpuupppp_t)(void*, uint32_t, uint32_t, void*, void*, 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 (*iFpupupui_t)(void*, uint32_t, void*, uint32_t, void*, uint32_t, int32_t);
@@ -2100,8 +2108,11 @@ typedef uint32_t (*uFEpuuppp_t)(x64emu_t*, void*, uint32_t, uint32_t, void*, voi
 typedef uint32_t (*uFEpppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFiiiuuuu_t)(int32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFuippppp_t)(uint32_t, int32_t, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFpippppp_t)(void*, int32_t, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFpuupppp_t)(void*, uint32_t, uint32_t, void*, void*, void*, void*);
 typedef uint32_t (*uFppiuppp_t)(void*, void*, int32_t, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFppuuuup_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, void*);
+typedef uint32_t (*uFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef uintptr_t (*LFEppLppU_t)(x64emu_t*, void*, void*, uintptr_t, void*, void*, uint64_t);
 typedef uintptr_t (*LFEpppppu_t)(x64emu_t*, void*, void*, void*, void*, void*, uint32_t);
 typedef void* (*pFEpLiiii_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, int32_t, int32_t);
@@ -2206,7 +2217,7 @@ typedef void (*vFpUiUiupi_t)(void*, uint64_t, int32_t, uint64_t, int32_t, uint32
 typedef void (*vFpUuuUUUi_t)(void*, uint64_t, uint32_t, uint32_t, uint64_t, uint64_t, uint64_t, int32_t);
 typedef void (*vFppiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppiiipii_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t, int32_t);
-typedef void (*vFppipipii_t)(void*, void*, int32_t, void*, int32_t, void*, int32_t, int32_t);
+typedef void (*vFppipipiu_t)(void*, void*, int32_t, void*, int32_t, void*, int32_t, uint32_t);
 typedef void (*vFppipppui_t)(void*, void*, int32_t, void*, void*, void*, uint32_t, int32_t);
 typedef void (*vFppippppi_t)(void*, void*, int32_t, void*, void*, void*, void*, int32_t);
 typedef void (*vFppippppp_t)(void*, void*, int32_t, void*, void*, void*, void*, void*);
@@ -2444,13 +2455,13 @@ typedef int32_t (*iFpiipiiipip_t)(void*, int32_t, int32_t, void*, int32_t, int32
 typedef int32_t (*iFpippddiidd_t)(void*, int32_t, void*, void*, double, double, int32_t, int32_t, double, double);
 typedef int32_t (*iFpCuWCCCCup_t)(void*, uint8_t, uint32_t, uint16_t, uint8_t, uint8_t, uint8_t, uint8_t, uint32_t, void*);
 typedef int32_t (*iFpuupiuiipp_t)(void*, uint32_t, uint32_t, void*, int32_t, uint32_t, int32_t, int32_t, void*, void*);
-typedef int32_t (*iFpddpippppp_t)(void*, double, double, void*, int32_t, void*, void*, void*, void*, void*);
 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 (*iFppuuiiuupi_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t, void*, int32_t);
 typedef int32_t (*iFpppiiipipi_t)(void*, void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*, int32_t);
 typedef int32_t (*iFpppLLipppp_t)(void*, void*, void*, uintptr_t, uintptr_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFppppiiuuii_t)(void*, void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFpppppppipi_t)(void*, void*, void*, void*, void*, void*, void*, int32_t, void*, int32_t);
+typedef uint32_t (*uFpddpippppp_t)(void*, double, double, void*, int32_t, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFpppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFEiippppppp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFEpiiiiiipp_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*);
@@ -3273,6 +3284,7 @@ void pFpup(x64emu_t *emu, uintptr_t fcn) { pFpup_t fn = (pFpup_t)fcn; R_RAX=(uin
 void pFpUi(x64emu_t *emu, uintptr_t fcn) { pFpUi_t fn = (pFpUi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX); }
 void pFpUp(x64emu_t *emu, uintptr_t fcn) { pFpUp_t fn = (pFpUp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void pFpdu(x64emu_t *emu, uintptr_t fcn) { pFpdu_t fn = (pFpdu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI); }
+void pFpdd(x64emu_t *emu, uintptr_t fcn) { pFpdd_t fn = (pFpdd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void pFplC(x64emu_t *emu, uintptr_t fcn) { pFplC_t fn = (pFplC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint8_t)R_RDX); }
 void pFplu(x64emu_t *emu, uintptr_t fcn) { pFplu_t fn = (pFplu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX); }
 void pFpll(x64emu_t *emu, uintptr_t fcn) { pFpll_t fn = (pFpll_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
@@ -3409,6 +3421,7 @@ void vFpipi(x64emu_t *emu, uintptr_t fcn) { vFpipi_t fn = (vFpipi_t)fcn; fn((voi
 void vFpipp(x64emu_t *emu, uintptr_t fcn) { vFpipp_t fn = (vFpipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFpIdi(x64emu_t *emu, uintptr_t fcn) { vFpIdi_t fn = (vFpIdi_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX); }
 void vFpCuW(x64emu_t *emu, uintptr_t fcn) { vFpCuW_t fn = (vFpCuW_t)fcn; fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX); }
+void vFpuii(x64emu_t *emu, uintptr_t fcn) { vFpuii_t fn = (vFpuii_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFpuip(x64emu_t *emu, uintptr_t fcn) { vFpuip_t fn = (vFpuip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void vFpuui(x64emu_t *emu, uintptr_t fcn) { vFpuui_t fn = (vFpuui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void vFpuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuu_t fn = (vFpuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
@@ -3429,6 +3442,7 @@ void vFpddi(x64emu_t *emu, uintptr_t fcn) { vFpddi_t fn = (vFpddi_t)fcn; fn((voi
 void vFpddd(x64emu_t *emu, uintptr_t fcn) { vFpddd_t fn = (vFpddd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
 void vFplll(x64emu_t *emu, uintptr_t fcn) { vFplll_t fn = (vFplll_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
 void vFplpp(x64emu_t *emu, uintptr_t fcn) { vFplpp_t fn = (vFplpp_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
+void vFpLii(x64emu_t *emu, uintptr_t fcn) { vFpLii_t fn = (vFpLii_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFpLLL(x64emu_t *emu, uintptr_t fcn) { vFpLLL_t fn = (vFpLLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void vFppii(x64emu_t *emu, uintptr_t fcn) { vFppii_t fn = (vFppii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFppiu(x64emu_t *emu, uintptr_t fcn) { vFppiu_t fn = (vFppiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
@@ -3723,6 +3737,7 @@ void pFpuWp(x64emu_t *emu, uintptr_t fcn) { pFpuWp_t fn = (pFpuWp_t)fcn; R_RAX=(
 void pFpuuC(x64emu_t *emu, uintptr_t fcn) { pFpuuC_t fn = (pFpuuC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint8_t)R_RCX); }
 void pFpuuu(x64emu_t *emu, uintptr_t fcn) { pFpuuu_t fn = (pFpuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFpuup(x64emu_t *emu, uintptr_t fcn) { pFpuup_t fn = (pFpuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
+void pFpudd(x64emu_t *emu, uintptr_t fcn) { pFpudd_t fn = (pFpudd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void pFpuLL(x64emu_t *emu, uintptr_t fcn) { pFpuLL_t fn = (pFpuLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void pFpupi(x64emu_t *emu, uintptr_t fcn) { pFpupi_t fn = (pFpupi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void pFpupu(x64emu_t *emu, uintptr_t fcn) { pFpupu_t fn = (pFpupu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
@@ -4077,6 +4092,7 @@ void uFuiiii(x64emu_t *emu, uintptr_t fcn) { uFuiiii_t fn = (uFuiiii_t)fcn; R_RA
 void uFpCCCC(x64emu_t *emu, uintptr_t fcn) { uFpCCCC_t fn = (uFpCCCC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8); }
 void uFpWuip(x64emu_t *emu, uintptr_t fcn) { uFpWuip_t fn = (uFpWuip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void uFpuuuu(x64emu_t *emu, uintptr_t fcn) { uFpuuuu_t fn = (uFpuuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
+void uFpuupp(x64emu_t *emu, uintptr_t fcn) { uFpuupp_t fn = (uFpuupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFpupuu(x64emu_t *emu, uintptr_t fcn) { uFpupuu_t fn = (uFpupuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void uFppiip(x64emu_t *emu, uintptr_t fcn) { uFppiip_t fn = (uFppiip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void uFppipp(x64emu_t *emu, uintptr_t fcn) { uFppipp_t fn = (uFppipp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -4151,16 +4167,19 @@ void pFpuuip(x64emu_t *emu, uintptr_t fcn) { pFpuuip_t fn = (pFpuuip_t)fcn; R_RA
 void pFpuuWW(x64emu_t *emu, uintptr_t fcn) { pFpuuWW_t fn = (pFpuuWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8); }
 void pFpuuuu(x64emu_t *emu, uintptr_t fcn) { pFpuuuu_t fn = (pFpuuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void pFpuuup(x64emu_t *emu, uintptr_t fcn) { pFpuuup_t fn = (pFpuuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
+void pFpupii(x64emu_t *emu, uintptr_t fcn) { pFpupii_t fn = (pFpupii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFpuppp(x64emu_t *emu, uintptr_t fcn) { pFpuppp_t fn = (pFpuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFpUdii(x64emu_t *emu, uintptr_t fcn) { pFpUdii_t fn = (pFpUdii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFpdddd(x64emu_t *emu, uintptr_t fcn) { pFpdddd_t fn = (pFpdddd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
 void pFplppp(x64emu_t *emu, uintptr_t fcn) { pFplppp_t fn = (pFplppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void pFpLpii(x64emu_t *emu, uintptr_t fcn) { pFpLpii_t fn = (pFpLpii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFppiii(x64emu_t *emu, uintptr_t fcn) { pFppiii_t fn = (pFppiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFppiip(x64emu_t *emu, uintptr_t fcn) { pFppiip_t fn = (pFppiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFppiup(x64emu_t *emu, uintptr_t fcn) { pFppiup_t fn = (pFppiup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void pFppipi(x64emu_t *emu, uintptr_t fcn) { pFppipi_t fn = (pFppipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void pFppipp(x64emu_t *emu, uintptr_t fcn) { pFppipp_t fn = (pFppipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFppWpp(x64emu_t *emu, uintptr_t fcn) { pFppWpp_t fn = (pFppWpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void pFppuii(x64emu_t *emu, uintptr_t fcn) { pFppuii_t fn = (pFppuii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFppuuu(x64emu_t *emu, uintptr_t fcn) { pFppuuu_t fn = (pFppuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void pFppuup(x64emu_t *emu, uintptr_t fcn) { pFppuup_t fn = (pFppuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void pFppupp(x64emu_t *emu, uintptr_t fcn) { pFppupp_t fn = (pFppupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -4491,12 +4510,14 @@ void pFpuuupu(x64emu_t *emu, uintptr_t fcn) { pFpuuupu_t fn = (pFpuuupu_t)fcn; R
 void pFpuuUUU(x64emu_t *emu, uintptr_t fcn) { pFpuuUUU_t fn = (pFpuuUUU_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9); }
 void pFpupppp(x64emu_t *emu, uintptr_t fcn) { pFpupppp_t fn = (pFpupppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFplpppp(x64emu_t *emu, uintptr_t fcn) { pFplpppp_t fn = (pFplpppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void pFpLppii(x64emu_t *emu, uintptr_t fcn) { pFpLppii_t fn = (pFpLppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFppiiii(x64emu_t *emu, uintptr_t fcn) { pFppiiii_t fn = (pFppiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFppiCCC(x64emu_t *emu, uintptr_t fcn) { pFppiCCC_t fn = (pFppiCCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9); }
 void pFppiupp(x64emu_t *emu, uintptr_t fcn) { pFppiupp_t fn = (pFppiupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFppipip(x64emu_t *emu, uintptr_t fcn) { pFppipip_t fn = (pFppipip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void pFppippi(x64emu_t *emu, uintptr_t fcn) { pFppippi_t fn = (pFppippi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void pFppippp(x64emu_t *emu, uintptr_t fcn) { pFppippp_t fn = (pFppippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void pFppupii(x64emu_t *emu, uintptr_t fcn) { pFppupii_t fn = (pFppupii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFppuppp(x64emu_t *emu, uintptr_t fcn) { pFppuppp_t fn = (pFppuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpplppp(x64emu_t *emu, uintptr_t fcn) { pFpplppp_t fn = (pFpplppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpppiup(x64emu_t *emu, uintptr_t fcn) { pFpppiup_t fn = (pFpppiup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
@@ -4639,13 +4660,11 @@ void iFpipipip(x64emu_t *emu, uintptr_t fcn) { iFpipipip_t fn = (iFpipipip_t)fcn
 void iFpipippp(x64emu_t *emu, uintptr_t fcn) { iFpipippp_t fn = (iFpipippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpippLpp(x64emu_t *emu, uintptr_t fcn) { iFpippLpp_t fn = (iFpippLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpippppW(x64emu_t *emu, uintptr_t fcn) { iFpippppW_t fn = (iFpippppW_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint16_t*)(R_RSP + 8)); }
-void iFpippppp(x64emu_t *emu, uintptr_t fcn) { iFpippppp_t fn = (iFpippppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpIIpppp(x64emu_t *emu, uintptr_t fcn) { iFpIIpppp_t fn = (iFpIIpppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpWppppW(x64emu_t *emu, uintptr_t fcn) { iFpWppppW_t fn = (iFpWppppW_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint16_t*)(R_RSP + 8)); }
 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 iFpuuiuui(x64emu_t *emu, uintptr_t fcn) { iFpuuiuui_t fn = (iFpuuiuui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
-void iFpuupppp(x64emu_t *emu, uintptr_t fcn) { iFpuupppp_t fn = (iFpuupppp_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**)(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 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)); }
@@ -4693,8 +4712,11 @@ void uFEpuuppp(x64emu_t *emu, uintptr_t fcn) { uFEpuuppp_t fn = (uFEpuuppp_t)fcn
 void uFEpppppp(x64emu_t *emu, uintptr_t fcn) { uFEpppppp_t fn = (uFEpppppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFiiiuuuu(x64emu_t *emu, uintptr_t fcn) { uFiiiuuuu_t fn = (uFiiiuuuu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void uFuippppp(x64emu_t *emu, uintptr_t fcn) { uFuippppp_t fn = (uFuippppp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void uFpippppp(x64emu_t *emu, uintptr_t fcn) { uFpippppp_t fn = (uFpippppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void uFpuupppp(x64emu_t *emu, uintptr_t fcn) { uFpuupppp_t fn = (uFpuupppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFppiuppp(x64emu_t *emu, uintptr_t fcn) { uFppiuppp_t fn = (uFppiuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFppuuuup(x64emu_t *emu, uintptr_t fcn) { uFppuuuup_t fn = (uFppuuuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
+void uFppppppp(x64emu_t *emu, uintptr_t fcn) { uFppppppp_t fn = (uFppppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void LFEppLppU(x64emu_t *emu, uintptr_t fcn) { LFEppLppU_t fn = (LFEppLppU_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint64_t)R_R9); }
 void LFEpppppu(x64emu_t *emu, uintptr_t fcn) { LFEpppppu_t fn = (LFEpppppu_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void pFEpLiiii(x64emu_t *emu, uintptr_t fcn) { pFEpLiiii_t fn = (pFEpLiiii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
@@ -4799,7 +4821,7 @@ void vFpUiUiupi(x64emu_t *emu, uintptr_t fcn) { vFpUiUiupi_t fn = (vFpUiUiupi_t)
 void vFpUuuUUUi(x64emu_t *emu, uintptr_t fcn) { vFpUuuUUUi_t fn = (vFpUuuUUUi_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiii_t fn = (vFppiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppiiipii(x64emu_t *emu, uintptr_t fcn) { vFppiiipii_t fn = (vFppiiipii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
-void vFppipipii(x64emu_t *emu, uintptr_t fcn) { vFppipipii_t fn = (vFppipipii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
+void vFppipipiu(x64emu_t *emu, uintptr_t fcn) { vFppipipiu_t fn = (vFppipipiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void vFppipppui(x64emu_t *emu, uintptr_t fcn) { vFppipppui_t fn = (vFppipppui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppippppi(x64emu_t *emu, uintptr_t fcn) { vFppippppi_t fn = (vFppippppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppippppp(x64emu_t *emu, uintptr_t fcn) { vFppippppp_t fn = (vFppippppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -5037,13 +5059,13 @@ void iFpiipiiipip(x64emu_t *emu, uintptr_t fcn) { iFpiipiiipip_t fn = (iFpiipiii
 void iFpippddiidd(x64emu_t *emu, uintptr_t fcn) { iFpippddiidd_t fn = (iFpippddiidd_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_R8, (int32_t)R_R9, emu->xmm[2].d[0], emu->xmm[3].d[0]); }
 void iFpCuWCCCCup(x64emu_t *emu, uintptr_t fcn) { iFpCuWCCCCup_t fn = (iFpCuWCCCCup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8), *(uint8_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFpuupiuiipp(x64emu_t *emu, uintptr_t fcn) { iFpuupiuiipp_t fn = (iFpuupiuiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
-void iFpddpippppp(x64emu_t *emu, uintptr_t fcn) { iFpddpippppp_t fn = (iFpddpippppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void 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 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 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)); }
 void iFpppLLipppp(x64emu_t *emu, uintptr_t fcn) { iFpppLLipppp_t fn = (iFpppLLipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFppppiiuuii(x64emu_t *emu, uintptr_t fcn) { iFppppiiuuii_t fn = (iFppppiiuuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)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 iFpppppppipi(x64emu_t *emu, uintptr_t fcn) { iFpppppppipi_t fn = (iFpppppppipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
+void uFpddpippppp(x64emu_t *emu, uintptr_t fcn) { uFpddpippppp_t fn = (uFpddpippppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void uFpppppppppp(x64emu_t *emu, uintptr_t fcn) { uFpppppppppp_t fn = (uFpppppppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void pFEiippppppp(x64emu_t *emu, uintptr_t fcn) { pFEiippppppp_t fn = (pFEiippppppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFEpiiiiiipp(x64emu_t *emu, uintptr_t fcn) { pFEpiiiiiipp_t fn = (pFEpiiiiiipp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
@@ -5779,6 +5801,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpUi) return 1;
 	if (fun == &pFpUp) return 1;
 	if (fun == &pFpdu) return 2;
+	if (fun == &pFpdd) return 3;
 	if (fun == &pFplC) return 1;
 	if (fun == &pFplu) return 1;
 	if (fun == &pFpll) return 1;
@@ -5887,6 +5910,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpipp) return 1;
 	if (fun == &vFpIdi) return 2;
 	if (fun == &vFpCuW) return 1;
+	if (fun == &vFpuii) return 1;
 	if (fun == &vFpuip) return 1;
 	if (fun == &vFpuui) return 1;
 	if (fun == &vFpuuu) return 1;
@@ -5907,6 +5931,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpddd) return 4;
 	if (fun == &vFplll) return 1;
 	if (fun == &vFplpp) return 1;
+	if (fun == &vFpLii) return 1;
 	if (fun == &vFpLLL) return 1;
 	if (fun == &vFppii) return 1;
 	if (fun == &vFppiu) return 1;
@@ -6151,6 +6176,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpuuC) return 1;
 	if (fun == &pFpuuu) return 1;
 	if (fun == &pFpuup) return 1;
+	if (fun == &pFpudd) return 3;
 	if (fun == &pFpuLL) return 1;
 	if (fun == &pFpupi) return 1;
 	if (fun == &pFpupu) return 1;
@@ -6444,6 +6470,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpCCCC) return 1;
 	if (fun == &uFpWuip) return 1;
 	if (fun == &uFpuuuu) return 1;
+	if (fun == &uFpuupp) return 1;
 	if (fun == &uFpupuu) return 1;
 	if (fun == &uFppiip) return 1;
 	if (fun == &uFppipp) return 1;
@@ -6504,16 +6531,19 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpuuWW) return 1;
 	if (fun == &pFpuuuu) return 1;
 	if (fun == &pFpuuup) return 1;
+	if (fun == &pFpupii) return 1;
 	if (fun == &pFpuppp) return 1;
 	if (fun == &pFpUdii) return 2;
 	if (fun == &pFpdddd) return 5;
 	if (fun == &pFplppp) return 1;
+	if (fun == &pFpLpii) return 1;
 	if (fun == &pFppiii) return 1;
 	if (fun == &pFppiip) return 1;
 	if (fun == &pFppiup) return 1;
 	if (fun == &pFppipi) return 1;
 	if (fun == &pFppipp) return 1;
 	if (fun == &pFppWpp) return 1;
+	if (fun == &pFppuii) return 1;
 	if (fun == &pFppuuu) return 1;
 	if (fun == &pFppuup) return 1;
 	if (fun == &pFppupp) return 1;
@@ -6782,12 +6812,14 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpuuUUU) return 1;
 	if (fun == &pFpupppp) return 1;
 	if (fun == &pFplpppp) return 1;
+	if (fun == &pFpLppii) return 1;
 	if (fun == &pFppiiii) return 1;
 	if (fun == &pFppiCCC) return 1;
 	if (fun == &pFppiupp) return 1;
 	if (fun == &pFppipip) return 1;
 	if (fun == &pFppippi) return 1;
 	if (fun == &pFppippp) return 1;
+	if (fun == &pFppupii) return 1;
 	if (fun == &pFppuppp) return 1;
 	if (fun == &pFpplppp) return 1;
 	if (fun == &pFpppiup) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 96843374..3ac88ac1 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -681,6 +681,7 @@ void pFpup(x64emu_t *emu, uintptr_t fnc);
 void pFpUi(x64emu_t *emu, uintptr_t fnc);
 void pFpUp(x64emu_t *emu, uintptr_t fnc);
 void pFpdu(x64emu_t *emu, uintptr_t fnc);
+void pFpdd(x64emu_t *emu, uintptr_t fnc);
 void pFplC(x64emu_t *emu, uintptr_t fnc);
 void pFplu(x64emu_t *emu, uintptr_t fnc);
 void pFpll(x64emu_t *emu, uintptr_t fnc);
@@ -817,6 +818,7 @@ void vFpipi(x64emu_t *emu, uintptr_t fnc);
 void vFpipp(x64emu_t *emu, uintptr_t fnc);
 void vFpIdi(x64emu_t *emu, uintptr_t fnc);
 void vFpCuW(x64emu_t *emu, uintptr_t fnc);
+void vFpuii(x64emu_t *emu, uintptr_t fnc);
 void vFpuip(x64emu_t *emu, uintptr_t fnc);
 void vFpuui(x64emu_t *emu, uintptr_t fnc);
 void vFpuuu(x64emu_t *emu, uintptr_t fnc);
@@ -837,6 +839,7 @@ void vFpddi(x64emu_t *emu, uintptr_t fnc);
 void vFpddd(x64emu_t *emu, uintptr_t fnc);
 void vFplll(x64emu_t *emu, uintptr_t fnc);
 void vFplpp(x64emu_t *emu, uintptr_t fnc);
+void vFpLii(x64emu_t *emu, uintptr_t fnc);
 void vFpLLL(x64emu_t *emu, uintptr_t fnc);
 void vFppii(x64emu_t *emu, uintptr_t fnc);
 void vFppiu(x64emu_t *emu, uintptr_t fnc);
@@ -1131,6 +1134,7 @@ void pFpuWp(x64emu_t *emu, uintptr_t fnc);
 void pFpuuC(x64emu_t *emu, uintptr_t fnc);
 void pFpuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpuup(x64emu_t *emu, uintptr_t fnc);
+void pFpudd(x64emu_t *emu, uintptr_t fnc);
 void pFpuLL(x64emu_t *emu, uintptr_t fnc);
 void pFpupi(x64emu_t *emu, uintptr_t fnc);
 void pFpupu(x64emu_t *emu, uintptr_t fnc);
@@ -1485,6 +1489,7 @@ void uFuiiii(x64emu_t *emu, uintptr_t fnc);
 void uFpCCCC(x64emu_t *emu, uintptr_t fnc);
 void uFpWuip(x64emu_t *emu, uintptr_t fnc);
 void uFpuuuu(x64emu_t *emu, uintptr_t fnc);
+void uFpuupp(x64emu_t *emu, uintptr_t fnc);
 void uFpupuu(x64emu_t *emu, uintptr_t fnc);
 void uFppiip(x64emu_t *emu, uintptr_t fnc);
 void uFppipp(x64emu_t *emu, uintptr_t fnc);
@@ -1559,16 +1564,19 @@ void pFpuuip(x64emu_t *emu, uintptr_t fnc);
 void pFpuuWW(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpuuup(x64emu_t *emu, uintptr_t fnc);
+void pFpupii(x64emu_t *emu, uintptr_t fnc);
 void pFpuppp(x64emu_t *emu, uintptr_t fnc);
 void pFpUdii(x64emu_t *emu, uintptr_t fnc);
 void pFpdddd(x64emu_t *emu, uintptr_t fnc);
 void pFplppp(x64emu_t *emu, uintptr_t fnc);
+void pFpLpii(x64emu_t *emu, uintptr_t fnc);
 void pFppiii(x64emu_t *emu, uintptr_t fnc);
 void pFppiip(x64emu_t *emu, uintptr_t fnc);
 void pFppiup(x64emu_t *emu, uintptr_t fnc);
 void pFppipi(x64emu_t *emu, uintptr_t fnc);
 void pFppipp(x64emu_t *emu, uintptr_t fnc);
 void pFppWpp(x64emu_t *emu, uintptr_t fnc);
+void pFppuii(x64emu_t *emu, uintptr_t fnc);
 void pFppuuu(x64emu_t *emu, uintptr_t fnc);
 void pFppuup(x64emu_t *emu, uintptr_t fnc);
 void pFppupp(x64emu_t *emu, uintptr_t fnc);
@@ -1899,12 +1907,14 @@ void pFpuuupu(x64emu_t *emu, uintptr_t fnc);
 void pFpuuUUU(x64emu_t *emu, uintptr_t fnc);
 void pFpupppp(x64emu_t *emu, uintptr_t fnc);
 void pFplpppp(x64emu_t *emu, uintptr_t fnc);
+void pFpLppii(x64emu_t *emu, uintptr_t fnc);
 void pFppiiii(x64emu_t *emu, uintptr_t fnc);
 void pFppiCCC(x64emu_t *emu, uintptr_t fnc);
 void pFppiupp(x64emu_t *emu, uintptr_t fnc);
 void pFppipip(x64emu_t *emu, uintptr_t fnc);
 void pFppippi(x64emu_t *emu, uintptr_t fnc);
 void pFppippp(x64emu_t *emu, uintptr_t fnc);
+void pFppupii(x64emu_t *emu, uintptr_t fnc);
 void pFppuppp(x64emu_t *emu, uintptr_t fnc);
 void pFpplppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppiup(x64emu_t *emu, uintptr_t fnc);
@@ -2047,13 +2057,11 @@ void iFpipipip(x64emu_t *emu, uintptr_t fnc);
 void iFpipippp(x64emu_t *emu, uintptr_t fnc);
 void iFpippLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpippppW(x64emu_t *emu, uintptr_t fnc);
-void iFpippppp(x64emu_t *emu, uintptr_t fnc);
 void iFpIIpppp(x64emu_t *emu, uintptr_t fnc);
 void iFpWppppW(x64emu_t *emu, uintptr_t fnc);
 void iFpuiCuCp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuiuui(x64emu_t *emu, uintptr_t fnc);
-void iFpuupppp(x64emu_t *emu, uintptr_t fnc);
 void iFpupiLpL(x64emu_t *emu, uintptr_t fnc);
 void iFpupuuui(x64emu_t *emu, uintptr_t fnc);
 void iFpupupui(x64emu_t *emu, uintptr_t fnc);
@@ -2101,8 +2109,11 @@ void uFEpuuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpppppp(x64emu_t *emu, uintptr_t fnc);
 void uFiiiuuuu(x64emu_t *emu, uintptr_t fnc);
 void uFuippppp(x64emu_t *emu, uintptr_t fnc);
+void uFpippppp(x64emu_t *emu, uintptr_t fnc);
+void uFpuupppp(x64emu_t *emu, uintptr_t fnc);
 void uFppiuppp(x64emu_t *emu, uintptr_t fnc);
 void uFppuuuup(x64emu_t *emu, uintptr_t fnc);
+void uFppppppp(x64emu_t *emu, uintptr_t fnc);
 void LFEppLppU(x64emu_t *emu, uintptr_t fnc);
 void LFEpppppu(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiii(x64emu_t *emu, uintptr_t fnc);
@@ -2207,7 +2218,7 @@ void vFpUiUiupi(x64emu_t *emu, uintptr_t fnc);
 void vFpUuuUUUi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiipii(x64emu_t *emu, uintptr_t fnc);
-void vFppipipii(x64emu_t *emu, uintptr_t fnc);
+void vFppipipiu(x64emu_t *emu, uintptr_t fnc);
 void vFppipppui(x64emu_t *emu, uintptr_t fnc);
 void vFppippppi(x64emu_t *emu, uintptr_t fnc);
 void vFppippppp(x64emu_t *emu, uintptr_t fnc);
@@ -2445,13 +2456,13 @@ void iFpiipiiipip(x64emu_t *emu, uintptr_t fnc);
 void iFpippddiidd(x64emu_t *emu, uintptr_t fnc);
 void iFpCuWCCCCup(x64emu_t *emu, uintptr_t fnc);
 void iFpuupiuiipp(x64emu_t *emu, uintptr_t fnc);
-void iFpddpippppp(x64emu_t *emu, uintptr_t fnc);
 void iFppuuiiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFppuuiiuupi(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiipipi(x64emu_t *emu, uintptr_t fnc);
 void iFpppLLipppp(x64emu_t *emu, uintptr_t fnc);
 void iFppppiiuuii(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppipi(x64emu_t *emu, uintptr_t fnc);
+void uFpddpippppp(x64emu_t *emu, uintptr_t fnc);
 void uFpppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFEiippppppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpiiiiiipp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedcairo_private.h b/src/wrapped/wrappedcairo_private.h
index 7e484d1d..4a92a415 100755
--- a/src/wrapped/wrappedcairo_private.h
+++ b/src/wrapped/wrappedcairo_private.h
@@ -15,9 +15,9 @@ GO(cairo_copy_path, pFp)
 GO(cairo_copy_path_flat, pFp)
 GO(cairo_create, pFp)
 GO(cairo_curve_to, vFpdddddd)
-//GO(cairo_debug_reset_static_data, 
+GO(cairo_debug_reset_static_data, vFv)
 GO(cairo_destroy, vFp)
-GO(cairo_device_acquire, iFp)
+GO(cairo_device_acquire, uFp)
 GO(cairo_device_destroy, vFp)
 GO(cairo_device_finish, vFp)
 GO(cairo_device_flush, vFp)
@@ -43,26 +43,26 @@ GO(cairo_fill_preserve, vFp)
 GO(cairo_font_extents, vFpp)
 GO(cairo_font_face_destroy, vFp)
 GO(cairo_font_face_get_reference_count, uFp)
-GO(cairo_font_face_get_type, iFp)
+GO(cairo_font_face_get_type, uFp)
 GO(cairo_font_face_get_user_data, pFpp)
 GO(cairo_font_face_reference, pFp)
 //GOM(cairo_font_face_set_user_data, iFpppp)
-GO(cairo_font_face_status, iFp)
+GO(cairo_font_face_status, uFp)
 GO(cairo_font_options_copy, pFp)
 GO(cairo_font_options_create, pFv)
 GO(cairo_font_options_destroy, vFp)
 GO(cairo_font_options_equal, iFpp)
-GO(cairo_font_options_get_antialias, iFp)
-GO(cairo_font_options_get_hint_metrics, iFp)
-GO(cairo_font_options_get_hint_style, iFp)
-GO(cairo_font_options_get_subpixel_order, iFp)
+GO(cairo_font_options_get_antialias, uFp)
+GO(cairo_font_options_get_hint_metrics, uFp)
+GO(cairo_font_options_get_hint_style, uFp)
+GO(cairo_font_options_get_subpixel_order, uFp)
 GO(cairo_font_options_hash, LFp)
 GO(cairo_font_options_merge, vFpp)
-GO(cairo_font_options_set_antialias, vFpi)
-GO(cairo_font_options_set_hint_metrics, vFpi)
-GO(cairo_font_options_set_hint_style, vFpi)
-GO(cairo_font_options_set_subpixel_order, vFpi)
-GO(cairo_font_options_status, iFp)
+GO(cairo_font_options_set_antialias, vFpu)
+GO(cairo_font_options_set_hint_metrics, vFpu)
+GO(cairo_font_options_set_hint_style, vFpu)
+GO(cairo_font_options_set_subpixel_order, vFpu)
+GO(cairo_font_options_status, uFp)
 GO(cairo_format_stride_for_width, iFii)
 GO(cairo_ft_font_face_create_for_ft_face, pFpi)
 GO(cairo_ft_font_face_create_for_pattern, pFp)
@@ -72,21 +72,21 @@ GO(cairo_ft_font_face_unset_synthesize, vFpu)
 GO(cairo_ft_font_options_substitute, vFpp)
 GO(cairo_ft_scaled_font_lock_face, pFp)
 GO(cairo_ft_scaled_font_unlock_face, vFp)
-GO(cairo_get_antialias, iFp)
+GO(cairo_get_antialias, uFp)
 GO(cairo_get_current_point, vFppp)
 GO(cairo_get_dash, vFppp)
 GO(cairo_get_dash_count, iFp)
-GO(cairo_get_fill_rule, iFp)
+GO(cairo_get_fill_rule, uFp)
 GO(cairo_get_font_face, pFp)
 GO(cairo_get_font_matrix, vFpp)
 GO(cairo_get_font_options, vFpp)
 GO(cairo_get_group_target, pFp)
-GO(cairo_get_line_cap, iFp)
-GO(cairo_get_line_join, iFp)
+GO(cairo_get_line_cap, uFp)
+GO(cairo_get_line_join, uFp)
 GO(cairo_get_line_width, dFp)
 GO(cairo_get_matrix, vFpp)
 GO(cairo_get_miter_limit, dFp)
-GO(cairo_get_operator, iFp)
+GO(cairo_get_operator, uFp)
 GO(cairo_get_reference_count, uFp)
 GO(cairo_get_scaled_font, pFp)
 GO(cairo_get_source, pFp)
@@ -101,7 +101,7 @@ GO(cairo_has_current_point, iFp)
 GO(cairo_identity_matrix, vFp)
 GO(cairo_image_surface_create, pFiii)
 GO(cairo_image_surface_create_for_data, pFpiiii)
-//GO(cairo_image_surface_create_from_png, 
+GO(cairo_image_surface_create_from_png, pFp)
 //GO(cairo_image_surface_create_from_png_stream, 
 GO(cairo_image_surface_get_data, pFp)
 GO(cairo_image_surface_get_format, iFp)
@@ -119,7 +119,7 @@ GO(cairo_matrix_init_identity, vFp)
 GO(cairo_matrix_init_rotate, vFpd)
 GO(cairo_matrix_init_scale, vFpdd)
 GO(cairo_matrix_init_translate, vFpdd)
-GO(cairo_matrix_invert, iFp)
+GO(cairo_matrix_invert, uFp)
 GO(cairo_matrix_multiply, vFppp)
 GO(cairo_matrix_rotate, vFpd)
 GO(cairo_matrix_scale, vFpdd)
@@ -129,9 +129,9 @@ GO(cairo_matrix_translate, vFpdd)
 GO(cairo_mesh_pattern_begin_patch, vFp)
 GO(cairo_mesh_pattern_curve_to, vFpdddddd)
 GO(cairo_mesh_pattern_end_patch, vFp)
-GO(cairo_mesh_pattern_get_control_point, iFpuupp)
-GO(cairo_mesh_pattern_get_corner_color_rgba, iFpuupppp)
-GO(cairo_mesh_pattern_get_patch_count, iFpp)
+GO(cairo_mesh_pattern_get_control_point, uFpuupp)
+GO(cairo_mesh_pattern_get_corner_color_rgba, uFpuupppp)
+GO(cairo_mesh_pattern_get_patch_count, uFpp)
 GO(cairo_mesh_pattern_get_path, pFpu)
 GO(cairo_mesh_pattern_line_to, vFpdd)
 GO(cairo_mesh_pattern_move_to, vFpdd)
@@ -151,67 +151,67 @@ GO(cairo_pattern_create_for_surface, pFp)
 GO(cairo_pattern_create_linear, pFdddd)
 GO(cairo_pattern_create_mesh, pFv)
 GO(cairo_pattern_create_radial, pFdddddd)
-//GO(cairo_pattern_create_raster_source, 
+GO(cairo_pattern_create_raster_source, pFpuii)
 GO(cairo_pattern_create_rgb, pFddd)
 GO(cairo_pattern_create_rgba, pFdddd)
 GO(cairo_pattern_destroy, vFp)
-GO(cairo_pattern_get_color_stop_count, iFpp)
-GO(cairo_pattern_get_color_stop_rgba, iFpippppp)
-GO(cairo_pattern_get_extend, iFp)
-GO(cairo_pattern_get_filter, iFp)
-GO(cairo_pattern_get_linear_points, iFppppp)
+GO(cairo_pattern_get_color_stop_count, uFpp)
+GO(cairo_pattern_get_color_stop_rgba, uFpippppp)
+GO(cairo_pattern_get_extend, uFp)
+GO(cairo_pattern_get_filter, uFp)
+GO(cairo_pattern_get_linear_points, uFppppp)
 GO(cairo_pattern_get_matrix, vFpp)
-GO(cairo_pattern_get_radial_circles, iFppppppp)
+GO(cairo_pattern_get_radial_circles, uFppppppp)
 GO(cairo_pattern_get_reference_count, uFp)
 GO(cairo_pattern_get_rgba, iFppppp)
-GO(cairo_pattern_get_surface, iFpp)
-GO(cairo_pattern_get_type, iFp)
+GO(cairo_pattern_get_surface, uFpp)
+GO(cairo_pattern_get_type, uFp)
 GO(cairo_pattern_get_user_data, pFpp)
 GO(cairo_pattern_reference, pFp)
-GO(cairo_pattern_set_extend, vFpi)
-GO(cairo_pattern_set_filter, vFpi)
+GO(cairo_pattern_set_extend, vFpu)
+GO(cairo_pattern_set_filter, vFpu)
 GO(cairo_pattern_set_matrix, vFpp)
 //GOM(cairo_pattern_set_user_data, iFEpppp)
-GO(cairo_pattern_status, iFp)
-//GO(cairo_pdf_get_versions, 
-//GO(cairo_pdf_surface_create, 
+GO(cairo_pattern_status, uFp)
+GO(cairo_pdf_get_versions, vFpp)
+GO(cairo_pdf_surface_create, pFpdd)
 //GO(cairo_pdf_surface_create_for_stream, 
-//GO(cairo_pdf_surface_restrict_to_version, 
-//GO(cairo_pdf_surface_set_size, 
-//GO(cairo_pdf_version_to_string, 
+GO(cairo_pdf_surface_restrict_to_version, vFpu)
+GO(cairo_pdf_surface_set_size, vFpdd)
+GO(cairo_pdf_version_to_string, pFu)
 GO(cairo_pop_group, pFp)
 GO(cairo_pop_group_to_source, vFp)
-//GO(cairo_ps_get_levels, 
-//GO(cairo_ps_level_to_string, 
-//GO(cairo_ps_surface_create, 
+GO(cairo_ps_get_levels, vFpp)
+GO(cairo_ps_level_to_string, pFu)
+GO(cairo_ps_surface_create, pFpdd)
 //GO(cairo_ps_surface_create_for_stream, 
-//GO(cairo_ps_surface_dsc_begin_page_setup, 
+GO(cairo_ps_surface_dsc_begin_page_setup, vFp)
 //GO(cairo_ps_surface_dsc_begin_setup, 
-//GO(cairo_ps_surface_dsc_comment, 
-//GO(cairo_ps_surface_get_eps, 
-//GO(cairo_ps_surface_restrict_to_level, 
-//GO(cairo_ps_surface_set_eps, 
-//GO(cairo_ps_surface_set_size, 
+GO(cairo_ps_surface_dsc_comment, vFpp)
+GO(cairo_ps_surface_get_eps, iFp)
+GO(cairo_ps_surface_restrict_to_level, vFpu)
+GO(cairo_ps_surface_set_eps, vFpi)
+GO(cairo_ps_surface_set_size, vFpdd)
 GO(cairo_push_group, vFp)
-GO(cairo_push_group_with_content, vFpi)
-//GO(cairo_raster_source_pattern_get_acquire, 
-//GO(cairo_raster_source_pattern_get_callback_data, 
-//GO(cairo_raster_source_pattern_get_copy, 
-//GO(cairo_raster_source_pattern_get_finish, 
-//GO(cairo_raster_source_pattern_get_snapshot, 
+GO(cairo_push_group_with_content, vFpu)
+GO(cairo_raster_source_pattern_get_acquire, vFppp)
+GO(cairo_raster_source_pattern_get_callback_data, pFp)
+GO(cairo_raster_source_pattern_get_copy, pFp)
+GO(cairo_raster_source_pattern_get_finish, pFp)
+GO(cairo_raster_source_pattern_get_snapshot, pFp)
 //GO(cairo_raster_source_pattern_set_acquire, 
-//GO(cairo_raster_source_pattern_set_callback_data, 
+GO(cairo_raster_source_pattern_set_callback_data, vFpp)
 //GO(cairo_raster_source_pattern_set_copy, 
 //GO(cairo_raster_source_pattern_set_finish, 
 //GO(cairo_raster_source_pattern_set_snapshot, 
-//GO(cairo_recording_surface_create, 
-//GO(cairo_recording_surface_get_extents, 
-//GO(cairo_recording_surface_ink_extents, 
+GO(cairo_recording_surface_create, pFup)
+GO(cairo_recording_surface_get_extents, iFpp)
+GO(cairo_recording_surface_ink_extents, vFppppp)
 GO(cairo_rectangle, vFpdddd)
 GO(cairo_rectangle_list_destroy, vFp)
 GO(cairo_reference, pFp)
 GO(cairo_region_contains_point, iFpii)
-GO(cairo_region_contains_rectangle, iFpp)
+GO(cairo_region_contains_rectangle, uFpp)
 GO(cairo_region_copy, pFp)
 GO(cairo_region_create, pFv)
 GO(cairo_region_create_rectangle, pFp)
@@ -225,14 +225,14 @@ GO(cairo_region_intersect_rectangle, iFpp)
 GO(cairo_region_is_empty, iFp)
 GO(cairo_region_num_rectangles, iFp)
 GO(cairo_region_reference, pFp)
-GO(cairo_region_status, iFp)
+GO(cairo_region_status, uFp)
 GO(cairo_region_subtract, iFpp)
 GO(cairo_region_subtract_rectangle, iFpp)
 GO(cairo_region_translate, vFpii)
 GO(cairo_region_union, iFpp)
 GO(cairo_region_union_rectangle, iFpp)
-GO(cairo_region_xor, iFpp)
-GO(cairo_region_xor_rectangle, iFpp)
+GO(cairo_region_xor, uFpp)
+GO(cairo_region_xor_rectangle, uFpp)
 GO(cairo_rel_curve_to, vFpdddddd)
 GO(cairo_rel_line_to, vFpdd)
 GO(cairo_rel_move_to, vFpdd)
@@ -250,36 +250,36 @@ GO(cairo_scaled_font_get_font_matrix, vFpp)
 GO(cairo_scaled_font_get_font_options, vFpp)
 GO(cairo_scaled_font_get_reference_count, uFp)
 GO(cairo_scaled_font_get_scale_matrix, vFpp)
-GO(cairo_scaled_font_get_type, iFp)
+GO(cairo_scaled_font_get_type, uFp)
 GO(cairo_scaled_font_get_user_data, pFpp)
 GO(cairo_scaled_font_glyph_extents, vFppip)
 GO(cairo_scaled_font_reference, pFp)
 //GOM(cairo_scaled_font_set_user_data, iFEpppp)
-GO(cairo_scaled_font_status, iFp)
+GO(cairo_scaled_font_status, uFp)
 GO(cairo_scaled_font_text_extents, vFppp)
-GO(cairo_scaled_font_text_to_glyphs, iFpddpippppp)
-//GO(cairo_script_create, 
+GO(cairo_scaled_font_text_to_glyphs, uFpddpippppp)
+GO(cairo_script_create, pFp)
 //GO(cairo_script_create_for_stream, 
-//GO(cairo_script_from_recording_surface, 
-//GO(cairo_script_get_mode, 
-//GO(cairo_script_set_mode, 
-//GO(cairo_script_surface_create, 
-//GO(cairo_script_surface_create_for_target, 
-//GO(cairo_script_write_comment, 
-GO(cairo_select_font_face, vFppii)
-GO(cairo_set_antialias, vFpi)
+GO(cairo_script_from_recording_surface, uFpp)
+GO(cairo_script_get_mode, uFp)
+GO(cairo_script_set_mode, vFpu)
+GO(cairo_script_surface_create, pFpudd)
+GO(cairo_script_surface_create_for_target, pFpp)
+GO(cairo_script_write_comment, vFppi)
+GO(cairo_select_font_face, vFppuu)
+GO(cairo_set_antialias, vFpu)
 GO(cairo_set_dash, vFppid)
-GO(cairo_set_fill_rule, vFpi)
+GO(cairo_set_fill_rule, vFpu)
 GO(cairo_set_font_face, vFpp)
 GO(cairo_set_font_matrix, vFpp)
 GO(cairo_set_font_options, vFpp)
 GO(cairo_set_font_size, vFpd)
-GO(cairo_set_line_cap, vFpi)
-GO(cairo_set_line_join, vFpi)
+GO(cairo_set_line_cap, vFpu)
+GO(cairo_set_line_join, vFpu)
 GO(cairo_set_line_width, vFpd)
 GO(cairo_set_matrix, vFpp)
 GO(cairo_set_miter_limit, vFpd)
-GO(cairo_set_operator, vFpi)
+GO(cairo_set_operator, vFpu)
 GO(cairo_set_scaled_font, vFpp)
 GO(cairo_set_source, vFpp)
 GO(cairo_set_source_rgb, vFpddd)
@@ -290,21 +290,21 @@ GO(cairo_set_tolerance, vFpd)
 GO(cairo_show_glyphs, vFppi)
 GO(cairo_show_page, vFp)
 GO(cairo_show_text, vFpp)
-GO(cairo_show_text_glyphs, vFppipipii)
-GO(cairo_status, iFp)
-//GO(cairo_status_to_string, 
+GO(cairo_show_text_glyphs, vFppipipiu)
+GO(cairo_status, uFp)
+GO(cairo_status_to_string, pFu)
 GO(cairo_stroke, vFp)
 GO(cairo_stroke_extents, vFppppp)
 GO(cairo_stroke_preserve, vFp)
 GO(cairo_surface_copy_page, vFp)
 GO(cairo_surface_create_for_rectangle, pFpdddd)
-//GO(cairo_surface_create_observer, 
-GO(cairo_surface_create_similar, pFppii)
-GO(cairo_surface_create_similar_image, pFppii)
+GO(cairo_surface_create_observer, pFpu)
+GO(cairo_surface_create_similar, pFpuii)
+GO(cairo_surface_create_similar_image, pFpiii)
 GO(cairo_surface_destroy, vFp)
 GO(cairo_surface_finish, vFp)
 GO(cairo_surface_flush, vFp)
-GO(cairo_surface_get_content, pFp)
+GO(cairo_surface_get_content, uFp)
 GO(cairo_surface_get_device, pFp)
 GO(cairo_surface_get_device_offset, vFppp)
 GO(cairo_surface_get_device_scale, vFpp)
@@ -312,7 +312,7 @@ GO(cairo_surface_get_fallback_resolution, vFppp)
 GO(cairo_surface_get_font_options, vFpp)
 GO(cairo_surface_get_mime_data, vFpppp)
 GO(cairo_surface_get_reference_count, uFp)
-GO(cairo_surface_get_type, iFp)
+GO(cairo_surface_get_type, uFp)
 GO(cairo_surface_get_user_data, pFpp)
 GO(cairo_surface_has_show_text_glyphs, iFp)
 GO(cairo_surface_map_to_image, pFpp)
@@ -325,7 +325,7 @@ GO(cairo_surface_mark_dirty_rectangle, vFpiiii)
 //GO(cairo_surface_observer_add_mask_callback, 
 //GO(cairo_surface_observer_add_paint_callback, 
 //GO(cairo_surface_observer_add_stroke_callback, 
-//GO(cairo_surface_observer_elapsed, 
+GO(cairo_surface_observer_elapsed, dFp)
 //GO(cairo_surface_observer_print, 
 GO(cairo_surface_reference, pFp)
 GO(cairo_surface_set_device_offset, vFpdd)
@@ -334,65 +334,65 @@ GO(cairo_surface_set_fallback_resolution, vFpdd)
 //GOM(cairo_surface_set_mime_data, iFEpppLpp)
 //GOM(cairo_surface_set_user_data, iFEpppp)
 GO(cairo_surface_show_page, vFp)
-GO(cairo_surface_status, iFp)
+GO(cairo_surface_status, uFp)
 GO(cairo_surface_supports_mime_type, iFpp)
 GO(cairo_surface_unmap_image, vFpp)
-//GO(cairo_surface_write_to_png, 
+GO(cairo_surface_write_to_png, uFpp)
 //GO(cairo_surface_write_to_png_stream, 
-//GO(cairo_svg_get_versions, 
-//GO(cairo_svg_surface_create, 
+GO(cairo_svg_get_versions, vFpp)
+GO(cairo_svg_surface_create, pFpdd)
 //GO(cairo_svg_surface_create_for_stream, 
-//GO(cairo_svg_surface_restrict_to_version, 
-//GO(cairo_svg_version_to_string, 
+GO(cairo_svg_surface_restrict_to_version, vFpu)
+GO(cairo_svg_version_to_string, pFu)
 GO(cairo_text_cluster_allocate, pFi)
 GO(cairo_text_cluster_free, vFp)
 GO(cairo_text_extents, vFppp)
 GO(cairo_text_path, vFpp)
-GO(cairo_toy_font_face_create, pFpii)
+GO(cairo_toy_font_face_create, pFpuu)
 GO(cairo_toy_font_face_get_family, pFp)
-GO(cairo_toy_font_face_get_slant, iFp)
-GO(cairo_toy_font_face_get_weight, iFp)
+GO(cairo_toy_font_face_get_slant, uFp)
+GO(cairo_toy_font_face_get_weight, uFp)
 GO(cairo_transform, vFpp)
 GO(cairo_translate, vFpdd)
-//GO(cairo_user_font_face_create, 
-//GO(cairo_user_font_face_get_init_func, 
-//GO(cairo_user_font_face_get_render_glyph_func, 
-//GO(cairo_user_font_face_get_text_to_glyphs_func, 
-//GO(cairo_user_font_face_get_unicode_to_glyph_func, 
+GO(cairo_user_font_face_create, pFv)
+GO(cairo_user_font_face_get_init_func, pFp)
+GO(cairo_user_font_face_get_render_glyph_func, pFp)
+GO(cairo_user_font_face_get_text_to_glyphs_func, pFp)
+GO(cairo_user_font_face_get_unicode_to_glyph_func, pFp)
 //GO(cairo_user_font_face_set_init_func, 
 //GO(cairo_user_font_face_set_render_glyph_func, 
 //GO(cairo_user_font_face_set_text_to_glyphs_func, 
 //GO(cairo_user_font_face_set_unicode_to_glyph_func, 
 GO(cairo_user_to_device, vFppp)
 GO(cairo_user_to_device_distance, vFppp)
-//GO(cairo_version, 
-//GO(cairo_version_string, 
-//GO(cairo_xcb_device_debug_cap_xrender_version, 
+GO(cairo_version, iFv)
+GO(cairo_version_string, pFv)
+GO(cairo_xcb_device_debug_cap_xrender_version, vFpii)
 //GO(cairo_xcb_device_debug_cap_xshm_version, 
-//GO(cairo_xcb_device_debug_get_precision, 
-//GO(cairo_xcb_device_debug_set_precision, 
-//GO(cairo_xcb_device_get_connection, 
-//GO(cairo_xcb_surface_create, 
-//GO(cairo_xcb_surface_create_for_bitmap, 
-//GO(cairo_xcb_surface_create_with_xrender_format, 
-//GO(cairo_xcb_surface_set_drawable, 
-//GO(cairo_xcb_surface_set_size, 
-//GO(cairo_xlib_device_debug_cap_xrender_version, 
-//GO(cairo_xlib_device_debug_get_precision, 
-//GO(cairo_xlib_device_debug_set_precision, 
+GO(cairo_xcb_device_debug_get_precision, iFp)
+GO(cairo_xcb_device_debug_set_precision, vFpi)
+GO(cairo_xcb_device_get_connection, pFp)
+GO(cairo_xcb_surface_create, pFpupii)
+GO(cairo_xcb_surface_create_for_bitmap, pFppuii)
+GO(cairo_xcb_surface_create_with_xrender_format, pFppupii)
+GO(cairo_xcb_surface_set_drawable, vFpuii)
+GO(cairo_xcb_surface_set_size, vFpii)
+GO(cairo_xlib_device_debug_cap_xrender_version, vFpii)
+GO(cairo_xlib_device_debug_get_precision, iFp)
+GO(cairo_xlib_device_debug_set_precision, vFpi)
 //GO(cairo_xlib_surface_create, 
-//GO(cairo_xlib_surface_create_for_bitmap, 
-//GO(cairo_xlib_surface_create_with_xrender_format, 
+GO(cairo_xlib_surface_create_for_bitmap, pFpLpii)
+GO(cairo_xlib_surface_create_with_xrender_format, pFpLppii)
 //GO(cairo_xlib_surface_get_depth, 
-//GO(cairo_xlib_surface_get_display, 
-//GO(cairo_xlib_surface_get_drawable, 
-//GO(cairo_xlib_surface_get_height, 
-//GO(cairo_xlib_surface_get_screen, 
+GO(cairo_xlib_surface_get_display, pFp)
+GO(cairo_xlib_surface_get_drawable, LFp)
+GO(cairo_xlib_surface_get_height, iFp)
+GO(cairo_xlib_surface_get_screen, pFp)
 //GO(cairo_xlib_surface_get_visual, 
 //GO(cairo_xlib_surface_get_width, 
-//GO(cairo_xlib_surface_get_xrender_format, 
-//GO(cairo_xlib_surface_set_drawable, 
-//GO(cairo_xlib_surface_set_size, 
+GO(cairo_xlib_surface_get_xrender_format, pFp)
+GO(cairo_xlib_surface_set_drawable, vFpLii)
+GO(cairo_xlib_surface_set_size, vFpii)
 //GO(cairo_xml_create, 
 //GO(cairo_xml_create_for_stream, 
 //GO(cairo_xml_for_recording_surface, 
diff --git a/src/wrapped/wrappedcairogobject_private.h b/src/wrapped/wrappedcairogobject_private.h
index 57894ae9..32245885 100644
--- a/src/wrapped/wrappedcairogobject_private.h
+++ b/src/wrapped/wrappedcairogobject_private.h
@@ -2,36 +2,36 @@
 #error meh!
 #endif
 
-GO(cairo_gobject_antialias_get_type, lFv)
-GO(cairo_gobject_content_get_type, lFv)
-GO(cairo_gobject_context_get_type, lFv)
-GO(cairo_gobject_device_get_type, lFv)
-GO(cairo_gobject_device_type_get_type, lFv)
-GO(cairo_gobject_extend_get_type, lFv)
-GO(cairo_gobject_fill_rule_get_type, lFv)
-GO(cairo_gobject_filter_get_type, lFv)
-GO(cairo_gobject_font_face_get_type, lFv)
-GO(cairo_gobject_font_options_get_type, lFv)
-GO(cairo_gobject_font_slant_get_type, lFv)
-GO(cairo_gobject_font_type_get_type, lFv)
-GO(cairo_gobject_font_weight_get_type, lFv)
-GO(cairo_gobject_format_get_type, lFv)
-GO(cairo_gobject_hint_metrics_get_type, lFv)
-GO(cairo_gobject_hint_style_get_type, lFv)
-GO(cairo_gobject_line_cap_get_type, lFv)
-GO(cairo_gobject_line_join_get_type, lFv)
-GO(cairo_gobject_matrix_get_type, lFv)
-GO(cairo_gobject_operator_get_type, lFv)
-GO(cairo_gobject_path_data_type_get_type, lFv)
-GO(cairo_gobject_pattern_get_type, lFv)
-GO(cairo_gobject_pattern_type_get_type, lFv)
-GO(cairo_gobject_rectangle_get_type, lFv)
-GO(cairo_gobject_rectangle_int_get_type, lFv)
-GO(cairo_gobject_region_get_type, lFv)
-GO(cairo_gobject_region_overlap_get_type, lFv)
-GO(cairo_gobject_scaled_font_get_type, lFv)
-GO(cairo_gobject_status_get_type, lFv)
-GO(cairo_gobject_subpixel_order_get_type, lFv)
-GO(cairo_gobject_surface_get_type, lFv)
-GO(cairo_gobject_surface_type_get_type, lFv)
-GO(cairo_gobject_text_cluster_flags_get_type, lFv)
+GO(cairo_gobject_antialias_get_type, LFv)
+GO(cairo_gobject_content_get_type, LFv)
+GO(cairo_gobject_context_get_type, LFv)
+GO(cairo_gobject_device_get_type, LFv)
+GO(cairo_gobject_device_type_get_type, LFv)
+GO(cairo_gobject_extend_get_type, LFv)
+GO(cairo_gobject_fill_rule_get_type, LFv)
+GO(cairo_gobject_filter_get_type, LFv)
+GO(cairo_gobject_font_face_get_type, LFv)
+GO(cairo_gobject_font_options_get_type, LFv)
+GO(cairo_gobject_font_slant_get_type, LFv)
+GO(cairo_gobject_font_type_get_type, LFv)
+GO(cairo_gobject_font_weight_get_type, LFv)
+GO(cairo_gobject_format_get_type, LFv)
+GO(cairo_gobject_hint_metrics_get_type, LFv)
+GO(cairo_gobject_hint_style_get_type, LFv)
+GO(cairo_gobject_line_cap_get_type, LFv)
+GO(cairo_gobject_line_join_get_type, LFv)
+GO(cairo_gobject_matrix_get_type, LFv)
+GO(cairo_gobject_operator_get_type, LFv)
+GO(cairo_gobject_path_data_type_get_type, LFv)
+GO(cairo_gobject_pattern_get_type, LFv)
+GO(cairo_gobject_pattern_type_get_type, LFv)
+GO(cairo_gobject_rectangle_get_type, LFv)
+GO(cairo_gobject_rectangle_int_get_type, LFv)
+GO(cairo_gobject_region_get_type, LFv)
+GO(cairo_gobject_region_overlap_get_type, LFv)
+GO(cairo_gobject_scaled_font_get_type, LFv)
+GO(cairo_gobject_status_get_type, LFv)
+GO(cairo_gobject_subpixel_order_get_type, LFv)
+GO(cairo_gobject_surface_get_type, LFv)
+GO(cairo_gobject_surface_type_get_type, LFv)
+GO(cairo_gobject_text_cluster_flags_get_type, LFv)