[STEAM] Added libnettle as prefer emulated with gnutls when steam runtime is detected

* [WRAPPERHELPER] Added a new --check-only option

* Review

CMakeLists.txt

@@ -842,6 +842,7 @@ set(WRAPPEDS
     "${BOX64_ROOT}/src/wrapped/wrappedproxy.c"
     "${BOX64_ROOT}/src/wrapped/wrappedssh4.c"
     "${BOX64_ROOT}/src/wrapped/wrappedsmbclient.c"
+    "${BOX64_ROOT}/src/wrapped/wrappedpixman1.c"
 )
 endif()
 if(ANDROID)

src/box64version.h

@@ -3,6 +3,6 @@
 
 #define BOX64_MAJOR 0
 #define BOX64_MINOR 4
-#define BOX64_REVISION 2
+#define BOX64_REVISION 3
 
 #endif //__BOX64_VERSION_H_

src/core.c

@@ -424,8 +424,10 @@ static void addLibPaths(box64context_t* context)
     GO("libpng12.so.0");
     GO("libpng16.so.16");
     GO("libcurl.so.4");
-    if(getenv("BOX64_PRESSURE_VESSEL_FILES"))   // use emulated gnutls in this case, it's safer
+    if(getenv("BOX64_PRESSURE_VESSEL_FILES")) {  // use emulated gnutls in this case, it's safer (nettle is a gnutls dependancy)
         GO("libgnutls.so.30");
+        GO("libnettle.so.8");
+    }
     GO("libtbbmalloc.so.2");
     GO("libtbbmalloc_proxy.so.2");
     GO("libicuuc.so.64");

src/dynarec/dynarec_native_functions.c

@@ -704,51 +704,67 @@ void native_aeskeygenassist(x64emu_t* emu, int gx, int ex, void* p, uint32_t u8)
     GX->ud[3] ^= u8;
 }
 
+static inline __int128 pclmul_4bit(uint64_t a, uint64_t b)
+{
+    __uint128_t result = 0;
+    __uint128_t op2 = b;
+    __uint128_t table[16];
+    table[0] = 0;
+    table[1] = op2;
+    table[2] = op2 << 1;
+    table[3] = table[2] ^ table[1];
+    table[4] = op2 << 2;
+    table[5] = table[4] ^ table[1];
+    table[6] = table[4] ^ table[2];
+    table[7] = table[6] ^ table[1];
+    table[8] = op2 << 3;
+    table[9] = table[8] ^ table[1];
+    table[10] = table[8] ^ table[2];
+    table[11] = table[10] ^ table[1];
+    table[12] = table[8] ^ table[4];
+    table[13] = table[12] ^ table[1];
+    table[14] = table[12] ^ table[2];
+    table[15] = table[14] ^ table[1];
+
+    for (int i = 0; i < 16; ++i) {
+        result ^= table[(a >> (i * 4)) & 0xf] << (i * 4);
+    }
+    return (__int128)result;
+}
+
 void native_pclmul(x64emu_t* emu, int gx, int ex, void* p, uint32_t u8)
 {
-    sse_regs_t *EX = p?((sse_regs_t*)p):&emu->xmm[ex];
-    sse_regs_t *GX = &emu->xmm[gx];
-    int g = (u8&1)?1:0;
-    int e = (u8&0b10000)?1:0;
-    __int128 result = 0;
-    __int128 op2 = EX->q[e];
-    for (int i=0; i<64; ++i)
-        if(GX->q[g]&(1LL<<i))
-            result ^= (op2<<i);
-    GX->u128 = result;
+    sse_regs_t* EX = p ? ((sse_regs_t*)p) : &emu->xmm[ex];
+    sse_regs_t* GX = &emu->xmm[gx];
+    int g = (u8 & 1) ? 1 : 0;
+    int e = (u8 & 0b10000) ? 1 : 0;
+
+    GX->u128 = pclmul_4bit(GX->q[g], EX->q[e]);
 }
+
 void native_pclmul_x(x64emu_t* emu, int gx, int vx, void* p, uint32_t u8)
 {
+    sse_regs_t* EX = ((uintptr_t)p > 15) ? (sse_regs_t*)p : &emu->xmm[(uintptr_t)p];
+    sse_regs_t* GX = &emu->xmm[gx];
+    sse_regs_t* VX = &emu->xmm[vx];
+    int g = (u8 & 1) ? 1 : 0;
+    int e = (u8 & 0b10000) ? 1 : 0;
 
-    sse_regs_t *EX = ((uintptr_t)p>15)?((sse_regs_t*)p):&emu->xmm[(uintptr_t)p];
-    sse_regs_t *GX = &emu->xmm[gx];
-    sse_regs_t *VX = &emu->xmm[vx];
-    int g = (u8&1)?1:0;
-    int e = (u8&0b10000)?1:0;
-    __int128 result = 0;
-    __int128 op2 = EX->q[e];
-    for (int i=0; i<64; ++i)
-        if(VX->q[g]&(1LL<<i))
-            result ^= (op2<<i);
-
-    GX->u128 = result;
+    GX->u128 = pclmul_4bit(VX->q[g], EX->q[e]);
 }
+
 void native_pclmul_y(x64emu_t* emu, int gy, int vy, void* p, uint32_t u8)
 {
-    //compute both low and high values
     native_pclmul_x(emu, gy, vy, p, u8);
-    sse_regs_t *EY = ((uintptr_t)p>15)?((sse_regs_t*)(p+16)):&emu->ymm[(uintptr_t)p];
-    sse_regs_t *GY = &emu->ymm[gy];
-    sse_regs_t *VY = &emu->ymm[vy];
-    int g = (u8&1)?1:0;
-    int e = (u8&0b10000)?1:0;
-    __int128 result = 0;
-    __int128 op2 = EY->q[e];
-    for (int i=0; i<64; ++i)
-        if(VY->q[g]&(1LL<<i))
-            result ^= (op2<<i);
 
-    GY->u128 = result;
+    sse_regs_t* EY = ((uintptr_t)p > 15) ? (sse_regs_t*)((char*)p + 16)
+                                         : &emu->ymm[(uintptr_t)p];
+    sse_regs_t* GY = &emu->ymm[gy];
+    sse_regs_t* VY = &emu->ymm[vy];
+    int g = (u8 & 1) ? 1 : 0;
+    int e = (u8 & 0b10000) ? 1 : 0;
+
+    GY->u128 = pclmul_4bit(VY->q[g], EY->q[e]);
 }
 
 static int flagsCacheNeedsTransform(dynarec_native_t* dyn, int ninst) {

src/dynarec/la64/dynarec_la64_0f.c

@@ -81,7 +81,7 @@ uintptr_t dynarec64_0F(dynarec_la64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
                 switch ((nextop >> 3) & 7) {
                     case 0:
                         INST_NAME("SGDT Ed");
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x3, x2, &fixedaddress, rex, NULL, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, x2, &fixedaddress, rex, NULL, 0, 0);
                         MOV32w(x1, 0x7f);
                         ST_H(x1, wback, 0);
                         if (rex.is32bits) {
@@ -94,7 +94,7 @@ uintptr_t dynarec64_0F(dynarec_la64_t* dyn, uintptr_t addr, uintptr_t ip, int ni
                         break;
                     case 1:
                         INST_NAME("SIDT Ed");
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x3, x2, &fixedaddress, rex, NULL, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, x2, &fixedaddress, rex, NULL, 0, 0);
                         MOV32w(x1, 0xfff);
                         ST_H(x1, wback, 0);
                         if (rex.is32bits) {

src/elfs/elfloader.c

@@ -2100,7 +2100,7 @@ EXPORT void PltResolver64(x64emu_t* emu)
             GetGlobalSymbolStartEnd(local_maplib, symname, &offs, &end, h, version, vername, veropt, (void**)&elfsym);
     }
     if (!offs) {
-        printf_log(LOG_NONE, "Error: PltResolver: Symbol %s %s(%sver %d: %s%s%s) not found, cannot apply R_X86_64_JUMP_SLOT %p in %s (local_maplib=%p, global maplib=%p, deepbind=%d)\n", (bind==STB_LOCAL)?"Local":((bind==STB_WEAK)?"Weak":""), symname, veropt?"opt":"", version, symname, vername?"@":"", vername?vername:"", p, (h && h->name)?h->name:"???", local_maplib, my_context->maplib, deepbind);
+        printf_log(LOG_NONE, "Error: PltResolver: Symbol %s%s(%sver %d: %s%s%s) not found, cannot apply R_X86_64_JUMP_SLOT %p in %s (local_maplib=%p, global maplib=%p, deepbind=%d)\n", (bind==STB_LOCAL)?"Local ":((bind==STB_WEAK)?"Weak ":""), symname, veropt?"opt":"", version, symname, vername?"@":"", vername?vername:"", p, (h && h->name)?h->name:"???", local_maplib, my_context->maplib, deepbind);
         emu->quit = 1;
         R_RIP = 0; //stop....
         return;

src/emu/x64printer.c

@@ -141,6 +141,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ")", tid, *(void**)(R_RSP), func, (uint64_t)R_RDI);
     } else if (w == uFd) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0]);
+    } else if (w == uFl) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI);
     } else if (w == uFL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI);
     } else if (w == uFp) {
@@ -299,8 +301,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI);
     } else if (w == vFUu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (uint64_t)R_RDI, (uint32_t)R_RSI);
-    } else if (w == vFfi) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], (int32_t)R_RDI);
     } else if (w == vFfC) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIu8 ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], (uint8_t)R_RDI);
     } else if (w == vFff) {
@@ -355,10 +355,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI);
     } else if (w == iFEu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI);
-    } else if (w == iFEf) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0]);
-    } else if (w == iFEd) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0]);
     } else if (w == iFEp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI);
     } else if (w == iFwp) {
@@ -477,12 +473,18 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (uint64_t)R_RSI);
     } else if (w == CFpi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI);
+    } else if (w == CFpC) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu8 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint8_t)R_RSI);
     } else if (w == CFpu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI);
+    } else if (w == CFpU) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI);
     } else if (w == CFpL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI);
     } else if (w == CFpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI);
+    } else if (w == WFEp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI);
     } else if (w == WFpi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI);
     } else if (w == WFpW) {
@@ -563,6 +565,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], emu->xmm[1].f[0]);
     } else if (w == fFfD) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRILf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], LD2localLD((void*)(R_RSP + 8)));
+    } else if (w == fFfl) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], (intptr_t)R_RDI);
     } else if (w == fFfp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIp ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], (void*)R_RDI);
     } else if (w == fFpi) {
@@ -587,6 +591,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0], emu->xmm[1].d[0]);
     } else if (w == dFdD) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRILf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0], LD2localLD((void*)(R_RSP + 8)));
+    } else if (w == dFdl) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0], (intptr_t)R_RDI);
     } else if (w == dFdp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIp ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0], (void*)R_RDI);
     } else if (w == dFll) {
@@ -613,6 +619,10 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI);
     } else if (w == lFEi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI);
+    } else if (w == lFEf) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0]);
+    } else if (w == lFEd) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0]);
     } else if (w == lFii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (int32_t)R_RSI);
     } else if (w == lFiL) {
@@ -621,8 +631,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (void*)R_RSI);
     } else if (w == lFui) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI);
-    } else if (w == lFDD) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRILf ", %" PRILf ")", tid, *(void**)(R_RSP), func, LD2localLD((void*)(R_RSP + 8)), LD2localLD((void*)(R_RSP + 24)));
     } else if (w == lFll) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI, (intptr_t)R_RSI);
     } else if (w == lFpi) {
@@ -1003,6 +1011,10 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (uint64_t)R_RDI, (uint64_t)R_RSI);
     } else if (w == iFEpi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI);
+    } else if (w == iFEpW) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu16 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint16_t)R_RSI);
+    } else if (w == iFEpu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI);
     } else if (w == iFEpU) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI);
     } else if (w == iFEpL) {
@@ -1105,6 +1117,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX);
     } else if (w == iFfff) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]);
+    } else if (w == iFLip) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX);
     } else if (w == iFLpi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX);
     } else if (w == iFLpL) {
@@ -1215,8 +1229,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX);
     } else if (w == iFppU) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX);
-    } else if (w == iFppf) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, emu->xmm[0].f[0]);
     } else if (w == iFppd) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0]);
     } else if (w == iFppl) {
@@ -1257,12 +1269,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX);
     } else if (w == WFppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX);
-    } else if (w == uFEpW) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu16 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint16_t)R_RSI);
-    } else if (w == uFEpu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI);
-    } else if (w == uFEpU) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI);
     } else if (w == uFEpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI);
     } else if (w == uFiuu) {
@@ -1389,8 +1395,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI, (void*)R_RSI, (intptr_t)R_RDX);
     } else if (w == fFppi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX);
-    } else if (w == fFppL) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX);
     } else if (w == fFppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX);
     } else if (w == dFuud) {
@@ -1455,6 +1459,12 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX);
     } else if (w == lFppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX);
+    } else if (w == LFEpW) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu16 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint16_t)R_RSI);
+    } else if (w == LFEpu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI);
+    } else if (w == LFEpU) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI);
     } else if (w == LFEpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI);
     } else if (w == LFEpA) {
@@ -1619,8 +1629,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX);
     } else if (w == pFLpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX);
-    } else if (w == pFpcU) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi8 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int8_t)R_RSI, (uint64_t)R_RDX);
+    } else if (w == pFpcL) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi8 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int8_t)R_RSI, (uintptr_t)R_RDX);
     } else if (w == pFpii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX);
     } else if (w == pFpiu) {
@@ -1725,8 +1735,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX);
     } else if (w == vFEpLp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX);
-    } else if (w == vFEppi) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX);
     } else if (w == vFEppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX);
     } else if (w == vFEppV) {
@@ -2001,6 +2009,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX);
     } else if (w == vFpLpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX);
+    } else if (w == vFppww) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi16 ", %" PRIi16 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int16_t)R_RDX, (int16_t)R_RCX);
     } else if (w == vFppii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX);
     } else if (w == vFppiu) {
@@ -2223,6 +2233,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX);
     } else if (w == iFpiid) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[0].d[0]);
+    } else if (w == iFpiil) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX);
     } else if (w == iFpiiL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX);
     } else if (w == iFpiip) {
@@ -2303,6 +2315,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX);
     } else if (w == iFpuup) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX);
+    } else if (w == iFpuUi) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (int32_t)R_RCX);
     } else if (w == iFpufp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIf ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0], (void*)R_RDX);
     } else if (w == iFpuLi) {
@@ -2323,12 +2337,14 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX);
     } else if (w == iFpupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX);
-    } else if (w == iFpupV) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8));
     } else if (w == iFpUup) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX);
     } else if (w == iFpUUu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX);
+    } else if (w == iFpUUp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX);
+    } else if (w == iFpUpu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX);
     } else if (w == iFpUpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX);
     } else if (w == iFpfii) {
@@ -2375,8 +2391,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX);
     } else if (w == iFpLpi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX);
-    } else if (w == iFpLpu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX);
     } else if (w == iFpLpf) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, emu->xmm[0].f[0]);
     } else if (w == iFpLpd) {
@@ -2387,6 +2401,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX);
     } else if (w == iFpLpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX);
+    } else if (w == iFpLpV) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8));
     } else if (w == iFppcc) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi8 ", %" PRIi8 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int8_t)R_RDX, (int8_t)R_RCX);
     } else if (w == iFppii) {
@@ -2465,6 +2481,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX);
     } else if (w == iFpppd) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].d[0]);
+    } else if (w == iFpppl) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX);
     } else if (w == iFpppL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX);
     } else if (w == iFpppp) {
@@ -2665,8 +2683,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX);
     } else if (w == lFEppL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX);
-    } else if (w == lFEppp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX);
     } else if (w == lFiiLu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIi32 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX);
     } else if (w == lFiipL) {
@@ -2873,8 +2889,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]);
     } else if (w == pFDipp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRILf ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, LD2localLD((void*)(R_RSP + 8)), (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX);
-    } else if (w == pFlfff) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]);
     } else if (w == pFLiip) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX);
     } else if (w == pFLupp) {
@@ -3021,8 +3035,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8));
     } else if (w == vFEpipA) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX);
-    } else if (w == vFEpuup) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX);
     } else if (w == vFEpuuV) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)(R_RSP + 8));
     } else if (w == vFEpuuA) {
@@ -3049,8 +3061,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX);
     } else if (w == vFEpppu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX);
-    } else if (w == vFEpppL) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX);
     } else if (w == vFEpppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX);
     } else if (w == vFiiiii) {
@@ -3231,8 +3241,12 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8);
     } else if (w == vFLpppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
+    } else if (w == vFpwwip) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi16 ", %" PRIi16 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX, (int32_t)R_RCX, (void*)R_R8);
     } else if (w == vFpwwWW) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi16 ", %" PRIi16 ", %" PRIu16 ", %" PRIu16 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8);
+    } else if (w == vFpwiip) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi16 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int16_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8);
     } else if (w == vFpiiii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8);
     } else if (w == vFpiiiu) {
@@ -3545,6 +3559,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == iFupupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
+    } else if (w == iFuppip) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8);
     } else if (w == iFuppLp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8);
     } else if (w == iFupppp) {
@@ -3561,8 +3577,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi16 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == iFpiiii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8);
-    } else if (w == iFpiiiu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8);
     } else if (w == iFpiiiL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8);
     } else if (w == iFpiiip) {
@@ -3645,14 +3659,14 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8);
     } else if (w == iFpuupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
+    } else if (w == iFpuUup) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8);
     } else if (w == iFpuUpU) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (uint64_t)R_R8);
     } else if (w == iFpulup) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8);
     } else if (w == iFpulpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8);
-    } else if (w == iFpuLup) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8);
     } else if (w == iFpuLpL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8);
     } else if (w == iFpuLpp) {
@@ -3839,8 +3853,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == IFpLIII) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIi64 ", %" PRIi64 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8);
-    } else if (w == IFppIII) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIi64 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8);
     } else if (w == uFEiupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX);
     } else if (w == uFEippp) {
@@ -4099,6 +4111,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX);
     } else if (w == pFEpppu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX);
+    } else if (w == pFEpppL) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX);
     } else if (w == pFEpppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX);
     } else if (w == pFEpppV) {
@@ -4117,6 +4131,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8);
     } else if (w == pFuiiiu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8);
+    } else if (w == pFuiipi) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8);
     } else if (w == pFuiupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == pFuuiip) {
@@ -4293,14 +4309,14 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == vFEpippp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
-    } else if (w == vFEpuipp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == vFEpuipV) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8));
     } else if (w == vFEpuipA) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == vFEpuppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
+    } else if (w == vFEpLipp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == vFEpLLpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == vFEppupp) {
@@ -4345,8 +4361,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu8 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint8_t)R_R9);
     } else if (w == vFuiuiil) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (intptr_t)R_R9);
-    } else if (w == vFuiuiip) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9);
     } else if (w == vFuiuiuu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9);
     } else if (w == vFuiuiuU) {
@@ -4459,6 +4473,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9);
     } else if (w == vFpiilli) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi64 ", %" PRIi64 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9);
+    } else if (w == vFpiipii) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9);
     } else if (w == vFpiippi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9);
     } else if (w == vFpiippp) {
@@ -4479,6 +4495,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9);
     } else if (w == vFpuiipp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9);
+    } else if (w == vFpuuiii) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9);
     } else if (w == vFpuuuiu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9);
     } else if (w == vFpuuuuu) {
@@ -4505,6 +4523,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9);
     } else if (w == vFpupppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
+    } else if (w == vFpUUUUu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint32_t)R_R9);
     } else if (w == vFpdddii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], (int32_t)R_RSI, (int32_t)R_RDX);
     } else if (w == vFpddddd) {
@@ -4517,8 +4537,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uintptr_t)R_R9);
     } else if (w == vFpLiipi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9);
-    } else if (w == vFpLLLLu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9);
     } else if (w == vFpLpLLL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9);
     } else if (w == vFpLpppi) {
@@ -4577,8 +4595,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9);
     } else if (w == vFppLppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
-    } else if (w == vFpppiii) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9);
     } else if (w == vFpppiip) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9);
     } else if (w == vFpppiui) {
@@ -4787,8 +4803,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu16 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == iFpuiCpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIu8 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (void*)R_R8, (void*)R_R9);
-    } else if (w == iFpuiLpp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9);
+    } else if (w == iFpuiUpp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == iFpuippp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == iFpuuuii) {
@@ -4811,8 +4827,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9);
     } else if (w == iFpuuppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
-    } else if (w == iFpuLuLu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIu32 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9);
+    } else if (w == iFpuUuUu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIu32 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX, (uint64_t)R_R8, (uint32_t)R_R9);
     } else if (w == iFpuLLpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == iFpupupi) {
@@ -4827,6 +4843,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9);
     } else if (w == iFpupppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
+    } else if (w == iFpUUUUu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint32_t)R_R9);
     } else if (w == iFpdpipp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIf ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, emu->xmm[0].d[0], (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == iFpLiiiL) {
@@ -4847,8 +4865,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu32 ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9);
     } else if (w == iFpLuppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
-    } else if (w == iFpLLLLu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9);
     } else if (w == iFpLLLLL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9);
     } else if (w == iFpLLLLp) {
@@ -4871,6 +4887,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9);
     } else if (w == iFppiiip) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9);
+    } else if (w == iFppiiuu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9);
     } else if (w == iFppiipi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9);
     } else if (w == iFppiipL) {
@@ -4907,6 +4925,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == iFppuIII) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi64 ", %" PRIi64 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9);
+    } else if (w == iFppuIup) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int64_t)R_RCX, (uint32_t)R_R8, (void*)R_R9);
     } else if (w == iFppuuLp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9);
     } else if (w == iFppuupL) {
@@ -4915,8 +4935,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == iFppufff) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]);
-    } else if (w == iFppulup) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (intptr_t)R_RCX, (uint32_t)R_R8, (void*)R_R9);
     } else if (w == iFppulll) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi64 ", %" PRIi64 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (intptr_t)R_R9);
     } else if (w == iFppuLpp) {
@@ -5119,8 +5137,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9);
     } else if (w == lFEippLL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8);
-    } else if (w == lFEpippp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == lFipipLu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uint32_t)R_R9);
     } else if (w == lFipLipu) {
@@ -5145,6 +5161,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == LFELpppu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8);
+    } else if (w == LFEpippp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == LFEpuppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8);
     } else if (w == LFEpLppu) {
@@ -5153,14 +5171,16 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8);
     } else if (w == LFpipipi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9);
+    } else if (w == LFpuuupL) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9);
     } else if (w == LFplplpl) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (intptr_t)R_R9);
     } else if (w == LFpLippp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == LFpLLLLL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9);
-    } else if (w == LFppipLp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9);
+    } else if (w == LFppupLp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9);
     } else if (w == LFpplplp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8, (void*)R_R9);
     } else if (w == LFppLLpL) {
@@ -5241,8 +5261,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9);
     } else if (w == pFpiippp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
-    } else if (w == pFpiuuup) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9);
     } else if (w == pFpidddd) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]);
     } else if (w == pFpiLLLL) {
@@ -5297,6 +5315,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9);
     } else if (w == pFppiiup) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9);
+    } else if (w == pFppiipi) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9);
     } else if (w == pFppiipp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == pFppiIll) {
@@ -5491,6 +5511,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (void*)R_R9, *(intptr_t*)(R_RSP + 8));
     } else if (w == vFLpuLpLp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu64 ", %" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIp ", %" PRIu64 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uintptr_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8));
+    } else if (w == vFpiiiiii) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (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));
     } else if (w == vFpiiiipp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
     } else if (w == vFpiiliip) {
@@ -5631,8 +5653,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
     } else if (w == iFEilpppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
-    } else if (w == iFElppppp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == iFEpipupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == iFEpupppp) {
@@ -5699,8 +5719,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8));
     } else if (w == iFpiipppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
-    } else if (w == iFpiuiipp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (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));
     } else if (w == iFpiuuuiu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (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));
     } else if (w == iFpiuLiii) {
@@ -5779,8 +5797,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8));
     } else if (w == iFppiiiii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (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));
-    } else if (w == iFppiiiip) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (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));
     } else if (w == iFppiiLll) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIu64 ", %" PRIi64 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8, (intptr_t)R_R9, *(intptr_t*)(R_RSP + 8));
     } else if (w == iFppiipii) {
@@ -5815,6 +5831,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
     } else if (w == iFppupppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
+    } else if (w == iFppUUUUu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(uint32_t*)(R_RSP + 8));
     } else if (w == iFppliupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIi32 ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
     } else if (w == iFppLiipp) {
@@ -5827,8 +5845,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8));
     } else if (w == iFppLLupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
-    } else if (w == iFppLLLLu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(uint32_t*)(R_RSP + 8));
     } else if (w == iFppLpLpL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (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));
     } else if (w == iFppLpppp) {
@@ -5849,10 +5865,10 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
     } else if (w == iFpppuiii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8));
+    } else if (w == iFpppuIup) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int64_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8));
     } else if (w == iFpppuupu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8));
-    } else if (w == iFpppulup) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi64 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (intptr_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8));
     } else if (w == iFpppLppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8));
     } else if (w == iFppppilp) {
@@ -5881,10 +5897,14 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == uFEiipppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
+    } else if (w == uFElppppp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == uFEpiuppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == uFEpuuppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
+    } else if (w == uFEpppLpp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == uFEpppppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9);
     } else if (w == uFiiiuuuu) {
@@ -5925,6 +5945,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8));
     } else if (w == dFppppppL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8));
+    } else if (w == lFppiiiip) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (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));
     } else if (w == lFpppplpl) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(intptr_t*)(R_RSP + 8));
     } else if (w == LFEppLppU) {
@@ -6299,8 +6321,12 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16));
     } else if (w == iFdiippppL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0], (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8));
+    } else if (w == iFpiiiiiiu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (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), *(uint32_t*)(R_RSP + 16));
     } else if (w == iFpiiupppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16));
+    } else if (w == iFpiuiiLLL) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16));
     } else if (w == iFpipiipip) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16));
     } else if (w == iFpippiiii) {
@@ -6339,8 +6365,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16));
     } else if (w == iFpuuppppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (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**)(R_RSP + 16));
-    } else if (w == iFpuLLLppL) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16));
+    } else if (w == iFpuUUUppU) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint64_t*)(R_RSP + 16));
     } else if (w == iFpupupuup) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16));
     } else if (w == iFpupppppp) {
@@ -6373,8 +6399,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi64 ", %" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16));
     } else if (w == iFppipiipi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16));
-    } else if (w == iFppIIIppp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIi64 ", %" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16));
     } else if (w == iFppuiiuuu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)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));
     } else if (w == iFppuuuuuu) {
@@ -6623,14 +6647,14 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ", %" PRIu8 ", %" PRIu8 ", %" PRIu8 ", %" PRIu8 ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], emu->xmm[1].f[0], (uint8_t)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0]);
     } else if (w == vFddddddddd) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], emu->xmm[4].d[0], emu->xmm[5].d[0], emu->xmm[6].d[0], emu->xmm[7].d[0], *(double*)(R_RSP + 8));
+    } else if (w == vFpiuiuiiLL) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu64 ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24));
     } else if (w == vFpiuippppi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_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), *(int32_t*)(R_RSP + 24));
     } else if (w == vFpiLLpiipi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu64 ", %" PRIu64 ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24));
     } else if (w == vFpiLpLiipi) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIu64 ", %" PRIp ", %" PRIu64 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24));
-    } else if (w == vFpipiuiipp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24));
     } else if (w == vFpuuCiuuuu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIu8 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint8_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24));
     } else if (w == vFpuuuuuuuu) {
@@ -6857,6 +6881,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24));
     } else if (w == pFpiiiiuuuu) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (int32_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), *(uint32_t*)(R_RSP + 24));
+    } else if (w == pFpiiuuuuii) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)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), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24));
     } else if (w == pFpLpLLipui) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIi32 ", %" PRIp ", %" PRIu32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24));
     } else if (w == pFpLppLLiLi) {
@@ -6939,6 +6965,10 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi64 ", %" PRIi64 ", %" PRIf ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, emu->xmm[0].d[0], (void*)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(intptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(intptr_t*)(R_RSP + 24));
     } else if (w == vFullpplplpl) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi64 ", %" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (intptr_t)R_R9, *(void**)(R_RSP + 8), *(intptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(intptr_t*)(R_RSP + 32));
+    } else if (w == vFuppiiiipip) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32));
+    } else if (w == vFuppuiiiiip) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (void*)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), *(void**)(R_RSP + 32));
     } else if (w == vFffffffffff) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0], emu->xmm[6].f[0], emu->xmm[7].f[0], *(float*)(R_RSP + 8), *(float*)(R_RSP + 16));
     } else if (w == vFpiuippppip) {
@@ -6989,8 +7019,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24));
     } else if (w == iFEpupppLppL) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24));
-    } else if (w == iFEppiiiippp) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (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), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24));
     } else if (w == iFEppLuppupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24));
     } else if (w == iFEppppLpppp) {
@@ -7053,6 +7081,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIf ", %" PRIf ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (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));
     } else if (w == uFpppppppppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (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));
+    } else if (w == lFEppiiiippp) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (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), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24));
     } else if (w == lFpLppdddddd) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], emu->xmm[4].d[0], emu->xmm[5].d[0]);
     } else if (w == pFEiuppppppp) {
@@ -7255,6 +7285,10 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIu32 ", %" PRIi64 ", %" PRIi64 ", %" PRIf ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ", %" PRIf ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, emu->xmm[0].d[0], (void*)R_R8, (intptr_t)R_R9, *(void**)(R_RSP + 8), *(intptr_t*)(R_RSP + 16), emu->xmm[1].d[0], *(void**)(R_RSP + 24), *(intptr_t*)(R_RSP + 32));
     } else if (w == vFuullpplplppl) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIu32 ", %" PRIi64 ", %" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIi64 ", %" PRIp ", %" PRIp ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (void*)R_R9, *(intptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(intptr_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(intptr_t*)(R_RSP + 48));
+    } else if (w == vFupppwwwwwwWW) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIi16 ", %" PRIi16 ", %" PRIi16 ", %" PRIi16 ", %" PRIi16 ", %" PRIi16 ", %" PRIu16 ", %" PRIu16 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(int16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(int16_t*)(R_RSP + 24), *(int16_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(uint16_t*)(R_RSP + 48));
+    } else if (w == vFupppiiiiiiii) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48));
     } else if (w == vFffffffffffff) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0], emu->xmm[6].f[0], emu->xmm[7].f[0], *(float*)(R_RSP + 8), *(float*)(R_RSP + 16), *(float*)(R_RSP + 24), *(float*)(R_RSP + 32));
     } else if (w == vFpiLLpiiiipii) {
@@ -7307,10 +7341,14 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIu64 ", %" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(uintptr_t*)(R_RSP + 48));
     } else if (w == iFpLpppppppppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48));
+    } else if (w == iFppiiiiiiiiii) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (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), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48));
     } else if (w == iFppLlliLppppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIi64 ", %" PRIi64 ", %" PRIi32 ", %" PRIu64 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (int32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48));
     } else if (w == iFpppipipiipii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48));
+    } else if (w == iFppppwwwwwwWW) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIi16 ", %" PRIi16 ", %" PRIi16 ", %" PRIi16 ", %" PRIi16 ", %" PRIi16 ", %" PRIu16 ", %" PRIu16 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(int16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(int16_t*)(R_RSP + 24), *(int16_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(uint16_t*)(R_RSP + 48));
     } else if (w == iFpppppppppppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48));
     } else if (w == uFpuupppppuuuu) {
@@ -7321,8 +7359,8 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu64 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu64 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40));
     } else if (w == pFEppppppppppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40));
-    } else if (w == pFWWiCCCCiipup) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu16 ", %" PRIu16 ", %" PRIi32 ", %" PRIu8 ", %" PRIu8 ", %" PRIu8 ", %" PRIu8 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint16_t)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48));
+    } else if (w == pFWWuCCCCuupup) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu16 ", %" PRIu16 ", %" PRIu32 ", %" PRIu8 ", %" PRIu8 ", %" PRIu8 ", %" PRIu8 ", %" PRIu32 ", %" PRIu32 ", %" PRIp ", %" PRIu32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint16_t)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9, *(uint8_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48));
     } else if (w == pFppippLLLiLpp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIi32 ", %" PRIu64 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uintptr_t*)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48));
     } else if (w == pFppuuppppuppp) {
@@ -7437,14 +7475,16 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64));
     } else if (w == iFpipppppppppppp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64));
+    } else if (w == iFpuLwwWWwwWWpuu) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu64 ", %" PRIi16 ", %" PRIi16 ", %" PRIu16 ", %" PRIu16 ", %" PRIi16 ", %" PRIi16 ", %" PRIu16 ", %" PRIu16 ", %" PRIp ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (int16_t)R_RCX, (int16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(int16_t*)(R_RSP + 24), *(uint16_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(uint32_t*)(R_RSP + 56), *(uint32_t*)(R_RSP + 64));
     } else if (w == iFppupppLLLLpupp) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIu64 ", %" PRIp ", %" PRIu32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uintptr_t*)(R_RSP + 24), *(uintptr_t*)(R_RSP + 32), *(void**)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64));
-    } else if (w == iFpppwwWWwwWWpuu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIi16 ", %" PRIi16 ", %" PRIu16 ", %" PRIu16 ", %" PRIi16 ", %" PRIi16 ", %" PRIu16 ", %" PRIu16 ", %" PRIp ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int16_t)R_RCX, (int16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(int16_t*)(R_RSP + 24), *(uint16_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(uint32_t*)(R_RSP + 56), *(uint32_t*)(R_RSP + 64));
     } else if (w == vFuiiiiiuiiiiilll) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi64 ", %" PRIi64 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(intptr_t*)(R_RSP + 56), *(intptr_t*)(R_RSP + 64), *(intptr_t*)(R_RSP + 72));
     } else if (w == vFuuiiiiuuiiiiiii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(int32_t*)(R_RSP + 72));
+    } else if (w == vFuppuiiiiiiiipip) {
+        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIu32 ", %" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (uint32_t)R_RDI, (void*)R_RSI, (void*)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), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(void**)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(void**)(R_RSP + 72));
     } else if (w == vFfffffffffffffff) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ", %" PRIf ")", tid, *(void**)(R_RSP), func, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0], emu->xmm[6].f[0], emu->xmm[7].f[0], *(float*)(R_RSP + 8), *(float*)(R_RSP + 16), *(float*)(R_RSP + 24), *(float*)(R_RSP + 32), *(float*)(R_RSP + 40), *(float*)(R_RSP + 48), *(float*)(R_RSP + 56));
     } else if (w == vFppUpUUpUUpUUuuu) {
@@ -7507,8 +7547,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIp ", %" PRIu64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64), *(void**)(R_RSP + 72), *(void**)(R_RSP + 80), *(uintptr_t*)(R_RSP + 88));
     } else if (w == pFppippipipipipipip) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)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**)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(void**)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(void**)(R_RSP + 72), *(int32_t*)(R_RSP + 80), *(void**)(R_RSP + 88));
-    } else if (w == vFppuiiiiipuiiiiiiii) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (void*)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**)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(int32_t*)(R_RSP + 72), *(int32_t*)(R_RSP + 80), *(int32_t*)(R_RSP + 88), *(int32_t*)(R_RSP + 96));
     } else if (w == vFppuuiiiipuuiiiiiii) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ", %" PRIi32 ")", tid, *(void**)(R_RSP), func, (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), *(void**)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(int32_t*)(R_RSP + 72), *(int32_t*)(R_RSP + 80), *(int32_t*)(R_RSP + 88), *(int32_t*)(R_RSP + 96));
     } else if (w == vFpppipppppppppppppp) {
@@ -7642,8 +7680,6 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi32 ", %" PRIp ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
 #endif
 #if !defined(STATICBUILD)
-    } else if (w == iFEpu) {
-        snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI);
     } else if (w == iFlip) {
         snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIi64 ", %" PRIi32 ", %" PRIp ")", tid, *(void**)(R_RSP), func, (intptr_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX);
     } else if (w == iFLLi) {

src/include/gtkclass.h

@@ -1992,7 +1992,7 @@ typedef struct my_GstAggregatorClass_s {
   int       (*sink_event_pre_queue) (void* self, void* aggregator_pad, void* event);
   int       (*sink_query_pre_queue) (void* self, void* aggregator_pad, void* query);
   int       (*finish_buffer_list)   (void* self, void* bufferlist);
-  void      (*peek_next_sample)     (void* self, void* aggregator_pad);
+  void*     (*peek_next_sample)     (void* self, void* aggregator_pad);
   void*      _gst_reserved[20-5];
 } my_GstAggregatorClass_t;
 

src/library_list.h

@@ -303,6 +303,8 @@ GO("libproxy.so", proxy)
 GO("libssh.so.4", ssh4)
 GO("libsmbclient.so.0", smbclient)
 GO("libsmbclient.so", smbclient)
+GO("libpixman-1.so.0", pixman1)
+GO("libpixman-1.so", pixman1)
 
 GO("libc.so", libc)
 GO("libm.so", libm)

src/mallochook.c

@@ -774,7 +774,7 @@ EXPORT void* my_safer_scalable_aligned_realloc(void* p, size_t size, size_t alig
     void* new_p = actual_memalign(align, size);
     memcpy(new_p, p, (old_size<size)?old_size:size);
     actual_free(p);
-    return p;
+    return new_p;
 }
 
 EXPORT void my_safer_scalable_free(void*p , void* old)
@@ -822,7 +822,7 @@ EXPORT void* my_scalable_aligned_realloc(void* p, size_t size, size_t align)
     void* new_p = actual_memalign(align, size);
     memcpy(new_p, p, (old_size<size)?old_size:size);
     actual_free(p);
-    return p;
+    return new_p;
 }
 
 EXPORT size_t my_scalable_msize(void* p)

src/tools/gtkclass.c

@@ -31,11 +31,8 @@ for match in unique_sorted_matches:
     print(f'void {match}(x64emu_t *emu, uintptr_t fnc);')
 */
 
-void UFp(x64emu_t* emu, uintptr_t fnc);
 void iFL(x64emu_t* emu, uintptr_t fnc);
 void iFp(x64emu_t* emu, uintptr_t fnc);
-void iFpUU(x64emu_t* emu, uintptr_t fnc);
-void iFpUup(x64emu_t* emu, uintptr_t fnc);
 void iFpi(x64emu_t* emu, uintptr_t fnc);
 void iFpii(x64emu_t* emu, uintptr_t fnc);
 void iFpiii(x64emu_t* emu, uintptr_t fnc);
@@ -44,38 +41,42 @@ void iFpip(x64emu_t* emu, uintptr_t fnc);
 void iFpipLpp(x64emu_t* emu, uintptr_t fnc);
 void iFpippp(x64emu_t* emu, uintptr_t fnc);
 void iFpp(x64emu_t* emu, uintptr_t fnc);
-void iFppLp(x64emu_t* emu, uintptr_t fnc);
-void iFppU(x64emu_t* emu, uintptr_t fnc);
-void iFppUup(x64emu_t* emu, uintptr_t fnc);
 void iFppdd(x64emu_t* emu, uintptr_t fnc);
 void iFppi(x64emu_t* emu, uintptr_t fnc);
 void iFppii(x64emu_t* emu, uintptr_t fnc);
 void iFppiiu(x64emu_t* emu, uintptr_t fnc);
+void iFppLp(x64emu_t* emu, uintptr_t fnc);
 void iFppp(x64emu_t* emu, uintptr_t fnc);
 void iFpppi(x64emu_t* emu, uintptr_t fnc);
 void iFpppp(x64emu_t* emu, uintptr_t fnc);
+void iFppppi(x64emu_t* emu, uintptr_t fnc);
 void iFppppp(x64emu_t* emu, uintptr_t fnc);
+void iFppppppi(x64emu_t* emu, uintptr_t fnc);
+void iFpppU(x64emu_t* emu, uintptr_t fnc);
+void iFppU(x64emu_t* emu, uintptr_t fnc);
+void iFppUup(x64emu_t* emu, uintptr_t fnc);
 void iFpu(x64emu_t* emu, uintptr_t fnc);
 void iFpupp(x64emu_t* emu, uintptr_t fnc);
-void iFppppi(x64emu_t* emu, uintptr_t fnc);
-void iFppppppi(x64emu_t* emu, uintptr_t fnc);
+void iFpUU(x64emu_t* emu, uintptr_t fnc);
+void iFpUup(x64emu_t* emu, uintptr_t fnc);
 void pFL(x64emu_t* emu, uintptr_t fnc);
 void pFLup(x64emu_t* emu, uintptr_t fnc);
 void pFp(x64emu_t* emu, uintptr_t fnc);
-void pFpLi(x64emu_t* emu, uintptr_t fnc);
-void pFpLp(x64emu_t* emu, uintptr_t fnc);
 void pFpi(x64emu_t* emu, uintptr_t fnc);
 void pFpipp(x64emu_t* emu, uintptr_t fnc);
+void pFpLi(x64emu_t* emu, uintptr_t fnc);
 void pFpll(x64emu_t* emu, uintptr_t fnc);
+void pFpLp(x64emu_t* emu, uintptr_t fnc);
 void pFpp(x64emu_t* emu, uintptr_t fnc);
+void pFppii(x64emu_t* emu, uintptr_t fnc);
 void pFppL(x64emu_t* emu, uintptr_t fnc);
 void pFppp(x64emu_t* emu, uintptr_t fnc);
-void pFppii(x64emu_t* emu, uintptr_t fnc);
 void pFpppp(x64emu_t* emu, uintptr_t fnc);
 void pFppppp(x64emu_t* emu, uintptr_t fnc);
 void pFpppppp(x64emu_t* emu, uintptr_t fnc);
 void pFppppppi(x64emu_t* emu, uintptr_t fnc);
 void pFv(x64emu_t* emu, uintptr_t fnc);
+void UFp(x64emu_t* emu, uintptr_t fnc);
 void uFpp(x64emu_t* emu, uintptr_t fnc);
 void vFLp(x64emu_t* emu, uintptr_t fnc);
 void vFLup(x64emu_t* emu, uintptr_t fnc);
@@ -88,6 +89,7 @@ void vFpip(x64emu_t* emu, uintptr_t fnc);
 void vFpipp(x64emu_t* emu, uintptr_t fnc);
 void vFpippp(x64emu_t* emu, uintptr_t fnc);
 void vFpipppp(x64emu_t* emu, uintptr_t fnc);
+void vFpLi(x64emu_t* emu, uintptr_t fnc);
 void vFpp(x64emu_t* emu, uintptr_t fnc);
 void vFppdd(x64emu_t* emu, uintptr_t fnc);
 void vFppi(x64emu_t* emu, uintptr_t fnc);
@@ -97,6 +99,8 @@ void vFppp(x64emu_t* emu, uintptr_t fnc);
 void vFpppp(x64emu_t* emu, uintptr_t fnc);
 void vFppppp(x64emu_t* emu, uintptr_t fnc);
 void vFpppppp(x64emu_t* emu, uintptr_t fnc);
+void vFppppppi(x64emu_t* emu, uintptr_t fnc);
+void vFppppppp(x64emu_t* emu, uintptr_t fnc);
 void vFpppuu(x64emu_t* emu, uintptr_t fnc);
 void vFppu(x64emu_t* emu, uintptr_t fnc);
 void vFppupp(x64emu_t* emu, uintptr_t fnc);
@@ -105,8 +109,6 @@ void vFpu(x64emu_t* emu, uintptr_t fnc);
 void vFpup(x64emu_t* emu, uintptr_t fnc);
 void vFpupp(x64emu_t* emu, uintptr_t fnc);
 void vFu(x64emu_t* emu, uintptr_t fnc);
-void vFppppppp(x64emu_t* emu, uintptr_t fnc);
-void vFppppppi(x64emu_t* emu, uintptr_t fnc);
 
 static bridge_t*        my_bridge           = NULL;
 static const char* (*g_type_name)(size_t)   = NULL;
@@ -403,8 +405,8 @@ WRAPPER(GObject, set_property, void, (void* object, uint32_t property_id, void*
 WRAPPER(GObject, get_property, void, (void* object, uint32_t property_id, void* value, void* pspec), "pupp", object, property_id, value, pspec);
 WRAPPER(GObject, dispose, void, (void* object), "p", object);
 WRAPPER(GObject, finalize, void, (void* object), "p", object);
-WRAPPER(GObject, dispatch_properties_changed, void*, (size_t type, uint32_t n_pspecs, void* pspecs), "Lup", type, n_pspecs, pspecs);
-WRAPPER(GObject, notify, void*, (size_t type, void* pspecs), "Lp", type, pspecs);
+WRAPPER(GObject, dispatch_properties_changed, void, (size_t type, uint32_t n_pspecs, void* pspecs), "Lup", type, n_pspecs, pspecs);
+WRAPPER(GObject, notify, void, (void* object, void* pspecs), "pp", object, pspecs);
 WRAPPER(GObject, constructed, void, (void* object), "p", object);
 
 #define SUPERGO() \
@@ -456,8 +458,8 @@ WRAPPER(GInitiallyUnowned, set_property, void, (void* object, uint32_t property_
 WRAPPER(GInitiallyUnowned, get_property, void, (void* object, uint32_t property_id, void* value, void* pspec), "pupp", object, property_id, value, pspec);
 WRAPPER(GInitiallyUnowned, dispose, void, (void* object), "p", object);
 WRAPPER(GInitiallyUnowned, finalize, void, (void* object), "p", object);
-WRAPPER(GInitiallyUnowned, dispatch_properties_changed, void*, (size_t type, uint32_t n_pspecs, void* pspecs), "Lup", type, n_pspecs, pspecs);
-WRAPPER(GInitiallyUnowned, notify, void*, (size_t type, void* pspecs), "Lp", type, pspecs);
+WRAPPER(GInitiallyUnowned, dispatch_properties_changed, void, (size_t type, uint32_t n_pspecs, void* pspecs), "Lup", type, n_pspecs, pspecs);
+WRAPPER(GInitiallyUnowned, notify, void, (size_t type, void* pspecs), "Lp", type, pspecs);
 WRAPPER(GInitiallyUnowned, constructed, void, (void* object), "p", object);
 
 #define SUPERGO() \
@@ -508,7 +510,7 @@ WRAPPER(GApplication, activate, void, (void* application), "p", application);
 WRAPPER(GApplication, open, void, (void* application, void* files, int n_files, void* hint), "ppip", application, files, n_files, hint);
 WRAPPER(GApplication, command_line, void, (void* application, void* command_line), "pp", application, command_line);
 WRAPPER(GApplication, local_command_line, void, (void* application, void* arguments, void* exit_status), "ppp", application, arguments, exit_status);
-WRAPPER(GApplication, before_emit, void*, (void* application, void* platform_data), "pp", application, platform_data);
+WRAPPER(GApplication, before_emit, void, (void* application, void* platform_data), "pp", application, platform_data);
 WRAPPER(GApplication, after_emit, void, (void* application, void* platform_data), "pp", application, platform_data);
 WRAPPER(GApplication, add_platform_data, void, (void* application, void* builder), "pp", application, builder);
 WRAPPER(GApplication, quit_mainloop, void, (void* application), "p", application);
@@ -580,7 +582,7 @@ WRAPPER(GtkApplication, window_added, void, (void* application, void* window), "
 WRAPPER(GtkApplication, window_removed, void, (void* application, void* window), "pp", application, window);
 
 #define SUPERGO() \
-    GO(window_added, pFpp);   \
+    GO(window_added, vFpp);   \
     GO(window_removed, vFpp);
 
 static void wrapGtkApplicationClass(my_GtkApplicationClass_t* class)
@@ -712,10 +714,10 @@ WRAPPER(GtkWidget2, selection_request_event,int, (void* widget, void* event), "p
 WRAPPER(GtkWidget2, selection_notify_event, int, (void* widget, void* event), "pp", widget, event);
 WRAPPER(GtkWidget2, proximity_in_event,  int, (void* widget, void* event), "pp", widget, event);
 WRAPPER(GtkWidget2, proximity_out_event, int, (void* widget, void* event), "pp", widget, event);
-WRAPPER(GtkWidget2, visibility_notify_event, int, (void* widget, void* event), "p", widget, event);
-WRAPPER(GtkWidget2, client_event,        int, (void* widget, void* event), "p", widget, event);
-WRAPPER(GtkWidget2, no_expose_event,     int, (void* widget, void* event), "p", widget, event);
-WRAPPER(GtkWidget2, window_state_event,  int, (void* widget, void* event), "p", widget, event);
+WRAPPER(GtkWidget2, visibility_notify_event, int, (void* widget, void* event), "pp", widget, event);
+WRAPPER(GtkWidget2, client_event,        int, (void* widget, void* event), "pp", widget, event);
+WRAPPER(GtkWidget2, no_expose_event,     int, (void* widget, void* event), "pp", widget, event);
+WRAPPER(GtkWidget2, window_state_event,  int, (void* widget, void* event), "pp", widget, event);
 WRAPPER(GtkWidget2, selection_get,       void, (void* widget, void* selection_data, uint32_t info, uint32_t time_), "ppuu", widget, selection_data, info, time_);
 WRAPPER(GtkWidget2, selection_received,  void, (void* widget, void* selection_data, uint32_t time_), "ppu", widget, selection_data, time_);
 WRAPPER(GtkWidget2, drag_begin,          void, (void* widget, void* context), "pp", widget, context);
@@ -1476,7 +1478,7 @@ WRAPPER(GtkTreeView2, start_interactive_search, int, (void* tree_view), "p", tre
     GO(row_collapsed, vFppp);               \
     GO(columns_changed, vFp);               \
     GO(cursor_changed, vFp);                \
-    GO(move_cursor, iFppp);                 \
+    GO(move_cursor, iFpii);                 \
     GO(select_all, iFp);                    \
     GO(unselect_all, iFp);                  \
     GO(select_cursor_row, iFpi);            \
@@ -1772,7 +1774,7 @@ static void bridgeGtkListBoxInstance(my_GtkListBox_t* class)
 WRAPPER(GtkListBoxRowClass, activate, void, (void *row), "p", row);
 
 #define SUPERGO()       \
-    GO(activate, vFpp);
+    GO(activate, vFp);
 
 // wrap (so bridge all calls, just in case)
 static void wrapGtkListBoxRowClass(my_GtkListBoxRowClass_t* class)
@@ -1921,7 +1923,7 @@ static void bridgeMetaFrames2Instance(my_MetaFrames2_t* class)
     bridgeGtkWindow2Instance(&class->parent);
 }
 // ----- GtkNotebook2Class ------
-WRAPPER(GtkNotebook2Class, switch_page, void, (void* notebook, void* page, uint32_t page_num), "ppp", notebook, page, page_num);
+WRAPPER(GtkNotebook2Class, switch_page, void, (void* notebook, void* page, uint32_t page_num), "ppu", notebook, page, page_num);
 WRAPPER(GtkNotebook2Class, select_page, int, (void* notebook, int move_focus), "pi", notebook, move_focus);
 WRAPPER(GtkNotebook2Class, focus_tab, int, (void* notebook, int type), "pi", notebook, type);
 WRAPPER(GtkNotebook2Class, change_current_page, int, (void* notebook, int offset), "pi", notebook, offset);
@@ -1931,7 +1933,7 @@ WRAPPER(GtkNotebook2Class, insert_page, int, (void* notebook, void* child, void*
 WRAPPER(GtkNotebook2Class, create_window, void*, (void* notebook, void* page, int x, int y), "ppii", notebook, page, x, y);
 
 #define SUPERGO()                   \
-    GO(switch_page, vFppp);         \
+    GO(switch_page, vFppu);         \
     GO(select_page, iFpi);          \
     GO(focus_tab, iFpi);            \
     GO(change_current_page, iFpi);  \
@@ -2567,8 +2569,8 @@ WRAPPER(GtkEntry2, get_text_area_size, void, (void* entry, void* x, void* y, voi
     GO(populate_popup, vFpp);       \
     GO(activate, vFp);              \
     GO(move_cursor, vFpiii);        \
-    GO(insert_at_cursor, vFp);      \
-    GO(delete_from_cursor, vFpii);  \
+    GO(insert_at_cursor, vFpp);     \
+    GO(delete_from_cursor, vFpLi);  \
     GO(backspace, vFp);             \
     GO(cut_clipboard, vFp);         \
     GO(copy_clipboard, vFp);        \
@@ -3602,7 +3604,7 @@ WRAPPER(GstElement,set_context, void, (void* element, void* context), "pp", elem
     GO(no_more_pads, vFp);      \
     GO(request_new_pad, pFpppp);\
     GO(release_pad, vFpp);      \
-    GO(get_state, iFppU);       \
+    GO(get_state, iFpppU);       \
     GO(set_state, iFpi);        \
     GO(change_state, iFpi);     \
     GO(state_changed, vFpiii);  \
@@ -3826,7 +3828,7 @@ WRAPPER(GstVideoDecoder, handle_missing_data, int, (void* decoder, uint64_t time
     GO(stop, iFp);                      \
     GO(parse, iFpppi);                  \
     GO(set_format, iFpp);               \
-    GO(reset, iFp);                     \
+    GO(reset, iFpi);                    \
     GO(finish, iFp);                    \
     GO(handle_frame, iFpp);             \
     GO(sink_event, iFpp);               \
@@ -3907,7 +3909,7 @@ WRAPPER(GstVideoEncoder, transform_meta, int, (void* encoder, void* frame, void*
     GO(stop, iFp);                      \
     GO(set_format, iFpp);               \
     GO(handle_frame, iFpp);             \
-    GO(reset, iFp);                     \
+    GO(reset, iFpi);                    \
     GO(finish, iFp);                    \
     GO(pre_push, iFpp);                 \
     GO(getcaps, pFpp);                  \
@@ -4197,7 +4199,7 @@ WRAPPER(GstAggregator, negotiate, int, (void* self), "p", self);
 WRAPPER(GstAggregator, sink_event_pre_queue, int, (void* self, void* aggregator_pad, void* event), "ppp", self, aggregator_pad, event);
 WRAPPER(GstAggregator, sink_query_pre_queue, int, (void* self, void* aggregator_pad, void* query), "ppp", self, aggregator_pad, query);
 WRAPPER(GstAggregator, finish_buffer_list, int, (void* self, void* bufferlist), "pp", self, bufferlist);
-WRAPPER(GstAggregator, peek_next_sample, void, (void* self, void* aggregator_pad), "pp", self, aggregator_pad);
+WRAPPER(GstAggregator, peek_next_sample, void*, (void* self, void* aggregator_pad), "pp", self, aggregator_pad);
 
 #define SUPERGO()                       \
     GO(flush, iFp);                     \
@@ -4222,7 +4224,7 @@ WRAPPER(GstAggregator, peek_next_sample, void, (void* self, void* aggregator_pad
     GO(sink_event_pre_queue, iFppp);    \
     GO(sink_query_pre_queue, iFppp);    \
     GO(finish_buffer_list, iFpp);       \
-    GO(peek_next_sample, vFpp);         \
+    GO(peek_next_sample, pFpp);         \
 
 // wrap (so bridge all calls, just in case)
 static void wrapGstAggregatorClass(my_GstAggregatorClass_t* class)
@@ -4711,7 +4713,7 @@ WRAPPER(GstAudioDecoder, transform_meta, int,(void* enc, void* outbuf, void* met
     GO(propose_allocation, iFpp);       \
     GO(sink_query, iFpp);               \
     GO(src_query, iFpp);                \
-    GO(getcaps, vFpp);                  \
+    GO(getcaps, pFpp);                  \
     GO(transform_meta, iFpppp);         \
 
 // wrap (so bridge all calls, just in case)
@@ -4759,7 +4761,7 @@ WRAPPER(GstAudioEncoder, flush, void, (void* enc), "p", enc);
 WRAPPER(GstAudioEncoder, pre_push, int, (void* enc, void* *buffer), "pp", enc, buffer);
 WRAPPER(GstAudioEncoder, sink_event, int, (void* enc, void* event), "pp", enc, event);
 WRAPPER(GstAudioEncoder, src_event, int, (void* enc, void* event), "pp", enc, event);
-WRAPPER(GstAudioEncoder, getcaps, void, (void* enc, void* filter), "pp", enc, filter);
+WRAPPER(GstAudioEncoder, getcaps, void*, (void* enc, void* filter), "pp", enc, filter);
 WRAPPER(GstAudioEncoder, open, int, (void* enc), "p", enc);
 WRAPPER(GstAudioEncoder, close, int, (void* enc), "p", enc);
 WRAPPER(GstAudioEncoder, negotiate, int, (void* enc), "p", enc);
@@ -4774,11 +4776,11 @@ WRAPPER(GstAudioEncoder, src_query, int, (void* enc, void* query), "pp", enc, qu
     GO(stop, iFp);                      \
     GO(set_format, iFpp);               \
     GO(handle_frame, iFpp);             \
-    GO(flush, vFpi);                    \
+    GO(flush, vFp);                     \
     GO(pre_push, iFpp);                 \
     GO(sink_event, iFpp);               \
     GO(src_event, iFpp);                \
-    GO(getcaps, vFpp);                  \
+    GO(getcaps, pFpp);                  \
     GO(open, iFp);                      \
     GO(close, iFp);                     \
     GO(negotiate, iFp);                 \

src/wrapped/generated/wrappedcairotypes.h

@@ -13,20 +13,20 @@
 
 typedef void* (*pFp_t)(void*);
 typedef uint32_t (*uFppp_t)(void*, void*, void*);
-typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef uint32_t (*uFpppp_t)(void*, void*, void*, void*);
 typedef void* (*pFppdd_t)(void*, void*, double, double);
-typedef int32_t (*iFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
+typedef uint32_t (*uFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(cairo_xcb_device_get_connection, pFp_t) \
 	GO(cairo_surface_write_to_png_stream, uFppp_t) \
-	GO(cairo_device_set_user_data, iFpppp_t) \
-	GO(cairo_font_face_set_user_data, iFpppp_t) \
-	GO(cairo_pattern_set_user_data, iFpppp_t) \
-	GO(cairo_scaled_font_set_user_data, iFpppp_t) \
-	GO(cairo_set_user_data, iFpppp_t) \
-	GO(cairo_surface_set_user_data, iFpppp_t) \
+	GO(cairo_device_set_user_data, uFpppp_t) \
+	GO(cairo_font_face_set_user_data, uFpppp_t) \
+	GO(cairo_pattern_set_user_data, uFpppp_t) \
+	GO(cairo_scaled_font_set_user_data, uFpppp_t) \
+	GO(cairo_set_user_data, uFpppp_t) \
+	GO(cairo_surface_set_user_data, uFpppp_t) \
 	GO(cairo_pdf_surface_create_for_stream, pFppdd_t) \
-	GO(cairo_surface_set_mime_data, iFpppLpp_t)
+	GO(cairo_surface_set_mime_data, uFpppLpp_t)
 
 #endif // __wrappedcairoTYPES_H_

src/wrapped/generated/wrappedcrypto3types.h

@@ -21,8 +21,8 @@ typedef int32_t (*iFppV_t)(void*, void*, ...);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef void (*vFiipV_t)(int32_t, int32_t, void*, ...);
 typedef void (*vFiipA_t)(int32_t, int32_t, void*, va_list);
-typedef void (*vFpppL_t)(void*, void*, void*, uintptr_t);
 typedef void* (*pFiLpp_t)(int32_t, uintptr_t, void*, void*);
+typedef void* (*pFpppL_t)(void*, void*, void*, uintptr_t);
 typedef void* (*pFpppp_t)(void*, void*, void*, void*);
 typedef int32_t (*iFpiipp_t)(void*, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFpLppp_t)(void*, uintptr_t, void*, void*, void*);
@@ -35,7 +35,6 @@ typedef void* (*pFpppppppp_t)(void*, void*, void*, void*, void*, void*, void*, v
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(CRYPTO_set_id_callback, vFp_t) \
 	GO(CRYPTO_set_locking_callback, vFp_t) \
-	GO(OSSL_PARAM_construct_end, vFp_t) \
 	GO(BIO_meth_get_callback_ctrl, pFp_t) \
 	GO(BIO_meth_get_create, pFp_t) \
 	GO(BIO_meth_get_ctrl, pFp_t) \
@@ -45,6 +44,7 @@ typedef void* (*pFpppppppp_t)(void*, void*, void*, void*, void*, void*, void*, v
 	GO(BIO_meth_get_read, pFp_t) \
 	GO(BIO_meth_get_write, pFp_t) \
 	GO(OPENSSL_sk_new, pFp_t) \
+	GO(OSSL_PARAM_construct_end, pFp_t) \
 	GO(X509V3_EXT_get, pFp_t) \
 	GO(ERR_print_errors_cb, vFpp_t) \
 	GO(OPENSSL_sk_pop_free, vFpp_t) \
@@ -57,16 +57,16 @@ typedef void* (*pFpppppppp_t)(void*, void*, void*, void*, void*, void*, void*, v
 	GO(UI_method_set_reader, iFpp_t) \
 	GO(UI_method_set_writer, iFpp_t) \
 	GO(EVP_MD_do_all_provided, vFppp_t) \
-	GO(OSSL_PARAM_construct_int, vFppp_t) \
-	GO(OSSL_PARAM_construct_uint, vFppp_t) \
 	GO(ASN1_i2d_bio, iFppp_t) \
 	GO(BIO_printf, iFppV_t) \
 	GO(OPENSSL_sk_deep_copy, pFppp_t) \
+	GO(OSSL_PARAM_construct_int, pFppp_t) \
+	GO(OSSL_PARAM_construct_uint, pFppp_t) \
 	GO(ERR_set_error, vFiipV_t) \
 	GO(ERR_vset_error, vFiipA_t) \
-	GO(OSSL_PARAM_construct_octet_string, vFpppL_t) \
-	GO(OSSL_PARAM_construct_utf8_string, vFpppL_t) \
 	GO(RSA_generate_key, pFiLpp_t) \
+	GO(OSSL_PARAM_construct_octet_string, pFpppL_t) \
+	GO(OSSL_PARAM_construct_utf8_string, pFpppL_t) \
 	GO(ASN1_d2i_bio, pFpppp_t) \
 	GO(PEM_X509_INFO_read_bio, pFpppp_t) \
 	GO(PEM_read_DHparams, pFpppp_t) \

src/wrapped/generated/wrappedcryptotypes.h

@@ -15,7 +15,6 @@ typedef void (*vFp_t)(void*);
 typedef void* (*pFp_t)(void*);
 typedef void (*vFpp_t)(void*, void*);
 typedef int32_t (*iFpp_t)(void*, void*);
-typedef void* (*pFpp_t)(void*, void*);
 typedef int32_t (*iFppp_t)(void*, void*, void*);
 typedef void* (*pFpppp_t)(void*, void*, void*, void*);
 typedef int32_t (*iFpiipp_t)(void*, int32_t, int32_t, void*, void*);
@@ -27,6 +26,7 @@ typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*
 	GO(CRYPTO_set_id_callback, vFp_t) \
 	GO(CRYPTO_set_locking_callback, vFp_t) \
 	GO(sk_new, pFp_t) \
+	GO(OPENSSL_sk_pop_free, vFpp_t) \
 	GO(X509_STORE_CTX_set_verify_cb, vFpp_t) \
 	GO(X509_STORE_set_verify_cb, vFpp_t) \
 	GO(sk_pop_free, vFpp_t) \
@@ -37,7 +37,6 @@ typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*
 	GO(BIO_meth_set_puts, iFpp_t) \
 	GO(BIO_meth_set_read, iFpp_t) \
 	GO(BIO_meth_set_write, iFpp_t) \
-	GO(OPENSSL_sk_pop_free, pFpp_t) \
 	GO(ASN1_i2d_bio, iFppp_t) \
 	GO(ASN1_d2i_bio, pFpppp_t) \
 	GO(PEM_read_bio_DHparams, pFpppp_t) \

src/wrapped/generated/wrappedcurltypes.h

@@ -13,12 +13,12 @@
 
 typedef int32_t (*iFpup_t)(void*, uint32_t, void*);
 typedef uint32_t (*uFpup_t)(void*, uint32_t, void*);
-typedef int32_t (*iFlppppp_t)(intptr_t, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFlppppp_t)(intptr_t, void*, void*, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(curl_multi_setopt, iFpup_t) \
 	GO(curl_easy_setopt, uFpup_t) \
 	GO(curl_share_setopt, uFpup_t) \
-	GO(curl_global_init_mem, iFlppppp_t)
+	GO(curl_global_init_mem, uFlppppp_t)
 
 #endif // __wrappedcurlTYPES_H_

src/wrapped/generated/wrappedlibglxnvidiatypes.h

@@ -16,7 +16,7 @@ typedef void* (*pFp_t)(void*);
 typedef void (*vFpp_t)(void*, void*);
 typedef int32_t (*iFpp_t)(void*, void*);
 typedef void (*vFipp_t)(int32_t, void*, void*);
-typedef void (*vFppi_t)(void*, void*, int32_t);
+typedef void (*vFpLi_t)(void*, uintptr_t, int32_t);
 typedef void (*vFppp_t)(void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
@@ -30,7 +30,7 @@ typedef void (*vFppp_t)(void*, void*, void*);
 	GO(glDebugMessageCallbackKHR, vFpp_t) \
 	GO(eglDebugMessageControlKHR, iFpp_t) \
 	GO(glProgramCallbackMESA, vFipp_t) \
-	GO(glXSwapIntervalEXT, vFppi_t) \
+	GO(glXSwapIntervalEXT, vFpLi_t) \
 	GO(eglSetBlobCacheFuncsANDROID, vFppp_t)
 
 #endif // __wrappedlibglxnvidiaTYPES_H_

src/wrapped/generated/wrappedlibicetypes.h

@@ -12,12 +12,13 @@
 #endif
 
 typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
 typedef int32_t (*iFpp_t)(void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(IceSetErrorHandler, pFp_t) \
 	GO(IceSetIOErrorHandler, pFp_t) \
-	GO(IceAddConnectionWatch, iFpp_t) \
-	GO(IceRemoveConnectionWatch, iFpp_t)
+	GO(IceRemoveConnectionWatch, vFpp_t) \
+	GO(IceAddConnectionWatch, iFpp_t)
 
 #endif // __wrappedlibiceTYPES_H_

src/wrapped/generated/wrappedlibmtypes.h

@@ -13,13 +13,13 @@
 
 typedef int32_t (*iFv_t)(void);
 typedef int32_t (*iFi_t)(int32_t);
-typedef int32_t (*iFf_t)(float);
-typedef int32_t (*iFd_t)(double);
 typedef int32_t (*iFp_t)(void*);
 typedef int64_t (*IFf_t)(float);
 typedef int64_t (*IFd_t)(double);
 typedef float (*fFf_t)(float);
 typedef double (*dFd_t)(double);
+typedef intptr_t (*lFf_t)(float);
+typedef intptr_t (*lFd_t)(double);
 typedef float (*fFff_t)(float, float);
 typedef double (*dFdd_t)(double, double);
 
@@ -39,8 +39,6 @@ typedef double (*DFDD_t)(double, double);
 	GO(feraiseexcept, iFi_t) \
 	GO(fesetround, iFi_t) \
 	GO(fetestexcept, iFi_t) \
-	GO(lrintf, iFf_t) \
-	GO(lrint, iFd_t) \
 	GO(fesetenv, iFp_t) \
 	GO(feupdateenv, iFp_t) \
 	GO(llrintf, IFf_t) \
@@ -75,6 +73,8 @@ typedef double (*DFDD_t)(double, double);
 	GO(pow10, dFd_t) \
 	GO(rint, dFd_t) \
 	GO(pow10l, DFD_t) \
+	GO(lrintf, lFf_t) \
+	GO(lrint, lFd_t) \
 	GO(__atan2f_finite, fFff_t) \
 	GO(__fmodf_finite, fFff_t) \
 	GO(__hypotf_finite, fFff_t) \

src/wrapped/generated/wrappedlibrttypes.h

@@ -13,7 +13,7 @@
 
 typedef int32_t (*iFp_t)(void*);
 typedef int32_t (*iFip_t)(int32_t, void*);
-typedef int32_t (*iFupp_t)(uint32_t, void*, void*);
+typedef int32_t (*iFipp_t)(int32_t, void*, void*);
 typedef int32_t (*iFipip_t)(int32_t, void*, int32_t, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
@@ -22,7 +22,7 @@ typedef int32_t (*iFipip_t)(int32_t, void*, int32_t, void*);
 	GO(aio_write, iFp_t) \
 	GO(aio_write64, iFp_t) \
 	GO(aio_cancel, iFip_t) \
-	GO(timer_create, iFupp_t) \
+	GO(timer_create, iFipp_t) \
 	GO(lio_listio, iFipip_t)
 
 #endif // __wrappedlibrtTYPES_H_

src/wrapped/generated/wrappedlibxcbtypes.h

@@ -11,13 +11,13 @@
 #define ADDED_FUNCTIONS() 
 #endif
 
-typedef void (*vFp_t)(void*);
+typedef void (*vFb_t)(void*);
 typedef void* (*pFip_t)(int32_t, void*);
 typedef void* (*pFpp_t)(void*, void*);
 typedef void* (*pFppp_t)(void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
-	GO(xcb_disconnect, vFp_t) \
+	GO(xcb_disconnect, vFb_t) \
 	GO(xcb_connect_to_fd, pFip_t) \
 	GO(xcb_connect, pFpp_t) \
 	GO(xcb_connect_to_display_with_auth_info, pFppp_t)

src/wrapped/generated/wrappedlibxttypes.h

@@ -11,19 +11,19 @@
 #define ADDED_FUNCTIONS() 
 #endif
 
-typedef void (*vFpp_t)(void*, void*);
-typedef intptr_t (*lFppp_t)(void*, void*, void*);
-typedef void (*vFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
-typedef intptr_t (*lFpippp_t)(void*, int32_t, void*, void*, void*);
+typedef void* (*pFpp_t)(void*, void*);
+typedef uintptr_t (*LFppp_t)(void*, void*, void*);
+typedef void (*vFpLipp_t)(void*, uintptr_t, int32_t, void*, void*);
+typedef uintptr_t (*LFpippp_t)(void*, int32_t, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
-	GO(XtAppSetErrorHandler, vFpp_t) \
-	GO(XtAppSetErrorMsgHandler, vFpp_t) \
-	GO(XtAppSetWarningHandler, vFpp_t) \
-	GO(XtAppSetWarningMsgHandler, vFpp_t) \
-	GO(XtAppAddWorkProc, lFppp_t) \
-	GO(XtAddEventHandler, vFpuipp_t) \
-	GO(XtAddRawEventHandler, vFpuipp_t) \
-	GO(XtAppAddInput, lFpippp_t)
+	GO(XtAppSetErrorHandler, pFpp_t) \
+	GO(XtAppSetErrorMsgHandler, pFpp_t) \
+	GO(XtAppSetWarningHandler, pFpp_t) \
+	GO(XtAppSetWarningMsgHandler, pFpp_t) \
+	GO(XtAppAddWorkProc, LFppp_t) \
+	GO(XtAddEventHandler, vFpLipp_t) \
+	GO(XtAddRawEventHandler, vFpLipp_t) \
+	GO(XtAppAddInput, LFpippp_t)
 
 #endif // __wrappedlibxtTYPES_H_

src/wrapped/generated/wrappedpixman1defs.h

@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.5.0.24) *
+ *******************************************************************/
+#ifndef __wrappedpixman1DEFS_H_
+#define __wrappedpixman1DEFS_H_
+
+
+#endif // __wrappedpixman1DEFS_H_

src/wrapped/generated/wrappedpixman1types.h

@@ -0,0 +1,17 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.5.0.24) *
+ *******************************************************************/
+#ifndef __wrappedpixman1TYPES_H_
+#define __wrappedpixman1TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+
+#define SUPER() ADDED_FUNCTIONS()
+
+#endif // __wrappedpixman1TYPES_H_

src/wrapped/generated/wrappedpixman1undefs.h

@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.5.0.24) *
+ *******************************************************************/
+#ifndef __wrappedpixman1UNDEFS_H_
+#define __wrappedpixman1UNDEFS_H_
+
+
+#endif // __wrappedpixman1UNDEFS_H_

src/wrapped/generated/wrappedsdl1types.h

@@ -14,17 +14,19 @@
 typedef void (*vFp_t)(void*);
 typedef int32_t (*iFv_t)(void);
 typedef int32_t (*iFp_t)(void*);
+typedef uint16_t (*WFp_t)(void*);
 typedef uint32_t (*uFp_t)(void*);
 typedef uint64_t (*UFp_t)(void*);
 typedef void* (*pFv_t)(void);
 typedef void* (*pFp_t)(void*);
 typedef int32_t (*iFup_t)(uint32_t, void*);
+typedef int32_t (*iFpW_t)(void*, uint16_t);
+typedef int32_t (*iFpu_t)(void*, uint32_t);
+typedef int32_t (*iFpU_t)(void*, uint64_t);
 typedef int32_t (*iFpp_t)(void*, void*);
-typedef uint32_t (*uFpW_t)(void*, uint16_t);
-typedef uint32_t (*uFpu_t)(void*, uint32_t);
-typedef uint32_t (*uFpU_t)(void*, uint64_t);
 typedef void* (*pFpi_t)(void*, int32_t);
 typedef void* (*pFpp_t)(void*, void*);
+typedef void* (*pFSi_t)(void*, int32_t);
 typedef int32_t (*iFppi_t)(void*, void*, int32_t);
 typedef void* (*pFupp_t)(uint32_t, void*, void*);
 typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*);
@@ -42,31 +44,31 @@ typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*);
 	GO(SDL_HasSSE, iFv_t) \
 	GO(SDL_HasSSE2, iFv_t) \
 	GO(SDL_GetWMInfo, iFp_t) \
-	GO(SDL_RemoveTimer, iFp_t) \
-	GO(SDL_ReadBE16, uFp_t) \
+	GO(SDL_ReadBE16, WFp_t) \
+	GO(SDL_ReadLE16, WFp_t) \
 	GO(SDL_ReadBE32, uFp_t) \
-	GO(SDL_ReadLE16, uFp_t) \
 	GO(SDL_ReadLE32, uFp_t) \
+	GO(SDL_RemoveTimer, uFp_t) \
 	GO(SDL_ReadBE64, UFp_t) \
 	GO(SDL_ReadLE64, UFp_t) \
 	GO(SDL_GetEventFilter, pFv_t) \
 	GO(SDL_GL_GetProcAddress, pFp_t) \
 	GO(SDL_LoadObject, pFp_t) \
 	GO(SDL_SetTimer, iFup_t) \
+	GO(SDL_WriteBE16, iFpW_t) \
+	GO(SDL_WriteLE16, iFpW_t) \
+	GO(SDL_WriteBE32, iFpu_t) \
+	GO(SDL_WriteLE32, iFpu_t) \
+	GO(SDL_WriteBE64, iFpU_t) \
+	GO(SDL_WriteLE64, iFpU_t) \
 	GO(SDL_OpenAudio, iFpp_t) \
-	GO(SDL_WriteBE16, uFpW_t) \
-	GO(SDL_WriteLE16, uFpW_t) \
-	GO(SDL_WriteBE32, uFpu_t) \
-	GO(SDL_WriteLE32, uFpu_t) \
-	GO(SDL_WriteBE64, uFpU_t) \
-	GO(SDL_WriteLE64, uFpU_t) \
 	GO(SDL_LoadBMP_RW, pFpi_t) \
 	GO(SDL_RWFromConstMem, pFpi_t) \
-	GO(SDL_RWFromFP, pFpi_t) \
 	GO(SDL_RWFromMem, pFpi_t) \
 	GO(SDL_CreateThread, pFpp_t) \
 	GO(SDL_LoadFunction, pFpp_t) \
 	GO(SDL_RWFromFile, pFpp_t) \
+	GO(SDL_RWFromFP, pFSi_t) \
 	GO(SDL_SaveBMP_RW, iFppi_t) \
 	GO(SDL_AddTimer, pFupp_t) \
 	GO(SDL_LoadWAV_RW, pFpippp_t)

src/wrapped/generated/wrappedsdl2types.h

@@ -27,9 +27,9 @@ typedef int32_t (*iFWW_t)(uint16_t, uint16_t);
 typedef int32_t (*iFUU_t)(uint64_t, uint64_t);
 typedef int32_t (*iFpi_t)(void*, int32_t);
 typedef int32_t (*iFpp_t)(void*, void*);
-typedef uint32_t (*uFpW_t)(void*, uint16_t);
-typedef uint32_t (*uFpu_t)(void*, uint32_t);
-typedef uint32_t (*uFpU_t)(void*, uint64_t);
+typedef uintptr_t (*LFpW_t)(void*, uint16_t);
+typedef uintptr_t (*LFpu_t)(void*, uint32_t);
+typedef uintptr_t (*LFpU_t)(void*, uint64_t);
 typedef void* (*pFpi_t)(void*, int32_t);
 typedef void* (*pFpp_t)(void*, void*);
 typedef void (*vFipV_t)(int32_t, void*, ...);
@@ -42,7 +42,7 @@ typedef int64_t (*IFpIi_t)(void*, int64_t, int32_t);
 typedef void* (*pFupp_t)(uint32_t, void*, void*);
 typedef void* (*pFppi_t)(void*, void*, int32_t);
 typedef void* (*pFppp_t)(void*, void*, void*);
-typedef void (*vFpuup_t)(void*, uint32_t, uint32_t, void*);
+typedef void (*vFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
 typedef int32_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef int32_t (*iFpLpV_t)(void*, uintptr_t, void*, ...);
 typedef uintptr_t (*LFppLL_t)(void*, void*, uintptr_t, uintptr_t);
@@ -100,13 +100,13 @@ typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*);
 	GO(SDL_GameControllerAddMappingsFromRW, iFpi_t) \
 	GO(SDL_GetEventFilter, iFpp_t) \
 	GO(SDL_OpenAudio, iFpp_t) \
-	GO(SDL_WriteBE16, uFpW_t) \
-	GO(SDL_WriteLE16, uFpW_t) \
-	GO(SDL_WriteBE32, uFpu_t) \
-	GO(SDL_WriteLE32, uFpu_t) \
-	GO(SDL_WriteU8, uFpu_t) \
-	GO(SDL_WriteBE64, uFpU_t) \
-	GO(SDL_WriteLE64, uFpU_t) \
+	GO(SDL_WriteBE16, LFpW_t) \
+	GO(SDL_WriteLE16, LFpW_t) \
+	GO(SDL_WriteBE32, LFpu_t) \
+	GO(SDL_WriteLE32, LFpu_t) \
+	GO(SDL_WriteU8, LFpu_t) \
+	GO(SDL_WriteBE64, LFpU_t) \
+	GO(SDL_WriteLE64, LFpU_t) \
 	GO(SDL_LoadBMP_RW, pFpi_t) \
 	GO(SDL_RWFromConstMem, pFpi_t) \
 	GO(SDL_RWFromFP, pFpi_t) \
@@ -129,7 +129,7 @@ typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*);
 	GO(SDL_AddTimer, pFupp_t) \
 	GO(SDL_LoadFile_RW, pFppi_t) \
 	GO(SDL_CreateThread, pFppp_t) \
-	GO(SDL_qsort, vFpuup_t) \
+	GO(SDL_qsort, vFpLLp_t) \
 	GO(SDL_vsnprintf, iFpLpp_t) \
 	GO(SDL_snprintf, iFpLpV_t) \
 	GO(SDL_RWread, LFppLL_t) \

src/wrapped/generated/wrappedvorbisfiletypes.h

@@ -12,11 +12,11 @@
 #endif
 
 typedef int32_t (*iFppplPPPP_t)(void*, void*, void*, intptr_t, void*, void*, void*, void*);
-typedef int32_t (*iFppiiiippp_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, void*, void*, void*);
+typedef intptr_t (*lFppiiiippp_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(ov_open_callbacks, iFppplPPPP_t) \
 	GO(ov_test_callbacks, iFppplPPPP_t) \
-	GO(ov_read_filter, iFppiiiippp_t)
+	GO(ov_read_filter, lFppiiiippp_t)
 
 #endif // __wrappedvorbisfileTYPES_H_

src/wrapped/generated/wrapper.h

@@ -104,6 +104,7 @@ void uFC(x64emu_t *emu, uintptr_t fnc);
 void uFu(x64emu_t *emu, uintptr_t fnc);
 void uFU(x64emu_t *emu, uintptr_t fnc);
 void uFd(x64emu_t *emu, uintptr_t fnc);
+void uFl(x64emu_t *emu, uintptr_t fnc);
 void uFL(x64emu_t *emu, uintptr_t fnc);
 void uFp(x64emu_t *emu, uintptr_t fnc);
 void uFS(x64emu_t *emu, uintptr_t fnc);
@@ -118,12 +119,14 @@ void fFi(x64emu_t *emu, uintptr_t fnc);
 void fFu(x64emu_t *emu, uintptr_t fnc);
 void fFf(x64emu_t *emu, uintptr_t fnc);
 void fFp(x64emu_t *emu, uintptr_t fnc);
+void fFx(x64emu_t *emu, uintptr_t fnc);
 void dFv(x64emu_t *emu, uintptr_t fnc);
 void dFi(x64emu_t *emu, uintptr_t fnc);
 void dFu(x64emu_t *emu, uintptr_t fnc);
 void dFd(x64emu_t *emu, uintptr_t fnc);
 void dFL(x64emu_t *emu, uintptr_t fnc);
 void dFp(x64emu_t *emu, uintptr_t fnc);
+void dFX(x64emu_t *emu, uintptr_t fnc);
 void DFD(x64emu_t *emu, uintptr_t fnc);
 void DFY(x64emu_t *emu, uintptr_t fnc);
 void lFE(x64emu_t *emu, uintptr_t fnc);
@@ -174,6 +177,7 @@ void uWp(x64emu_t *emu, uintptr_t fnc);
 void fWp(x64emu_t *emu, uintptr_t fnc);
 void vFEi(x64emu_t *emu, uintptr_t fnc);
 void vFEp(x64emu_t *emu, uintptr_t fnc);
+void vFEb(x64emu_t *emu, uintptr_t fnc);
 void vFcc(x64emu_t *emu, uintptr_t fnc);
 void vFww(x64emu_t *emu, uintptr_t fnc);
 void vFii(x64emu_t *emu, uintptr_t fnc);
@@ -200,7 +204,6 @@ void vFul(x64emu_t *emu, uintptr_t fnc);
 void vFuL(x64emu_t *emu, uintptr_t fnc);
 void vFup(x64emu_t *emu, uintptr_t fnc);
 void vFUu(x64emu_t *emu, uintptr_t fnc);
-void vFfi(x64emu_t *emu, uintptr_t fnc);
 void vFfC(x64emu_t *emu, uintptr_t fnc);
 void vFff(x64emu_t *emu, uintptr_t fnc);
 void vFfp(x64emu_t *emu, uintptr_t fnc);
@@ -236,8 +239,6 @@ void cFpp(x64emu_t *emu, uintptr_t fnc);
 void wFpi(x64emu_t *emu, uintptr_t fnc);
 void iFEi(x64emu_t *emu, uintptr_t fnc);
 void iFEu(x64emu_t *emu, uintptr_t fnc);
-void iFEf(x64emu_t *emu, uintptr_t fnc);
-void iFEd(x64emu_t *emu, uintptr_t fnc);
 void iFEp(x64emu_t *emu, uintptr_t fnc);
 void iFwp(x64emu_t *emu, uintptr_t fnc);
 void iFii(x64emu_t *emu, uintptr_t fnc);
@@ -304,9 +305,12 @@ void CFuW(x64emu_t *emu, uintptr_t fnc);
 void CFuu(x64emu_t *emu, uintptr_t fnc);
 void CFuU(x64emu_t *emu, uintptr_t fnc);
 void CFpi(x64emu_t *emu, uintptr_t fnc);
+void CFpC(x64emu_t *emu, uintptr_t fnc);
 void CFpu(x64emu_t *emu, uintptr_t fnc);
+void CFpU(x64emu_t *emu, uintptr_t fnc);
 void CFpL(x64emu_t *emu, uintptr_t fnc);
 void CFpp(x64emu_t *emu, uintptr_t fnc);
+void WFEp(x64emu_t *emu, uintptr_t fnc);
 void WFpi(x64emu_t *emu, uintptr_t fnc);
 void WFpW(x64emu_t *emu, uintptr_t fnc);
 void WFpp(x64emu_t *emu, uintptr_t fnc);
@@ -355,6 +359,7 @@ void fFif(x64emu_t *emu, uintptr_t fnc);
 void fFfi(x64emu_t *emu, uintptr_t fnc);
 void fFff(x64emu_t *emu, uintptr_t fnc);
 void fFfD(x64emu_t *emu, uintptr_t fnc);
+void fFfl(x64emu_t *emu, uintptr_t fnc);
 void fFfp(x64emu_t *emu, uintptr_t fnc);
 void fFpi(x64emu_t *emu, uintptr_t fnc);
 void fFpu(x64emu_t *emu, uintptr_t fnc);
@@ -368,6 +373,7 @@ void dFud(x64emu_t *emu, uintptr_t fnc);
 void dFdi(x64emu_t *emu, uintptr_t fnc);
 void dFdd(x64emu_t *emu, uintptr_t fnc);
 void dFdD(x64emu_t *emu, uintptr_t fnc);
+void dFdl(x64emu_t *emu, uintptr_t fnc);
 void dFdp(x64emu_t *emu, uintptr_t fnc);
 void dFll(x64emu_t *emu, uintptr_t fnc);
 void dFpi(x64emu_t *emu, uintptr_t fnc);
@@ -381,11 +387,12 @@ void DFDD(x64emu_t *emu, uintptr_t fnc);
 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 lFEf(x64emu_t *emu, uintptr_t fnc);
+void lFEd(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);
@@ -598,6 +605,8 @@ void iFEWW(x64emu_t *emu, uintptr_t fnc);
 void iFEup(x64emu_t *emu, uintptr_t fnc);
 void iFEUU(x64emu_t *emu, uintptr_t fnc);
 void iFEpi(x64emu_t *emu, uintptr_t fnc);
+void iFEpW(x64emu_t *emu, uintptr_t fnc);
+void iFEpu(x64emu_t *emu, uintptr_t fnc);
 void iFEpU(x64emu_t *emu, uintptr_t fnc);
 void iFEpL(x64emu_t *emu, uintptr_t fnc);
 void iFEpp(x64emu_t *emu, uintptr_t fnc);
@@ -652,6 +661,7 @@ void iFupL(x64emu_t *emu, uintptr_t fnc);
 void iFupp(x64emu_t *emu, uintptr_t fnc);
 void iFUpp(x64emu_t *emu, uintptr_t fnc);
 void iFfff(x64emu_t *emu, uintptr_t fnc);
+void iFLip(x64emu_t *emu, uintptr_t fnc);
 void iFLpi(x64emu_t *emu, uintptr_t fnc);
 void iFLpL(x64emu_t *emu, uintptr_t fnc);
 void iFLpp(x64emu_t *emu, uintptr_t fnc);
@@ -709,7 +719,6 @@ void iFppC(x64emu_t *emu, uintptr_t fnc);
 void iFppW(x64emu_t *emu, uintptr_t fnc);
 void iFppu(x64emu_t *emu, uintptr_t fnc);
 void iFppU(x64emu_t *emu, uintptr_t fnc);
-void iFppf(x64emu_t *emu, uintptr_t fnc);
 void iFppd(x64emu_t *emu, uintptr_t fnc);
 void iFppl(x64emu_t *emu, uintptr_t fnc);
 void iFppL(x64emu_t *emu, uintptr_t fnc);
@@ -749,9 +758,6 @@ void CFppp(x64emu_t *emu, uintptr_t fnc);
 void WFWpL(x64emu_t *emu, uintptr_t fnc);
 void WFpip(x64emu_t *emu, uintptr_t fnc);
 void WFppp(x64emu_t *emu, uintptr_t fnc);
-void uFEpW(x64emu_t *emu, uintptr_t fnc);
-void uFEpu(x64emu_t *emu, uintptr_t fnc);
-void uFEpU(x64emu_t *emu, uintptr_t fnc);
 void uFEpp(x64emu_t *emu, uintptr_t fnc);
 void uFiuu(x64emu_t *emu, uintptr_t fnc);
 void uFiup(x64emu_t *emu, uintptr_t fnc);
@@ -809,11 +815,8 @@ void uFppL(x64emu_t *emu, uintptr_t fnc);
 void uFppp(x64emu_t *emu, uintptr_t fnc);
 void uFbWW(x64emu_t *emu, uintptr_t fnc);
 void uFbWu(x64emu_t *emu, uintptr_t fnc);
-void uFbuC(x64emu_t *emu, uintptr_t fnc);
-void uFbuW(x64emu_t *emu, uintptr_t fnc);
 void uFbuu(x64emu_t *emu, uintptr_t fnc);
 void uFbuU(x64emu_t *emu, uintptr_t fnc);
-void uFbup(x64emu_t *emu, uintptr_t fnc);
 void UFpup(x64emu_t *emu, uintptr_t fnc);
 void UFpUU(x64emu_t *emu, uintptr_t fnc);
 void UFppi(x64emu_t *emu, uintptr_t fnc);
@@ -834,7 +837,6 @@ void fFfff(x64emu_t *emu, uintptr_t fnc);
 void fFffp(x64emu_t *emu, uintptr_t fnc);
 void fFlpl(x64emu_t *emu, uintptr_t fnc);
 void fFppi(x64emu_t *emu, uintptr_t fnc);
-void fFppL(x64emu_t *emu, uintptr_t fnc);
 void fFppp(x64emu_t *emu, uintptr_t fnc);
 void dFuud(x64emu_t *emu, uintptr_t fnc);
 void dFddd(x64emu_t *emu, uintptr_t fnc);
@@ -869,6 +871,9 @@ void lFppL(x64emu_t *emu, uintptr_t fnc);
 void lFppp(x64emu_t *emu, uintptr_t fnc);
 void lFppS(x64emu_t *emu, uintptr_t fnc);
 void lFSpl(x64emu_t *emu, uintptr_t fnc);
+void LFEpW(x64emu_t *emu, uintptr_t fnc);
+void LFEpu(x64emu_t *emu, uintptr_t fnc);
+void LFEpU(x64emu_t *emu, uintptr_t fnc);
 void LFEpp(x64emu_t *emu, uintptr_t fnc);
 void LFEpA(x64emu_t *emu, uintptr_t fnc);
 void LFipL(x64emu_t *emu, uintptr_t fnc);
@@ -913,6 +918,7 @@ void pFEpL(x64emu_t *emu, uintptr_t fnc);
 void pFEpp(x64emu_t *emu, uintptr_t fnc);
 void pFEpV(x64emu_t *emu, uintptr_t fnc);
 void pFEpA(x64emu_t *emu, uintptr_t fnc);
+void pFESi(x64emu_t *emu, uintptr_t fnc);
 void pFiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiu(x64emu_t *emu, uintptr_t fnc);
 void pFiif(x64emu_t *emu, uintptr_t fnc);
@@ -952,7 +958,7 @@ void pFLLL(x64emu_t *emu, uintptr_t fnc);
 void pFLLp(x64emu_t *emu, uintptr_t fnc);
 void pFLpi(x64emu_t *emu, uintptr_t fnc);
 void pFLpp(x64emu_t *emu, uintptr_t fnc);
-void pFpcU(x64emu_t *emu, uintptr_t fnc);
+void pFpcL(x64emu_t *emu, uintptr_t fnc);
 void pFpii(x64emu_t *emu, uintptr_t fnc);
 void pFpiu(x64emu_t *emu, uintptr_t fnc);
 void pFpif(x64emu_t *emu, uintptr_t fnc);
@@ -1000,7 +1006,6 @@ void pFbuu(x64emu_t *emu, uintptr_t fnc);
 void pFbup(x64emu_t *emu, uintptr_t fnc);
 void pFbUp(x64emu_t *emu, uintptr_t fnc);
 void pFbpi(x64emu_t *emu, uintptr_t fnc);
-void pFbpu(x64emu_t *emu, uintptr_t fnc);
 void pFbpL(x64emu_t *emu, uintptr_t fnc);
 void pFbpp(x64emu_t *emu, uintptr_t fnc);
 void SFEpp(x64emu_t *emu, uintptr_t fnc);
@@ -1031,7 +1036,6 @@ void vFEpuA(x64emu_t *emu, uintptr_t fnc);
 void vFEpUp(x64emu_t *emu, uintptr_t fnc);
 void vFEpLi(x64emu_t *emu, uintptr_t fnc);
 void vFEpLp(x64emu_t *emu, uintptr_t fnc);
-void vFEppi(x64emu_t *emu, uintptr_t fnc);
 void vFEppp(x64emu_t *emu, uintptr_t fnc);
 void vFEppV(x64emu_t *emu, uintptr_t fnc);
 void vFEppA(x64emu_t *emu, uintptr_t fnc);
@@ -1169,6 +1173,7 @@ void vFpLpi(x64emu_t *emu, uintptr_t fnc);
 void vFpLpu(x64emu_t *emu, uintptr_t fnc);
 void vFpLpL(x64emu_t *emu, uintptr_t fnc);
 void vFpLpp(x64emu_t *emu, uintptr_t fnc);
+void vFppww(x64emu_t *emu, uintptr_t fnc);
 void vFppii(x64emu_t *emu, uintptr_t fnc);
 void vFppiu(x64emu_t *emu, uintptr_t fnc);
 void vFppid(x64emu_t *emu, uintptr_t fnc);
@@ -1289,6 +1294,7 @@ void iFpiii(x64emu_t *emu, uintptr_t fnc);
 void iFpiiC(x64emu_t *emu, uintptr_t fnc);
 void iFpiiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiid(x64emu_t *emu, uintptr_t fnc);
+void iFpiil(x64emu_t *emu, uintptr_t fnc);
 void iFpiiL(x64emu_t *emu, uintptr_t fnc);
 void iFpiip(x64emu_t *emu, uintptr_t fnc);
 void iFpiIi(x64emu_t *emu, uintptr_t fnc);
@@ -1330,6 +1336,7 @@ void iFpuuU(x64emu_t *emu, uintptr_t fnc);
 void iFpuul(x64emu_t *emu, uintptr_t fnc);
 void iFpuuL(x64emu_t *emu, uintptr_t fnc);
 void iFpuup(x64emu_t *emu, uintptr_t fnc);
+void iFpuUi(x64emu_t *emu, uintptr_t fnc);
 void iFpufp(x64emu_t *emu, uintptr_t fnc);
 void iFpuLi(x64emu_t *emu, uintptr_t fnc);
 void iFpuLL(x64emu_t *emu, uintptr_t fnc);
@@ -1340,9 +1347,10 @@ void iFpupu(x64emu_t *emu, uintptr_t fnc);
 void iFpupl(x64emu_t *emu, uintptr_t fnc);
 void iFpupL(x64emu_t *emu, uintptr_t fnc);
 void iFpupp(x64emu_t *emu, uintptr_t fnc);
-void iFpupV(x64emu_t *emu, uintptr_t fnc);
 void iFpUup(x64emu_t *emu, uintptr_t fnc);
 void iFpUUu(x64emu_t *emu, uintptr_t fnc);
+void iFpUUp(x64emu_t *emu, uintptr_t fnc);
+void iFpUpu(x64emu_t *emu, uintptr_t fnc);
 void iFpUpp(x64emu_t *emu, uintptr_t fnc);
 void iFpfii(x64emu_t *emu, uintptr_t fnc);
 void iFpfff(x64emu_t *emu, uintptr_t fnc);
@@ -1366,12 +1374,12 @@ void iFpLLu(x64emu_t *emu, uintptr_t fnc);
 void iFpLLL(x64emu_t *emu, uintptr_t fnc);
 void iFpLLp(x64emu_t *emu, uintptr_t fnc);
 void iFpLpi(x64emu_t *emu, uintptr_t fnc);
-void iFpLpu(x64emu_t *emu, uintptr_t fnc);
 void iFpLpf(x64emu_t *emu, uintptr_t fnc);
 void iFpLpd(x64emu_t *emu, uintptr_t fnc);
 void iFpLpD(x64emu_t *emu, uintptr_t fnc);
 void iFpLpL(x64emu_t *emu, uintptr_t fnc);
 void iFpLpp(x64emu_t *emu, uintptr_t fnc);
+void iFpLpV(x64emu_t *emu, uintptr_t fnc);
 void iFppcc(x64emu_t *emu, uintptr_t fnc);
 void iFppii(x64emu_t *emu, uintptr_t fnc);
 void iFppiI(x64emu_t *emu, uintptr_t fnc);
@@ -1411,6 +1419,7 @@ void iFpppC(x64emu_t *emu, uintptr_t fnc);
 void iFpppu(x64emu_t *emu, uintptr_t fnc);
 void iFpppU(x64emu_t *emu, uintptr_t fnc);
 void iFpppd(x64emu_t *emu, uintptr_t fnc);
+void iFpppl(x64emu_t *emu, uintptr_t fnc);
 void iFpppL(x64emu_t *emu, uintptr_t fnc);
 void iFpppp(x64emu_t *emu, uintptr_t fnc);
 void iFpONN(x64emu_t *emu, uintptr_t fnc);
@@ -1418,6 +1427,7 @@ void iFpHpp(x64emu_t *emu, uintptr_t fnc);
 void iFSpii(x64emu_t *emu, uintptr_t fnc);
 void iFSpiL(x64emu_t *emu, uintptr_t fnc);
 void iFSpip(x64emu_t *emu, uintptr_t fnc);
+void iFSpLL(x64emu_t *emu, uintptr_t fnc);
 void iFSppp(x64emu_t *emu, uintptr_t fnc);
 void iFbupp(x64emu_t *emu, uintptr_t fnc);
 void iFbUpp(x64emu_t *emu, uintptr_t fnc);
@@ -1517,8 +1527,6 @@ void uFpppL(x64emu_t *emu, uintptr_t fnc);
 void uFpppp(x64emu_t *emu, uintptr_t fnc);
 void uFSuup(x64emu_t *emu, uintptr_t fnc);
 void uFbipp(x64emu_t *emu, uintptr_t fnc);
-void uFbuuC(x64emu_t *emu, uintptr_t fnc);
-void uFbuuu(x64emu_t *emu, uintptr_t fnc);
 void UFppii(x64emu_t *emu, uintptr_t fnc);
 void UFppip(x64emu_t *emu, uintptr_t fnc);
 void UFppuu(x64emu_t *emu, uintptr_t fnc);
@@ -1530,6 +1538,7 @@ void UFbCuW(x64emu_t *emu, uintptr_t fnc);
 void UFbCuu(x64emu_t *emu, uintptr_t fnc);
 void UFbWCp(x64emu_t *emu, uintptr_t fnc);
 void UFbWWp(x64emu_t *emu, uintptr_t fnc);
+void UFbuiC(x64emu_t *emu, uintptr_t fnc);
 void UFbuCC(x64emu_t *emu, uintptr_t fnc);
 void UFbuWp(x64emu_t *emu, uintptr_t fnc);
 void UFbuuC(x64emu_t *emu, uintptr_t fnc);
@@ -1541,7 +1550,6 @@ void dFpppp(x64emu_t *emu, uintptr_t fnc);
 void lFEipV(x64emu_t *emu, uintptr_t fnc);
 void lFEpip(x64emu_t *emu, uintptr_t fnc);
 void lFEppL(x64emu_t *emu, uintptr_t fnc);
-void lFEppp(x64emu_t *emu, uintptr_t fnc);
 void lFiiLu(x64emu_t *emu, uintptr_t fnc);
 void lFiipL(x64emu_t *emu, uintptr_t fnc);
 void lFipiI(x64emu_t *emu, uintptr_t fnc);
@@ -1647,7 +1655,6 @@ void pFffff(x64emu_t *emu, uintptr_t fnc);
 void pFdipp(x64emu_t *emu, uintptr_t fnc);
 void pFdddd(x64emu_t *emu, uintptr_t fnc);
 void pFDipp(x64emu_t *emu, uintptr_t fnc);
-void pFlfff(x64emu_t *emu, uintptr_t fnc);
 void pFLiip(x64emu_t *emu, uintptr_t fnc);
 void pFLupp(x64emu_t *emu, uintptr_t fnc);
 void pFLLup(x64emu_t *emu, uintptr_t fnc);
@@ -1719,14 +1726,9 @@ void pFpppL(x64emu_t *emu, uintptr_t fnc);
 void pFpppp(x64emu_t *emu, uintptr_t fnc);
 void pFpONN(x64emu_t *emu, uintptr_t fnc);
 void pFpSuu(x64emu_t *emu, uintptr_t fnc);
-void pFpbii(x64emu_t *emu, uintptr_t fnc);
+void pFpbiu(x64emu_t *emu, uintptr_t fnc);
 void pFSppi(x64emu_t *emu, uintptr_t fnc);
-void pFbuuC(x64emu_t *emu, uintptr_t fnc);
-void pFbuuu(x64emu_t *emu, uintptr_t fnc);
-void pFbuup(x64emu_t *emu, uintptr_t fnc);
-void pFbpWp(x64emu_t *emu, uintptr_t fnc);
 void pFbpup(x64emu_t *emu, uintptr_t fnc);
-void pFbppu(x64emu_t *emu, uintptr_t fnc);
 void pFbppU(x64emu_t *emu, uintptr_t fnc);
 void vWpiiu(x64emu_t *emu, uintptr_t fnc);
 void vWpuup(x64emu_t *emu, uintptr_t fnc);
@@ -1749,7 +1751,6 @@ void vFEiipA(x64emu_t *emu, uintptr_t fnc);
 void vFEippp(x64emu_t *emu, uintptr_t fnc);
 void vFEpipV(x64emu_t *emu, uintptr_t fnc);
 void vFEpipA(x64emu_t *emu, uintptr_t fnc);
-void vFEpuup(x64emu_t *emu, uintptr_t fnc);
 void vFEpuuV(x64emu_t *emu, uintptr_t fnc);
 void vFEpuuA(x64emu_t *emu, uintptr_t fnc);
 void vFEpupp(x64emu_t *emu, uintptr_t fnc);
@@ -1763,7 +1764,6 @@ void vFEppup(x64emu_t *emu, uintptr_t fnc);
 void vFEppLp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppi(x64emu_t *emu, uintptr_t fnc);
 void vFEpppu(x64emu_t *emu, uintptr_t fnc);
-void vFEpppL(x64emu_t *emu, uintptr_t fnc);
 void vFEpppp(x64emu_t *emu, uintptr_t fnc);
 void vFiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiu(x64emu_t *emu, uintptr_t fnc);
@@ -1854,7 +1854,9 @@ void vFluipp(x64emu_t *emu, uintptr_t fnc);
 void vFlplpl(x64emu_t *emu, uintptr_t fnc);
 void vFLpppi(x64emu_t *emu, uintptr_t fnc);
 void vFLpppp(x64emu_t *emu, uintptr_t fnc);
+void vFpwwip(x64emu_t *emu, uintptr_t fnc);
 void vFpwwWW(x64emu_t *emu, uintptr_t fnc);
+void vFpwiip(x64emu_t *emu, uintptr_t fnc);
 void vFpiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpiiip(x64emu_t *emu, uintptr_t fnc);
@@ -2011,6 +2013,7 @@ void iFuupid(x64emu_t *emu, uintptr_t fnc);
 void iFuupup(x64emu_t *emu, uintptr_t fnc);
 void iFuuppp(x64emu_t *emu, uintptr_t fnc);
 void iFupupp(x64emu_t *emu, uintptr_t fnc);
+void iFuppip(x64emu_t *emu, uintptr_t fnc);
 void iFuppLp(x64emu_t *emu, uintptr_t fnc);
 void iFupppp(x64emu_t *emu, uintptr_t fnc);
 void iFLppip(x64emu_t *emu, uintptr_t fnc);
@@ -2019,7 +2022,6 @@ void iFpciUU(x64emu_t *emu, uintptr_t fnc);
 void iFpwwww(x64emu_t *emu, uintptr_t fnc);
 void iFpwppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiii(x64emu_t *emu, uintptr_t fnc);
-void iFpiiiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiL(x64emu_t *emu, uintptr_t fnc);
 void iFpiiip(x64emu_t *emu, uintptr_t fnc);
 void iFpiiui(x64emu_t *emu, uintptr_t fnc);
@@ -2061,10 +2063,10 @@ void iFpuuLL(x64emu_t *emu, uintptr_t fnc);
 void iFpuuLp(x64emu_t *emu, uintptr_t fnc);
 void iFpuupi(x64emu_t *emu, uintptr_t fnc);
 void iFpuupp(x64emu_t *emu, uintptr_t fnc);
+void iFpuUup(x64emu_t *emu, uintptr_t fnc);
 void iFpuUpU(x64emu_t *emu, uintptr_t fnc);
 void iFpulup(x64emu_t *emu, uintptr_t fnc);
 void iFpulpp(x64emu_t *emu, uintptr_t fnc);
-void iFpuLup(x64emu_t *emu, uintptr_t fnc);
 void iFpuLpL(x64emu_t *emu, uintptr_t fnc);
 void iFpuLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpupui(x64emu_t *emu, uintptr_t fnc);
@@ -2162,7 +2164,6 @@ void iFpSuif(x64emu_t *emu, uintptr_t fnc);
 void iFSppLp(x64emu_t *emu, uintptr_t fnc);
 void iFSpppi(x64emu_t *emu, uintptr_t fnc);
 void IFpLIII(x64emu_t *emu, uintptr_t fnc);
-void IFppIII(x64emu_t *emu, uintptr_t fnc);
 void uFEiupp(x64emu_t *emu, uintptr_t fnc);
 void uFEippp(x64emu_t *emu, uintptr_t fnc);
 void uFEpipp(x64emu_t *emu, uintptr_t fnc);
@@ -2309,6 +2310,7 @@ void pFEppdd(x64emu_t *emu, uintptr_t fnc);
 void pFEppLp(x64emu_t *emu, uintptr_t fnc);
 void pFEpppi(x64emu_t *emu, uintptr_t fnc);
 void pFEpppu(x64emu_t *emu, uintptr_t fnc);
+void pFEpppL(x64emu_t *emu, uintptr_t fnc);
 void pFEpppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpppV(x64emu_t *emu, uintptr_t fnc);
 void pFEpppA(x64emu_t *emu, uintptr_t fnc);
@@ -2318,6 +2320,7 @@ void pFipipL(x64emu_t *emu, uintptr_t fnc);
 void pFipipp(x64emu_t *emu, uintptr_t fnc);
 void pFuiiii(x64emu_t *emu, uintptr_t fnc);
 void pFuiiiu(x64emu_t *emu, uintptr_t fnc);
+void pFuiipi(x64emu_t *emu, uintptr_t fnc);
 void pFuiupp(x64emu_t *emu, uintptr_t fnc);
 void pFuuiip(x64emu_t *emu, uintptr_t fnc);
 void pFuuupu(x64emu_t *emu, uintptr_t fnc);
@@ -2400,6 +2403,7 @@ void pFppppi(x64emu_t *emu, uintptr_t fnc);
 void pFppppu(x64emu_t *emu, uintptr_t fnc);
 void pFppppL(x64emu_t *emu, uintptr_t fnc);
 void pFppppp(x64emu_t *emu, uintptr_t fnc);
+void pFpSiii(x64emu_t *emu, uintptr_t fnc);
 void pFpSpuu(x64emu_t *emu, uintptr_t fnc);
 void pFbupii(x64emu_t *emu, uintptr_t fnc);
 void pFbpuii(x64emu_t *emu, uintptr_t fnc);
@@ -2424,10 +2428,10 @@ void vFEiiipp(x64emu_t *emu, uintptr_t fnc);
 void vFEpiwpp(x64emu_t *emu, uintptr_t fnc);
 void vFEpiLpp(x64emu_t *emu, uintptr_t fnc);
 void vFEpippp(x64emu_t *emu, uintptr_t fnc);
-void vFEpuipp(x64emu_t *emu, uintptr_t fnc);
 void vFEpuipV(x64emu_t *emu, uintptr_t fnc);
 void vFEpuipA(x64emu_t *emu, uintptr_t fnc);
 void vFEpuppp(x64emu_t *emu, uintptr_t fnc);
+void vFEpLipp(x64emu_t *emu, uintptr_t fnc);
 void vFEpLLpp(x64emu_t *emu, uintptr_t fnc);
 void vFEppupp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppLp(x64emu_t *emu, uintptr_t fnc);
@@ -2450,7 +2454,6 @@ void vFuiIIII(x64emu_t *emu, uintptr_t fnc);
 void vFuiuiii(x64emu_t *emu, uintptr_t fnc);
 void vFuiuiiC(x64emu_t *emu, uintptr_t fnc);
 void vFuiuiil(x64emu_t *emu, uintptr_t fnc);
-void vFuiuiip(x64emu_t *emu, uintptr_t fnc);
 void vFuiuiuu(x64emu_t *emu, uintptr_t fnc);
 void vFuiuiuU(x64emu_t *emu, uintptr_t fnc);
 void vFuiuCip(x64emu_t *emu, uintptr_t fnc);
@@ -2507,6 +2510,7 @@ void vFpiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpiilli(x64emu_t *emu, uintptr_t fnc);
+void vFpiipii(x64emu_t *emu, uintptr_t fnc);
 void vFpiippi(x64emu_t *emu, uintptr_t fnc);
 void vFpiippp(x64emu_t *emu, uintptr_t fnc);
 void vFpiLppi(x64emu_t *emu, uintptr_t fnc);
@@ -2517,6 +2521,7 @@ void vFpipppp(x64emu_t *emu, uintptr_t fnc);
 void vFpuiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpuiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpuiipp(x64emu_t *emu, uintptr_t fnc);
+void vFpuuiii(x64emu_t *emu, uintptr_t fnc);
 void vFpuuuiu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuuup(x64emu_t *emu, uintptr_t fnc);
@@ -2530,13 +2535,13 @@ void vFpupuup(x64emu_t *emu, uintptr_t fnc);
 void vFpupupu(x64emu_t *emu, uintptr_t fnc);
 void vFpuppuu(x64emu_t *emu, uintptr_t fnc);
 void vFpupppp(x64emu_t *emu, uintptr_t fnc);
+void vFpUUUUu(x64emu_t *emu, uintptr_t fnc);
 void vFpdddii(x64emu_t *emu, uintptr_t fnc);
 void vFpddddd(x64emu_t *emu, uintptr_t fnc);
 void vFpddddp(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiiL(x64emu_t *emu, uintptr_t fnc);
 void vFpLiipi(x64emu_t *emu, uintptr_t fnc);
-void vFpLLLLu(x64emu_t *emu, uintptr_t fnc);
 void vFpLpLLL(x64emu_t *emu, uintptr_t fnc);
 void vFpLpppi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiii(x64emu_t *emu, uintptr_t fnc);
@@ -2566,7 +2571,6 @@ void vFpplppi(x64emu_t *emu, uintptr_t fnc);
 void vFpplppp(x64emu_t *emu, uintptr_t fnc);
 void vFppLppi(x64emu_t *emu, uintptr_t fnc);
 void vFppLppp(x64emu_t *emu, uintptr_t fnc);
-void vFpppiii(x64emu_t *emu, uintptr_t fnc);
 void vFpppiip(x64emu_t *emu, uintptr_t fnc);
 void vFpppiui(x64emu_t *emu, uintptr_t fnc);
 void vFpppiff(x64emu_t *emu, uintptr_t fnc);
@@ -2671,7 +2675,7 @@ void iFpWipip(x64emu_t *emu, uintptr_t fnc);
 void iFpWCupp(x64emu_t *emu, uintptr_t fnc);
 void iFpWpppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiCpp(x64emu_t *emu, uintptr_t fnc);
-void iFpuiLpp(x64emu_t *emu, uintptr_t fnc);
+void iFpuiUpp(x64emu_t *emu, uintptr_t fnc);
 void iFpuippp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuuii(x64emu_t *emu, uintptr_t fnc);
 void iFpuuuuu(x64emu_t *emu, uintptr_t fnc);
@@ -2683,7 +2687,7 @@ void iFpuupii(x64emu_t *emu, uintptr_t fnc);
 void iFpuupuu(x64emu_t *emu, uintptr_t fnc);
 void iFpuuppu(x64emu_t *emu, uintptr_t fnc);
 void iFpuuppp(x64emu_t *emu, uintptr_t fnc);
-void iFpuLuLu(x64emu_t *emu, uintptr_t fnc);
+void iFpuUuUu(x64emu_t *emu, uintptr_t fnc);
 void iFpuLLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpupupi(x64emu_t *emu, uintptr_t fnc);
 void iFpupupp(x64emu_t *emu, uintptr_t fnc);
@@ -2691,6 +2695,7 @@ void iFpupLpL(x64emu_t *emu, uintptr_t fnc);
 void iFpupLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpupppu(x64emu_t *emu, uintptr_t fnc);
 void iFpupppp(x64emu_t *emu, uintptr_t fnc);
+void iFpUUUUu(x64emu_t *emu, uintptr_t fnc);
 void iFpdpipp(x64emu_t *emu, uintptr_t fnc);
 void iFpLiiiL(x64emu_t *emu, uintptr_t fnc);
 void iFpLiiip(x64emu_t *emu, uintptr_t fnc);
@@ -2701,7 +2706,6 @@ void iFpLuipp(x64emu_t *emu, uintptr_t fnc);
 void iFpLuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpLupip(x64emu_t *emu, uintptr_t fnc);
 void iFpLuppp(x64emu_t *emu, uintptr_t fnc);
-void iFpLLLLu(x64emu_t *emu, uintptr_t fnc);
 void iFpLLLLL(x64emu_t *emu, uintptr_t fnc);
 void iFpLLLLp(x64emu_t *emu, uintptr_t fnc);
 void iFpLLppp(x64emu_t *emu, uintptr_t fnc);
@@ -2713,6 +2717,7 @@ void iFpLpppL(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppp(x64emu_t *emu, uintptr_t fnc);
 void iFppiiii(x64emu_t *emu, uintptr_t fnc);
 void iFppiiip(x64emu_t *emu, uintptr_t fnc);
+void iFppiiuu(x64emu_t *emu, uintptr_t fnc);
 void iFppiipi(x64emu_t *emu, uintptr_t fnc);
 void iFppiipL(x64emu_t *emu, uintptr_t fnc);
 void iFppiipp(x64emu_t *emu, uintptr_t fnc);
@@ -2731,11 +2736,11 @@ void iFppCupp(x64emu_t *emu, uintptr_t fnc);
 void iFppuiii(x64emu_t *emu, uintptr_t fnc);
 void iFppuipp(x64emu_t *emu, uintptr_t fnc);
 void iFppuIII(x64emu_t *emu, uintptr_t fnc);
+void iFppuIup(x64emu_t *emu, uintptr_t fnc);
 void iFppuuLp(x64emu_t *emu, uintptr_t fnc);
 void iFppuupL(x64emu_t *emu, uintptr_t fnc);
 void iFppuupp(x64emu_t *emu, uintptr_t fnc);
 void iFppufff(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);
@@ -2846,14 +2851,15 @@ void UFbCuuCC(x64emu_t *emu, uintptr_t fnc);
 void UFbCuuWW(x64emu_t *emu, uintptr_t fnc);
 void UFbCuuWp(x64emu_t *emu, uintptr_t fnc);
 void UFbCuuup(x64emu_t *emu, uintptr_t fnc);
+void UFbuCwwu(x64emu_t *emu, uintptr_t fnc);
 void UFbuWCCC(x64emu_t *emu, uintptr_t fnc);
 void UFbuWCuu(x64emu_t *emu, uintptr_t fnc);
 void UFbuuuuu(x64emu_t *emu, uintptr_t fnc);
+void UFbuuUUU(x64emu_t *emu, uintptr_t fnc);
 void fFlfplpl(x64emu_t *emu, uintptr_t fnc);
 void fFpppppL(x64emu_t *emu, uintptr_t fnc);
 void dFpppppL(x64emu_t *emu, uintptr_t fnc);
 void lFEippLL(x64emu_t *emu, uintptr_t fnc);
-void lFEpippp(x64emu_t *emu, uintptr_t fnc);
 void lFipipLu(x64emu_t *emu, uintptr_t fnc);
 void lFipLipu(x64emu_t *emu, uintptr_t fnc);
 void lFipLipp(x64emu_t *emu, uintptr_t fnc);
@@ -2866,14 +2872,16 @@ void lFppLipp(x64emu_t *emu, uintptr_t fnc);
 void lFpppLpp(x64emu_t *emu, uintptr_t fnc);
 void LFEuuppp(x64emu_t *emu, uintptr_t fnc);
 void LFELpppu(x64emu_t *emu, uintptr_t fnc);
+void LFEpippp(x64emu_t *emu, uintptr_t fnc);
 void LFEpuppp(x64emu_t *emu, uintptr_t fnc);
 void LFEpLppu(x64emu_t *emu, uintptr_t fnc);
 void LFEppppu(x64emu_t *emu, uintptr_t fnc);
 void LFpipipi(x64emu_t *emu, uintptr_t fnc);
+void LFpuuupL(x64emu_t *emu, uintptr_t fnc);
 void LFplplpl(x64emu_t *emu, uintptr_t fnc);
 void LFpLippp(x64emu_t *emu, uintptr_t fnc);
 void LFpLLLLL(x64emu_t *emu, uintptr_t fnc);
-void LFppipLp(x64emu_t *emu, uintptr_t fnc);
+void LFppupLp(x64emu_t *emu, uintptr_t fnc);
 void LFpplplp(x64emu_t *emu, uintptr_t fnc);
 void LFppLLpL(x64emu_t *emu, uintptr_t fnc);
 void LFppLpLi(x64emu_t *emu, uintptr_t fnc);
@@ -2916,7 +2924,6 @@ void pFpiiCCC(x64emu_t *emu, uintptr_t fnc);
 void pFpiiuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiipip(x64emu_t *emu, uintptr_t fnc);
 void pFpiippp(x64emu_t *emu, uintptr_t fnc);
-void pFpiuuup(x64emu_t *emu, uintptr_t fnc);
 void pFpidddd(x64emu_t *emu, uintptr_t fnc);
 void pFpiLLLL(x64emu_t *emu, uintptr_t fnc);
 void pFpipipL(x64emu_t *emu, uintptr_t fnc);
@@ -2944,6 +2951,7 @@ void pFpLppup(x64emu_t *emu, uintptr_t fnc);
 void pFpLpppp(x64emu_t *emu, uintptr_t fnc);
 void pFppiiii(x64emu_t *emu, uintptr_t fnc);
 void pFppiiup(x64emu_t *emu, uintptr_t fnc);
+void pFppiipi(x64emu_t *emu, uintptr_t fnc);
 void pFppiipp(x64emu_t *emu, uintptr_t fnc);
 void pFppiIll(x64emu_t *emu, uintptr_t fnc);
 void pFppiCCC(x64emu_t *emu, uintptr_t fnc);
@@ -2971,9 +2979,8 @@ void pFppppiL(x64emu_t *emu, uintptr_t fnc);
 void pFpppppi(x64emu_t *emu, uintptr_t fnc);
 void pFpppppu(x64emu_t *emu, uintptr_t fnc);
 void pFpppppp(x64emu_t *emu, uintptr_t fnc);
+void pFpSiipi(x64emu_t *emu, uintptr_t fnc);
 void pFSpiiii(x64emu_t *emu, uintptr_t fnc);
-void pFbuuwwu(x64emu_t *emu, uintptr_t fnc);
-void pFbuuUUU(x64emu_t *emu, uintptr_t fnc);
 void pFbpupii(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuip(x64emu_t *emu, uintptr_t fnc);
 void iWEppppp(x64emu_t *emu, uintptr_t fnc);
@@ -3053,6 +3060,7 @@ void vFlplplff(x64emu_t *emu, uintptr_t fnc);
 void vFlplpldd(x64emu_t *emu, uintptr_t fnc);
 void vFlpplppl(x64emu_t *emu, uintptr_t fnc);
 void vFLpuLpLp(x64emu_t *emu, uintptr_t fnc);
+void vFpiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiliip(x64emu_t *emu, uintptr_t fnc);
 void vFpiiLiip(x64emu_t *emu, uintptr_t fnc);
@@ -3123,7 +3131,6 @@ void vFppppppL(x64emu_t *emu, uintptr_t fnc);
 void vFppppppp(x64emu_t *emu, uintptr_t fnc);
 void cFppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEilpppp(x64emu_t *emu, uintptr_t fnc);
-void iFElppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpipupp(x64emu_t *emu, uintptr_t fnc);
 void iFEpupppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpUuppp(x64emu_t *emu, uintptr_t fnc);
@@ -3157,7 +3164,6 @@ void iFpiiCCCC(x64emu_t *emu, uintptr_t fnc);
 void iFpiiffff(x64emu_t *emu, uintptr_t fnc);
 void iFpiipiii(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);
@@ -3197,7 +3203,6 @@ void iFpLpLppp(x64emu_t *emu, uintptr_t fnc);
 void iFpLppiii(x64emu_t *emu, uintptr_t fnc);
 void iFpLppiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiii(x64emu_t *emu, uintptr_t fnc);
-void iFppiiiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiiLll(x64emu_t *emu, uintptr_t fnc);
 void iFppiipii(x64emu_t *emu, uintptr_t fnc);
 void iFppiipiL(x64emu_t *emu, uintptr_t fnc);
@@ -3215,13 +3220,13 @@ void iFppuuppp(x64emu_t *emu, uintptr_t fnc);
 void iFppupupu(x64emu_t *emu, uintptr_t fnc);
 void iFppupupp(x64emu_t *emu, uintptr_t fnc);
 void iFppupppp(x64emu_t *emu, uintptr_t fnc);
+void iFppUUUUu(x64emu_t *emu, uintptr_t fnc);
 void iFppliupp(x64emu_t *emu, uintptr_t fnc);
 void iFppLiipp(x64emu_t *emu, uintptr_t fnc);
 void iFppLiWwL(x64emu_t *emu, uintptr_t fnc);
 void iFppLippp(x64emu_t *emu, uintptr_t fnc);
 void iFppLuuii(x64emu_t *emu, uintptr_t fnc);
 void iFppLLupp(x64emu_t *emu, uintptr_t fnc);
-void iFppLLLLu(x64emu_t *emu, uintptr_t fnc);
 void iFppLpLpL(x64emu_t *emu, uintptr_t fnc);
 void iFppLpppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiii(x64emu_t *emu, uintptr_t fnc);
@@ -3232,8 +3237,8 @@ void iFpppipip(x64emu_t *emu, uintptr_t fnc);
 void iFpppippi(x64emu_t *emu, uintptr_t fnc);
 void iFpppippp(x64emu_t *emu, uintptr_t fnc);
 void iFpppuiii(x64emu_t *emu, uintptr_t fnc);
+void iFpppuIup(x64emu_t *emu, uintptr_t fnc);
 void iFpppuupu(x64emu_t *emu, uintptr_t fnc);
-void iFpppulup(x64emu_t *emu, uintptr_t fnc);
 void iFpppLppp(x64emu_t *emu, uintptr_t fnc);
 void iFppppilp(x64emu_t *emu, uintptr_t fnc);
 void iFppppipp(x64emu_t *emu, uintptr_t fnc);
@@ -3249,8 +3254,10 @@ void iFppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFSipIppp(x64emu_t *emu, uintptr_t fnc);
 void uFEiiuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEiipppp(x64emu_t *emu, uintptr_t fnc);
+void uFElppppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpiuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpuuppp(x64emu_t *emu, uintptr_t fnc);
+void uFEpppLpp(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);
@@ -3267,8 +3274,7 @@ void uFpppLLpu(x64emu_t *emu, uintptr_t fnc);
 void uFppppLiu(x64emu_t *emu, uintptr_t fnc);
 void uFppppppu(x64emu_t *emu, uintptr_t fnc);
 void uFppppppp(x64emu_t *emu, uintptr_t fnc);
-void uFbuuuwwu(x64emu_t *emu, uintptr_t fnc);
-void uFbuupwwC(x64emu_t *emu, uintptr_t fnc);
+void UFbCCuwwu(x64emu_t *emu, uintptr_t fnc);
 void UFbCuwwWW(x64emu_t *emu, uintptr_t fnc);
 void UFbCuwwup(x64emu_t *emu, uintptr_t fnc);
 void UFbCuWCCC(x64emu_t *emu, uintptr_t fnc);
@@ -3280,10 +3286,12 @@ void UFbuuwwup(x64emu_t *emu, uintptr_t fnc);
 void UFbuuCCup(x64emu_t *emu, uintptr_t fnc);
 void UFbuuWWCp(x64emu_t *emu, uintptr_t fnc);
 void UFbuuuuCC(x64emu_t *emu, uintptr_t fnc);
+void UFbuupwwC(x64emu_t *emu, uintptr_t fnc);
 void fFpppppLL(x64emu_t *emu, uintptr_t fnc);
 void fFppppppL(x64emu_t *emu, uintptr_t fnc);
 void dFpppppLL(x64emu_t *emu, uintptr_t fnc);
 void dFppppppL(x64emu_t *emu, uintptr_t fnc);
+void lFppiiiip(x64emu_t *emu, uintptr_t fnc);
 void lFpppplpl(x64emu_t *emu, uintptr_t fnc);
 void LFEppLppU(x64emu_t *emu, uintptr_t fnc);
 void LFEpppppu(x64emu_t *emu, uintptr_t fnc);
@@ -3478,7 +3486,9 @@ void iFuiiiiuup(x64emu_t *emu, uintptr_t fnc);
 void iFuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFupipppip(x64emu_t *emu, uintptr_t fnc);
 void iFdiippppL(x64emu_t *emu, uintptr_t fnc);
+void iFpiiiiiiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiiupppp(x64emu_t *emu, uintptr_t fnc);
+void iFpiuiiLLL(x64emu_t *emu, uintptr_t fnc);
 void iFpipiipip(x64emu_t *emu, uintptr_t fnc);
 void iFpippiiii(x64emu_t *emu, uintptr_t fnc);
 void iFpippuuui(x64emu_t *emu, uintptr_t fnc);
@@ -3498,7 +3508,7 @@ void iFpuuupupu(x64emu_t *emu, uintptr_t fnc);
 void iFpuupuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuppiip(x64emu_t *emu, uintptr_t fnc);
 void iFpuuppppp(x64emu_t *emu, uintptr_t fnc);
-void iFpuLLLppL(x64emu_t *emu, uintptr_t fnc);
+void iFpuUUUppU(x64emu_t *emu, uintptr_t fnc);
 void iFpupupuup(x64emu_t *emu, uintptr_t fnc);
 void iFpupppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpduuulul(x64emu_t *emu, uintptr_t fnc);
@@ -3515,7 +3525,6 @@ void iFpLpppupu(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppppp(x64emu_t *emu, uintptr_t fnc);
 void iFppillppp(x64emu_t *emu, uintptr_t fnc);
 void iFppipiipi(x64emu_t *emu, uintptr_t fnc);
-void iFppIIIppp(x64emu_t *emu, uintptr_t fnc);
 void iFppuiiuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuuLpUu(x64emu_t *emu, uintptr_t fnc);
@@ -3536,7 +3545,7 @@ void iFppppppii(x64emu_t *emu, uintptr_t fnc);
 void iFppppppuu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppi(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppp(x64emu_t *emu, uintptr_t fnc);
-void iFbWWipppp(x64emu_t *emu, uintptr_t fnc);
+void iFbWWupppp(x64emu_t *emu, uintptr_t fnc);
 void iFbupppWWu(x64emu_t *emu, uintptr_t fnc);
 void CFuiifpppp(x64emu_t *emu, uintptr_t fnc);
 void uFEipupppp(x64emu_t *emu, uintptr_t fnc);
@@ -3557,12 +3566,16 @@ void uFpppLppLp(x64emu_t *emu, uintptr_t fnc);
 void uFppppuppu(x64emu_t *emu, uintptr_t fnc);
 void uFpppppupp(x64emu_t *emu, uintptr_t fnc);
 void uFbWWWWWWp(x64emu_t *emu, uintptr_t fnc);
+void UFbCCCuwwu(x64emu_t *emu, uintptr_t fnc);
+void UFbCCuuwwC(x64emu_t *emu, uintptr_t fnc);
 void UFbCuwwWWu(x64emu_t *emu, uintptr_t fnc);
 void UFbCuuuCup(x64emu_t *emu, uintptr_t fnc);
 void UFbWCCuuup(x64emu_t *emu, uintptr_t fnc);
 void UFbuCCWCpp(x64emu_t *emu, uintptr_t fnc);
 void UFbuWWWWWW(x64emu_t *emu, uintptr_t fnc);
 void UFbuuCCCup(x64emu_t *emu, uintptr_t fnc);
+void UFbuuWWCuu(x64emu_t *emu, uintptr_t fnc);
+void UFbuuuuuCC(x64emu_t *emu, uintptr_t fnc);
 void fFppppppLL(x64emu_t *emu, uintptr_t fnc);
 void fFpppppppL(x64emu_t *emu, uintptr_t fnc);
 void dFppppppLL(x64emu_t *emu, uintptr_t fnc);
@@ -3609,11 +3622,8 @@ void pFppplippp(x64emu_t *emu, uintptr_t fnc);
 void pFppppuppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppiip(x64emu_t *emu, uintptr_t fnc);
 void pFpppppupp(x64emu_t *emu, uintptr_t fnc);
-void pFbCCuuwwC(x64emu_t *emu, uintptr_t fnc);
-void pFbWWiCpup(x64emu_t *emu, uintptr_t fnc);
-void pFbuuWWCuu(x64emu_t *emu, uintptr_t fnc);
-void pFbuuupwwp(x64emu_t *emu, uintptr_t fnc);
-void pFbdwwWWui(x64emu_t *emu, uintptr_t fnc);
+void pFbWWuCpup(x64emu_t *emu, uintptr_t fnc);
+void pFbuwwWWuu(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuiipp(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuuipp(x64emu_t *emu, uintptr_t fnc);
 void iWpuipuppp(x64emu_t *emu, uintptr_t fnc);
@@ -3658,10 +3668,10 @@ void vFulldpldpl(x64emu_t *emu, uintptr_t fnc);
 void vFullpplppl(x64emu_t *emu, uintptr_t fnc);
 void vFffCCCCfff(x64emu_t *emu, uintptr_t fnc);
 void vFddddddddd(x64emu_t *emu, uintptr_t fnc);
+void vFpiuiuiiLL(x64emu_t *emu, uintptr_t fnc);
 void vFpiuippppi(x64emu_t *emu, uintptr_t fnc);
 void vFpiLLpiipi(x64emu_t *emu, uintptr_t fnc);
 void vFpiLpLiipi(x64emu_t *emu, uintptr_t fnc);
-void vFpipiuiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpuuCiuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuppppppp(x64emu_t *emu, uintptr_t fnc);
@@ -3756,6 +3766,8 @@ void uFpuupuppuu(x64emu_t *emu, uintptr_t fnc);
 void uFpLiipLLLp(x64emu_t *emu, uintptr_t fnc);
 void uFppLpLuppp(x64emu_t *emu, uintptr_t fnc);
 void uFppppppppp(x64emu_t *emu, uintptr_t fnc);
+void uFbupuuuuup(x64emu_t *emu, uintptr_t fnc);
+void UFbCCCuwwup(x64emu_t *emu, uintptr_t fnc);
 void UFbCuWCCuuu(x64emu_t *emu, uintptr_t fnc);
 void UFbuuwwWWww(x64emu_t *emu, uintptr_t fnc);
 void UFbuuWCCCCp(x64emu_t *emu, uintptr_t fnc);
@@ -3778,6 +3790,7 @@ void pFEpppppppi(x64emu_t *emu, uintptr_t fnc);
 void pFEpppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFuupuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiiiiuuuu(x64emu_t *emu, uintptr_t fnc);
+void pFpiiuuuuii(x64emu_t *emu, uintptr_t fnc);
 void pFpLpLLipui(x64emu_t *emu, uintptr_t fnc);
 void pFpLppLLiLi(x64emu_t *emu, uintptr_t fnc);
 void pFppupupuuu(x64emu_t *emu, uintptr_t fnc);
@@ -3785,9 +3798,6 @@ void pFppupppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppiiiiii(x64emu_t *emu, uintptr_t fnc);
 void pFpppuipppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppuupp(x64emu_t *emu, uintptr_t fnc);
-void pFbiiCpWWup(x64emu_t *emu, uintptr_t fnc);
-void pFbupuuuuup(x64emu_t *emu, uintptr_t fnc);
-void pFbppppuuCC(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuiippu(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuuiipp(x64emu_t *emu, uintptr_t fnc);
 void iWpiuuupipu(x64emu_t *emu, uintptr_t fnc);
@@ -3827,6 +3837,8 @@ void vFuddiiddiip(x64emu_t *emu, uintptr_t fnc);
 void vFullfplplpl(x64emu_t *emu, uintptr_t fnc);
 void vFulldplplpl(x64emu_t *emu, uintptr_t fnc);
 void vFullpplplpl(x64emu_t *emu, uintptr_t fnc);
+void vFuppiiiipip(x64emu_t *emu, uintptr_t fnc);
+void vFuppuiiiiip(x64emu_t *emu, uintptr_t fnc);
 void vFffffffffff(x64emu_t *emu, uintptr_t fnc);
 void vFpiuippppip(x64emu_t *emu, uintptr_t fnc);
 void vFpipipippip(x64emu_t *emu, uintptr_t fnc);
@@ -3852,7 +3864,6 @@ void iFEipiipippi(x64emu_t *emu, uintptr_t fnc);
 void iFEpiiiiippp(x64emu_t *emu, uintptr_t fnc);
 void iFEpuppupppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpupppLppL(x64emu_t *emu, uintptr_t fnc);
-void iFEppiiiippp(x64emu_t *emu, uintptr_t fnc);
 void iFEppLuppupp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppLpppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppppipp(x64emu_t *emu, uintptr_t fnc);
@@ -3885,9 +3896,11 @@ void uFpuuuuuuupp(x64emu_t *emu, uintptr_t fnc);
 void uFpddpippppp(x64emu_t *emu, uintptr_t fnc);
 void uFpppppppppp(x64emu_t *emu, uintptr_t fnc);
 void UFbCuWCCuuCW(x64emu_t *emu, uintptr_t fnc);
+void UFbuwwWWuCuu(x64emu_t *emu, uintptr_t fnc);
 void UFbuuiiWWiiW(x64emu_t *emu, uintptr_t fnc);
 void UFbuuuwwwwWW(x64emu_t *emu, uintptr_t fnc);
 void UFbuuuWCCCWp(x64emu_t *emu, uintptr_t fnc);
+void lFEppiiiippp(x64emu_t *emu, uintptr_t fnc);
 void lFpLppdddddd(x64emu_t *emu, uintptr_t fnc);
 void pFEiuppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpiipWWupp(x64emu_t *emu, uintptr_t fnc);
@@ -3902,7 +3915,6 @@ void pFppuiipuuii(x64emu_t *emu, uintptr_t fnc);
 void pFppuuLLuppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void pFpppppppppp(x64emu_t *emu, uintptr_t fnc);
-void pFbuwwWWuCuu(x64emu_t *emu, uintptr_t fnc);
 void pFbuuuWWWCCi(x64emu_t *emu, uintptr_t fnc);
 void iWEpuipupppp(x64emu_t *emu, uintptr_t fnc);
 void iWEpuuiiuipp(x64emu_t *emu, uintptr_t fnc);
@@ -4000,6 +4012,8 @@ void vFuuuuullpplpl(x64emu_t *emu, uintptr_t fnc);
 void vFuullfplplfpl(x64emu_t *emu, uintptr_t fnc);
 void vFuulldplpldpl(x64emu_t *emu, uintptr_t fnc);
 void vFuullpplplppl(x64emu_t *emu, uintptr_t fnc);
+void vFupppwwwwwwWW(x64emu_t *emu, uintptr_t fnc);
+void vFupppiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFffffffffffff(x64emu_t *emu, uintptr_t fnc);
 void vFpiLLpiiiipii(x64emu_t *emu, uintptr_t fnc);
 void vFpiLLpLiiiipi(x64emu_t *emu, uintptr_t fnc);
@@ -4026,8 +4040,10 @@ void iFpCCCWCWCCCWp(x64emu_t *emu, uintptr_t fnc);
 void iFpLLlliLppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpLpuuLpLpppL(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppppppppp(x64emu_t *emu, uintptr_t fnc);
+void iFppiiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFppLlliLppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppipipiipii(x64emu_t *emu, uintptr_t fnc);
+void iFppppwwwwwwWW(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFpuupppppuuuu(x64emu_t *emu, uintptr_t fnc);
 void uFpppppppppppp(x64emu_t *emu, uintptr_t fnc);
@@ -4035,7 +4051,7 @@ void UFbCuuWWwwCCup(x64emu_t *emu, uintptr_t fnc);
 void UFbuuuWWWWWWWW(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiuuLipii(x64emu_t *emu, uintptr_t fnc);
 void pFEppppppppppp(x64emu_t *emu, uintptr_t fnc);
-void pFWWiCCCCiipup(x64emu_t *emu, uintptr_t fnc);
+void pFWWuCCCCuupup(x64emu_t *emu, uintptr_t fnc);
 void pFppippLLLiLpp(x64emu_t *emu, uintptr_t fnc);
 void pFppuuppppuppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppppppppp(x64emu_t *emu, uintptr_t fnc);
@@ -4095,12 +4111,13 @@ void vFppppppppppppLL(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppppL(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpipppppppppppp(x64emu_t *emu, uintptr_t fnc);
+void iFpuLwwWWwwWWpuu(x64emu_t *emu, uintptr_t fnc);
 void iFppupppLLLLpupp(x64emu_t *emu, uintptr_t fnc);
-void iFpppwwWWwwWWpuu(x64emu_t *emu, uintptr_t fnc);
 void UFbuuuuWWWCCCCpp(x64emu_t *emu, uintptr_t fnc);
 void pFbpCpppwwwwwwWW(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiiiuiiiiilll(x64emu_t *emu, uintptr_t fnc);
 void vFuuiiiiuuiiiiiii(x64emu_t *emu, uintptr_t fnc);
+void vFuppuiiiiiiiipip(x64emu_t *emu, uintptr_t fnc);
 void vFfffffffffffffff(x64emu_t *emu, uintptr_t fnc);
 void vFppUpUUpUUpUUuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpppippppppppppp(x64emu_t *emu, uintptr_t fnc);
@@ -4121,20 +4138,19 @@ void vFpppppppppppppppL(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiuppppWppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
+void UFbuuWWWWWWwwCCCuu(x64emu_t *emu, uintptr_t fnc);
 void pFpipppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFppipipipipipipip(x64emu_t *emu, uintptr_t fnc);
 void pFppupupupupupupup(x64emu_t *emu, uintptr_t fnc);
 void pFpppppppppppppppp(x64emu_t *emu, uintptr_t fnc);
-void pFbuuWWWWWWwwCCCuu(x64emu_t *emu, uintptr_t fnc);
 void vFuuuuiiiiuuiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiidddduiiiiuu(x64emu_t *emu, uintptr_t fnc);
 void vFpppuppiipppuUUUpi(x64emu_t *emu, uintptr_t fnc);
 void vFppppppppppppppLLL(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppppppLL(x64emu_t *emu, uintptr_t fnc);
 void vFppppppppppppppppL(x64emu_t *emu, uintptr_t fnc);
+void UFbuuuuuwwuuuuUUUup(x64emu_t *emu, uintptr_t fnc);
 void pFppippipipipipipip(x64emu_t *emu, uintptr_t fnc);
-void pFbuuuuuwwuuuuUUUup(x64emu_t *emu, uintptr_t fnc);
-void vFppuiiiiipuiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuuiiiipuuiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpppipppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppppppLLL(x64emu_t *emu, uintptr_t fnc);
@@ -4209,7 +4225,6 @@ void iFEipipp(x64emu_t *emu, uintptr_t fnc);
 
 #if !defined(STATICBUILD)
 void lFiN(x64emu_t *emu, uintptr_t fnc);
-void iFEpu(x64emu_t *emu, uintptr_t fnc);
 void iFlip(x64emu_t *emu, uintptr_t fnc);
 void iFLLi(x64emu_t *emu, uintptr_t fnc);
 void iFLLii(x64emu_t *emu, uintptr_t fnc);

src/wrapped/wrappedanl_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(__libanl_version_placeholder, vFv)

src/wrapped/wrappedbz2_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 //GO(BZ2_blockSort, 
@@ -7,7 +7,7 @@
 //GO(BZ2_bz__AssertH__fail, 
 GO(BZ2_bzBuffToBuffCompress, iFpppuiii)
 GO(BZ2_bzBuffToBuffDecompress, iFpppuii)
-GO(BZ2_bzclose, iFp)
+GO(BZ2_bzclose, vFp)
 GOM(BZ2_bzCompress, iFEpi)
 GOM(BZ2_bzCompressEnd, iFEp)
 GOM(BZ2_bzCompressInit, iFEpiii)
@@ -23,12 +23,12 @@ GO(BZ2_bzread, iFppi)
 GO(BZ2_bzRead, iFpppi)
 GO(BZ2_bzReadClose, vFpp)
 GO(BZ2_bzReadGetUnused, vFpppp)
-GO(BZ2_bzReadOpen, pFppipi)
+GO(BZ2_bzReadOpen, pFpSiipi)
 GO(BZ2_bzwrite, iFppi)
 GO(BZ2_bzWrite, vFpppi)
 GO(BZ2_bzWriteClose, vFppipp)
 GO(BZ2_bzWriteClose64, vFppipppp)
-GO(BZ2_bzWriteOpen, pFppiii)
+GO(BZ2_bzWriteOpen, pFpSiii)
 //GO(BZ2_compressBlock, 
 //GO(BZ2_decompress, 
 //GO(BZ2_hbAssignCodes, 

src/wrapped/wrappedcairo.c

@@ -94,17 +94,17 @@ EXPORT void* my_cairo_xcb_device_get_connection(x64emu_t* emu, void* a)
     return add_xcb_connection(my->cairo_xcb_device_get_connection(a));
 }
 
-EXPORT int my_cairo_surface_set_user_data(x64emu_t* emu, void* surf, void* key, void* data, void* d)
+EXPORT uint32_t my_cairo_surface_set_user_data(x64emu_t* emu, void* surf, void* key, void* data, void* d)
 {
     return my->cairo_surface_set_user_data(surf, key, data, find_destroy_Fct(d));
 }
 
-EXPORT int my_cairo_set_user_data(x64emu_t* emu, void* cr, void* key, void* data, void* d)
+EXPORT uint32_t my_cairo_set_user_data(x64emu_t* emu, void* cr, void* key, void* data, void* d)
 {
     return my->cairo_set_user_data(cr, key, data, find_destroy_Fct(d));
 }
 
-EXPORT int my_cairo_device_set_user_data(x64emu_t* emu, void* device, void* key, void* data, void* d)
+EXPORT uint32_t my_cairo_device_set_user_data(x64emu_t* emu, void* device, void* key, void* data, void* d)
 {
     return my->cairo_device_set_user_data(device, key, data, find_destroy_Fct(d));
 }
@@ -114,12 +114,12 @@ EXPORT int my_cairo_font_face_set_user_data(x64emu_t* emu, void* font_face, void
     return my->cairo_font_face_set_user_data(font_face, key, data, find_destroy_Fct(d));
 }
 
-EXPORT int my_cairo_scaled_font_set_user_data(x64emu_t* emu, void* scaled_font, void* key, void* data, void* d)
+EXPORT uint32_t my_cairo_scaled_font_set_user_data(x64emu_t* emu, void* scaled_font, void* key, void* data, void* d)
 {
     return my->cairo_scaled_font_set_user_data(scaled_font, key, data, find_destroy_Fct(d));
 }
 
-EXPORT int my_cairo_surface_set_mime_data(x64emu_t* emu, void* surf, void* mime_type, void* data, size_t len, void* destroy, void* closure)
+EXPORT uint32_t my_cairo_surface_set_mime_data(x64emu_t* emu, void* surf, void* mime_type, void* data, size_t len, void* destroy, void* closure)
 {
     return my->cairo_surface_set_mime_data(surf, mime_type, data, len, find_destroy_Fct(destroy), closure);
 }

src/wrapped/wrappedcairo_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(cairo_append_path, vFpp)
@@ -29,12 +29,12 @@ GO(cairo_device_observer_fill_elapsed, dFp)
 GO(cairo_device_observer_glyphs_elapsed, dFp)
 GO(cairo_device_observer_mask_elapsed, dFp)
 GO(cairo_device_observer_paint_elapsed, dFp)
-//GOM(cairo_device_observer_print, iFEppp)
+//GOM(cairo_device_observer_print, uFEppp)
 GO(cairo_device_observer_stroke_elapsed, dFp)
 GO(cairo_device_reference, pFp)
 GO(cairo_device_release, vFp)
-GOM(cairo_device_set_user_data, iFEpppp)
-GO(cairo_device_status, iFp)
+GOM(cairo_device_set_user_data, uFEpppp)
+GO(cairo_device_status, uFp)
 GO(cairo_device_to_user, vFppp)
 GO(cairo_device_to_user_distance, vFppp)
 GO(cairo_fill, vFp)
@@ -46,7 +46,7 @@ GO(cairo_font_face_get_reference_count, uFp)
 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, iFEpppp)
+GOM(cairo_font_face_set_user_data, uFEpppp)
 GO(cairo_font_face_status, uFp)
 GO(cairo_font_options_copy, pFp)
 GO(cairo_font_options_create, pFv)
@@ -163,7 +163,7 @@ GO(cairo_pattern_get_linear_points, uFppppp)
 GO(cairo_pattern_get_matrix, vFpp)
 GO(cairo_pattern_get_radial_circles, uFppppppp)
 GO(cairo_pattern_get_reference_count, uFp)
-GO(cairo_pattern_get_rgba, iFppppp)
+GO(cairo_pattern_get_rgba, uFppppp)
 GO(cairo_pattern_get_surface, uFpp)
 GO(cairo_pattern_get_type, uFp)
 GO(cairo_pattern_get_user_data, pFpp)
@@ -171,7 +171,7 @@ GO(cairo_pattern_reference, pFp)
 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)
+GOM(cairo_pattern_set_user_data, uFEpppp)
 GO(cairo_pattern_status, uFp)
 GO(cairo_pdf_get_versions, vFpp)
 GO(cairo_pdf_surface_create, pFpdd)
@@ -220,17 +220,17 @@ GO(cairo_region_destroy, vFp)
 GO(cairo_region_equal, iFpp)
 GO(cairo_region_get_extents, vFpp)
 GO(cairo_region_get_rectangle, vFpip)
-GO(cairo_region_intersect, iFpp)
-GO(cairo_region_intersect_rectangle, iFpp)
+GO(cairo_region_intersect, uFpp)
+GO(cairo_region_intersect_rectangle, uFpp)
 GO(cairo_region_is_empty, iFp)
 GO(cairo_region_num_rectangles, iFp)
 GO(cairo_region_reference, pFp)
 GO(cairo_region_status, uFp)
-GO(cairo_region_subtract, iFpp)
-GO(cairo_region_subtract_rectangle, iFpp)
+GO(cairo_region_subtract, uFpp)
+GO(cairo_region_subtract_rectangle, uFpp)
 GO(cairo_region_translate, vFpii)
-GO(cairo_region_union, iFpp)
-GO(cairo_region_union_rectangle, iFpp)
+GO(cairo_region_union, uFpp)
+GO(cairo_region_union_rectangle, uFpp)
 GO(cairo_region_xor, uFpp)
 GO(cairo_region_xor_rectangle, uFpp)
 GO(cairo_rel_curve_to, vFpdddddd)
@@ -254,7 +254,7 @@ 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)
+GOM(cairo_scaled_font_set_user_data, uFEpppp)
 GO(cairo_scaled_font_status, uFp)
 GO(cairo_scaled_font_text_extents, vFppp)
 GO(cairo_scaled_font_text_to_glyphs, uFpddpippppp)
@@ -286,7 +286,7 @@ GO(cairo_set_source_rgb, vFpddd)
 GO(cairo_set_source_rgba, vFpdddd)
 GO(cairo_set_source_surface, vFppdd)
 GO(cairo_set_tolerance, vFpd)
-GOM(cairo_set_user_data, iFEpppp)
+GOM(cairo_set_user_data, uFEpppp)
 GO(cairo_show_glyphs, vFppi)
 GO(cairo_show_page, vFp)
 GO(cairo_show_text, vFpp)
@@ -307,7 +307,7 @@ GO(cairo_surface_flush, vFp)
 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)
+GO(cairo_surface_get_device_scale, vFppp)
 GO(cairo_surface_get_fallback_resolution, vFppp)
 GO(cairo_surface_get_font_options, vFpp)
 GO(cairo_surface_get_mime_data, vFpppp)
@@ -331,8 +331,8 @@ GO(cairo_surface_reference, pFp)
 GO(cairo_surface_set_device_offset, vFpdd)
 GO(cairo_surface_set_device_scale, vFpdd)
 GO(cairo_surface_set_fallback_resolution, vFpdd)
-GOM(cairo_surface_set_mime_data, iFEpppLpp)
-GOM(cairo_surface_set_user_data, iFEpppp)
+GOM(cairo_surface_set_mime_data, uFEpppLpp)
+GOM(cairo_surface_set_user_data, uFEpppp)
 GO(cairo_surface_show_page, vFp)
 GO(cairo_surface_status, uFp)
 GO(cairo_surface_supports_mime_type, iFpp)

src/wrapped/wrappedcrypto3_private.h

@@ -974,10 +974,10 @@ GO(d2i_DISPLAYTEXT, pFppl)
 //GO(d2i_DSAparams, 
 GO(d2i_DSAPrivateKey, pFppl)
 GO(d2i_DSAPrivateKey_bio, pFpp)
-GO(d2i_DSAPrivateKey_fp, pFpp)
+GO(d2i_DSAPrivateKey_fp, pFSp)
 GO(d2i_DSA_PUBKEY, pFppl)
 GO(d2i_DSA_PUBKEY_bio, pFpp)
-GO(d2i_DSA_PUBKEY_fp, pFpp)
+GO(d2i_DSA_PUBKEY_fp, pFSp)
 //GO(d2i_DSAPublicKey, 
 GO(d2i_DSA_SIG, pFppl)
 GO(d2i_ECDSA_SIG, pFppl)
@@ -987,10 +987,10 @@ GO(d2i_ECDSA_SIG, pFppl)
 //GO(d2i_ECPrivateKey, 
 GO(d2i_EC_PRIVATEKEY, pFppl)
 GO(d2i_ECPrivateKey_bio, pFpp)
-GO(d2i_ECPrivateKey_fp, pFpp)
+GO(d2i_ECPrivateKey_fp, pFSp)
 GO(d2i_EC_PUBKEY, pFppl)
 GO(d2i_EC_PUBKEY_bio, pFpp)
-GO(d2i_EC_PUBKEY_fp, pFpp)
+GO(d2i_EC_PUBKEY_fp, pFSp)
 //GO(d2i_EDIPARTYNAME, 
 //GO(d2i_ESS_CERT_ID, 
 //GO(d2i_ESS_ISSUER_SERIAL, 
@@ -1050,43 +1050,43 @@ GO(d2i_PKCS7_bio, pFpp)
 //GO(d2i_PKCS7_ENC_CONTENT, 
 //GO(d2i_PKCS7_ENCRYPT, 
 //GO(d2i_PKCS7_ENVELOPE, 
-GO(d2i_PKCS7_fp, pFpp)
+GO(d2i_PKCS7_fp, pFSp)
 //GO(d2i_PKCS7_ISSUER_AND_SERIAL, 
 //GO(d2i_PKCS7_RECIP_INFO, 
 //GO(d2i_PKCS7_SIGNED, 
 //GO(d2i_PKCS7_SIGN_ENVELOPE, 
 //GO(d2i_PKCS7_SIGNER_INFO, 
 GO(d2i_PKCS8_bio, pFpp)
-GO(d2i_PKCS8_fp, pFpp)
+GO(d2i_PKCS8_fp, pFSp)
 GO(d2i_PKCS8PrivateKey_bio, pFpp)
 GO(d2i_PKCS8PrivateKey_fp, pFpp)
 GO(d2i_PKCS8_PRIV_KEY_INFO, pFppl)
 GO(d2i_PKCS8_PRIV_KEY_INFO_bio, pFpp)
-GO(d2i_PKCS8_PRIV_KEY_INFO_fp, pFpp)
+GO(d2i_PKCS8_PRIV_KEY_INFO_fp, pFSp)
 //GO(d2i_PKEY_USAGE_PERIOD, 
 //GO(d2i_POLICYINFO, 
 //GO(d2i_POLICYQUALINFO, 
 GO(d2i_PrivateKey, pFippl)
 GO(d2i_PrivateKey_bio, pFpp)
-GO(d2i_PrivateKey_fp, pFpp)
+GO(d2i_PrivateKey_fp, pFSp)
 //GO(d2i_PROXY_CERT_INFO_EXTENSION, 
 //GO(d2i_PROXY_POLICY, 
 GO(d2i_PUBKEY, pFppl)
 GO(d2i_PUBKEY_bio, pFpp)
-GO(d2i_PUBKEY_fp, pFpp)
+GO(d2i_PUBKEY_fp, pFSp)
 GO(d2i_PublicKey, pFippl)
 //GO(d2i_RSA_NET, 
 //GO(d2i_RSA_OAEP_PARAMS, 
 GO(d2i_RSAPrivateKey, pFppl)
 GO(d2i_RSAPrivateKey_bio, pFpp)
-GO(d2i_RSAPrivateKey_fp, pFpp)
+GO(d2i_RSAPrivateKey_fp, pFSp)
 //GO(d2i_RSA_PSS_PARAMS, 
 GO(d2i_RSA_PUBKEY, pFppl)
 GO(d2i_RSA_PUBKEY_bio, pFpp)
-GO(d2i_RSA_PUBKEY_fp, pFpp)
+GO(d2i_RSA_PUBKEY_fp, pFSp)
 GO(d2i_RSAPublicKey, pFppl)
 GO(d2i_RSAPublicKey_bio, pFpp)
-GO(d2i_RSAPublicKey_fp, pFpp)
+GO(d2i_RSAPublicKey_fp, pFSp)
 //GO(d2i_SXNET, 
 //GO(d2i_SXNETID, 
 //GO(d2i_TS_ACCURACY, 
@@ -1115,18 +1115,18 @@ GO(d2i_X509_bio, pFpp)
 //GO(d2i_X509_CINF, 
 GO(d2i_X509_CRL, pFppl)
 GO(d2i_X509_CRL_bio, pFpp)
-GO(d2i_X509_CRL_fp, pFpp)
+GO(d2i_X509_CRL_fp, pFSp)
 //GO(d2i_X509_CRL_INFO, 
 //GO(d2i_X509_EXTENSION, 
 //GO(d2i_X509_EXTENSIONS, 
-GO(d2i_X509_fp, pFppl)
+GO(d2i_X509_fp, pFSp)
 GO(d2i_X509_NAME, pFppl)
 //GO(d2i_X509_NAME_ENTRY, 
 //GO(d2i_X509_PKEY, 
 //GO(d2i_X509_PUBKEY, 
 GO(d2i_X509_REQ, pFppl)
 GO(d2i_X509_REQ_bio, pFpp)
-GO(d2i_X509_REQ_fp, pFpp)
+GO(d2i_X509_REQ_fp, pFSp)
 //GO(d2i_X509_REQ_INFO, 
 //GO(d2i_X509_REVOKED, 
 //GO(d2i_X509_SIG, 
@@ -1231,7 +1231,7 @@ GO(DSA_new, pFv)
 GO(DSA_OpenSSL, pFv)
 //GO(dsa_paramgen_check_g, 
 GO(DSA_set0_key, iFppp)
-GO(DSA_set0_pqg, iFppp)
+GO(DSA_set0_pqg, iFpppp)
 //GO(DSAparams_dup, 
 //GO(DSAparams_print, 
 //GO(DSAparams_print_fp, 
@@ -1510,7 +1510,7 @@ GO(EC_POINT_oct2point, iFpppLp)
 //GO(EC_POINT_point2buf, 
 //GO(EC_POINT_point2bn, 
 //GO(EC_POINT_point2hex, 
-GO(EC_POINT_point2oct, LFppipLp)
+GO(EC_POINT_point2oct, LFppupLp)
 GO(EC_POINT_set_affine_coordinates, iFppppp)
 GO(EC_POINT_set_affine_coordinates_GF2m, iFppppp)
 GO(EC_POINT_set_affine_coordinates_GFp, iFppppp)
@@ -2103,7 +2103,7 @@ GO(EVP_PKEY_get_group_name, iFppLp)
 GO(EVP_PKEY_CTX_set0_rsa_oaep_label, iFppi)
 GO(EVP_PKEY_CTX_set_ec_paramgen_curve_nid, iFpi)
 GO(EVP_PKEY_get_bn_param, iFppp)
-GO(EVP_PKEY_get_utf8_string_param, iFppppL)
+GO(EVP_PKEY_get_utf8_string_param, iFpppLp)
 GO(EVP_PKEY_get_raw_private_key, iFppp)
 GO(EVP_PKEY_get_raw_public_key, iFppp)
 GO(EVP_PKEY_new_raw_private_key, pFippL)
@@ -2243,7 +2243,7 @@ GO(HMAC_CTX_set_flags, vFpL)
 GO(HMAC_Final, iFppp)
 GO(HMAC_Init, iFppip)
 GO(HMAC_Init_ex, iFppipp)
-GO(HMAC_Update, iFppi)
+GO(HMAC_Update, iFppL)
 //GO(i2a_ACCESS_DESCRIPTION, 
 GO(i2a_ASN1_ENUMERATED, iFpp)
 GO(i2a_ASN1_INTEGER, iFpp)
@@ -2298,10 +2298,10 @@ GO(i2d_DISPLAYTEXT, iFpp)
 //GO(i2d_DSAparams, 
 GO(i2d_DSAPrivateKey, iFpp)
 GO(i2d_DSAPrivateKey_bio, iFpp)
-GO(i2d_DSAPrivateKey_fp, iFpp)
+GO(i2d_DSAPrivateKey_fp, iFSp)
 GO(i2d_DSA_PUBKEY, iFpp)
 GO(i2d_DSA_PUBKEY_bio, iFpp)
-GO(i2d_DSA_PUBKEY_fp, iFpp)
+GO(i2d_DSA_PUBKEY_fp, iFSp)
 //GO(i2d_DSAPublicKey, 
 GO(i2d_DSA_SIG, iFpp)
 GO(i2d_ECDSA_SIG, iFpp)
@@ -2311,10 +2311,10 @@ GO(i2d_ECDSA_SIG, iFpp)
 GO(i2d_ECPrivateKey, iFpp)
 //GO(i2d_EC_PRIVATEKEY, 
 GO(i2d_ECPrivateKey_bio, iFpp)
-GO(i2d_ECPrivateKey_fp, iFpp)
+GO(i2d_ECPrivateKey_fp, iFSp)
 GO(i2d_EC_PUBKEY, iFpp)
 GO(i2d_EC_PUBKEY_bio, iFpp)
-GO(i2d_EC_PUBKEY_fp, iFpp)
+GO(i2d_EC_PUBKEY_fp, iFSp)
 GO(i2d_EDIPARTYNAME, iFpp)
 GO(i2d_ESS_CERT_ID, iFpp)
 GO(i2d_ESS_ISSUER_SERIAL, iFpp)
@@ -2375,7 +2375,7 @@ GO(i2d_PKCS7_DIGEST, iFpp)
 GO(i2d_PKCS7_ENC_CONTENT, iFpp)
 GO(i2d_PKCS7_ENCRYPT, iFpp)
 GO(i2d_PKCS7_ENVELOPE, iFpp)
-GO(i2d_PKCS7_fp, iFpp)
+GO(i2d_PKCS7_fp, iFSp)
 GO(i2d_PKCS7_ISSUER_AND_SERIAL, iFpp)
 GO(i2d_PKCS7_NDEF, iFpp)
 GO(i2d_PKCS7_RECIP_INFO, iFpp)
@@ -2383,41 +2383,41 @@ GO(i2d_PKCS7_SIGNED, iFpp)
 GO(i2d_PKCS7_SIGN_ENVELOPE, iFpp)
 GO(i2d_PKCS7_SIGNER_INFO, iFpp)
 GO(i2d_PKCS8_bio, iFpp)
-GO(i2d_PKCS8_fp, iFpp)
+GO(i2d_PKCS8_fp, iFSp)
 GO(i2d_PKCS8PrivateKey_bio, iFpp)
 GO(i2d_PKCS8PrivateKey_fp, iFpp)
 GO(i2d_PKCS8PrivateKeyInfo_bio, iFpp)
-GO(i2d_PKCS8PrivateKeyInfo_fp, iFpp)
+GO(i2d_PKCS8PrivateKeyInfo_fp, iFSp)
 GO(i2d_PKCS8PrivateKey_nid_bio, iFpp)
 GO(i2d_PKCS8PrivateKey_nid_fp, iFpp)
 GO(i2d_PKCS8_PRIV_KEY_INFO, iFpp)
 GO(i2d_PKCS8_PRIV_KEY_INFO_bio, iFpp)
-GO(i2d_PKCS8_PRIV_KEY_INFO_fp, iFpp)
+GO(i2d_PKCS8_PRIV_KEY_INFO_fp, iFSp)
 GO(i2d_PKEY_USAGE_PERIOD, iFpp)
 GO(i2d_POLICYINFO, iFpp)
 GO(i2d_POLICYQUALINFO, iFpp)
 GO(i2d_PrivateKey, iFpp)
 GO(i2d_PrivateKey_bio, iFpp)
-GO(i2d_PrivateKey_fp, iFpp)
+GO(i2d_PrivateKey_fp, iFSp)
 GO(i2d_PROXY_CERT_INFO_EXTENSION, iFpp)
 GO(i2d_PROXY_POLICY, iFpp)
 GO(i2d_PUBKEY, iFpp)
 GO(i2d_PUBKEY_bio, iFpp)
-GO(i2d_PUBKEY_fp, iFpp)
+GO(i2d_PUBKEY_fp, iFSp)
 GO(i2d_PublicKey, iFpp)
 //GO(i2d_re_X509_tbs, 
 GO(i2d_RSA_NET, iFpp)
 GO(i2d_RSA_OAEP_PARAMS, iFpp)
 GO(i2d_RSAPrivateKey, iFpp)
 GO(i2d_RSAPrivateKey_bio, iFpp)
-GO(i2d_RSAPrivateKey_fp, iFpp)
+GO(i2d_RSAPrivateKey_fp, iFSp)
 GO(i2d_RSA_PSS_PARAMS, iFpp)
 GO(i2d_RSA_PUBKEY, iFpp)
 GO(i2d_RSA_PUBKEY_bio, iFpp)
-GO(i2d_RSA_PUBKEY_fp, iFpp)
+GO(i2d_RSA_PUBKEY_fp, iFSp)
 GO(i2d_RSAPublicKey, iFpp)
 GO(i2d_RSAPublicKey_bio, iFpp)
-GO(i2d_RSAPublicKey_fp, iFpp)
+GO(i2d_RSAPublicKey_fp, iFSp)
 GO(i2d_SXNET, iFpp)
 GO(i2d_SXNETID, iFpp)
 GO(i2d_TS_ACCURACY, iFpp)
@@ -2446,18 +2446,18 @@ GO(i2d_X509_CERT_PAIR, iFpp)
 GO(i2d_X509_CINF, iFpp)
 GO(i2d_X509_CRL, iFpp)
 GO(i2d_X509_CRL_bio, iFpp)
-GO(i2d_X509_CRL_fp, iFpp)
+GO(i2d_X509_CRL_fp, iFSp)
 GO(i2d_X509_CRL_INFO, iFpp)
 GO(i2d_X509_EXTENSION, iFpp)
 GO(i2d_X509_EXTENSIONS, iFpp)
-GO(i2d_X509_fp, iFpp)
+GO(i2d_X509_fp, iFSp)
 GO(i2d_X509_NAME, iFpp)
 GO(i2d_X509_NAME_ENTRY, iFpp)
 GO(i2d_X509_PKEY, iFpp)
 GO(i2d_X509_PUBKEY, iFpp)
 GO(i2d_X509_REQ, iFpp)
 GO(i2d_X509_REQ_bio, iFpp)
-GO(i2d_X509_REQ_fp, iFpp)
+GO(i2d_X509_REQ_fp, iFSp)
 GO(i2d_X509_REQ_INFO, iFpp)
 GO(i2d_X509_REVOKED, iFpp)
 GO(i2d_X509_SIG, iFpp)
@@ -2528,7 +2528,7 @@ GO(ISSUING_DIST_POINT_it, pFv)
 GO(MD4_Final, iFpp)
 GO(MD4_Init, iFp)
 //GO(MD4_Transform, 
-GO(MD4_Update, iFppu)
+GO(MD4_Update, iFppL)
 GO(MD5, pFpLp)
 //GO(md5_block_data_order, 
 GO(MD5_Final, iFpp)
@@ -2823,12 +2823,12 @@ GO(OSSL_PARAM_BLD_push_BN, iFppp)
 GO(OSSL_PARAM_BLD_push_octet_string, iFpppL)
 GO(OSSL_PARAM_BLD_push_utf8_string, iFpppL)
 GO(OSSL_PARAM_BLD_to_param, pFp)
-GOM(OSSL_PARAM_construct_end, vFEp)
-GOM(OSSL_PARAM_construct_int, vFEppp)
-GOM(OSSL_PARAM_construct_octet_string, vFEpppL)
-GOM(OSSL_PARAM_construct_uint, vFEppp)
-GOM(OSSL_PARAM_construct_utf8_string, vFEpppL)
-GO(OSSL_PARAM_construct_uint64, vFpp)
+GOM(OSSL_PARAM_construct_end, pFEp)
+GOM(OSSL_PARAM_construct_int, pFEppp)
+GOM(OSSL_PARAM_construct_octet_string, pFEpppL)
+GOM(OSSL_PARAM_construct_uint, pFEppp)
+GOM(OSSL_PARAM_construct_utf8_string, pFEpppL)
+GO(OSSL_PARAM_construct_uint64, pFppp)
 GO(OSSL_PARAM_free, vFp)
 GO(OSSL_PARAM_get_BN, iFpp)
 GO(OSSL_PARAM_get_octet_string_ptr, iFppp)
@@ -3076,7 +3076,7 @@ GO(PKCS5_v2_PBE_keyivgen, iFppipppi)
 //GO(PKCS7_ENCRYPT_new, 
 //GO(PKCS7_ENVELOPE_free, 
 //GO(PKCS7_ENVELOPE_new, 
-GO(PKCS7_final, iFpppi)
+GO(PKCS7_final, iFppi)
 GO(PKCS7_free, vFp)
 //GO(PKCS7_get0_signers, 
 //GO(PKCS7_get_attribute, 
@@ -3762,14 +3762,14 @@ GO(X509_NAME_get_text_by_OBJ, iFpppi)
 //GO(X509_NAME_new, 
 GO(X509_NAME_oneline, pFppi)
 GO(X509_NAME_print, iFppi)
-GO(X509_NAME_print_ex, iFppiu)
-GO(X509_NAME_print_ex_fp, iFppiu)
+GO(X509_NAME_print_ex, iFppiL)
+GO(X509_NAME_print_ex_fp, iFSpiL)
 //GO(X509_NAME_set, 
 GO(X509_new, pFv)
 GO(X509_OBJECT_free, vFp)
 GO(X509_OBJECT_new, pFv)
 //GO(X509_OBJECT_free_contents, 
-GO(X509_OBJECT_get_type, iFp)
+GO(X509_OBJECT_get_type, uFp)
 GO(X509_OBJECT_get0_X509, pFp)
 GO(X509_OBJECT_set1_X509, iFpp)
 GO(X509_OBJECT_get0_X509_CRL, pFp)
@@ -3795,8 +3795,8 @@ GO(X509_OBJECT_set1_X509_CRL, iFpp)
 //GO(X509_policy_tree_level_count, 
 GO(X509_print, iFpp)
 GO(X509_print_ex, iFppLL)
-GO(X509_print_ex_fp, iFppLL)
-GO(X509_print_fp, iFpp)
+GO(X509_print_ex_fp, iFSpLL)
+GO(X509_print_fp, iFSp)
 //GO(X509_pubkey_digest, 
 GO(X509_PUBKEY_free, vFp)
 GO(X509_PUBKEY_get, pFp)
@@ -3915,7 +3915,7 @@ GO(X509_STORE_CTX_new, pFv)
 //GO(X509_STORE_CTX_set_cert, 
 //GO(X509_STORE_CTX_set_chain, 
 GO(X509_STORE_CTX_set_current_cert, vFpp)
-GO(X509_STORE_CTX_set_default, iFp)
+GO(X509_STORE_CTX_set_default, iFpp)
 //GO(X509_STORE_CTX_set_depth, 
 GO(X509_STORE_CTX_set_error, vFpi)
 GO(X509_STORE_CTX_set_error_depth, vFpi)

src/wrapped/wrappedcrypto_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 //GO(a2d_ASN1_OBJECT, 
@@ -177,8 +177,8 @@ GO(ASN1_STRING_length, iFp)
 //GO(ASN1_STRING_length_set, 
 //GO(ASN1_STRING_new, 
 GO(ASN1_STRING_print, iFpp)
-GO(ASN1_STRING_print_ex, iFppu)
-GO(ASN1_STRING_print_ex_fp, iFppu)
+GO(ASN1_STRING_print_ex, iFppL)
+GO(ASN1_STRING_print_ex_fp, iFSpL)
 GO(ASN1_STRING_set, iFppi)
 //GO(ASN1_STRING_set0, 
 //GO(ASN1_STRING_set_by_NID, 
@@ -205,7 +205,7 @@ GO(ASN1_STRING_type, iFp)
 GO(ASN1_TIME_free, vFp)
 GO(ASN1_TIME_new, pFv)
 //GO(ASN1_TIME_print, 
-GO(ASN1_TIME_set, pFpL)
+GO(ASN1_TIME_set, pFpl)
 //GO(ASN1_TIME_set_string, 
 //GO(ASN1_TIME_to_generalizedtime, 
 //GO(ASN1_TYPE_cmp, 
@@ -394,7 +394,7 @@ GO(BIO_wpending, iFp)
 GO(BIO_write, iFppi)
 GO(BN_add, iFppp)
 //GO(bn_add_part_words, 
-GO(BN_add_word, iFpu)
+GO(BN_add_word, iFpL)
 //GO(bn_add_words, 
 //GO(BN_asc2bn, 
 GO(BN_bin2bn, pFpip)
@@ -433,7 +433,7 @@ GO(BN_CTX_new, pFv)
 GO(BN_dec2bn, iFpp)
 GO(BN_div, iFppppp)
 //GO(BN_div_recp, 
-GO(BN_div_word, uFpu)
+GO(BN_div_word, LFpL)
 //GO(bn_div_words, 
 GO(BN_dup, pFp)
 //GO(bn_dup_expand, 
@@ -443,7 +443,7 @@ GO(BN_free, vFp)
 //GO(BN_from_montgomery, 
 GO(BN_gcd, iFpppp)
 //GO(BN_GENCB_call, 
-//GO(BN_generate_prime, pFpiippBp) //callback previous last argument...
+//GOM(BN_generate_prime, pFEpiipppp)
 //GO(BN_generate_prime_ex, 
 //GO(BN_get0_nist_prime_192, 
 //GO(BN_get0_nist_prime_224, 
@@ -451,7 +451,7 @@ GO(BN_gcd, iFpppp)
 //GO(BN_get0_nist_prime_384, 
 //GO(BN_get0_nist_prime_521, 
 //GO(BN_get_params, 
-GO(BN_get_word, uFp)
+GO(BN_get_word, LFp)
 //GO(BN_GF2m_add, 
 //GO(BN_GF2m_arr2poly, 
 //GO(BN_GF2m_mod, 
@@ -475,12 +475,12 @@ GO(BN_get_word, uFp)
 GO(BN_hex2bn, iFpp)
 //GO(BN_init, 
 GO(BN_is_bit_set, iFpi)
-//GO(BN_is_prime, iFpiBpp)  // third argument is a callback
+//GOM(BN_is_prime, iFEpippp)
 //GO(BN_is_prime_ex, 
 //GO(BN_is_prime_fasttest, 
 //GO(BN_is_prime_fasttest_ex, 
 GO(BN_is_word, iFpL)
-GO(BN_is_zero, iFp) 
+GO(BN_is_zero, iFp)
 //GO(BN_kronecker, 
 GO(BN_lshift, iFppi)
 GO(BN_lshift1, iFpp)
@@ -506,7 +506,7 @@ GO(BN_mod_sqr, iFpppp)
 //GO(BN_mod_sqrt, 
 GO(BN_mod_sub, iFppppp)
 //GO(BN_mod_sub_quick, 
-GO(BN_mod_word, uFpu)
+GO(BN_mod_word, LFpL)
 //GO(BN_MONT_CTX_copy, 
 //GO(BN_MONT_CTX_free, 
 //GO(BN_MONT_CTX_init, 
@@ -525,7 +525,7 @@ GO(BN_mul, iFpppp)
 //GO(bn_mul_normal, 
 //GO(bn_mul_part_recursive, 
 //GO(bn_mul_recursive, 
-GO(BN_mul_word, iFpu)
+GO(BN_mul_word, iFpL)
 //GO(bn_mul_words, 
 GO(BN_new, pFv)
 //GO(BN_nist_mod_192, 
@@ -535,11 +535,11 @@ GO(BN_new, pFv)
 //GO(BN_nist_mod_521, 
 GO(BN_nnmod, iFpppp)
 GO(BN_num_bits, iFp)
-GO(BN_num_bits_word, iFu)
+GO(BN_num_bits_word, iFL)
 GO(BN_one, iFp)
 //GO(BN_options, 
 GO(BN_print, iFpp)
-GO(BN_print_fp, iFpp)
+GO(BN_print_fp, iFSp)
 GO(BN_pseudo_rand, iFpiii)
 GO(BN_pseudo_rand_range, iFpp)
 GO(BN_rand, iFpiii)
@@ -554,7 +554,7 @@ GO(BN_rshift1, iFpp)
 GO(BN_set_bit, iFpi)
 GO(BN_set_negative, vFpi)
 //GO(BN_set_params, 
-GO(BN_set_word, iFpu)
+GO(BN_set_word, iFpL)
 GO(BN_sqr, iFppp)
 //GO(bn_sqr_comba4, 
 //GO(bn_sqr_comba8, 
@@ -563,9 +563,9 @@ GO(BN_sqr, iFppp)
 //GO(bn_sqr_words, 
 GO(BN_sub, iFppp)
 //GO(bn_sub_part_words, 
-GO(BN_sub_word, iFpu)
+GO(BN_sub_word, iFpL)
 //GO(bn_sub_words, 
-GO(BN_swap, pFpp)
+GO(BN_swap, vFpp)
 GO(BN_to_ASN1_ENUMERATED, pFpp)
 GO(BN_to_ASN1_INTEGER, pFpp)
 //GO(BN_uadd, 
@@ -880,7 +880,7 @@ GOM(CRYPTO_get_ex_new_index, iFEilpppp)
 //GO(CRYPTO_get_new_lockid, 
 //GO(CRYPTO_is_mem_check_on, 
 //GO(CRYPTO_lock, 
-GO(CRYPTO_malloc, pFupi)
+GO(CRYPTO_malloc, pFLpi)
 //GO(CRYPTO_malloc_locked, 
 //GO(CRYPTO_memcmp, 
 //GO(CRYPTO_mem_ctrl, 
@@ -896,7 +896,7 @@ GO(CRYPTO_num_locks, iFv)
 //GO(CRYPTO_ofb128_encrypt, 
 //GO(CRYPTO_pop_info, 
 //GO(CRYPTO_push_info_, 
-GO(CRYPTO_realloc, pFpupi)
+GO(CRYPTO_realloc, pFpLpi)
 //GO(CRYPTO_realloc_clean, 
 //GO(CRYPTO_remalloc, 
 //GO(CRYPTO_remove_all_info, 
@@ -970,10 +970,10 @@ GO(d2i_DHparams, pFppl)
 //GO(d2i_DSAparams, 
 GO(d2i_DSAPrivateKey, pFppl)
 GO(d2i_DSAPrivateKey_bio, pFpp)
-GO(d2i_DSAPrivateKey_fp, pFpp)
+GO(d2i_DSAPrivateKey_fp, pFSp)
 GO(d2i_DSA_PUBKEY, pFppl)
 GO(d2i_DSA_PUBKEY_bio, pFpp)
-GO(d2i_DSA_PUBKEY_fp, pFpp)
+GO(d2i_DSA_PUBKEY_fp, pFSp)
 //GO(d2i_DSAPublicKey, 
 //GO(d2i_DSA_SIG, 
 //GO(d2i_ECDSA_SIG, 
@@ -983,10 +983,10 @@ GO(d2i_DSA_PUBKEY_fp, pFpp)
 //GO(d2i_ECPrivateKey, 
 GO(d2i_EC_PRIVATEKEY, pFppl)
 GO(d2i_ECPrivateKey_bio, pFpp)
-GO(d2i_ECPrivateKey_fp, pFpp)
+GO(d2i_ECPrivateKey_fp, pFSp)
 GO(d2i_EC_PUBKEY, pFppl)
 GO(d2i_EC_PUBKEY_bio, pFpp)
-GO(d2i_EC_PUBKEY_fp, pFpp)
+GO(d2i_EC_PUBKEY_fp, pFSp)
 //GO(d2i_EDIPARTYNAME, 
 //GO(d2i_ESS_CERT_ID, 
 //GO(d2i_ESS_ISSUER_SERIAL, 
@@ -1046,43 +1046,43 @@ GO(d2i_PKCS7_bio, pFpp)
 //GO(d2i_PKCS7_ENC_CONTENT, 
 //GO(d2i_PKCS7_ENCRYPT, 
 //GO(d2i_PKCS7_ENVELOPE, 
-GO(d2i_PKCS7_fp, pFpp)
+GO(d2i_PKCS7_fp, pFSp)
 //GO(d2i_PKCS7_ISSUER_AND_SERIAL, 
 //GO(d2i_PKCS7_RECIP_INFO, 
 //GO(d2i_PKCS7_SIGNED, 
 //GO(d2i_PKCS7_SIGN_ENVELOPE, 
 //GO(d2i_PKCS7_SIGNER_INFO, 
 GO(d2i_PKCS8_bio, pFpp)
-GO(d2i_PKCS8_fp, pFpp)
+GO(d2i_PKCS8_fp, pFSp)
 GO(d2i_PKCS8PrivateKey_bio, pFpp)
 GO(d2i_PKCS8PrivateKey_fp, pFpp)
 GO(d2i_PKCS8_PRIV_KEY_INFO, pFppl)
 GO(d2i_PKCS8_PRIV_KEY_INFO_bio, pFpp)
-GO(d2i_PKCS8_PRIV_KEY_INFO_fp, pFpp)
+GO(d2i_PKCS8_PRIV_KEY_INFO_fp, pFSp)
 //GO(d2i_PKEY_USAGE_PERIOD, 
 //GO(d2i_POLICYINFO, 
 //GO(d2i_POLICYQUALINFO, 
-GO(d2i_PrivateKey, pFppl)
+GO(d2i_PrivateKey, pFippl)
 GO(d2i_PrivateKey_bio, pFpp)
-GO(d2i_PrivateKey_fp, pFpp)
+GO(d2i_PrivateKey_fp, pFSp)
 //GO(d2i_PROXY_CERT_INFO_EXTENSION, 
 //GO(d2i_PROXY_POLICY, 
 GO(d2i_PUBKEY, pFppl)
 GO(d2i_PUBKEY_bio, pFpp)
-GO(d2i_PUBKEY_fp, pFpp)
+GO(d2i_PUBKEY_fp, pFSp)
 //GO(d2i_PublicKey, 
 //GO(d2i_RSA_NET, 
 //GO(d2i_RSA_OAEP_PARAMS, 
 GO(d2i_RSAPrivateKey, pFppl)
 GO(d2i_RSAPrivateKey_bio, pFpp)
-GO(d2i_RSAPrivateKey_fp, pFpp)
+GO(d2i_RSAPrivateKey_fp, pFSp)
 //GO(d2i_RSA_PSS_PARAMS, 
 GO(d2i_RSA_PUBKEY, pFppl)
 GO(d2i_RSA_PUBKEY_bio, pFpp)
-GO(d2i_RSA_PUBKEY_fp, pFpp)
+GO(d2i_RSA_PUBKEY_fp, pFSp)
 GO(d2i_RSAPublicKey, pFppl)
 GO(d2i_RSAPublicKey_bio, pFpp)
-GO(d2i_RSAPublicKey_fp, pFpp)
+GO(d2i_RSAPublicKey_fp, pFSp)
 //GO(d2i_SXNET, 
 //GO(d2i_SXNETID, 
 //GO(d2i_TS_ACCURACY, 
@@ -1111,18 +1111,18 @@ GO(d2i_X509_bio, pFpp)
 //GO(d2i_X509_CINF, 
 GO(d2i_X509_CRL, pFppl)
 GO(d2i_X509_CRL_bio, pFpp)
-GO(d2i_X509_CRL_fp, pFpp)
+GO(d2i_X509_CRL_fp, pFSp)
 //GO(d2i_X509_CRL_INFO, 
 //GO(d2i_X509_EXTENSION, 
 //GO(d2i_X509_EXTENSIONS, 
-GO(d2i_X509_fp, pFppl)
+GO(d2i_X509_fp, pFSp)
 GO(d2i_X509_NAME, pFppl)
 //GO(d2i_X509_NAME_ENTRY, 
 //GO(d2i_X509_PKEY, 
 //GO(d2i_X509_PUBKEY, 
 GO(d2i_X509_REQ, pFppl)
 GO(d2i_X509_REQ_bio, pFpp)
-GO(d2i_X509_REQ_fp, pFpp)
+GO(d2i_X509_REQ_fp, pFSp)
 //GO(d2i_X509_REQ_INFO, 
 //GO(d2i_X509_REVOKED, 
 //GO(d2i_X509_SIG, 
@@ -1213,7 +1213,7 @@ GO(DSA_free, vFp)
 GO(DSA_generate_key, iFp)
 //GO(DSA_generate_parameters, 
 GO(DSA_generate_parameters_ex, iFpipippp)
-GO(DSA_get0_key, iFppp)
+GO(DSA_get0_key, vFppp)
 GO(DSA_get_method, pFp)
 GO(DSA_get0_pqg, vFpppp)
 //GO(DSA_get_default_method, 
@@ -1497,10 +1497,10 @@ GO(EC_POINT_method_of, pFp)
 GO(EC_POINT_mul, iFpppppp)
 GO(EC_POINT_new, pFp)
 //GO(EC_POINT_oct2point, 
-//GO(EC_POINT_point2buf,
+//GO(EC_POINT_point2buf, 
 //GO(EC_POINT_point2bn, 
 //GO(EC_POINT_point2hex, 
-//GO(EC_POINT_point2oct,
+//GO(EC_POINT_point2oct, 
 GO(EC_POINT_set_affine_coordinates, iFppppp)
 GO(EC_POINT_set_affine_coordinates_GF2m, iFppppp)
 GO(EC_POINT_set_affine_coordinates_GFp, iFppppp)
@@ -1616,7 +1616,7 @@ GO(ENGINE_register_RSA, iFp)
 //GO(ENGINE_register_STORE, 
 GO(ENGINE_remove, iFp)
 //GO(engine_set_all_null, 
-//GOM(ENGINE_set_ciphers, iFEpp)   //typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *e, const EVP_CIPHER **impl, const int **nids, int nid)
+//GOM(ENGINE_set_ciphers, iFEpp)
 //GOM(ENGINE_set_cmd_defns, iFEpp)
 //GO(ENGINE_set_ctrl_function, 
 GO(ENGINE_set_default, iFpu)
@@ -1695,7 +1695,7 @@ GO(ERR_lib_error_string, pFu)
 //GO(ERR_load_COMP_strings, 
 //GO(ERR_load_CONF_strings, 
 GO(ERR_load_crypto_strings, vFv)
-GO(ERR_load_CRYPTO_strings, vFv)
+GO(ERR_load_CRYPTO_strings, iFv)
 //GO(ERR_load_DH_strings, 
 //GO(ERR_load_DSA_strings, 
 //GO(ERR_load_DSO_strings, 
@@ -1704,12 +1704,12 @@ GO(ERR_load_CRYPTO_strings, vFv)
 //GO(ERR_load_EC_strings, 
 //GO(ERR_load_ENGINE_strings, 
 //GO(ERR_load_ERR_strings, 
-GO(ERR_load_EVP_strings, vFv)
+GO(ERR_load_EVP_strings, iFv)
 //GO(ERR_load_OBJ_strings, 
 //GO(ERR_load_OCSP_strings, 
 //GO(ERR_load_PEM_strings, 
 //GO(ERR_load_PKCS12_strings, 
-GO(ERR_load_PKCS7_strings, vFv)
+GO(ERR_load_PKCS7_strings, iFv)
 //GO(ERR_load_RAND_strings, 
 //GO(ERR_load_RSA_strings, 
 //GO(ERR_load_strings, 
@@ -1928,7 +1928,7 @@ GO(EVP_MD_CTX_clear_flags, vFpi)
 GO(EVP_MD_CTX_copy, iFpp)
 GO(EVP_MD_CTX_copy_ex, iFpp)
 GO(EVP_MD_CTX_create, pFv)
-GO(EVP_MD_CTX_ctrl, vFpiip)
+GO(EVP_MD_CTX_ctrl, iFpiip)
 GO(EVP_MD_CTX_destroy, vFp)
 GO(EVP_MD_CTX_free, vFp)
 //GO(EVP_MD_CTX_init, 
@@ -2003,7 +2003,7 @@ GO(EVP_PKEY_CTX_set_app_data, vFpp)
 //GO(EVP_PKEY_delete_attr, 
 GO(EVP_PKEY_derive, iFppp)
 GO(EVP_PKEY_derive_init, iFp)
-GO(EVP_PKEY_derive_set_peer, iFppi)
+GO(EVP_PKEY_derive_set_peer, iFpp)
 //GO(EVP_PKEY_encrypt, 
 //GO(EVP_PKEY_encrypt_init, 
 //GO(EVP_PKEY_encrypt_old, 
@@ -2059,7 +2059,7 @@ GO(EVP_PKEY_set1_RSA, iFpp)
 //GO(evp_pkey_set_cb_translate, 
 //GO(EVP_PKEY_set_type, 
 //GO(EVP_PKEY_set_type_str, 
-GO(EVP_PKEY_sign, iFppppp)
+GO(EVP_PKEY_sign, iFppppL)
 GO(EVP_PKEY_sign_init, iFp)
 //GO(EVP_PKEY_size, 
 GO(EVP_PKEY_type, iFi)
@@ -2096,9 +2096,9 @@ GO(EVP_sha384, pFv)
 GO(EVP_sha512, pFv)
 //GO(EVP_SignFinal, 
 GO(EVP_VerifyFinal, iFppup)
-GO(EVP_VerifyInit, iFpp)        // 1.1.0+
-GO(EVP_VerifyInit_ex, iFppp)    // 1.1.0+
-GO(EVP_VerifyUpdate, iFppu)     // 1.1.0+
+GO(EVP_VerifyInit, iFpp)
+GO(EVP_VerifyInit_ex, iFppp)
+GO(EVP_VerifyUpdate, iFppu)
 //GO(EVP_whirlpool, 
 GO(EXTENDED_KEY_USAGE_free, vFp)
 //GO(EXTENDED_KEY_USAGE_new, 
@@ -2146,7 +2146,7 @@ GO(HMAC_CTX_free, vFp)
 GO(HMAC_Init, iFppip)
 GO(HMAC_Init_ex, iFppipp)
 GO(HMAC_CTX_new, pFv)
-GO(HMAC_Update, iFppi)
+GO(HMAC_Update, iFppL)
 //GO(i2a_ACCESS_DESCRIPTION, 
 //GO(i2a_ASN1_ENUMERATED, 
 //GO(i2a_ASN1_INTEGER, 
@@ -2201,10 +2201,10 @@ GO(i2d_DHparams, iFpp)
 //GO(i2d_DSAparams, 
 GO(i2d_DSAPrivateKey, iFpp)
 GO(i2d_DSAPrivateKey_bio, iFpp)
-GO(i2d_DSAPrivateKey_fp, iFpp)
+GO(i2d_DSAPrivateKey_fp, iFSp)
 GO(i2d_DSA_PUBKEY, iFpp)
 GO(i2d_DSA_PUBKEY_bio, iFpp)
-GO(i2d_DSA_PUBKEY_fp, iFpp)
+GO(i2d_DSA_PUBKEY_fp, iFSp)
 //GO(i2d_DSAPublicKey, 
 //GO(i2d_DSA_SIG, 
 //GO(i2d_ECDSA_SIG, 
@@ -2214,10 +2214,10 @@ GO(i2d_DSA_PUBKEY_fp, iFpp)
 GO(i2d_ECPrivateKey, iFpp)
 //GO(i2d_EC_PRIVATEKEY, 
 GO(i2d_ECPrivateKey_bio, iFpp)
-GO(i2d_ECPrivateKey_fp, iFpp)
+GO(i2d_ECPrivateKey_fp, iFSp)
 GO(i2d_EC_PUBKEY, iFpp)
 GO(i2d_EC_PUBKEY_bio, iFpp)
-GO(i2d_EC_PUBKEY_fp, iFpp)
+GO(i2d_EC_PUBKEY_fp, iFSp)
 GO(i2d_EDIPARTYNAME, iFpp)
 GO(i2d_ESS_CERT_ID, iFpp)
 GO(i2d_ESS_ISSUER_SERIAL, iFpp)
@@ -2278,7 +2278,7 @@ GO(i2d_PKCS7_DIGEST, iFpp)
 GO(i2d_PKCS7_ENC_CONTENT, iFpp)
 GO(i2d_PKCS7_ENCRYPT, iFpp)
 GO(i2d_PKCS7_ENVELOPE, iFpp)
-GO(i2d_PKCS7_fp, iFpp)
+GO(i2d_PKCS7_fp, iFSp)
 GO(i2d_PKCS7_ISSUER_AND_SERIAL, iFpp)
 GO(i2d_PKCS7_NDEF, iFpp)
 GO(i2d_PKCS7_RECIP_INFO, iFpp)
@@ -2286,41 +2286,41 @@ GO(i2d_PKCS7_SIGNED, iFpp)
 GO(i2d_PKCS7_SIGN_ENVELOPE, iFpp)
 GO(i2d_PKCS7_SIGNER_INFO, iFpp)
 GO(i2d_PKCS8_bio, iFpp)
-GO(i2d_PKCS8_fp, iFpp)
+GO(i2d_PKCS8_fp, iFSp)
 GO(i2d_PKCS8PrivateKey_bio, iFpp)
 GO(i2d_PKCS8PrivateKey_fp, iFpp)
 GO(i2d_PKCS8PrivateKeyInfo_bio, iFpp)
-GO(i2d_PKCS8PrivateKeyInfo_fp, iFpp)
+GO(i2d_PKCS8PrivateKeyInfo_fp, iFSp)
 GO(i2d_PKCS8PrivateKey_nid_bio, iFpp)
 GO(i2d_PKCS8PrivateKey_nid_fp, iFpp)
 GO(i2d_PKCS8_PRIV_KEY_INFO, iFpp)
 GO(i2d_PKCS8_PRIV_KEY_INFO_bio, iFpp)
-GO(i2d_PKCS8_PRIV_KEY_INFO_fp, iFpp)
+GO(i2d_PKCS8_PRIV_KEY_INFO_fp, iFSp)
 GO(i2d_PKEY_USAGE_PERIOD, iFpp)
 GO(i2d_POLICYINFO, iFpp)
 GO(i2d_POLICYQUALINFO, iFpp)
 GO(i2d_PrivateKey, iFpp)
 GO(i2d_PrivateKey_bio, iFpp)
-GO(i2d_PrivateKey_fp, iFpp)
+GO(i2d_PrivateKey_fp, iFSp)
 GO(i2d_PROXY_CERT_INFO_EXTENSION, iFpp)
 GO(i2d_PROXY_POLICY, iFpp)
 GO(i2d_PUBKEY, iFpp)
 GO(i2d_PUBKEY_bio, iFpp)
-GO(i2d_PUBKEY_fp, iFpp)
+GO(i2d_PUBKEY_fp, iFSp)
 //GO(i2d_PublicKey, 
 //GO(i2d_re_X509_tbs, 
 GO(i2d_RSA_NET, iFpp)
 GO(i2d_RSA_OAEP_PARAMS, iFpp)
 GO(i2d_RSAPrivateKey, iFpp)
 GO(i2d_RSAPrivateKey_bio, iFpp)
-GO(i2d_RSAPrivateKey_fp, iFpp)
+GO(i2d_RSAPrivateKey_fp, iFSp)
 GO(i2d_RSA_PSS_PARAMS, iFpp)
 GO(i2d_RSA_PUBKEY, iFpp)
 GO(i2d_RSA_PUBKEY_bio, iFpp)
-GO(i2d_RSA_PUBKEY_fp, iFpp)
+GO(i2d_RSA_PUBKEY_fp, iFSp)
 GO(i2d_RSAPublicKey, iFpp)
 GO(i2d_RSAPublicKey_bio, iFpp)
-GO(i2d_RSAPublicKey_fp, iFpp)
+GO(i2d_RSAPublicKey_fp, iFSp)
 GO(i2d_SXNET, iFpp)
 GO(i2d_SXNETID, iFpp)
 GO(i2d_TS_ACCURACY, iFpp)
@@ -2349,18 +2349,18 @@ GO(i2d_X509_CERT_PAIR, iFpp)
 GO(i2d_X509_CINF, iFpp)
 GO(i2d_X509_CRL, iFpp)
 GO(i2d_X509_CRL_bio, iFpp)
-GO(i2d_X509_CRL_fp, iFpp)
+GO(i2d_X509_CRL_fp, iFSp)
 GO(i2d_X509_CRL_INFO, iFpp)
 GO(i2d_X509_EXTENSION, iFpp)
 GO(i2d_X509_EXTENSIONS, iFpp)
-GO(i2d_X509_fp, iFpp)
+GO(i2d_X509_fp, iFSp)
 GO(i2d_X509_NAME, iFpp)
 GO(i2d_X509_NAME_ENTRY, iFpp)
 GO(i2d_X509_PKEY, iFpp)
 GO(i2d_X509_PUBKEY, iFpp)
 GO(i2d_X509_REQ, iFpp)
 GO(i2d_X509_REQ_bio, iFpp)
-GO(i2d_X509_REQ_fp, iFpp)
+GO(i2d_X509_REQ_fp, iFSp)
 GO(i2d_X509_REQ_INFO, iFpp)
 GO(i2d_X509_REVOKED, iFpp)
 GO(i2d_X509_SIG, iFpp)
@@ -2430,13 +2430,13 @@ GO(i2t_ASN1_OBJECT, iFpip)
 GO(MD4_Final, iFpp)
 GO(MD4_Init, iFp)
 //GO(MD4_Transform, 
-GO(MD4_Update, iFppu)
+GO(MD4_Update, iFppL)
 GO(MD5, pFpLp)
 //GO(md5_block_data_order, 
 GO(MD5_Final, iFpp)
 GO(MD5_Init, iFp)
 GO(MD5_Transform, vFpp)
-GO(MD5_Update, iFppu)
+GO(MD5_Update, iFppL)
 //GO(MDC2, 
 //GO(MDC2_Final, 
 //GO(MDC2_Init, 
@@ -2659,13 +2659,13 @@ GO(OPENSSL_init_crypto, iFUp)
 //GO(OPENSSL_memcmp, 
 GO(OPENSSL_no_config, vFv)
 //GO(OPENSSL_rdtsc, 
-GO(OPENSSL_sk_free, vFp)    //1.1+
-GO(OPENSSL_sk_new_null, pFv)    //1.1+
-GO(OPENSSL_sk_num, iFp) //1.1+
-GO(OPENSSL_sk_pop, pFp) //1.1+
-GOM(OPENSSL_sk_pop_free, pFEpp) //1.1+
-GO(OPENSSL_sk_push, iFpp)   //1.1+
-GO(OPENSSL_sk_value, pFpi)  //1.1+
+GO(OPENSSL_sk_free, vFp)
+GO(OPENSSL_sk_new_null, pFv)
+GO(OPENSSL_sk_num, iFp)
+GO(OPENSSL_sk_pop, pFp)
+GOM(OPENSSL_sk_pop_free, vFEpp)
+GO(OPENSSL_sk_push, iFpp)
+GO(OPENSSL_sk_value, pFpi)
 //GO(OPENSSL_showfatal, 
 //GO(OPENSSL_stderr, 
 //GO(OPENSSL_strcasecmp, 
@@ -3179,7 +3179,7 @@ GO(sk_pop, pFp)
 GOM(sk_pop_free, vFEpp)
 GO(sk_push, iFpp)
 GO(sk_set, pFpip)
-//GOM(sk_set_cmp_func, pFEpp)   //int(*)(const void *, const void *) 	sk_set_cmp_func (_STACK *sk, int(*c)(const void *, const void *))
+//GOM(sk_set_cmp_func, pFEpp)
 GO(sk_shift, pFp)
 GO(sk_sort, vFp)
 GO(sk_unshift, iFpp)
@@ -3639,8 +3639,8 @@ GO(X509_NAME_get_text_by_OBJ, iFpppi)
 //GO(X509_NAME_new, 
 GO(X509_NAME_oneline, pFppi)
 GO(X509_NAME_print, iFppi)
-GO(X509_NAME_print_ex, iFppiu)
-GO(X509_NAME_print_ex_fp, iFppiu)
+GO(X509_NAME_print_ex, iFppiL)
+GO(X509_NAME_print_ex_fp, iFSpiL)
 //GO(X509_NAME_set, 
 GO(X509_new, pFv)
 //GO(X509_OBJECT_free_contents, 
@@ -3665,8 +3665,8 @@ GO(X509_new, pFv)
 //GO(X509_policy_tree_level_count, 
 GO(X509_print, iFpp)
 GO(X509_print_ex, iFppLL)
-GO(X509_print_ex_fp, iFppLL)
-GO(X509_print_fp, iFpp)
+GO(X509_print_ex_fp, iFSpLL)
+GO(X509_print_fp, iFSp)
 //GO(X509_pubkey_digest, 
 //GO(X509_PUBKEY_free, 
 GO(X509_PUBKEY_get, pFp)
@@ -3784,7 +3784,7 @@ GO(X509_STORE_CTX_new, pFv)
 //GO(X509_STORE_CTX_set_cert, 
 //GO(X509_STORE_CTX_set_chain, 
 GO(X509_STORE_CTX_set_current_cert, vFpp)
-GO(X509_STORE_CTX_set_default, iFp)
+GO(X509_STORE_CTX_set_default, iFpp)
 //GO(X509_STORE_CTX_set_depth, 
 GO(X509_STORE_CTX_set_error, vFpi)
 GO(X509_STORE_CTX_set_error_depth, vFpi)
@@ -3798,12 +3798,12 @@ GOM(X509_STORE_CTX_set_verify_cb, vFEpp)
 GO(X509_STORE_free, vFp)
 //GO(X509_STORE_get1_certs, 
 //GO(X509_STORE_get1_crls, 
-//GO(X509_STORE_get_by_subject,
-GO(X509_STORE_get_ex_data, pFpi) 
+//GO(X509_STORE_get_by_subject, 
+GO(X509_STORE_get_ex_data, pFpi)
 GO(X509_STORE_load_file, iFpp)
 GO(X509_STORE_load_path, iFpp)
 GO(X509_STORE_load_store, iFpp)
-//GO(X509_STORE_load_locations, iFppp)
+GO(X509_STORE_load_locations, iFppp)
 GO(X509_STORE_new, pFv)
 //GO(X509_STORE_set1_param, 
 //GO(X509_STORE_set_default_paths, 

src/wrapped/wrappedcurl.c

@@ -933,7 +933,7 @@ EXPORT uint32_t my_curl_share_setopt(x64emu_t* emu, void* handle, CURLSHoption o
     }
 }
 
-EXPORT int my_curl_global_init_mem(x64emu_t* emu, long flags, void* m, void* f, void* r, void* s, void* c)
+EXPORT uint32_t my_curl_global_init_mem(x64emu_t* emu, long flags, void* m, void* f, void* r, void* s, void* c)
 {
     return my->curl_global_init_mem(flags,
         find_malloc_callback_Fct(m),

src/wrapped/wrappedcurl_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error Meh....
+#error Meh...
 #endif
 
 GO(curl_easy_cleanup, vFp)
@@ -9,9 +9,9 @@ GO(curl_easy_getinfo, uFpppppp) //vararg
 GO(curl_easy_init, pFv)
 //GO(curl_easy_pause, 
 GO(curl_easy_perform, uFp)
-GO(curl_easy_recv, iFppLp)
+GO(curl_easy_recv, uFppLp)
 GO(curl_easy_reset, vFp)
-GO(curl_easy_send, iFppLp)
+GO(curl_easy_send, uFppLp)
 GOM(curl_easy_setopt, uFEpup)   // can set many callbacks!
 GO(curl_easy_strerror, pFu)
 //GO(curl_easy_unescape, 
@@ -23,38 +23,38 @@ GO(curl_free, vFp)
 //GO(curl_getdate, 
 //GO(curl_getenv, 
 GO(curl_global_cleanup, vFv)
-GO(curl_global_init, uFu)
-GOM(curl_global_init_mem, iFElppppp)
+GO(curl_global_init, uFl)
+GOM(curl_global_init_mem, uFElppppp)
 GO(curl_global_sslset, uFupp)
-// GO(curl_maprintf,
-// GO(curl_mfprintf,
+//GO(curl_maprintf, 
+//GO(curl_mfprintf, 
 GO(curl_mime_addpart, pFp)
-GO(curl_mime_data, iFppL)
-// GO(curl_mime_data_cb,
-// GO(curl_mime_encoder,
-GO(curl_mime_filedata, iFpp)
-// GO(curl_mime_filename,
-// GO(curl_mime_free,
-// GO(curl_mime_headers,
+GO(curl_mime_data, uFppL)
+//GO(curl_mime_data_cb, 
+//GO(curl_mime_encoder, 
+GO(curl_mime_filedata, uFpp)
+//GO(curl_mime_filename, 
+//GO(curl_mime_free, 
+//GO(curl_mime_headers, 
 GO(curl_mime_init, pFp)
-GO(curl_mime_name, iFpp)
+GO(curl_mime_name, uFpp)
 //GO(curl_mime_subparts, 
 //GO(curl_mime_type, 
 //GO(curl_mprintf, 
 //GO(curl_msnprintf, 
 //GO(curl_msprintf, 
-GO(curl_multi_add_handle, uFpp)
-GO(curl_multi_assign, uFpip)
-GO(curl_multi_cleanup, uFp)
-GO(curl_multi_fdset, uFppppp)
+GO(curl_multi_add_handle, iFpp)
+GO(curl_multi_assign, iFpip)
+GO(curl_multi_cleanup, iFp)
+GO(curl_multi_fdset, iFppppp)
 GO(curl_multi_info_read, pFpp)
 GO(curl_multi_init, pFv)
-GO(curl_multi_perform, uFpp)
-GO(curl_multi_poll, iFppuip)    // since 7.66.0
-GO(curl_multi_remove_handle, uFpp)
+GO(curl_multi_perform, iFpp)
+GO(curl_multi_poll, iFppuip)
+GO(curl_multi_remove_handle, iFpp)
 GOM(curl_multi_setopt, iFEpup)
 //GO(curl_multi_socket, 
-GO(curl_multi_socket_action, uFpiip)
+GO(curl_multi_socket_action, iFpiip)
 //GO(curl_multi_socket_all, 
 GO(curl_multi_strerror, pFi)
 GO(curl_multi_timeout, iFpp)
@@ -78,8 +78,8 @@ GO(curl_slist_free_all, vFp)
 GO(curl_url, pFv)
 GO(curl_url_cleanup, vFp)
 GO(curl_url_dup, pFp)
-GO(curl_url_get, iFpipu)
-GO(curl_url_set, iFpipu)
-GO(curl_url_strerror, pFi)
+GO(curl_url_get, uFpupu)
+GO(curl_url_set, uFpupu)
+GO(curl_url_strerror, pFu)
 GO(curl_version, pFv)
-GO(curl_version_info, pFi)
+GO(curl_version_info, pFu)

src/wrapped/wrappeddecor0_private.h

@@ -8,15 +8,15 @@ GOM(libdecor_decorate, pFEpppp)
 GO(libdecor_dispatch, iFpi)
 GO(libdecor_frame_close, vFp)
 GO(libdecor_frame_commit, vFppp)
-//GO(libdecor_frame_dismiss_popup,
-//GO(libdecor_frame_get_capabilities,
-//GO(libdecor_frame_get_content_height,
-//GO(libdecor_frame_get_content_width,
+//GO(libdecor_frame_dismiss_popup, 
+//GO(libdecor_frame_get_capabilities, 
+//GO(libdecor_frame_get_content_height, 
+//GO(libdecor_frame_get_content_width, 
 GO(libdecor_frame_get_max_content_size, vFppp)
 GO(libdecor_frame_get_min_content_size, vFppp)
 GO(libdecor_frame_get_title, pFp)
-//GO(libdecor_frame_get_window_state,
-//GO(libdecor_frame_get_wl_surface,
+//GO(libdecor_frame_get_window_state, 
+//GO(libdecor_frame_get_wl_surface, 
 GO(libdecor_frame_get_xdg_surface, pFp)
 GO(libdecor_frame_get_xdg_toplevel, pFp)
 GO(libdecor_frame_has_capability, iFpu)
@@ -39,7 +39,7 @@ GO(libdecor_frame_set_parent, vFpp)
 GO(libdecor_frame_set_title, vFpp)
 GO(libdecor_frame_set_visibility, vFpi)
 GO(libdecor_frame_show_window_menu, vFppuii)
-//GO(libdecor_frame_toplevel_commit,
+//GO(libdecor_frame_toplevel_commit, 
 GO(libdecor_frame_translate_coordinate, vFpiipp)
 GO(libdecor_frame_unref, vFp)
 GO(libdecor_frame_unset_capabilities, vFpu)
@@ -53,8 +53,8 @@ GO(libdecor_new, pFpp)
 //GO(libdecor_plugin_init,
 //GO(libdecor_plugin_release,
 GO(libdecor_state_free, vFp)
-//GO(libdecor_state_get_content_height,
-//GO(libdecor_state_get_content_width,
-//GO(libdecor_state_get_window_state,
+//GO(libdecor_state_get_content_height, 
+//GO(libdecor_state_get_content_width, 
+//GO(libdecor_state_get_window_state, 
 GO(libdecor_state_new, pFii)
 GO(libdecor_unref, vFp)

src/wrapped/wrappedevent21_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error Meh....
+#error Meh...
 #endif
 
 //GO(bufferevent_add_event_, 

src/wrapped/wrappedexpat.c

@@ -35,10 +35,10 @@ GO(4)
 
 // Start ...
 #define GO(A)   \
-static uintptr_t my_Start_fct_##A = 0;                                                      \
-static void* my_Start_##A(void* data, void* name, void* attr)                               \
-{                                                                                           \
-    return (void*)RunFunctionFmt(my_Start_fct_##A, "ppp", data, name, attr);          \
+static uintptr_t my_Start_fct_##A = 0;                         \
+static void my_Start_##A(void* data, void* name, void* attr)   \
+{                                                              \
+    RunFunctionFmt(my_Start_fct_##A, "ppp", data, name, attr); \
 }
 SUPER()
 #undef GO

src/wrapped/wrappedexpat_private.h

@@ -32,7 +32,7 @@ GO(XML_ParserCreateNS, pFpc)
 GO(XML_ParserFree, vFp)
 GO(XML_ParserReset, CFpp)
 GO(XML_ResumeParser, uFp)
-GO(XML_SetAllocTrackerActivationThreshold, iFpL)
+GO(XML_SetAllocTrackerActivationThreshold, CFpU)
 GO(XML_SetAllocTrackerMaximumAmplification, iFpf)
 GOM(XML_SetAttlistDeclHandler, vFEpp)
 GO(XML_SetBase, uFpp)
@@ -58,7 +58,7 @@ GOM(XML_SetNotationDeclHandler, vFEpp)
 GOM(XML_SetNotStandaloneHandler, vFEpp)
 GO(XML_SetParamEntityParsing, iFpu)
 GOM(XML_SetProcessingInstructionHandler, vFEpp)
-GO(XML_SetReparseDeferralEnabled, iFpi)
+GO(XML_SetReparseDeferralEnabled, CFpC)
 GO(XML_SetReturnNSTriplet, vFpi)
 GOM(XML_SetSkippedEntityHandler, vFEpp)
 GOM(XML_SetStartCdataSectionHandler, vFEpp)

src/wrapped/wrappedflac.c

@@ -274,10 +274,10 @@ static void* findWriteFct(void* fct)
 }
 // Metadata
 #define GO(A)   \
-static uintptr_t my_Metadata_fct_##A = 0;                                                        \
-static int my_Metadata_##A(void* decoder, void* metadata, void* data)                            \
-{                                                                                                \
-    return (int)RunFunctionFmt(my_Metadata_fct_##A, "ppp", decoder, metadata, data);      \
+static uintptr_t my_Metadata_fct_##A = 0;                                     \
+static void my_Metadata_##A(void* decoder, void* metadata, void* data)        \
+{                                                                             \
+    RunFunctionFmt(my_Metadata_fct_##A, "ppp", decoder, metadata, data);      \
 }
 SUPER()
 #undef GO

src/wrapped/wrappedfontconfig_private.h

@@ -136,16 +136,16 @@ GOM(FcObjectSetBuild, pFEpV)
 GO(FcObjectSetCreate, pFv)
 GO(FcObjectSetDestroy, vFp)
 GOM(FcObjectSetVaBuild, pFEpA)
-GO(FcPatternAdd, iFppiLi) // Warning: failed to confirm
+GO(FcPatternAdd, iFppiLi)
 GO(FcPatternAddBool, iFppi)
 GO(FcPatternAddCharSet, iFppp)
 GO(FcPatternAddDouble, iFppd)
-GO(FcPatternAddFTFace, iFppp) // Warning: failed to confirm
+GO(FcPatternAddFTFace, iFppp)
 GO(FcPatternAddInteger, iFppi)
 GO(FcPatternAddLangSet, iFppp)
 GO(FcPatternAddMatrix, iFppp)
 GO(FcPatternAddString, iFppp)
-GO(FcPatternAddWeak, iFppiLi) // Warning: failed to confirm
+GO(FcPatternAddWeak, iFppiLi)
 GOM(FcPatternBuild, pFEpV)
 GO(FcPatternCreate, pFv)
 GO(FcPatternDel, iFpp)
@@ -159,7 +159,7 @@ GO(FcPatternGet, uFppip)
 GO(FcPatternGetBool, uFppip)
 GO(FcPatternGetCharSet, uFppip)
 GO(FcPatternGetDouble, uFppip)
-GO(FcPatternGetFTFace, iFppip) // Warning: failed to confirm
+GO(FcPatternGetFTFace, iFppip)
 GO(FcPatternGetInteger, uFppip)
 GO(FcPatternGetLangSet, uFppip)
 GO(FcPatternGetMatrix, uFppip)

src/wrapped/wrappedfreetype_private.h

@@ -35,9 +35,9 @@ GO(FT_Face_GetCharVariantIndex, uFpLL)
 GO(FT_Face_Properties, iFpup)
 //GO(FT_Face_SetUnpatentedHinting, 
 GO(FT_FloorFix, lFl)
-GO(FT_Get_Advance, iFpiup)
+GO(FT_Get_Advance, iFpuip)
 GO(FT_Get_Advances, iFpuuip)
-//GO(FT_Get_BDF_Charset_ID,
+//GO(FT_Get_BDF_Charset_ID, 
 GO(FT_Get_BDF_Property, iFppp)
 GO(FT_Get_Char_Index, uFpL)
 GO(FT_Get_Charmap_Index, iFp)
@@ -84,7 +84,7 @@ GO(FT_Get_TrueType_Engine_Type, uFp)
 GO(FT_Get_Var_Axis_Flags, iFpup)
 GO(FT_Get_Var_Blend_Coordinates, iFpup)
 GO(FT_Get_Var_Design_Coordinates, iFpup)
-GO(FT_Get_WinFNT_Header, iFpp)  // does FT_WinFNT_HeaderRec_ needs alignment?
+GO(FT_Get_WinFNT_Header, iFpp)
 GO(FT_Get_X11_Font_Format, pFp)
 GO(FT_Glyph_Copy, iFpp)
 GO(FT_Glyph_Get_CBox, vFpup)

src/wrapped/wrappedgconf2_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 //GO(gconf_address_backend, 

src/wrapped/wrappedgdk3.c

@@ -125,10 +125,10 @@ static void* findGCallbackFct(void* fct)
 }
 // EventHandler
 #define GO(A)   \
-static uintptr_t my_EventHandler_fct_##A = 0;                                       \
-static void* my_EventHandler_##A(void* a, void* b, void* c, void* d, void* e)       \
-{                                                                                   \
-    return (void*)RunFunctionFmt(my_EventHandler_fct_##A, "ppppp", a, b, c, d, e);  \
+static uintptr_t my_EventHandler_fct_##A = 0;                   \
+static void my_EventHandler_##A(void* event, void* data)        \
+{                                                               \
+    RunFunctionFmt(my_EventHandler_fct_##A, "pp", event, data); \
 }
 SUPER()
 #undef GO

src/wrapped/wrappedgdk3_private.h

@@ -661,7 +661,7 @@ GO(gdk_window_set_geometry_hints, vFppu)
 GO(gdk_window_set_group, vFpp)
 GO(gdk_window_set_icon_list, vFpp)
 GO(gdk_window_set_icon_name, vFpp)
-//GOM(gdk_window_set_invalidate_handler, vFpp)
+//GOM(gdk_window_set_invalidate_handler, vFEpp)
 GO(gdk_window_set_keep_above, vFpi)
 GO(gdk_window_set_keep_below, vFpi)
 GO(gdk_window_set_modal_hint, vFpi)

src/wrapped/wrappedgdkpixbuf2_private.h

@@ -98,12 +98,12 @@ GO(gdk_pixbuf_rotate_simple, pFpu)
 GO(gdk_pixbuf_rotation_get_type, LFv)
 GO(gdk_pixbuf_saturate_and_pixelate, vFppfi)
 GOM(gdk_pixbuf_save, iFEppppV)
-//GO(gdk_pixbuf_save_to_buffer, iFpppppppppppppp)   //vaarg, wrap with gdk_pixbuf_save_to_bufferv ?
+//GOM(gdk_pixbuf_save_to_buffer, iFEpppppV)
 GO(gdk_pixbuf_save_to_bufferv, iFppppppp)
-//GOM(gdk_pixbuf_save_to_callback, iFEpppppV)   //wrap with gdk_pixbuf_save_to_callbackv
+//GOM(gdk_pixbuf_save_to_callback, iFEpppppV)
 //GOM(gdk_pixbuf_save_to_callbackv, iFEppppppp)
-//GO(gdk_pixbuf_save_to_stream, iFpppppppppppppp) //vaarg, but gdk_pixbuf_save_to_streamv is fairly recent
-//GOM(gdk_pixbuf_save_to_stream_async, vFEppppppppppppppp)   //vaarg, and gdk_pixbuf_save_to_streamv_async is fairly recent
+//GOM(gdk_pixbuf_save_to_stream, iFEpppppV)
+//GOM(gdk_pixbuf_save_to_stream_async, vFEppppppV)
 GO(gdk_pixbuf_save_to_stream_finish, iFpp)
 GO(gdk_pixbuf_savev, iFpppppp)
 GO(gdk_pixbuf_scale, vFppiiiiddddu)

src/wrapped/wrappedgio2.c

@@ -136,10 +136,10 @@ static void* findGTaskThreadFuncFct(void* fct)
 
 // GDBusProxyTypeFunc
 #define GO(A)   \
-static uintptr_t my_GDBusProxyTypeFunc_fct_##A = 0;                                                           \
-static int my_GDBusProxyTypeFunc_##A(void* manager, void* path, void* name, void* data)                       \
-{                                                                                                             \
-    return (int)RunFunctionFmt(my_GDBusProxyTypeFunc_fct_##A, "pppp", manager, path, name, data); \
+static uintptr_t my_GDBusProxyTypeFunc_fct_##A = 0;                                                     \
+static uintptr_t my_GDBusProxyTypeFunc_##A(void* manager, void* path, void* name, void* data)           \
+{                                                                                                       \
+    return (uintptr_t)RunFunctionFmt(my_GDBusProxyTypeFunc_fct_##A, "pppp", manager, path, name, data); \
 }
 SUPER()
 #undef GO
@@ -229,9 +229,9 @@ static void* findGDBusSignalCallbackFct(void* fct)
 // GDBusMessageFilterFunction
 #define GO(A)   \
 static uintptr_t my_GDBusMessageFilterFunction_fct_##A = 0;                                                         \
-static void my_GDBusMessageFilterFunction_##A(void* connection, void* message, int incoming, void* data)            \
+static void* my_GDBusMessageFilterFunction_##A(void* connection, void* message, int incoming, void* data)            \
 {                                                                                                                   \
-    RunFunctionFmt(my_GDBusMessageFilterFunction_fct_##A, "ppip", connection, message, incoming, data); \
+    return (void*)RunFunctionFmt(my_GDBusMessageFilterFunction_fct_##A, "ppip", connection, message, incoming, data); \
 }
 SUPER()
 #undef GO

src/wrapped/wrappedglesv2_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(glActiveShaderProgram, vFuu)
@@ -34,7 +34,7 @@ GO(glBlitFramebuffer, vFiiiiiiiiiu)
 GO(glBufferData, vFulpu)
 GO(glBufferSubData, vFullp)
 GO(glCheckFramebufferStatus, uFu)
-GO(glClear, vFi)
+GO(glClear, vFu)
 GO(glClearBufferfi, vFuifi)
 GO(glClearBufferfv, vFuip)
 GO(glClearBufferiv, vFuip)
@@ -75,7 +75,7 @@ GO(glDeleteTextures, vFip)
 GO(glDeleteTransformFeedbacks, vFip)
 GO(glDeleteVertexArrays, vFip)
 GO(glDepthFunc, vFu)
-GO(glDepthMask, vFi)
+GO(glDepthMask, vFC)
 GO(glDepthRangef, vFff)
 GO(glDetachShader, vFuu)
 GO(glDisable, vFu)
@@ -195,18 +195,18 @@ GO(glGetVertexAttribPointerv, vFuup)
 GO(glHint, vFuu)
 GO(glInvalidateFramebuffer, vFuip)
 GO(glInvalidateSubFramebuffer, vFuipiiii)
-GO(glIsBuffer, iFu)
-GO(glIsEnabled, iFu)
+GO(glIsBuffer, CFu)
+GO(glIsEnabled, CFu)
 GO(glIsEnabledi, iFuu)
-GO(glIsFramebuffer, iFu)
-GO(glIsProgram, iFu)
+GO(glIsFramebuffer, CFu)
+GO(glIsProgram, CFu)
 GO(glIsProgramPipeline, iFu)
 GO(glIsQuery, iFu)
-GO(glIsRenderbuffer, iFu)
+GO(glIsRenderbuffer, CFu)
 GO(glIsSampler, iFu)
-GO(glIsShader, iFu)
+GO(glIsShader, CFu)
 GO(glIsSync, CFp)
-GO(glIsTexture, iFu)
+GO(glIsTexture, CFu)
 GO(glIsTransformFeedback, iFu)
 GO(glIsVertexArray, iFu)
 GO(glLineWidth, vFf)
@@ -266,7 +266,7 @@ GO(glReleaseShaderCompiler, vFv)
 GO(glRenderbufferStorage, vFuuii)
 GO(glRenderbufferStorageMultisample, vFuiuii)
 GO(glResumeTransformFeedback, vFv)
-GO(glSampleCoverage, vFfi)
+GO(glSampleCoverage, vFfC)
 GO(glSampleMaski, vFui)
 GO(glSamplerParameterf, vFuuf)
 GO(glSamplerParameterfv, vFuup)
@@ -325,13 +325,13 @@ GO(glUniform4iv, vFiip)
 GO(glUniform4ui, vFiuuuu)
 GO(glUniform4uiv, vFiip)
 GO(glUniformBlockBinding, vFuuu)
-GO(glUniformMatrix2fv, vFiiip)
+GO(glUniformMatrix2fv, vFiiCp)
 GO(glUniformMatrix2x3fv, vFiiip)
 GO(glUniformMatrix2x4fv, vFiiip)
-GO(glUniformMatrix3fv, vFiiip)
+GO(glUniformMatrix3fv, vFiiCp)
 GO(glUniformMatrix3x2fv, vFiiip)
 GO(glUniformMatrix3x4fv, vFiiip)
-GO(glUniformMatrix4fv, vFiiip)
+GO(glUniformMatrix4fv, vFiiCp)
 GO(glUniformMatrix4x2fv, vFiiip)
 GO(glUniformMatrix4x3fv, vFiiip)
 GO(glUnmapBuffer, iFu)
@@ -356,7 +356,7 @@ GO(glVertexAttribI4ui, vFuuuuu)
 GO(glVertexAttribI4uiv, vFup)
 GO(glVertexAttribIFormat, vFuiuu)
 GO(glVertexAttribIPointer, vFuiuip)
-GO(glVertexAttribPointer, vFuiuiip)
+GO(glVertexAttribPointer, vFuiuCip)
 GO(glVertexBindingDivisor, vFuu)
 GO(glViewport, vFiiii)
 GO(glWaitSync, vFpuL)

src/wrapped/wrappedglib2.c

@@ -166,12 +166,13 @@ static uintptr_t fct_funcs_dispatch_##A = 0;
 static int my_funcs_dispatch_##A(void* source, void* cb, void* data) {                              \
     uintptr_t old = fct_funcs_dispatch_cb_##A;                                                      \
     fct_funcs_dispatch_cb_##A = (uintptr_t)cb;                                                      \
-    return (int)RunFunctionFmt((uintptr_t)ref_gsourcefuncs_##A->dispatch, "ppp", source, cb?my_funcs_dispatch_cb_##A:NULL, data); \
+    int ret = (int)RunFunctionFmt((uintptr_t)ref_gsourcefuncs_##A->dispatch, "ppp", source, cb?my_funcs_dispatch_cb_##A:NULL, data); \
     fct_funcs_dispatch_cb_##A = old;                                                                \
+    return ret;                                                                                     \
 }                                                                                                   \
 static uintptr_t fct_funcs_finalize_##A = 0;                                                        \
-static int my_funcs_finalize_##A(void* source) {                                                    \
-    return (int)RunFunctionFmt((uintptr_t)ref_gsourcefuncs_##A->finalize, "p", source);             \
+static void my_funcs_finalize_##A(void* source) {                                                   \
+    RunFunctionFmt((uintptr_t)ref_gsourcefuncs_##A->finalize, "p", source);                         \
 }
 SUPER()
 #undef GO
@@ -276,10 +277,10 @@ static void* findEqualFct(void* fct)
 }
 // GDestroyFunc ...
 #define GO(A)   \
-static uintptr_t my_destroyfunc_fct_##A = 0;                               \
-static int my_destroyfunc_##A(void* a, void* b)                            \
-{                                                                          \
-    return RunFunctionFmt(my_destroyfunc_fct_##A, "pp", a, b); \
+static uintptr_t my_destroyfunc_fct_##A = 0;           \
+static void my_destroyfunc_##A(void* data)             \
+{                                                      \
+    RunFunctionFmt(my_destroyfunc_fct_##A, "p", data); \
 }
 SUPER()
 #undef GO
@@ -320,10 +321,10 @@ static void* findSpawnChildSetupFct(void* fct)
 }
 // GSourceFunc ...
 #define GO(A)   \
-static uintptr_t my_GSourceFunc_fct_##A = 0;                                \
-static void my_GSourceFunc_##A(void* a, void* b, void* c, void* d)          \
-{                                                                           \
-    RunFunctionFmt(my_GSourceFunc_fct_##A, "pppp", a, b, c, d); \
+static uintptr_t my_GSourceFunc_fct_##A = 0;                    \
+static int my_GSourceFunc_##A(void* a)                          \
+{                                                               \
+    return (int)RunFunctionFmt(my_GSourceFunc_fct_##A, "p", a); \
 }
 SUPER()
 #undef GO
@@ -719,9 +720,9 @@ static void* findGThreadFuncFct(void* fct)
 // TimeOut
 #define GO(A)   \
 static uintptr_t my_TimeOut_fct_##A = 0;            \
-static void my_TimeOut_##A(void* a)                 \
+static int my_TimeOut_##A(void* a)                  \
 {                                                   \
-    RunFunctionFmt(my_TimeOut_fct_##A, "p", a);     \
+    return (int)RunFunctionFmt(my_TimeOut_fct_##A, "p", a);     \
 }
 SUPER()
 #undef GO
@@ -762,11 +763,11 @@ static void* findGTraverseFuncFct(void* fct)
 }
 
 // GLogWriterFunc ...
-#define GO(A)                                                         \
-    static uintptr_t my_GLogWriterFunc_fct_##A = 0;                   \
-    static int my_GLogWriterFunc_##A(void* a, void* b)                \
-    {                                                                 \
-        return RunFunctionFmt(my_GLogWriterFunc_fct_##A, "pp", a, b); \
+#define GO(A)                                                                       \
+    static uintptr_t my_GLogWriterFunc_fct_##A = 0;                                 \
+    static int my_GLogWriterFunc_##A(uint32_t a, void* b, size_t c, void* d)        \
+    {                                                                               \
+        return (int)RunFunctionFmt(my_GLogWriterFunc_fct_##A, "upLp", a, b, c, d);  \
     }
 SUPER()
 #undef GO

src/wrapped/wrappedglib2_private.h

@@ -1449,7 +1449,7 @@ GO(g_utf8_to_ucs4, pFplppp)
 GO(g_utf8_to_ucs4_fast, pFplp)
 GO(g_utf8_to_utf16, pFplppp)
 GO(g_utf8_validate, iFplp)
-GO(g_utime, iFpp) // Warning: failed to confirm
+GO(g_utime, iFpp)
 GO(g_uuid_string_is_valid, iFp)
 GO(g_uuid_string_random, pFv)
 GOM(g_variant_builder_add, vFEppV)

src/wrapped/wrappedgmodule2_private.h

@@ -1,14 +1,14 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 //GO(_fini, 
 GO(g_module_build_path, pFpp)
 GO(g_module_close, iFp)
-//GO(g_module_error, pFv)
-//GO(g_module_make_resident, vFp)
-//GO(g_module_name, pFp)
-GO(g_module_open_full, pFpip)
+GO(g_module_error, pFv)
+GO(g_module_make_resident, vFp)
+GO(g_module_name, pFp)
+GO(g_module_open_full, pFpup)
 GO(g_module_open, pFpu)
 GO(g_module_supported, iFv)
 GO(g_module_symbol, iFppp)

src/wrapped/wrappedgobject2.c

@@ -233,10 +233,10 @@ static void* findValueTransformFct(void* fct)
 
 // GDestroyFunc ...
 #define GO(A)   \
-static uintptr_t my_destroyfunc_fct_##A = 0;                               \
-static int my_destroyfunc_##A(void* a, void* b)                            \
-{                                                                          \
-    return RunFunctionFmt(my_destroyfunc_fct_##A, "pp", a, b); \
+static uintptr_t my_destroyfunc_fct_##A = 0;        \
+static void my_destroyfunc_##A(void* a)             \
+{                                                   \
+    RunFunctionFmt(my_destroyfunc_fct_##A, "p", a); \
 }
 SUPER()
 #undef GO
@@ -512,9 +512,9 @@ static void* findGCallbackFct(void* fct)
 // EmissionHook
 #define GO(A)   \
 static uintptr_t my_EmissionHook_fct_##A = 0;                           \
-static void my_EmissionHook_##A(void* a, uint32_t b, void* c, void* d)  \
+static int my_EmissionHook_##A(void* a, uint32_t b, void* c, void* d)  \
 {                                                                       \
-    RunFunctionFmt(my_EmissionHook_fct_##A, "pupp", a, b, c, d);        \
+    return (int)RunFunctionFmt(my_EmissionHook_fct_##A, "pupp", a, b, c, d);        \
 }
 SUPER()
 #undef GO

src/wrapped/wrappedgssapi_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error Meh....
+#error Meh...
 #endif
 
 //GO(gss_accept_sec_context, 

src/wrapped/wrappedgstgl.c

@@ -90,10 +90,10 @@ static glprocaddress_t findGetProcAddressAPIFct(int api)
 }
 // GDestroyFunc ...
 #define GO(A)   \
-static uintptr_t my_destroyfunc_fct_##A = 0;                               \
-static int my_destroyfunc_##A(void* a, void* b)                            \
-{                                                                          \
-    return RunFunctionFmt(my_destroyfunc_fct_##A, "pp", a, b); \
+static uintptr_t my_destroyfunc_fct_##A = 0;           \
+static void my_destroyfunc_##A(void* data)             \
+{                                                      \
+    RunFunctionFmt(my_destroyfunc_fct_##A, "p", data); \
 }
 SUPER()
 #undef GO

src/wrapped/wrappedgstreamer.c

@@ -101,10 +101,10 @@ GO(12)  \
 
 // GDestroyFunc ...
 #define GO(A)   \
-static uintptr_t my_destroyfunc_fct_##A = 0;                                \
-static int my_destroyfunc_##A(void* a, void* b)                             \
-{                                                                           \
-    return RunFunctionFmt(my_destroyfunc_fct_##A, "pp", a, b);  \
+static uintptr_t my_destroyfunc_fct_##A = 0;           \
+static void my_destroyfunc_##A(void* data)             \
+{                                                      \
+    RunFunctionFmt(my_destroyfunc_fct_##A, "p", data); \
 }
 SUPER()
 #undef GO
@@ -497,9 +497,9 @@ static void* findGstPadProbeCallbackFct(void* fct)
 //GstStructureForeachFunc
 #define GO(A)   \
 static uintptr_t my_GstStructureForeachFunc_fct_##A = 0;                            \
-static int my_GstStructureForeachFunc_##A(void* a, void* b, void* c)                \
+static int my_GstStructureForeachFunc_##A(uint32_t a, void* b, void* c)             \
 {                                                                                   \
-    return (int)RunFunctionFmt(my_GstStructureForeachFunc_fct_##A, "ppp", a, b, c); \
+    return (int)RunFunctionFmt(my_GstStructureForeachFunc_fct_##A, "upp", a, b, c); \
 }
 SUPER()
 #undef GO
@@ -543,9 +543,9 @@ static void* findGstPadLinkFunctionFct(void* fct)
 //GstStructureFilterMapFunc
 #define GO(A)   \
 static uintptr_t my_GstStructureFilterMapFunc_fct_##A = 0;                              \
-static int my_GstStructureFilterMapFunc_##A(void* a, void* b, void* c)                  \
+static int my_GstStructureFilterMapFunc_##A(uint32_t a, void* b, void* c)               \
 {                                                                                       \
-    return (int)RunFunctionFmt(my_GstStructureFilterMapFunc_fct_##A, "ppp", a, b, c);   \
+    return (int)RunFunctionFmt(my_GstStructureFilterMapFunc_fct_##A, "upp", a, b, c);   \
 }
 SUPER()
 #undef GO

src/wrapped/wrappedgthread2_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GOM(g_thread_init, vFEp)

src/wrapped/wrappedgtk3.c

@@ -380,9 +380,9 @@ static void* findGDestroyNotifyFct(void* fct)
 // GTickCallback
 #define GO(A)                                                                 \
     static uintptr_t my_GTickCallback_fct_##A = 0;                            \
-    static void my_GTickCallback_##A(void* widget, void* clock, void* data)   \
+    static int my_GTickCallback_##A(void* widget, void* clock, void* data)    \
     {                                                                         \
-        RunFunctionFmt(my_GTickCallback_fct_##A, "ppp", widget, clock, data); \
+        return (int)RunFunctionFmt(my_GTickCallback_fct_##A, "ppp", widget, clock, data); \
     }
 SUPER()
 #undef GO
@@ -546,9 +546,9 @@ static void* findGtkListBoxUpdateHeaderFunc(void* fct)
 // TranslateEvent
 #define GO(A)   \
 static uintptr_t my_TranslateEvent_fct_##A = 0;             \
-static void my_TranslateEvent_##A(void* a, void* b)         \
+static void* my_TranslateEvent_##A(void* a, void* b)        \
 {                                                           \
-    RunFunctionFmt(my_TranslateEvent_fct_##A, "pp", a, b);  \
+    return (void*)RunFunctionFmt(my_TranslateEvent_fct_##A, "pp", a, b);  \
 }
 SUPER()
 #undef GO
@@ -571,7 +571,7 @@ static void* findTranslateEvent(void* fct)
     static uintptr_t my_GCallback_fct_##A = 0;    \
     static void my_GCallback_##A(void* data)      \
     {                                             \
-        RunFunctionFmt(my_GCallback_fct_##A, ""); \
+        RunFunctionFmt(my_GCallback_fct_##A, "p"); \
     }
 SUPER()
 #undef GO

src/wrapped/wrappedgtkx112.c

@@ -702,9 +702,9 @@ static void* reverse_GtkLinkButtonUri_Fct(void* fct)
 // GtkKeySnoopFunc ...
 #define GO(A)   \
 static uintptr_t my_GtkKeySnoopFunc_fct_##A = 0;                    \
-static void my_GtkKeySnoopFunc_##A(void* a, void* b, void* c)       \
+static int my_GtkKeySnoopFunc_##A(void* a, void* b, void* c)       \
 {                                                                   \
-    RunFunctionFmt(my_GtkKeySnoopFunc_fct_##A, "ppp", a, b, c);     \
+    return (int)RunFunctionFmt(my_GtkKeySnoopFunc_fct_##A, "ppp", a, b, c);     \
 }
 SUPER()
 #undef GO
@@ -746,9 +746,9 @@ static void* findEventFct(void* fct)
 // TranslateEvent
 #define GO(A)   \
 static uintptr_t my_TranslateEvent_fct_##A = 0;             \
-static void my_TranslateEvent_##A(void* a, void* b)         \
+static void* my_TranslateEvent_##A(void* a, void* b)        \
 {                                                           \
-    RunFunctionFmt(my_TranslateEvent_fct_##A, "pp", a, b);  \
+    return (void*)RunFunctionFmt(my_TranslateEvent_fct_##A, "pp", a, b);  \
 }
 SUPER()
 #undef GO

src/wrapped/wrappediconv_private.h

@@ -12,4 +12,4 @@ GO(libiconv_open_into, iFppp)
 GO(libiconvlist, vFpp)
 GO(iconv_canonicalize, pFp)
 
-DATA(_libiconv_version, 4)
+DATA(_libiconv_version, 4)

src/wrapped/wrappedicui18n64_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ucal_add_64, vFpiip)

src/wrapped/wrappedicui18n66_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ucal_add_66, vFpiip)

src/wrapped/wrappedicui18n67_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ucal_add_67, vFpiip)

src/wrapped/wrappedicui18n68_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ucal_add_68, vFpiip)

src/wrapped/wrappedicui18n72_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 // UDate is double

src/wrapped/wrappedicui18n73_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ucal_add_73, vFpiip)

src/wrapped/wrappedicui18n74_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 // UDate is double
@@ -68,7 +68,7 @@ GO(ucol_open_74, pFpp)
 GO(ucol_openElements_74, pFppip)
 GO(ucol_openRules_74, pFpiiipp)
 GO(ucol_safeClone_74, pFpppp)
-GO(ucol_setAttribute_74, vFpiip)
+GO(ucol_setAttribute_74, vFpuip)
 GO(ucol_setVariableTop_74, uFppip)
 GO(ucol_strcoll_74, iFppipi)
 

src/wrapped/wrappedicui18n75_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 // UDate is double

src/wrapped/wrappedicui18n76_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 // UDate is double

src/wrapped/wrappedicuuc64_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_64, pFpp)

src/wrapped/wrappedicuuc66_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_66, pFpp)

src/wrapped/wrappedicuuc67_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_67, pFpp)

src/wrapped/wrappedicuuc68_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_68, pFpp)

src/wrapped/wrappedicuuc72_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_72, pFpp)

src/wrapped/wrappedicuuc73_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_73, pFpp)

src/wrapped/wrappedicuuc74_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_74, pFpp)

src/wrapped/wrappedicuuc75_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_75, pFpp)

src/wrapped/wrappedicuuc76_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(ubrk_clone_76, pFpp)

src/wrapped/wrappedkrb5_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error Meh....
+#error Meh...
 #endif
 
 //GO(decode_krb5_ad_kdcissued, 
@@ -649,4 +649,4 @@ GO(krb5_unparse_name_flags, iFppip)
 //GO(profile_ser_externalize, 
 //GO(profile_ser_internalize, 
 //GO(profile_ser_size, 
-//GO(profile_update_relation, 
+//GO(profile_update_relation, 

src/wrapped/wrappedlibavcodec58_private.h

@@ -42,7 +42,7 @@ GO(avcodec_descriptor_get_by_name, pFp)
 GO(avcodec_descriptor_next, pFp)
 //GOM(avcodec_encode_subtitle, iFEppip)
 GO(avcodec_enum_to_chroma_pos, iFppi)
-DATA(av_codec_ffversion, 8) // Warning: failed to confirm
+DATA(av_codec_ffversion, 8)
 GO(avcodec_fill_audio_frame, iFpiipii)
 GO(avcodec_find_best_pix_fmt_of_list, iFpiip)
 GO(avcodec_find_decoder, pFu)

src/wrapped/wrappedlibavutil56_private.h

@@ -507,7 +507,7 @@ GO(av_tea_alloc, pFv)
 GO(av_tea_crypt, vFpppipi)
 GO(av_tea_init, vFppi)
 DATA(av_tea_size, 4)
-GO(av_tempfile, iFppip) // Warning: failed to confirm
+GO(av_tempfile, iFppip)
 GO(av_thread_message_flush, vFp)
 GO(av_thread_message_queue_alloc, iFpuu)
 GO(av_thread_message_queue_free, vFp)
@@ -544,7 +544,7 @@ GO(av_tx_uninit, vFp)
 GO(av_usleep, iFu)
 GO(av_utf8_decode, iFpppu)
 GO(avutil_configuration, pFv)
-DATA(av_util_ffversion, 8) // Warning: failed to confirm
+DATA(av_util_ffversion, 8)
 GO(avutil_license, pFv)
 GO(avutil_version, uFv)
 GOM(av_vbprintf, vFEppA)

src/wrapped/wrappedlibc_private.h

@@ -177,9 +177,6 @@ GOW(__connect, iFipu)
 GOW(connect, iFipu)
 GO(copy_file_range, lFipipLu)
 //GO(__copy_grp, 
-GOW(copysign, dFdd)
-GOW(copysignf, fFff)
-GOWD(copysignl, DFDD, copysign)
 GOW(creat, iFpu)
 GOW(creat64, iFpu)
 //GO(create_module, 
@@ -430,12 +427,6 @@ GO(fgetws_unlocked, pFpiS)
 GO(fgetxattr, lFippL)
 GOW(fileno, iFS)
 GOW(fileno_unlocked, iFS)
-GO(__finite, iFd)
-GOW(finite, iFd)
-GO(__finitef, iFf)
-GOW(finitef, iFf)
-GOD(__finitel, iFD, __finite)
-GOWD(finitel, iFD, finite)
 GO(__flbf, iFp)
 GO(flistxattr, lFipL)
 GOW(flock, iFii)
@@ -478,9 +469,6 @@ GOW(freelocale, vFp)
 GO(fremovexattr, iFip)
 GO(freopen, SFppS)
 GO(freopen64, SFppS)
-GOW(frexp, dFdp)
-GOW(frexpf, fFfp)
-GOWD(frexpl, DFDp, frexp)
 GOM(fscanf, iFESpV)
 GO(fseek, iFSli)
 GO(fseeko, iFSli)
@@ -1165,9 +1153,6 @@ GOW(lchown, iFpuu)
 GOW(lckpwdf, iFv)
 GO(lcong48, vFp)
 GOW(lcong48_r, iFpp)
-GOW(ldexp, dFdi)
-GOW(ldexpf, fFfi)
-GOWD(ldexpl, DFDi, ldexp)
 GO(ldiv, HFll)
 GOM(lfind, pFEpppLp)
 GO(lgetxattr, lFpppL)
@@ -1346,9 +1331,6 @@ GO(mlockall, iFi)
 //GO(__mmap, 
 GOWM(mmap, pFEpLiiil)
 GOWM(mmap64, pFEpLiiiI)
-GOW(modf, dFdp)
-GOW(modff, fFfp)
-GOWD(modfl, DFDp, modf)
 //GOW(modify_ldt, 
 //GOW(moncontrol,
 GO(__monstartup, vFLL)
@@ -1759,9 +1741,6 @@ GO(ruserok_af, iFpippW)
 //GO(ruserpass, 
 GO(__sbrk, pFl)
 GO(sbrk, pFl)
-GOW(scalbn, dFdi)
-GOW(scalbnf, fFfi)
-GOWD(scalbnl, DFDi, scalbn)
 GOWM(scandir, iFEpppp)
 GOWM(scandir64, iFEpppp)
 GOWM(scandirat, iFipppp)
@@ -2076,7 +2055,7 @@ GOW(strtof64_l, dFppp)
 GOWD(strtof64x, DFpp, strtof32x)
 GOWD(strtof64x_l, DFppp, strtof32x_l)
 GO(__strtof_internal, fFppi)
-GO(__strtof_l, fFppL)
+GO(__strtof_l, fFppp)
 GOW(strtof_l, fFppp)
 //GO(__strtof_nan, 
 GO(strtoimax, IFppi)
@@ -2098,7 +2077,7 @@ GOD(__strtold_l, DFppp, __strtod_l)
 GOWD(strtold_l, DFppp, strtod_l)
 //GO(__strtold_nan, 
 GO(__strtol_internal, lFppii)
-GO(__strtol_l, lFppi)
+GO(__strtol_l, lFppip)
 GO(strtol_l, lFppip)
 GOW(strtoll, IFppi)
 GO(__strtoll_internal, IFppii)
@@ -2111,7 +2090,7 @@ GO(__strtoul_internal, LFppii)
 GO(strtoul_l, LFppip)
 GOW(strtoull, UFppi)
 GO(__strtoull_internal, UFppii)
-GOW(__strtoull_l, LFppip)
+GOW(__strtoull_l, UFppip)
 GOW(strtoull_l, UFppip)
 GO(strtoumax, UFppi)
 GO2(__isoc23_strtoumax, UFppi, strtoumax)
@@ -2755,3 +2734,450 @@ GO(dummy_iFiiULippp, iFiiULippp)    //needed for vulkanoverlay
 #endif
 
 GO(arc4random, uFv)
+
+// dup of libm...
+GOW(acos, dFd)
+GOW(acosf, fFf)
+// GOM(__acosf_finite, fFf)
+// GOM(__acos_finite, dFd)
+GOW(acosh, dFd)
+GOW(acoshf, fFf)
+// GOM(__acoshf_finite, fFf)
+// GOM(__acosh_finite, dFd)
+GOWD(acoshl, DFD, acosh)
+GOWD(acosl, DFD, acos)
+GOW(asin, dFd)
+GOW(asinf, fFf)
+// GOM(__asinf_finite, fFf)
+// GOM(__asin_finite, dFd)
+GOW(asinh, dFd)
+GOW(asinhf, fFf)
+GOWD(asinhl, DFD, asinh)
+GOWD(asinl, DFD, asin)
+GO(atan, dFd)
+GOW(atan2, dFdd)
+GOW(atan2f, fFff)
+// GOM(__atan2f_finite, fFff)
+// GOM(__atan2_finite, dFdd)
+GOWD(atan2l, DFDD, atan2)
+GOW(atanf, fFf)
+GOW(atanh, dFd)
+GOW(atanhf, fFf)
+// __atanhf_finite
+// __atanh_finite
+GOWD(atanhl, DFD, atanh)
+GOWD(atanl, DFD, atan)
+#ifdef STATICBUILD
+// GOW(cabs, dFX)
+// GOW(cabsf, fFx)
+// GOWD(cabsl, DFY, cabs)
+// GOW(cacos, XFX)
+// GOW(cacosf, xFx)
+// GOW(cacosh, XFX)
+// GOW(cacoshf, xFx)
+// GOWD(cacoshl, YFY, cacosh)
+// GOWD(cacosl, YFY, cacos)
+// GOW(carg, dFX)
+// GOW(cargf, fFx)
+// // cargl    // Weak
+// GOW(casin, XFX)
+// GOW(casinf, xFx)
+// GOW(casinh, XFX)
+// GOW(casinhf, xFx)
+// GOWD(casinhl, YFY, casinh)
+// GOWD(casinl, YFY, casin)
+// GOW(catan, XFX)
+// GOW(catanf, xFx)
+// GOW(catanh, XFX)
+// GOW(catanhf, xFx)
+// GOWD(catanhl, YFY, catanh)
+// GOWD(catanl, YFY, catan)
+// GOW(cbrt, dFd)
+// GOW(cbrtf, fFf)
+// GOWD(cbrtl, DFD, cbrt)
+// GOW(ccos, XFX)
+// GOW(ccosf, xFx)
+// GOW(ccosh, XFX)
+// GOW(ccoshf, xFx)
+// GOWD(ccoshl, YFY, ccosh)
+// GOWD(ccosl, YFY, ccos)
+// GOW(ceil, dFd)
+// GOW(ceilf, fFf)
+// GOWD(ceill, DFD, ceil)
+// GOW(cexp, XFX)
+// GOW(cexpf, xFx)
+// GOWD(cexpl, YFY, cexp)
+// GOW(clog, XFX)
+// GOW(clogf, xFx)
+// GOWD(clogl, YFY, clog)
+// GOW(cpow, XFXX)
+// GOW(cpowf, xFxx)
+// GOWD(cpowl, YFYY, cpow)
+// GOW(cproj, XFX)
+// GOW(cprojf, xFx)
+// GOW(csin, XFX)
+// GOW(csinf, xFx)
+// GOW(csinh, XFX)
+// GOW(csinhf, xFx)
+// GOWD(csinhl, YFY, csinh)
+// GOWD(csinl, YFY, csin)
+// GOW(csqrt, XFX)
+// GOW(csqrtf, xFx)
+// GOWD(csqrtl, YFY, csqrt)
+// GOW(ctan, XFX)
+// GOW(ctanf, xFx)
+// GOW(ctanh, XFX)
+// GOW(ctanhf, xFx)
+// GOWD(ctanhl, YFY, ctanh)
+// GOWD(ctanl, YFY, ctan)
+#else
+GOW(cabs, dFX)
+GOW(cabsf, fFx)
+GOWD(cabsl, DFY, cabs)
+GOW(cacos, XFX)
+GOW(cacosf, xFx)
+GOW(cacosh, XFX)
+GOW(cacoshf, xFx)
+GOWD(cacoshl, YFY, cacosh)
+GOWD(cacosl, YFY, cacos)
+GOW(carg, dFX)
+GOW(cargf, fFx)
+// cargl    // Weak
+GOW(casin, XFX)
+GOW(casinf, xFx)
+GOW(casinh, XFX)
+GOW(casinhf, xFx)
+GOWD(casinhl, YFY, casinh)
+GOWD(casinl, YFY, casin)
+GOW(catan, XFX)
+GOW(catanf, xFx)
+GOW(catanh, XFX)
+GOW(catanhf, xFx)
+GOWD(catanhl, YFY, catanh)
+GOWD(catanl, YFY, catan)
+GOW(cbrt, dFd)
+GOW(cbrtf, fFf)
+GOWD(cbrtl, DFD, cbrt)
+GOW(ccos, XFX)
+GOW(ccosf, xFx)
+GOW(ccosh, XFX)
+GOW(ccoshf, xFx)
+GOWD(ccoshl, YFY, ccosh)
+GOWD(ccosl, YFY, ccos)
+GOW(ceil, dFd)
+GOW(ceilf, fFf)
+GOWD(ceill, DFD, ceil)
+GOW(cexp, XFX)
+GOW(cexpf, xFx)
+GOWD(cexpl, YFY, cexp)
+GOW(clog, XFX)
+GOW(clogf, xFx)
+GOWD(clogl, YFY, clog)
+GOW(cpow, XFXX)
+GOW(cpowf, xFxx)
+GOWD(cpowl, YFYY, cpow)
+GOW(cproj, XFX)
+GOW(cprojf, xFx)
+GOW(csin, XFX)
+GOW(csinf, xFx)
+GOW(csinh, XFX)
+GOW(csinhf, xFx)
+GOWD(csinhl, YFY, csinh)
+GOWD(csinl, YFY, csin)
+GOW(csqrt, XFX)
+GOW(csqrtf, xFx)
+GOWD(csqrtl, YFY, csqrt)
+GOW(ctan, XFX)
+GOW(ctanf, xFx)
+GOW(ctanh, XFX)
+GOW(ctanhf, xFx)
+GOWD(ctanhl, YFY, ctanh)
+GOWD(ctanl, YFY, ctan)
+#endif
+GOW(copysign, dFdd)
+GOW(copysignf, fFff)
+GOWD(copysignl, DFDD, copysign)
+GOW(cos, dFd)
+GOW(cosf, fFf)
+GOW(cosh, dFd)
+GOW(coshf, fFf)
+// GOM(__coshf_finite, fFf)
+// GOM(__cosh_finite, dFd)
+GOWD(coshl, DFD, cosh)
+GOWD(cosl, DFD, cos)
+// __cxa_finalize  // Weak
+GOW(drem, dFdd)
+GOW(dremf, fFff)
+//GOW(dreml, 
+GOW(erf, dFd)
+GOW(erfc, dFd)
+GOW(erfcf, fFf)
+GOWD(erfcl, DFD, erfc)
+GOW(erff, fFf)
+GOWD(erfl, DFD, erf)
+GOW(exp, dFd)
+GOW(exp10, dFd)
+GOW(exp10f, fFf)
+// __exp10f_finite
+// __exp10_finite
+// exp10l   // Weak
+GOW(exp2, dFd)
+GOW(exp2f, fFf)
+// GOM(__exp2f_finite, fFf)
+// GOM(__exp2_finite, dFd)
+GOWD(exp2l, DFD, exp2)
+GOW(expf, fFf)
+// GOM(__expf_finite, fFf)
+// GOM(__exp_finite, dFd)
+GOWD(expl, DFD, exp)
+GOW(expm1, dFd)
+GOW(expm1f, fFf)
+GOWD(expm1l, DFD, expm1)
+GOW(fabs, dFd)
+GOW(fabsf, fFf)
+GOWD(fabsl, DFD, fabs)
+GOW(fdim, dFdd)
+GOW(fdimf, fFff)
+#ifdef STATICBUILD
+// GOM(feclearexcept, iFEi)
+// GO(fedisableexcept, iFi)
+// GO(feenableexcept, iFi)
+// GO(fegetenv, iFp)
+// GO(fegetexcept, iFv)
+// GO(fegetexceptflag, iFpi)
+// GOM(fegetround, iFEv)
+// GO(feholdexcept, iFp)
+// GOM(feraiseexcept, iFEi)
+// GOM(fesetenv, iFEp)
+// GO(fesetexceptflag, iFpi)
+// GOM(fesetround, iFEi)
+// GOM(fetestexcept, iFEi)
+// GOM(feupdateenv, iFEp)
+#else
+// GOM(feclearexcept, iFEi)
+GO(fedisableexcept, iFi)
+GO(feenableexcept, iFi)
+GO(fegetenv, iFp)
+GO(fegetexcept, iFv)
+GO(fegetexceptflag, iFpi)
+// GOM(fegetround, iFEv)
+GO(feholdexcept, iFp)
+// GOM(feraiseexcept, iFEi)
+// GOM(fesetenv, iFEp)
+GO(fesetexceptflag, iFpi)
+// GOM(fesetround, iFEi)
+// GOM(fetestexcept, iFEi)
+// GOM(feupdateenv, iFEp)
+#endif
+GOW(finite, iFd)
+GO(__finite, iFd)
+GOW(finitef, iFf)
+GO(__finitef, iFf)
+GOD(__finitel, iFD, __finite)
+GOWD(finitel, iFD, finite)
+GOW(floor, dFd)
+GOW(floorf, fFf)
+GOWD(floorl, DFD, floor)
+GOW(fma, dFddd)
+GOW(fmaf, fFfff)
+GOWD(fmal, DFDDD, fma)
+GOW(fmax, dFdd)
+GOW(fmaxf, fFff)
+GOWD(fmaxl, DFDD, fmax)
+GOW(fmin, dFdd)
+GOW(fminf, fFff)
+GOWD(fminl, DFDD, fmin)
+GOW(fmod, dFdd)
+GOW(fmodf, fFff)
+// GOM(__fmodf_finite, fFff)
+// GOM(__fmod_finite, dFdd)
+GOWD(fmodl, DFDD, fmod)
+GO(__fpclassify, iFd)
+GO(__fpclassifyf, iFf)
+GOW(frexp, dFdp)
+GOW(frexpf, fFfp)
+GOWD(frexpl, DFDp, frexp)
+GOW(gamma, dFd)
+GOW(gammaf, fFf)
+// __gammaf_r_finite
+// gammal   // Weak
+// __gamma_r_finite
+// __gmon_start__  // Weak
+GOW(hypot, dFdd)
+GOW(hypotf, fFff)
+// GOM(__hypotf_finite, fFff)
+// GOM(__hypot_finite, dFdd)
+GOWD(hypotl, DFDD, hypot)
+GOW(ilogb, iFd)
+GOW(ilogbf, iFf)
+// ilogbl   // Weak
+// __issignaling
+// __issignalingf
+// _ITM_deregisterTMCloneTable // Weak
+// _ITM_registerTMCloneTable   // Weak
+GO(j0, dFd)
+GO(j0f, fFf)
+// __j0f_finite
+// __j0_finite
+// j0l
+GO(j1, dFd)
+GO(j1f, fFf)
+// __j1f_finite
+// __j1_finite
+// j1l
+GO(jn, dFid)
+GO(jnf, fFif)
+// __jnf_finite
+// __jn_finite
+GOD(jnl, DFiD, jn)
+GOW(ldexp, dFdi)
+GOW(ldexpf, fFfi)
+GOWD(ldexpl, DFDi, ldexp)
+GOW(lgamma, dFd)
+GOW(lgammaf, fFf)
+GOW(lgammaf_r, fFfp)
+// __lgammaf_r_finite
+GOWD(lgammal, DFD, lgamma)
+GOWD(lgammal_r, DFDp, lgamma_r)
+GOW(lgamma_r, dFdp)
+// __lgamma_r_finite
+#ifdef STATICBUILD
+//DATAV(_LIB_VERSION, 8)
+#else
+DATAV(_LIB_VERSION, 8)
+#endif
+// GOWM(llrint, IFEd)
+// GOWM(llrintf, IFEf)
+// GOWM(llrintl, IFED)
+GOW(llround, IFd)
+GOW(llroundf, IFf)
+GOWD(llroundl, IFD, llround)
+GOW(log, dFd)
+GOW(log10, dFd)
+GOW(log10f, fFf)
+// GOM(__log10f_finite, fFf)
+// GOM(__log10_finite, dFd)
+GOWD(log10l, DFD, log10)
+GOW(log1p, dFd)
+GOW(log1pf, fFf)
+GOWD(log1pl, DFD, log1p)
+GOW(log2, dFd)
+GOW(log2f, fFf)
+// GOM(__log2f_finite, fFf)
+// GOM(__log2_finite, dFd)
+GOWD(log2l, DFD, log2)
+GOW(logb, dFd)
+GOW(logbf, fFf)
+// logbl    // Weak
+GOW(logf, fFf)
+// GOM(__logf_finite, fFf)
+// GOM(__log_finite, dFd)
+GOWD(logl, DFD, log)
+// GOWM(lrint, lFEd)
+// GOWM(lrintf, lFEf)
+// lrintl   // Weak
+GOW(lround, lFd)
+GOW(lroundf, lFf)
+GOWD(lroundl, lFD, lround)
+// matherr  // Weak
+GOW(modf, dFdp)
+GOW(modff, fFfp)
+GOWD(modfl, DFDp, modf)
+GOW(nan, dFp)
+GOW(nanf, fFp)
+// nanl // Weak
+// GOWM(nearbyint, dFEd)
+// GOWM(nearbyintf, fFEf)
+// nearbyintl   // Weak
+GOW(nextafter, dFdd)
+GOW(nextafterf, fFff)
+// GOWD(nextafterl, DFDD, nextafter)
+// GOWD(nexttoward, dFdD, my_nexttoward) // This loses precision
+// GOWD(nexttowardf, fFfD, my_nexttowardf) // This loses precision
+// nexttowardl  // Weak
+GOW(pow, dFdd)
+// GOWM(pow10, dFd)
+// GOWM(pow10f, fFf)
+// GOWM(pow10l, DFD)
+GOW(powf, fFff)
+// GOM(__powf_finite, fFff)
+// GOM(__pow_finite, dFdd)
+// GOM(__powl_finite, DFDD)
+GOWD(powl, DFDD, pow)
+GOW(remainder, dFdd)
+GOW(remainderf, fFff)
+// __remainderf_finite
+// __remainder_finite
+// remainderl   // Weak
+GOW(remquo, dFddp)
+GOW(remquof, fFffp)
+// remquol  // Weak
+// GOWM(rint, dFEd)
+// GOWM(rintf, fFEf)
+GOWD(rintl, DFD, rint)
+GOW(round, dFd)
+GOW(roundf, fFf)
+GO(roundeven, dFd)  //since C23
+GO(roundevenf, fFf)
+//GOD(roundevenl, DFD, )
+GOWD(roundl, DFD, round)
+GOW(scalb, dFdd)
+GOW(scalbf, fFff)
+// __scalbf_finite
+// __scalb_finite
+// scalbl   // Weak
+GOW(scalbln, dFdl)
+GOW(scalblnf, fFfl)
+// scalblnl // Weak
+GOW(scalbn, dFdi)
+GOW(scalbnf, fFfi)
+GOWD(scalbnl, DFDi, scalbn)
+// __signbit
+// __signbitf
+DATAB(signgam, 8)
+GOW(significand, dFd)
+GOW(significandf, fFf)
+// significandl // Weak
+GOW(sin, dFd)
+GOW(sincos, vFdpp)
+GOW(sincosf, vFfpp)
+GOWD(sincosl, vFDpp, sincos)
+GOW(sinf, fFf)
+GOW(sinh, dFd)
+GOW(sinhf, fFf)
+// GOM(__sinhf_finite, fFf)
+// GOM(__sinh_finite, dFd)
+GOWD(sinhl, DFD, sinh)
+GOWD(sinl, DFD, sin)
+GOW(sqrt, dFd)
+GOW(sqrtf, fFf)
+// GOM(__sqrtf_finite, fFf)
+// GOM(__sqrt_finite, dFd)
+GOWD(sqrtl, DFD, sqrt)
+GO(tan, dFd)
+GOW(tanf, fFf)
+GOW(tanh, dFd)
+GOW(tanhf, fFf)
+GOWD(tanhl, DFD, tanh)
+GOWD(tanl, DFD, tan)
+GOW(tgamma, dFd)
+GOW(tgammaf, fFf)
+GOWD(tgammal, DFD, tgamma)
+GOW(trunc, dFd)
+GOW(truncf, fFf)
+GOWD(truncl, DFD, trunc)
+GO(y0, dFd)
+GO(y0f, fFf)
+// __y0f_finite
+// __y0_finite
+// y0l
+GO(y1, dFd)
+GO(y1f, fFf)
+// __y1f_finite
+// __y1_finite
+// y1l
+GO(yn, dFid)
+GO(ynf, fFif)
+// __ynf_finite
+// __yn_finite
+GOD(ynl, DFiD, yn)

src/wrapped/wrappedlibcrypt_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(crypt, pFpp)
@@ -8,4 +8,4 @@ GO(encrypt, vFpi)
 GOW(encrypt_r, vFpip)
 //GOW(fcrypt, 
 GO(setkey, vFp)
-GOW(setkey_r, vFpp)
+GOW(setkey_r, vFpp)

src/wrapped/wrappedlibdrmamdgpu_private.h

@@ -1,25 +1,25 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error Meh....
+#error Meh...
 #endif
 
 GO(amdgpu_bo_alloc, iFppp)
 GO(amdgpu_bo_cpu_map, iFpp)
 GO(amdgpu_bo_cpu_unmap, iFp)
 GO(amdgpu_bo_export, iFpup)
-GO(amdgpu_bo_free, iFppp)
+GO(amdgpu_bo_free, iFp)
 GO(amdgpu_bo_import, iFpuup)
 GO(amdgpu_bo_inc_ref, vFp)
 GO(amdgpu_bo_list_create, iFpuppp)
 GO(amdgpu_bo_list_create_raw, iFpupp)
 GO(amdgpu_bo_list_destroy, iFp)
-GO(amdgpu_bo_list_destroy_raw, iFpupp)
+GO(amdgpu_bo_list_destroy_raw, iFpu)
 GO(amdgpu_bo_list_update, iFpupp)
 GO(amdgpu_bo_query_info, iFpp)
 GO(amdgpu_bo_set_metadata, iFpp)
-GO(amdgpu_bo_va_op, iFpLLLLu)
-GO(amdgpu_bo_va_op_raw, iFppLLLLu)
-GO(amdgpu_bo_wait_for_idle, iFpLp)
-GO(amdgpu_create_bo_from_user_mem, iFppLp)
+GO(amdgpu_bo_va_op, iFpUUUUu)
+GO(amdgpu_bo_va_op_raw, iFppUUUUu)
+GO(amdgpu_bo_wait_for_idle, iFpUp)
+GO(amdgpu_create_bo_from_user_mem, iFppUp)
 GO(amdgpu_cs_chunk_fence_info_to_data, vFpp)
 GO(amdgpu_cs_chunk_fence_to_dep, vFpp)
 GO(amdgpu_cs_create_semaphore, iFp)
@@ -35,32 +35,32 @@ GO(amdgpu_cs_destroy_syncobj, iFpu)
 GO(amdgpu_cs_export_syncobj, iFpup)
 GO(amdgpu_cs_fence_to_handle, iFppup)
 GO(amdgpu_cs_import_syncobj, iFpip)
-GO(amdgpu_cs_query_fence_status, iFpLLp)
+GO(amdgpu_cs_query_fence_status, iFpUUp)
 GO(amdgpu_cs_query_reset_state, iFppp)
 GO(amdgpu_cs_query_reset_state2, iFpp)
 GO(amdgpu_cs_signal_semaphore, iFpuuup)
-GO(amdgpu_cs_submit, iFpLpu)
+GO(amdgpu_cs_submit, iFpUpu)
 GO(amdgpu_cs_submit_raw, iFpppipp)
 GO(amdgpu_cs_submit_raw2, iFppuipp)
 GO(amdgpu_cs_syncobj_export_sync_file, iFpup)
-GO(amdgpu_cs_syncobj_export_sync_file2, iFpuLup)
+GO(amdgpu_cs_syncobj_export_sync_file2, iFpuUup)
 GO(amdgpu_cs_syncobj_import_sync_file, iFpui)
-GO(amdgpu_cs_syncobj_import_sync_file2, iFpuLi)
+GO(amdgpu_cs_syncobj_import_sync_file2, iFpuUi)
 GO(amdgpu_cs_syncobj_query, iFpppu)
 GO(amdgpu_cs_syncobj_query2, iFpppuu)
 GO(amdgpu_cs_syncobj_reset, iFppu)
 GO(amdgpu_cs_syncobj_signal, iFppu)
 GO(amdgpu_cs_syncobj_timeline_signal, iFpppu)
-GO(amdgpu_cs_syncobj_timeline_wait, iFpppulup)
-GO(amdgpu_cs_syncobj_transfer, iFpuLuLu)
-GO(amdgpu_cs_syncobj_wait, iFppulup)
-GO(amdgpu_cs_wait_fences, iFpuiLpp)
+GO(amdgpu_cs_syncobj_timeline_wait, iFpppuIup)
+GO(amdgpu_cs_syncobj_transfer, iFpuUuUu)
+GO(amdgpu_cs_syncobj_wait, iFppuIup)
+GO(amdgpu_cs_wait_fences, iFpuiUpp)
 GO(amdgpu_cs_wait_semaphore, iFpuuup)
 GO(amdgpu_device_deinitialize, iFp)
 GO(amdgpu_device_get_fd, iFp)
 GO(amdgpu_device_initialize, iFippp)
 GO(amdgpu_device_initialize2, iFiippp)
-GO(amdgpu_find_bo_by_cpu_mapping, iFppLpp)
+GO(amdgpu_find_bo_by_cpu_mapping, iFppUpp)
 GO(amdgpu_get_marketing_name, pFp)
 GO(amdgpu_query_buffer_size_alignment, iFpp)
 GO(amdgpu_query_crtc_from_id, iFpup)
@@ -76,12 +76,12 @@ GO(amdgpu_query_sensor_info, iFpuup)
 GO(amdgpu_query_sw_info, iFpup)
 GO(amdgpu_query_video_caps_info, iFpuup)
 GO(amdgpu_read_mm_registers, iFpuuuup)
-GO(amdgpu_va_get_start_addr, LFp)
+GO(amdgpu_va_get_start_addr, UFp)
 GO(amdgpu_va_manager_alloc, pFv)
 GO(amdgpu_va_manager_deinit, vFp)
-GO(amdgpu_va_manager_init, vFpLLLLu)
-GO(amdgpu_va_range_alloc, iFpuLLLppL)
-GO(amdgpu_va_range_alloc2, iFpuLLLppL)
+GO(amdgpu_va_manager_init, vFpUUUUu)
+GO(amdgpu_va_range_alloc, iFpuUUUppU)
+GO(amdgpu_va_range_alloc2, iFpuUUUppU)
 GO(amdgpu_va_range_free, iFp)
 GO(amdgpu_va_range_query, iFpupp)
 GO(amdgpu_vm_reserve_vmid, iFpu)

src/wrapped/wrappedlibfuse_private.h

@@ -97,7 +97,7 @@ GOM(fuse_lowlevel_new, pFEppLp)
 GOM(fuse_main_real, iFEippLp)
 //GO(fuse_main_real_compat22, 
 //GO(fuse_main_real_compat25, 
-GO(fuse_mount, pFpp)
+GO(fuse_mount, iFpp)
 //GO(fuse_mount_compat1, 
 //GO(fuse_mount_compat22, 
 //GO(fuse_mount_compat25, 
@@ -174,9 +174,9 @@ GO(fuse_set_signal_handlers, iFp)
 //GO(__fuse_teardown, 
 //GO(fuse_teardown, 
 //GO(fuse_teardown_compat22, 
-GO(fuse_unmount, vFpp)
+GO(fuse_unmount, vFp)
 //GO(fuse_unmount_compat22, 
 //GO(fuse_version, 
 
 GO(dummy_getdir_op, iFppiU)    // dummy functions for callbacks
-GO(dummy_readdir_op, iFpppUi)
+GO(dummy_readdir_op, iFpppUi)

src/wrapped/wrappedlibgl_private.h

@@ -4094,4 +4094,4 @@ GO(glXGetCurrentDisplayEXT, pFv)
 GO(glXQueryContextInfoEXT, iFpLip)
 GO(glXGetContextIDEXT, LFL)
 GO(glXImportContextEXT, LFpL)
-GO(glXFreeContextEXT, vFpL)
+GO(glXFreeContextEXT, vFpL)

src/wrapped/wrappedlibglu_private.h

@@ -2,7 +2,7 @@
 #error Meh...
 #endif
 
-GO(gluBeginCurve,vFp)
+GO(gluBeginCurve, vFp)
 GO(gluBeginPolygon, vFp)
 GO(gluBeginSurface, vFp)
 GO(gluBeginTrim, vFp)

src/wrapped/wrappedlibglx_private.h

@@ -1,48 +1,48 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 // __glXGLLoadGLXFunction
 GO(glXChooseFBConfig, pFpipp)
 GO(glXChooseVisual, pFpip)
-GO(glXCopyContext,vFppp)
-GO(glXCreateContext,pFpppi)
-GO(glXCreateGLXPixmap,pFppp)
-GO(glXCreateNewContext,pFppipi)
-GO(glXCreatePbuffer,pFppp)
-GO(glXCreatePixmap,pFppp)
-GO(glXCreateWindow,pFpppp)
-GO(glXDestroyContext,vFpp)
-GO(glXDestroyGLXPixmap,vFpp)
-GO(glXDestroyPbuffer,vFpp)
-GO(glXDestroyPixmap,vFpp)
-GO(glXDestroyWindow,vFpp)
+GO(glXCopyContext, vFpppL)
+GO(glXCreateContext, pFpppi)
+GO(glXCreateGLXPixmap, LFppL)
+GO(glXCreateNewContext, pFppipi)
+GO(glXCreatePbuffer, LFppp)
+GO(glXCreatePixmap, LFppLp)
+GO(glXCreateWindow, LFppLp)
+GO(glXDestroyContext, vFpp)
+GO(glXDestroyGLXPixmap, vFpL)
+GO(glXDestroyPbuffer, vFpL)
+GO(glXDestroyPixmap, vFpL)
+GO(glXDestroyWindow, vFpL)
 GO(glXGetClientString, pFpi)
 GO(glXGetConfig, iFppip)
 GO(glXGetCurrentContext, pFv)
 GO(glXGetCurrentDisplay, pFv)
-GO(glXGetCurrentDrawable, pFv)
-GO(glXGetCurrentReadDrawable, pFv)
+GO(glXGetCurrentDrawable, LFv)
+GO(glXGetCurrentReadDrawable, LFv)
 GO(glXGetFBConfigAttrib, iFppip)
-GO(glXGetFBConfigs,pFpip)
+GO(glXGetFBConfigs, pFpip)
 GOM(glXGetProcAddress, pFEp)
 GOM(glXGetProcAddressARB, pFEp)
-GO(glXGetSelectedEvent, vFppp)
+GO(glXGetSelectedEvent, vFpLp)
 GO(glXGetVisualFromFBConfig, pFpp)
-GO(glXIsDirect,iFpp)
-GO(glXMakeContextCurrent,iFpppp)
-GO(glXMakeCurrent,iFppp)
-GO(glXQueryContext,iFppip)
-GO(glXQueryDrawable, iFppip)
+GO(glXIsDirect, iFpp)
+GO(glXMakeContextCurrent, iFpLLp)
+GO(glXMakeCurrent, iFpLp)
+GO(glXQueryContext, iFppip)
+GO(glXQueryDrawable, vFpLip)
 GO(glXQueryExtension, iFppp)
-GO(glXQueryExtensionsString,pFpi)
-GO(glXQueryServerString,pFpii)
-GO(glXQueryVersion,iFppp)
-GO(glXSelectEvent, vFppu)
-GO(glXSwapBuffers,vFpp)
-GO(glXUseXFont,vFpiii)
-GO(glXWaitGL,vFv)
-GO(glXWaitX,vFv)
+GO(glXQueryExtensionsString, pFpi)
+GO(glXQueryServerString, pFpii)
+GO(glXQueryVersion, iFppp)
+GO(glXSelectEvent, vFpLL)
+GO(glXSwapBuffers, vFpL)
+GO(glXUseXFont, vFLiii)
+GO(glXWaitGL, vFv)
+GO(glXWaitX, vFv)
 
 
 

src/wrapped/wrappedlibglxnvidia.c

@@ -230,10 +230,10 @@ EXPORT int mynv_glXSwapIntervalMESA(x64emu_t* emu, int interval)
     return fnc(interval);
 }
 // glXSwapIntervalEXT ...
-EXPORT void mynv_dummy_glXSwapIntervalEXT(void* dpy, void* drawable, int interval) {}
-EXPORT void mynv_glXSwapIntervalEXT(x64emu_t* emu, void* dpy, void* drawable, int interval)
+EXPORT void mynv_dummy_glXSwapIntervalEXT(void* dpy, unsigned long drawable, int interval) {}
+EXPORT void mynv_glXSwapIntervalEXT(x64emu_t* emu, void* dpy, unsigned long drawable, int interval)
 {
-    vFppi_t fnc = getBridgeFnc2((void*)R_RIP);
+    vFpLi_t fnc = getBridgeFnc2((void*)R_RIP);
     if(!fnc) fnc=my->glXSwapIntervalEXT;
     if(!fnc) fnc=mynv_dummy_glXSwapIntervalEXT;
     fnc(dpy, drawable, interval);

src/wrapped/wrappedlibglxnvidia_private.h

@@ -670,7 +670,7 @@ GO(glBlendFuncSeparatei, vFuuuuu)
 GO(glBlendFunci, vFuuu)
 GO(glMinSampleShading, vFf)
 //VERSION_4_3
-GO(glInvalidateNamedFramebuffer,  vFiup)
+GO(glInvalidateNamedFramebuffer, vFiup)
 //VERSION_4_4
 GO(glBindBuffersBase, vFuuip)
 GO(glBindBuffersRange, vFuuippp)
@@ -2928,108 +2928,108 @@ GO(TexPageCommitmentARB, vFiiiiiiiii)
 
 //glx
 GO(glXBindHyperpipeSGIX, iFpi)
-GO(glXBindTexImageEXT, vFppip)
+GO(glXBindTexImageEXT, vFpLip)
 GO(glXBindSwapBarrierNV, iFpuu)
-GO(glXBindSwapBarrierSGIX,vFii)
-GO(glXBindVideoCaptureDeviceNV, iFpup)
+GO(glXBindSwapBarrierSGIX, vFpLi)
+GO(glXBindVideoCaptureDeviceNV, iFpuL)
 GO(glXBindVideoDeviceNV, iFpuup)
-GO(glXBindVideoImageNV, iFpppi)
+GO(glXBindVideoImageNV, iFpuLi)
 GO(glXChangeDrawableAttributes, vFp)
 GO(glXChangeDrawableAttributesSGIX, vFp)
 GO(glXClientInfo, vFv)
-GO(glXCopyContext, vFppp)
+GO(glXCopyContext, vFpppL)
 GO(glXChooseFBConfig, pFpipp)
 GO(glXChooseFBConfigSGIX, pFpipp)
-GO(glXCreateContext,pFpppi)
+GO(glXCreateContext, pFpppi)
 GO(glXCreateContextAttribsARB, pFpppip)
 GO(glXCreateContextWithConfigSGIX, pFppipi)
-GO(glXCreateGLXPbufferSGIX, pFppuup)
-GO(glXCreateGLXPixmap, pFppp)
-GO(glXCreateGLXPixmapWithConfigSGIX, pFppp)
+GO(glXCreateGLXPbufferSGIX, LFppuup)
+GO(glXCreateGLXPixmap, LFppL)
+GO(glXCreateGLXPixmapWithConfigSGIX, LFppL)
 GO(glXCreateGLXVideoSourceSGIX, pFpippip)
 GO(glXCreateNewContext, pFppipi)
-GO(glXCreatePbuffer, pFppp)
-GO(glXCreatePixmap, pFppp)
-GO(glXCreateWindow, pFpppp)
+GO(glXCreatePbuffer, LFppp)
+GO(glXCreatePixmap, LFppLp)
+GO(glXCreateWindow, LFppLp)
 GO(glXChooseVisual, pFpip)
-GO(glXCopyImageSubDataNV, vFppuiiiiipuiiiiiiii)
-GO(glXCopySubBufferMESA, vFppiiii)
-GO(glXDestroyContext,vFpp)
-GO(glXDestroyGLXPbufferSGIX,vFpp)
-GO(glXDestroyGLXPixmap,vFpp)
-GO(glXDestroyGLXVideoSourceSGIX,vFpp)
-GO(glXDestroyHyperpipeConfigSGIX,iFpi)
-GO(glXDestroyPbuffer,vFpp)
-GO(glXDestroyPixmap,vFpp)
-GO(glXDestroyWindow,vFpp)
+GO(glXCopyImageSubDataNV, vFppuuiiiipuuiiiiiii)
+GO(glXCopySubBufferMESA, vFpLiiii)
+GO(glXDestroyContext, vFpp)
+GO(glXDestroyGLXPbufferSGIX, vFpL)
+GO(glXDestroyGLXPixmap, vFpL)
+GO(glXDestroyGLXVideoSourceSGIX, vFpp)
+GO(glXDestroyHyperpipeConfigSGIX, iFpi)
+GO(glXDestroyPbuffer, vFpL)
+GO(glXDestroyPixmap, vFpL)
+GO(glXDestroyWindow, vFpL)
 GO(glXEnumerateVideoCaptureDevicesNV, pFpip)
 GO(glXEnumerateVideoDevicesNV, pFpip)
 GO(glXFreeContextEXT, vFpp)
 GO(glXGetClientString, pFpi)
 GO(glXGetConfig, iFppip)
-GO(glXGetContextIDEXT, uFp)
+GO(glXGetContextIDEXT, LFp)
 GO(glXGetCurrentContext, pFv)
 GO(glXGetCurrentDisplay, pFv)
-GO(glXGetCurrentDrawable, pFv)
-GO(glXGetCurrentReadDrawable, pFv)
-GO(glXGetDrawableAttributes,vFi)
-GO(glXGetDrawableAttributesSGIX,vFi)
-GO(glXGetFBConfigs,pFpip)
+GO(glXGetCurrentDrawable, LFv)
+GO(glXGetCurrentReadDrawable, LFv)
+GO(glXGetDrawableAttributes, vFi)
+GO(glXGetDrawableAttributesSGIX, vFi)
+GO(glXGetFBConfigs, pFpip)
 GO(glXGetFBConfigAttrib, iFppip)
 GO(glXGetFBConfigAttribSGIX, iFppip)
 GO(glXGetFBConfigFromVisualSGIX, pFpp)
-GO(glXGetFBConfigsSGIX,pFpip)
-GO(glXGetSelectedEvent, vFppp)
-GO(glXGetSelectedEventSGIX, vFppp)
+GO(glXGetFBConfigsSGIX, pFpip)
+GO(glXGetSelectedEvent, vFpLp)
+GO(glXGetSelectedEventSGIX, vFpLp)
 GO(glXGetVideoDeviceNV, iFpiip)
-GO(glXGetVideoInfoNV, iFpippp)
+GO(glXGetVideoInfoNV, iFpiupp)
 GO(glXGetVideoSyncSGI, iFp)
-GO(glXGetVisualConfigs,pFpp)
+GO(glXGetVisualConfigs, pFpp)
 GO(glXGetVisualFromFBConfig, pFpp)
 GO(glXGetVisualFromFBConfigSGIX, pFpp)
-GO(glXHyperpipeAttribSGIX,iFpiiip)
-//GO(glXHyperpipeConfigSGIX, iFpiipp)
-GO(glXImportContextEXT, pFpu)
-GO(glXIsDirect,iFpp)
-GO(glXJoinSwapGroupNV, iFppu)
-GO(glXJoinSwapGroupSGIX,vFpp)
-GO(glXLockVideoCaptureDeviceNV, vFpp)
-GO(glXMakeContextCurrent,iFpppp)
-GO(glXMakeCurrent,iFppp)
-GO(glXQueryContext,iFppip)
-GO(glXQueryContextInfoEXT,iFppip)
-GO(glXQueryDrawable, iFppip)
+GO(glXHyperpipeAttribSGIX, iFpiiip)
+GO(glXHyperpipeConfigSGIX, iFpiipp)
+GO(glXImportContextEXT, pFpL)
+GO(glXIsDirect, iFpp)
+GO(glXJoinSwapGroupNV, iFpLu)
+GO(glXJoinSwapGroupSGIX, vFpLL)
+GO(glXLockVideoCaptureDeviceNV, vFpL)
+GO(glXMakeContextCurrent, iFpLLp)
+GO(glXMakeCurrent, iFpLp)
+GO(glXQueryContext, iFppip)
+GO(glXQueryContextInfoEXT, iFppip)
+GO(glXQueryDrawable, vFpLip)
 GO(glXQueryExtension, iFppp)
-GO(glXQueryExtensionsString,pFpi)
+GO(glXQueryExtensionsString, pFpi)
 GO(glXQueryFrameCountNV, iFpip)
-GO(glXQueryGLXPbufferSGIX, vFppip)
-GO(glXQueryHyperpipeAttribSGIX,iFpiiip)
-GO(glXQueryHyperpipeBestAttribSGIX,iFpiiipp)
-GO(glXQueryHyperpipeConfigSGIX,pFpip)
-GO(glXQueryHyperpipeNetworkSGIX,pFpp)
-GO(glXQueryMaxSwapBarriersSGIX,pFpp) //?
+GO(glXQueryGLXPbufferSGIX, vFpLip)
+GO(glXQueryHyperpipeAttribSGIX, iFpiiip)
+GO(glXQueryHyperpipeBestAttribSGIX, iFpiiipp)
+GO(glXQueryHyperpipeConfigSGIX, pFpip)
+GO(glXQueryHyperpipeNetworkSGIX, pFpp)
+GO(glXQueryMaxSwapBarriersSGIX, iFpip)
 GO(glXQueryMaxSwapGroupsNV, iFpipp)
-GO(glXQueryServerString,pFpii)
-GO(glXQuerySwapGroupNV, iFpipp)
-GO(glXQueryVersion,iFppp)
-GO(glXQueryVideoCaptureDeviceNV, iFppip)
-GO(glXReleaseTexImageEXT, vFppi)
-GO(glXReleaseVideoCaptureDeviceNV, vFpp)
-GO(glXReleaseVideoDeviceNV, iFpip)
-GO(glXReleaseVideoImageNV, iFpp)
+GO(glXQueryServerString, pFpii)
+GO(glXQuerySwapGroupNV, iFpLpp)
+GO(glXQueryVersion, iFppp)
+GO(glXQueryVideoCaptureDeviceNV, iFpLip)
+GO(glXReleaseTexImageEXT, vFpLi)
+GO(glXReleaseVideoCaptureDeviceNV, vFpL)
+GO(glXReleaseVideoDeviceNV, iFpiu)
+GO(glXReleaseVideoImageNV, iFpL)
 //GO(glXRender, vFv)
 //GO(glXRenderLarge, vFv)
 GO(glXResetFrameCountNV, iFpi)
-GO(glXSelectEvent, vFppu)
-GO(glXSelectEventSGIX, vFppu)
-GO(glXSendPbufferToVideoNV, iFppipi)
-GO(glXSwapBuffers,vFpp)
-GO(glXUseXFont,vFpiii)
+GO(glXSelectEvent, vFpLL)
+GO(glXSelectEventSGIX, vFpLL)
+GO(glXSendPbufferToVideoNV, iFpLipC)
+GO(glXSwapBuffers, vFpL)
+GO(glXUseXFont, vFLiii)
 //GO(glXVendorPrivate, vFv)
 //GO(glXVendorPrivateWithReply, vFv)
-GO(glXWaitGL,vFv)
+GO(glXWaitGL, vFv)
 GO(glXWaitVideoSyncSGI, iFiip)
-GO(glXWaitX,vFv)
+GO(glXWaitX, vFv)
 
 GOM(glXGetProcAddress, pFEp)
 GOM(glXGetProcAddressARB, pFEp)
@@ -3041,26 +3041,26 @@ GO(glXQueryRendererStringMESA, pFpiii)
 GO(glXQueryCurrentRendererStringMESA, pFi)
 
 //GLX_OML_sync_control
-GO(glXGetSyncValuesOML, iFppppp)
-GO(glXGetMscRateOML, iFpppp)
-GO(glXSwapBuffersMscOML, IFppIII)
-GO(glXWaitForMscOML, iFppIIIppp)
-GO(glXWaitForSbcOML, iFppIppp)
+GO(glXGetSyncValuesOML, iFpLppp)
+GO(glXGetMscRateOML, iFpLpp)
+GO(glXSwapBuffersMscOML, IFpLIII)
+GO(glXWaitForMscOML, iFpLIIIppp)
+GO(glXWaitForSbcOML, iFpLIppp)
 
 //GLX_EXT_swap_control
-GOM(glXSwapIntervalEXT,vFEppi)
+GOM(glXSwapIntervalEXT, vFEpLi)
 //GLX_EXT_swap_control_tear
 //nothing
 
 //GLX_MESA_swap_control
-GOM(glXSwapIntervalMESA,iFEi)
+GOM(glXSwapIntervalMESA, iFEi)
 GO(glXGetSwapIntervalMESA, iFv)
 
 //GLX_SGI_swap_control
-GO(glXSwapIntervalSGI,iFi)
+GO(glXSwapIntervalSGI, iFi)
 
 //GLX_NV_vertex_array_range
-GO(glXAllocateMemoryNV, pFlfff)
+GO(glXAllocateMemoryNV, pFifff)
 GO(glXFreeMemoryNV, vFp)
 
 //GLX_ARB_????
@@ -3335,16 +3335,16 @@ GO(glBlendBarrierARB, vFv)
 GO(glBlendBarrierEXT, vFv)
 GO(glBlendBarrierOES, vFv)
 GO(glBlendBarrierANGLE, vFv)
-GO(glClearDepthfARB,vFf)
-GO(glClipPlanefARB,vFup)
-GO(glDepthRangefARB,vFff)
-GO(glFrustumfARB,vFffffff)
-GO(glGetClipPlanefARB,vFup)
-GO(glOrthofARB,vFffffff)
-GO(glClipPlanef,vFup)
-GO(glFrustumf,vFffffff)
-GO(glGetClipPlanef,vFup)
-GO(glOrthof,vFffffff)
+GO(glClearDepthfARB, vFf)
+GO(glClipPlanefARB, vFup)
+GO(glDepthRangefARB, vFff)
+GO(glFrustumfARB, vFffffff)
+GO(glGetClipPlanefARB, vFup)
+GO(glOrthofARB, vFffffff)
+GO(glClipPlanef, vFup)
+GO(glFrustumf, vFffffff)
+GO(glGetClipPlanef, vFup)
+GO(glOrthof, vFffffff)
 GO(glActiveShaderProgramEXT, vFuu)
 GO(glBindProgramPipelineEXT, vFu)
 GO(glCreateShaderProgramvEXT, uFilp)
@@ -3404,8 +3404,8 @@ GO(glNamedRenderbufferStorageMultisampleAdvancedAMD, vFuiiuii)
 GO(glImportSemaphoreFdEXT, vFuui)
 
 // GLX_SGI_make_current_read
-GO(glXMakeCurrentReadSGI, iFpppp)
-GO(glXGetCurrentReadDrawableSGI, pFv)
+GO(glXMakeCurrentReadSGI, iFpLLp)
+GO(glXGetCurrentReadDrawableSGI, LFv)
 
 // GL_IMG_multisampled_render_to_texture
 GO(glFramebufferTexture2DMultisampleIMG, vFiiiuil)
@@ -4087,7 +4087,7 @@ GO(glXCopyBufferSubDataNV, vFpppuulll)
 GO(glXNamedCopyBufferSubDataNV, vFpppuulll)
 
 // GLX_NV_delay_before_swap
-GO(glXDelayBeforeSwapNV, iFppf)
+GO(glXDelayBeforeSwapNV, iFpLf)
 
 // GL_ARB_viewport_array
 GO(glDepthRangeArraydvNV, vFuip)

src/wrapped/wrappedlibice.c

@@ -129,9 +129,9 @@ EXPORT int my_IceAddConnectionWatch(x64emu_t* emu, void* f, void* data)
     return my->IceAddConnectionWatch(findWatchProcFct(f), data);
 }
 
-EXPORT int my_IceRemoveConnectionWatch(x64emu_t* emu, void* f, void* data)
+EXPORT void my_IceRemoveConnectionWatch(x64emu_t* emu, void* f, void* data)
 {
-    return my->IceRemoveConnectionWatch(findWatchProcFct(f), data);
+    my->IceRemoveConnectionWatch(findWatchProcFct(f), data);
 }
 
 EXPORT void* my_IceSetErrorHandler(x64emu_t* emu, void* f)

src/wrapped/wrappedlibice_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 //GO(IceAcceptConnection, 
@@ -59,7 +59,7 @@ GO(IceConnectionNumber, iFp)
 //GO(_IcePaMagicCookie1Proc, 
 //GO(IcePing, 
 //GO(_IcePoMagicCookie1Proc, 
-GO(IceProcessMessages, iFppp)
+GO(IceProcessMessages, uFppp)
 //GO(IceProtocolRevision, 
 //GO(IceProtocolSetup, 
 //GO(IceProtocolShutdown, 
@@ -70,7 +70,7 @@ GO(IceProcessMessages, iFppp)
 //GO(IceRegisterForProtocolReply, 
 //GO(IceRegisterForProtocolSetup, 
 //GO(IceRelease, 
-GOM(IceRemoveConnectionWatch, iFEpp)
+GOM(IceRemoveConnectionWatch, vFEpp)
 //GO(_IceSearchReplyWaits, 
 GOM(IceSetErrorHandler, pFEp)
 //GO(IceSetHostBasedAuthProc, 

src/wrapped/wrappedlibm_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GOW(acos, dFd)
@@ -25,7 +25,7 @@ GOW(atan2, dFdd)
 GOW(atan2f, fFff)
 GOM(__atan2f_finite, fFff)
 GOM(__atan2_finite, dFdd)
-GOWD(atan2l, lFDD, atan2)
+GOWD(atan2l, DFDD, atan2)
 GOW(atanf, fFf)
 GOW(atanh, dFd)
 GOW(atanhf, fFf)
@@ -33,8 +33,8 @@ GOW(atanhf, fFf)
 // __atanh_finite
 GOWD(atanhl, DFD, atanh)
 GOWD(atanl, DFD, atan)
-GOW(cabs, XFX)
-GOW(cabsf, xFx)
+GOW(cabs, dFX)
+GOW(cabsf, fFx)
 GOWD(cabsl, DFY, cabs)
 GOW(cacos, XFX)
 GOW(cacosf, xFx)
@@ -42,8 +42,8 @@ GOW(cacosh, XFX)
 GOW(cacoshf, xFx)
 GOWD(cacoshl, YFY, cacosh)
 GOWD(cacosl, YFY, cacos)
-GOW(carg, XFX)
-GOW(cargf, xFx)
+GOW(carg, dFX)
+GOW(cargf, fFx)
 // cargl    // Weak
 GOW(casin, XFX)
 GOW(casinf, xFx)
@@ -89,7 +89,7 @@ GOWD(clogl, YFY, clog)
 // conjl    // Weak
 GOW(copysign, dFdd)
 GOW(copysignf, fFff)
-// copysignl    // Weak
+GOWD(copysignl, DFDD, copysign)
 GOW(cos, dFd)
 GOW(cosf, fFf)
 GOW(cosh, dFd)
@@ -125,7 +125,7 @@ GOWD(ctanl, YFY, ctan)
 // __cxa_finalize  // Weak
 GOW(drem, dFdd)
 GOW(dremf, fFff)
-// GOW(dreml,
+//GOW(dreml, 
 GOW(erf, dFd)
 GOW(erfc, dFd)
 GOW(erfcf, fFf)
@@ -171,11 +171,11 @@ GOM(fesetround, iFEi)
 GOM(fetestexcept, iFEi)
 GOM(feupdateenv, iFEp)
 GOW(finite, iFd)
-// __finite
+GO(__finite, iFd)
 GOW(finitef, iFf)
 GO(__finitef, iFf)
-// finitel  // Weak
-// __finitel
+GOD(__finitel, iFD, __finite)
+GOWD(finitel, iFD, finite)
 GOW(floor, dFd)
 GOW(floorf, fFf)
 GOWD(floorl, DFD, floor)
@@ -233,7 +233,7 @@ GO(jnf, fFif)
 GOD(jnl, DFiD, jn)
 GOW(ldexp, dFdi)
 GOW(ldexpf, fFfi)
-GOWD(ldexpl, DFD, ldexp)
+GOWD(ldexpl, DFDi, ldexp)
 GOW(lgamma, dFd)
 GOW(lgammaf, fFf)
 GOW(lgammaf_r, fFfp)
@@ -258,7 +258,7 @@ GOW(log10, dFd)
 GOW(log10f, fFf)
 GOM(__log10f_finite, fFf)
 GOM(__log10_finite, dFd)
-GOWD(log10l, DFD, log10) //Weak
+GOWD(log10l, DFD, log10)
 GOW(log1p, dFd)
 GOW(log1pf, fFf)
 GOWD(log1pl, DFD, log1p)
@@ -274,16 +274,16 @@ GOW(logf, fFf)
 GOM(__logf_finite, fFf)
 GOM(__log_finite, dFd)
 GOWD(logl, DFD, log)
-GOWM(lrint, iFEd)
-GOWM(lrintf, iFEf)
+GOWM(lrint, lFEd)
+GOWM(lrintf, lFEf)
 // lrintl   // Weak
-GOW(lround, iFd)
-GOW(lroundf, iFf)
+GOW(lround, lFd)
+GOW(lroundf, lFf)
 GOWD(lroundl, lFD, lround)
 // matherr  // Weak
 GOW(modf, dFdp)
 GOW(modff, fFfp)
-// modfl    // Weak
+GOWD(modfl, DFDp, modf)
 GOW(nan, dFp)
 GOW(nanf, fFp)
 // nanl // Weak
@@ -320,19 +320,19 @@ GOW(round, dFd)
 GOW(roundf, fFf)
 GO(roundeven, dFd)  //since C23
 GO(roundevenf, fFf)
-//GO(roundevenl, DFD)
+//GOD(roundevenl, DFD, )
 GOWD(roundl, DFD, round)
 GOW(scalb, dFdd)
 GOW(scalbf, fFff)
 // __scalbf_finite
 // __scalb_finite
 // scalbl   // Weak
-GOW(scalbln, dFdi)
-GOW(scalblnf, fFfi)
+GOW(scalbln, dFdl)
+GOW(scalblnf, fFfl)
 // scalblnl // Weak
 GOW(scalbn, dFdi)
 GOW(scalbnf, fFfi)
-// scalbnl  // Weak
+GOWD(scalbnl, DFDi, scalbn)
 // __signbit
 // __signbitf
 DATAB(signgam, 8)

src/wrapped/wrappedlibmvec_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 // SSE2 2x double (b = SSE, N2 = 2 elements, v = vector)

src/wrapped/wrappedlibnettle8_private.h

@@ -236,21 +236,21 @@ GO(nettle_gcm_aes128_digest, vFpLp)
 //GO(nettle_gcm_aes128_encrypt, 
 GO(nettle_gcm_aes128_set_iv, vFpLp)
 GO(nettle_gcm_aes128_set_key, vFpp)
-GO(nettle_gcm_aes128_update, vFpip)
+GO(nettle_gcm_aes128_update, vFpLp)
 //DATAM(nettle_gcm_aes192, 88)
 GO(nettle_gcm_aes192_decrypt, vFpLpp)
 GO(nettle_gcm_aes192_digest, vFpLp)
 //GO(nettle_gcm_aes192_encrypt, 
 GO(nettle_gcm_aes192_set_iv, vFpLp)
 GO(nettle_gcm_aes192_set_key, vFpp)
-GO(nettle_gcm_aes192_update, vFpip)
+GO(nettle_gcm_aes192_update, vFpLp)
 //DATAM(nettle_gcm_aes256, 88)
 GO(nettle_gcm_aes256_decrypt, vFpLpp)
 GO(nettle_gcm_aes256_digest, vFpLp)
 //GO(nettle_gcm_aes256_encrypt, 
 GO(nettle_gcm_aes256_set_iv, vFpLp)
 GO(nettle_gcm_aes256_set_key, vFpp)
-GO(nettle_gcm_aes256_update, vFpip)
+GO(nettle_gcm_aes256_update, vFpLp)
 GO(nettle_gcm_aes_decrypt, vFpLpp)
 GO(nettle_gcm_aes_digest, vFpLp)
 //GO(nettle_gcm_aes_encrypt, 
@@ -261,14 +261,14 @@ GO(nettle_gcm_aes_update, vFpLp)
 GO(nettle_gcm_camellia128_decrypt, vFpLpp)
 GO(nettle_gcm_camellia128_digest, vFpLp)
 //GO(nettle_gcm_camellia128_encrypt, 
-GO(nettle_gcm_camellia128_set_iv, vFpip)
+GO(nettle_gcm_camellia128_set_iv, vFpLp)
 GO(nettle_gcm_camellia128_set_key, vFpp)
 GO(nettle_gcm_camellia128_update, vFpLp)
 //DATAM(nettle_gcm_camellia256, 88)
 GO(nettle_gcm_camellia256_decrypt, vFpLpp)
 GO(nettle_gcm_camellia256_digest, vFpLp)
 //GO(nettle_gcm_camellia256_encrypt, 
-GO(nettle_gcm_camellia256_set_iv, vFpip)
+GO(nettle_gcm_camellia256_set_iv, vFpLp)
 GO(nettle_gcm_camellia256_set_key, vFpp)
 GO(nettle_gcm_camellia256_update, vFpLp)
 GOM(nettle_gcm_decrypt, vFEppppLpp)
@@ -305,14 +305,14 @@ GOM(nettle_hkdf_expand, vFEpppLLpLp)
 GOM(nettle_hkdf_extract, vFEpppLLpp)
 GOM(nettle_hmac_digest, vFEppppLp)
 GO(nettle_hmac_gosthash94cp_digest, vFpLp)
-GO(nettle_hmac_gosthash94cp_set_key, vFpip)
+GO(nettle_hmac_gosthash94cp_set_key, vFpLp)
 GO(nettle_hmac_gosthash94cp_update, vFpLp)
 GO(nettle_hmac_gosthash94_digest, vFpLp)
 //GO(nettle_hmac_gosthash94_set_key, 
 GO(nettle_hmac_gosthash94_update, vFpLp)
 //DATAM(nettle_hmac_md5, 48)
 GO(nettle_hmac_md5_digest, vFpLp)
-GO(nettle_hmac_md5_set_key, vFpip)
+GO(nettle_hmac_md5_set_key, vFpLp)
 GO(nettle_hmac_md5_update, vFpLp)
 //DATAM(nettle_hmac_ripemd160, 48)
 GO(nettle_hmac_ripemd160_digest, vFpLp)
@@ -321,22 +321,22 @@ GO(nettle_hmac_ripemd160_update, vFpLp)
 GOM(nettle_hmac_set_key, vFEppppLp)
 //DATAM(nettle_hmac_sha1, 48)
 GO(nettle_hmac_sha1_digest, vFpLp)
-GO(nettle_hmac_sha1_set_key, vFpip)
+GO(nettle_hmac_sha1_set_key, vFpLp)
 GO(nettle_hmac_sha1_update, vFpLp)
 //DATAM(nettle_hmac_sha224, 48)
 GO(nettle_hmac_sha224_digest, vFpLp)
 GO(nettle_hmac_sha224_set_key, vFpLp)
 //DATAM(nettle_hmac_sha256, 48)
-GO(nettle_hmac_sha256_digest, vFpip)
-GO(nettle_hmac_sha256_set_key, vFpip)
-GO(nettle_hmac_sha256_update, vFpip)
+GO(nettle_hmac_sha256_digest, vFpLp)
+GO(nettle_hmac_sha256_set_key, vFpLp)
+GO(nettle_hmac_sha256_update, vFpLp)
 //DATAM(nettle_hmac_sha384, 48)
 GO(nettle_hmac_sha384_digest, vFpLp)
 GO(nettle_hmac_sha384_set_key, vFpLp)
 //DATAM(nettle_hmac_sha512, 48)
-GO(nettle_hmac_sha512_digest, vFpip)
-GO(nettle_hmac_sha512_set_key, vFpip)
-GO(nettle_hmac_sha512_update, vFpip)
+GO(nettle_hmac_sha512_digest, vFpLp)
+GO(nettle_hmac_sha512_set_key, vFpLp)
+GO(nettle_hmac_sha512_update, vFpLp)
 //DATAM(nettle_hmac_sm3, 48)
 GO(nettle_hmac_sm3_digest, vFpLp)
 //GO(nettle_hmac_sm3_set_key, 
@@ -345,9 +345,9 @@ GO(nettle_hmac_sm3_update, vFpLp)
 GO(nettle_hmac_streebog256_digest, vFpLp)
 GO(nettle_hmac_streebog256_set_key, vFpLp)
 //DATAM(nettle_hmac_streebog512, 48)
-GO(nettle_hmac_streebog512_digest, vFpip)
-GO(nettle_hmac_streebog512_set_key, vFpip)
-GO(nettle_hmac_streebog512_update, vFpip)
+GO(nettle_hmac_streebog512_digest, vFpLp)
+GO(nettle_hmac_streebog512_set_key, vFpLp)
+GO(nettle_hmac_streebog512_update, vFpLp)
 GOM(nettle_hmac_update, vFEppLp)
 GO(nettle_knuth_lfib_get, uFp)
 GO(nettle_knuth_lfib_get_array, vFpLp)
@@ -443,7 +443,7 @@ DATA(nettle_sha256, 48)
 //GO(nettle_sha256_compress, 
 //GO(_nettle_sha256_compress_n, 
 //GO(_nettle_sha256_compress_n_c, 
-GO(nettle_sha256_digest, vFpip)
+GO(nettle_sha256_digest, vFpLp)
 GO(nettle_sha256_init, vFp)
 GO(nettle_sha256_update, vFpLp)
 GO(nettle_sha3_128_init, vFp)
@@ -455,7 +455,7 @@ GO(nettle_sha3_224_digest, vFpLp)
 GO(nettle_sha3_224_init, vFp)
 GO(nettle_sha3_224_update, vFpLp)
 DATA(nettle_sha3_256, 48)
-GO(nettle_sha3_256_digest, vFpip)
+GO(nettle_sha3_256_digest, vFpLp)
 GO(nettle_sha3_256_init, vFp)
 //GO(nettle_sha3_256_shake, 
 GO(nettle_sha3_256_shake_output, vFpLp)
@@ -469,7 +469,7 @@ GO(nettle_sha3_512_digest, vFpLp)
 GO(nettle_sha3_512_init, vFp)
 GO(nettle_sha3_512_update, vFpLp)
 DATA(nettle_sha384, 48)
-GO(nettle_sha384_digest, vFpip)
+GO(nettle_sha384_digest, vFpLp)
 GO(nettle_sha384_init, vFp)
 //GO(_nettle_sha3_pad, 
 GO(nettle_sha3_permute, vFp)
@@ -485,7 +485,7 @@ GO(nettle_sha512_256_digest, vFpLp)
 GO(nettle_sha512_256_init, vFp)
 //GO(_nettle_sha512_compress, 
 GO(nettle_sha512_compress, vFpp)
-GO(nettle_sha512_digest, vFpip)
+GO(nettle_sha512_digest, vFpLp)
 GO(nettle_sha512_init, vFp)
 GO(nettle_sha512_update, vFpLp)
 GO(nettle_siv_cmac_aes128_decrypt_message, iFpLpLpLpp)
@@ -517,7 +517,7 @@ GO(nettle_sm4_set_decrypt_key, vFpp)
 GO(nettle_streebog256_digest, vFpLp)
 GO(nettle_streebog256_init, vFp)
 //DATAM(nettle_streebog512, 48)
-GO(nettle_streebog512_digest, vFpip)
+GO(nettle_streebog512_digest, vFpLp)
 GO(nettle_streebog512_init, vFp)
 GO(nettle_streebog512_update, vFpLp)
 //DATAM(nettle_twofish128, 56)

src/wrapped/wrappedlibogg_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 // ogg_stream_state doesn't need align :)
@@ -10,7 +10,7 @@ GO(oggpack_adv, vFpi)
 //GO(oggpackB_adv, 
 //GO(oggpackB_adv1, 
 //GO(oggpackB_bits, 
-GO(oggpackB_bytes, iFp)
+GO(oggpackB_bytes, lFp)
 GO(oggpackB_get_buffer, pFp)
 //GO(oggpack_bits, 
 //GO(oggpackB_look, 
@@ -19,7 +19,7 @@ GO(oggpackB_read, lFpi)
 //GO(oggpackB_read1, 
 GO(oggpackB_readinit, vFppi)
 GO(oggpackB_reset, vFp)
-GO(oggpackB_write, vFpui)
+GO(oggpackB_write, vFpLi)
 //GO(oggpackB_writealign, 
 //GO(oggpackB_writecheck, 
 GO(oggpackB_writeclear, vFp)
@@ -35,7 +35,7 @@ GO(oggpack_read, lFpi)
 //GO(oggpack_read1, 
 GO(oggpack_readinit, vFppi)
 GO(oggpack_reset, vFp)
-GO(oggpack_write, vFpui)
+GO(oggpack_write, vFpLi)
 //GO(oggpack_writealign, 
 //GO(oggpack_writecheck, 
 GO(oggpack_writeclear, vFp)
@@ -43,7 +43,7 @@ GO(oggpack_writeclear, vFp)
 GO(oggpack_writeinit, vFp)
 GO(oggpack_writetrunc, vFpl)
 GO(ogg_page_bos, iFp)
-GO(ogg_page_checksum_set, iFp)
+GO(ogg_page_checksum_set, vFp)
 GO(ogg_page_continued, iFp)
 GO(ogg_page_eos, iFp)
 GO(ogg_page_granulepos, IFp)
@@ -67,12 +67,12 @@ GO(ogg_stream_pageout, iFpp)
 //GO(ogg_stream_pageout_fill, 
 GO(ogg_stream_reset, iFp)
 GO(ogg_stream_reset_serialno, iFpi)
-GO(ogg_sync_buffer, pFpi)
+GO(ogg_sync_buffer, pFpl)
 //GO(ogg_sync_check, 
 GO(ogg_sync_clear, iFp)
 //GO(ogg_sync_destroy, 
 GO(ogg_sync_init, iFp)
 GO(ogg_sync_pageout, iFpp)
-GO(ogg_sync_pageseek, iFpp)
+GO(ogg_sync_pageseek, lFpp)
 GO(ogg_sync_reset, iFp)
-GO(ogg_sync_wrote, iFpi)
+GO(ogg_sync_wrote, iFpl)

src/wrapped/wrappedlibpanel_private.h

@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error Meh....
+#error Meh...
 #endif
 
 GO(bottom_panel, iFp)
@@ -16,4 +16,4 @@ GO(replace_panel, iFpp)
 GO(set_panel_userptr, iFpp)
 GO(show_panel, iFp)
 GO(top_panel, iFp)
-GO(update_panels, vFv)
+GO(update_panels, vFv)

src/wrapped/wrappedlibpthread_private.h

@@ -86,7 +86,7 @@ GO(pthread_barrier_init, iFppu)
 GOM(pthread_barrier_init, iFEppu)
 #endif
 GO(pthread_barrier_wait, iFp)
-GO(pthread_cancel, iFp)
+GO(pthread_cancel, iFL)
 GO(pthread_clockjoin_np, iFppip)
 GOM(_pthread_cleanup_pop, vFEpi)
 GOM(_pthread_cleanup_pop_restore, vFEpi)
@@ -125,8 +125,8 @@ GO2(pthread_cond_timedwait@GLIBC_2.2.5, iFEppp, my_pthread_cond_timedwait_old)
 GO2(pthread_cond_wait@GLIBC_2.2.5, iFEpp, my_pthread_cond_wait_old)
 GOM(pthread_create, iFEpppp)
 GOM(pthread_cond_clockwait, iFEppip)
-GO(pthread_detach, iFp)
-GO(pthread_equal, iFpp)
+GO(pthread_detach, iFL)
+GO(pthread_equal, iFLL)
 GO(pthread_exit, vFp)
 GO2(pthread_getaffinity_np@GLIBC_2.3.3, iFEpp, my_pthread_getaffinity_np_old)
 GOM(pthread_getaffinity_np, iFEpLp)
@@ -140,13 +140,13 @@ GOM(pthread_getattr_default_np, iFEp)
 GOM(pthread_setattr_default_np, iFEp)
 #endif
 GO(pthread_getconcurrency, iFv)
-GO(pthread_getcpuclockid, iFpp)
-GO(pthread_getschedparam, iFppp)
+GO(pthread_getcpuclockid, iFLp)
+GO(pthread_getschedparam, iFLpp)
 GO(__pthread_getspecific, pFL)
 GO(pthread_getspecific, pFu)
 GO(pthread_getname_np, iFppL)
 //GO(__pthread_initialize_minimal, 
-GO(pthread_join, iFpp)
+GO(pthread_join, iFLp)
 GOM(__pthread_key_create, iFEpp)
 GOM(pthread_key_create, iFEpp)
 GOM(pthread_key_delete, iFEu)
@@ -246,15 +246,15 @@ GO(__pthread_rwlock_unlock, iFp)
 GO(pthread_rwlock_unlock, iFp)
 GO(__pthread_rwlock_wrlock, iFp)
 GO(pthread_rwlock_wrlock, iFp)
-GO(pthread_self, pFv)
+GO(pthread_self, LFv)
 GO2(pthread_setaffinity_np@GLIBC_2.3.3, iFEpp, my_pthread_setaffinity_np_old)
 GOM(pthread_setaffinity_np, iFEpLp)
 GO(pthread_setcancelstate, iFip)
 GO(pthread_setcanceltype, iFip)
 GO(pthread_setconcurrency, iFi)
 GO(pthread_setname_np, iFpp)
-GO(pthread_setschedparam, iFpip)
-GO(pthread_setschedprio, iFpi)
+GO(pthread_setschedparam, iFLip)
+GO(pthread_setschedprio, iFLi)
 GO(__pthread_setspecific, iFLp)
 GO(pthread_setspecific, iFup)
 GO(pthread_sigmask, iFipp)