about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorptitSeb <sebastien.chev@gmail.com>2021-03-26 12:27:00 +0100
committerptitSeb <sebastien.chev@gmail.com>2021-03-26 12:27:00 +0100
commitfe4472580452837034899ea64e329c8254554a9d (patch)
tree031ff560b7aefc0c3f90523ca730d89ffd1f9f22 /src
parent870e0872c0990dbb0c63f452a2b85acc3e02294f (diff)
downloadbox64-fe4472580452837034899ea64e329c8254554a9d.tar.gz
box64-fe4472580452837034899ea64e329c8254554a9d.zip
Added more libc and libfontconfig wrapped functions
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/generated/functions_list.txt1
-rw-r--r--src/wrapped/generated/wrapper.c2
-rw-r--r--src/wrapped/generated/wrapper.h1
-rwxr-xr-xsrc/wrapped/wrappedfontconfig_private.h4
-rwxr-xr-xsrc/wrapped/wrappedlibc_private.h32
5 files changed, 23 insertions, 17 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 5fe8263c..e1d2be89 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -468,6 +468,7 @@
 #() iFpppL
 #() iFpppp
 #() IFEpIi
+#() IFppip
 #() IFSIii
 #() uFifff
 #() uFuuuu
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 03614a81..37cdb611 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -501,6 +501,7 @@ typedef int32_t (*iFpppu_t)(void*, void*, void*, uint32_t);
 typedef int32_t (*iFpppL_t)(void*, void*, void*, uintptr_t);
 typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
 typedef int64_t (*IFEpIi_t)(x64emu_t*, void*, int64_t, int32_t);
+typedef int64_t (*IFppip_t)(void*, void*, int32_t, void*);
 typedef int64_t (*IFSIii_t)(void*, int64_t, int32_t, int32_t);
 typedef uint32_t (*uFifff_t)(int32_t, float, float, float);
 typedef uint32_t (*uFuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t);
@@ -1562,6 +1563,7 @@ void iFpppu(x64emu_t *emu, uintptr_t fcn) { iFpppu_t fn = (iFpppu_t)fcn; R_RAX=f
 void iFpppL(x64emu_t *emu, uintptr_t fcn) { iFpppL_t fn = (iFpppL_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFpppp(x64emu_t *emu, uintptr_t fcn) { iFpppp_t fn = (iFpppp_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void IFEpIi(x64emu_t *emu, uintptr_t fcn) { IFEpIi_t fn = (IFEpIi_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int32_t)R_RDX); }
+void IFppip(x64emu_t *emu, uintptr_t fcn) { IFppip_t fn = (IFppip_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void IFSIii(x64emu_t *emu, uintptr_t fcn) { IFSIii_t fn = (IFSIii_t)fcn; R_RAX=(uint64_t)fn(io_convert((void*)R_RDI), (int64_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void uFifff(x64emu_t *emu, uintptr_t fcn) { uFifff_t fn = (uFifff_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void uFuuuu(x64emu_t *emu, uintptr_t fcn) { uFuuuu_t fn = (uFuuuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index ac61bf20..77f46172 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -498,6 +498,7 @@ void iFpppu(x64emu_t *emu, uintptr_t fnc);
 void iFpppL(x64emu_t *emu, uintptr_t fnc);
 void iFpppp(x64emu_t *emu, uintptr_t fnc);
 void IFEpIi(x64emu_t *emu, uintptr_t fnc);
+void IFppip(x64emu_t *emu, uintptr_t fnc);
 void IFSIii(x64emu_t *emu, uintptr_t fnc);
 void uFifff(x64emu_t *emu, uintptr_t fnc);
 void uFuuuu(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedfontconfig_private.h b/src/wrapped/wrappedfontconfig_private.h
index ca775d3e..99aae2e1 100755
--- a/src/wrapped/wrappedfontconfig_private.h
+++ b/src/wrapped/wrappedfontconfig_private.h
@@ -57,12 +57,12 @@ GO(FcConfigGetFonts, pFpi)
 //GO(FcConfigGetRescanInverval, 
 //GO(FcConfigHome, 
 //GO(FcConfigParseAndLoad, 
-//GO(FcConfigReference, 
+GO(FcConfigReference, pFp)
 //GO(FcConfigSetCurrent, 
 //GO(FcConfigSetRescanInterval, 
 //GO(FcConfigSetRescanInverval, 
 GO(FcConfigSubstitute, iFppi)
-//GO(FcConfigSubstituteWithPat, 
+GO(FcConfigSubstituteWithPat, iFpppi)
 //GO(FcConfigUptoDate, 
 GO(FcDefaultSubstitute, vFp)
 //GO(FcDirCacheLoad, 
diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h
index 3254a86d..b6ed586e 100755
--- a/src/wrapped/wrappedlibc_private.h
+++ b/src/wrapped/wrappedlibc_private.h
@@ -2,6 +2,8 @@
 #error Meh...
 #endif
 
+//socklen_t is u32
+
 //GO(a64l, 
 GO(abort, vFv)
 //DATAB(__abort_msg, 
@@ -76,7 +78,7 @@ GO(atoll, IFp)
 GO(bcmp, iFppL)
 GO(bcopy, vFppL)
 //GO(bdflush, 
-//GOW(bind, 
+GOW(bind, iFipu)
 //GO(bindresvport, 
 GOW(bindtextdomain, pFpp)
 GOW(bind_textdomain_codeset, pFpp)
@@ -722,10 +724,10 @@ GOW(inet_pton, iFipp)
 //GOW(initstate, 
 //GOW(initstate_r, 
 //GO(innetgr, 
-//GO(inotify_add_watch, 
-//GO(inotify_init, 
-//GO(inotify_init1, 
-//GO(inotify_rm_watch, 
+GO(inotify_add_watch, iFipu)
+GO(inotify_init, iFv)
+GO(inotify_init1, iFi)
+GO(inotify_rm_watch, iFii)
 //GO(insque, 
 //GO(__internal_endnetgrent, 
 //GO(__internal_getnetgrent_r, 
@@ -1511,10 +1513,10 @@ GO(rename, iFpp)
 //GOW(re_set_registers, 
 //GOW(re_set_syntax, 
 //DATAB(_res_hconf, 
-//GO(__res_iclose, 
-//GO(__res_init, 
-//GO(__res_nclose, 
-//GO(__res_ninit, 
+GO(__res_iclose, vFpi)
+GO(__res_init, iFv)
+GO(__res_nclose, vFp)
+GO(__res_ninit, iFp)
 //GO(__resolv_context_get, 
 //GO(__resolv_context_get_override, 
 //GO(__resolv_context_get_preinit, 
@@ -1574,8 +1576,8 @@ GOM(scandir64, iFEpppp) //weak
 //GOW(sched_setparam, 
 //GO(__sched_setscheduler, 
 //GOW(sched_setscheduler, 
-//GO(__sched_yield, 
-//GOW(sched_yield, 
+GO(__sched_yield, iFv)
+GOW(sched_yield, iFv)
 //GOW(__secure_getenv, 
 //GOW(secure_getenv, 
 //GO(seed48, 
@@ -1636,8 +1638,8 @@ GOW(setpriority, iFiii)
 //GOW(setresgid, 
 //GOW(setresuid, 
 //GOW(setreuid, 
-//GOW(setrlimit, 
-//GOW(setrlimit64, 
+GOW(setrlimit, iFip)
+GOW(setrlimit64, iFip)
 //GO(setrpcent, 
 //GO(setservent, 
 //GO(setsgent, 
@@ -1855,8 +1857,8 @@ GO(__strtol_l, lFppi)
 GOW(strtol_l, lFppi)
 GOW(strtoll, lFppi)
 //GO(__strtoll_internal, 
-//GOW(__strtoll_l, 
-//GOW(strtoll_l, 
+GOW(__strtoll_l, IFppip)
+GOW(strtoll_l, IFppip)
 //GOW(strtoq, 
 GOW(strtoul, LFppi)
 GO(__strtoul_internal, LFppii)