Emulator-Archive/box64
1
0
Fork 0
mirror of https://github.com/ptitSeb/box64.git synced 2024-11-24 06:59:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added wrapped libSDL2_net

Browse Source
This commit is contained in:
ptitSeb 2021-04-11 15:08:33 +02:00
parent 7d11254a52
commit aef3677970
8 changed files with 108 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -236,6 +236,7 @@ set(WRAPPEDS
"${BOX64_ROOT}/src/wrapped/wrappedsdl2.c"
"${BOX64_ROOT}/src/wrapped/wrappedsdl2image.c"
"${BOX64_ROOT}/src/wrapped/wrappedsdl2mixer.c"
"${BOX64_ROOT}/src/wrapped/wrappedsdl2net.c"
"${BOX64_ROOT}/src/wrapped/wrappedsdl2ttf.c"
"${BOX64_ROOT}/src/wrapped/wrappedsmpeg2.c"
"${BOX64_ROOT}/src/wrapped/wrappedudev0.c"

1
src/library_list.h
View File

@ -18,6 +18,7 @@ GO("libSDL2.so", sdl2)
GO("libsdl2-2.0.so.0", sdl2)
GO("libSDL2_mixer-2.0.so.0", sdl2mixer)
GO("libSDL2_image-2.0.so.0", sdl2image)
GO("libSDL2_net-2.0.so.0", sdl2net)
GO("libSDL2_ttf-2.0.so.0", sdl2ttf)
GO("libSDL-1.2.so.0", sdl1)
GO("libSDL_mixer-1.2.so.0", sdl1mixer)

3
src/wrapped/generated/functions_list.txt
View File

@ -54,6 +54,7 @@
#() pFE
#() pFv
#() pFi
#() pFW
#() pFu
#() pFd
#() pFl
@ -280,6 +281,7 @@
#() iFppi
#() iFppI
#() iFppC
#() iFppW
#() iFppu
#() iFppd
#() iFppl
@ -972,6 +974,7 @@
#() iFpuuiuui
#() iFpuupppp
#() iFpupuuui
#() iFpupLpLi
#() iFpuppppp
#() iFpLipipi
#() iFppiiiip

8
src/wrapped/generated/wrapper.c
View File

@ -87,6 +87,7 @@ typedef uintptr_t (*LFp_t)(void*);
typedef void* (*pFE_t)(x64emu_t*);
typedef void* (*pFv_t)(void);
typedef void* (*pFi_t)(int64_t);
typedef void* (*pFW_t)(uint16_t);
typedef void* (*pFu_t)(uint64_t);
typedef void* (*pFd_t)(double);
typedef void* (*pFl_t)(intptr_t);
@ -313,6 +314,7 @@ typedef int64_t (*iFpLp_t)(void*, uintptr_t, void*);
typedef int64_t (*iFppi_t)(void*, void*, int64_t);
typedef int64_t (*iFppI_t)(void*, void*, int64_t);
typedef int64_t (*iFppC_t)(void*, void*, uint8_t);
typedef int64_t (*iFppW_t)(void*, void*, uint16_t);
typedef int64_t (*iFppu_t)(void*, void*, uint64_t);
typedef int64_t (*iFppd_t)(void*, void*, double);
typedef int64_t (*iFppl_t)(void*, void*, intptr_t);
@ -1005,6 +1007,7 @@ typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*
typedef int64_t (*iFpuuiuui_t)(void*, uint64_t, uint64_t, int64_t, uint64_t, uint64_t, int64_t);
typedef int64_t (*iFpuupppp_t)(void*, uint64_t, uint64_t, void*, void*, void*, void*);
typedef int64_t (*iFpupuuui_t)(void*, uint64_t, void*, uint64_t, uint64_t, uint64_t, int64_t);
typedef int64_t (*iFpupLpLi_t)(void*, uint64_t, void*, uintptr_t, void*, uintptr_t, int64_t);
typedef int64_t (*iFpuppppp_t)(void*, uint64_t, void*, void*, void*, void*, void*);
typedef int64_t (*iFpLipipi_t)(void*, uintptr_t, int64_t, void*, int64_t, void*, int64_t);
typedef int64_t (*iFppiiiip_t)(void*, void*, int64_t, int64_t, int64_t, int64_t, void*);
@ -1282,6 +1285,7 @@ void LFp(x64emu_t *emu, uintptr_t fcn) { LFp_t fn = (LFp_t)fcn; R_RAX=(uintptr_t
void pFE(x64emu_t *emu, uintptr_t fcn) { pFE_t fn = (pFE_t)fcn; R_RAX=(uintptr_t)fn(emu); }
void pFv(x64emu_t *emu, uintptr_t fcn) { pFv_t fn = (pFv_t)fcn; R_RAX=(uintptr_t)fn(); }
void pFi(x64emu_t *emu, uintptr_t fcn) { pFi_t fn = (pFi_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI); }
void pFW(x64emu_t *emu, uintptr_t fcn) { pFW_t fn = (pFW_t)fcn; R_RAX=(uintptr_t)fn((uint16_t)R_RDI); }
void pFu(x64emu_t *emu, uintptr_t fcn) { pFu_t fn = (pFu_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI); }
void pFd(x64emu_t *emu, uintptr_t fcn) { pFd_t fn = (pFd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0]); }
void pFl(x64emu_t *emu, uintptr_t fcn) { pFl_t fn = (pFl_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI); }
@ -1508,6 +1512,7 @@ void iFpLp(x64emu_t *emu, uintptr_t fcn) { iFpLp_t fn = (iFpLp_t)fcn; R_RAX=(int
void iFppi(x64emu_t *emu, uintptr_t fcn) { iFppi_t fn = (iFppi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
void iFppI(x64emu_t *emu, uintptr_t fcn) { iFppI_t fn = (iFppI_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
void iFppC(x64emu_t *emu, uintptr_t fcn) { iFppC_t fn = (iFppC_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX); }
void iFppW(x64emu_t *emu, uintptr_t fcn) { iFppW_t fn = (iFppW_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX); }
void iFppu(x64emu_t *emu, uintptr_t fcn) { iFppu_t fn = (iFppu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
void iFppd(x64emu_t *emu, uintptr_t fcn) { iFppd_t fn = (iFppd_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0]); }
void iFppl(x64emu_t *emu, uintptr_t fcn) { iFppl_t fn = (iFppl_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX); }
@ -2200,6 +2205,7 @@ void iFpippppp(x64emu_t *emu, uintptr_t fcn) { iFpippppp_t fn = (iFpippppp_t)fcn
void iFpuuiuui(x64emu_t *emu, uintptr_t fcn) { iFpuuiuui_t fn = (iFpuuiuui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
void iFpuupppp(x64emu_t *emu, uintptr_t fcn) { iFpuupppp_t fn = (iFpuupppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
void iFpupuuui(x64emu_t *emu, uintptr_t fcn) { iFpupuuui_t fn = (iFpupuuui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
void iFpupLpLi(x64emu_t *emu, uintptr_t fcn) { iFpupLpLi_t fn = (iFpupLpLi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(int64_t*)(R_RSP + 8)); }
void iFpuppppp(x64emu_t *emu, uintptr_t fcn) { iFpuppppp_t fn = (iFpuppppp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
void iFpLipipi(x64emu_t *emu, uintptr_t fcn) { iFpLipipi_t fn = (iFpLipipi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8, (void*)R_R9, *(int64_t*)(R_RSP + 8)); }
void iFppiiiip(x64emu_t *emu, uintptr_t fcn) { iFppiiiip_t fn = (iFppiiiip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8)); }
@ -2480,6 +2486,7 @@ int isSimpleWrapper(wrapper_t fun) {
if (fun == &LFp) return 1;
if (fun == &pFv) return 1;
if (fun == &pFi) return 1;
if (fun == &pFW) return 1;
if (fun == &pFu) return 1;
if (fun == &pFd) return 1;
if (fun == &pFl) return 1;
@ -2674,6 +2681,7 @@ int isSimpleWrapper(wrapper_t fun) {
if (fun == &iFppi) return 1;
if (fun == &iFppI) return 1;
if (fun == &iFppC) return 1;
if (fun == &iFppW) return 1;
if (fun == &iFppu) return 1;
if (fun == &iFppd) return 1;
if (fun == &iFppl) return 1;

3
src/wrapped/generated/wrapper.h
View File

@ -84,6 +84,7 @@ void LFp(x64emu_t *emu, uintptr_t fnc);
void pFE(x64emu_t *emu, uintptr_t fnc);
void pFv(x64emu_t *emu, uintptr_t fnc);
void pFi(x64emu_t *emu, uintptr_t fnc);
void pFW(x64emu_t *emu, uintptr_t fnc);
void pFu(x64emu_t *emu, uintptr_t fnc);
void pFd(x64emu_t *emu, uintptr_t fnc);
void pFl(x64emu_t *emu, uintptr_t fnc);
@ -310,6 +311,7 @@ void iFpLp(x64emu_t *emu, uintptr_t fnc);
void iFppi(x64emu_t *emu, uintptr_t fnc);
void iFppI(x64emu_t *emu, uintptr_t fnc);
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 iFppd(x64emu_t *emu, uintptr_t fnc);
void iFppl(x64emu_t *emu, uintptr_t fnc);
@ -1002,6 +1004,7 @@ void iFpippppp(x64emu_t *emu, uintptr_t fnc);
void iFpuuiuui(x64emu_t *emu, uintptr_t fnc);
void iFpuupppp(x64emu_t *emu, uintptr_t fnc);
void iFpupuuui(x64emu_t *emu, uintptr_t fnc);
void iFpupLpLi(x64emu_t *emu, uintptr_t fnc);
void iFpuppppp(x64emu_t *emu, uintptr_t fnc);
void iFpLipipi(x64emu_t *emu, uintptr_t fnc);
void iFppiiiip(x64emu_t *emu, uintptr_t fnc);

2
src/wrapped/wrappedlibc_private.h
View File

@ -536,7 +536,7 @@ GOW(getifaddrs, iFp)
//GOW(getmntent_r,
//GO(getmsg,
//GO(get_myaddress,
//GO(getnameinfo,
GO(getnameinfo, iFpupLpLi)
//GO(getnetbyaddr,
//GO(getnetbyaddr_r,
//GO(getnetbyname,

46
src/wrapped/wrappedsdl2net.c Executable file
View File

@ -0,0 +1,46 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define _GNU_SOURCE /* See feature_test_macros(7) */
#include <dlfcn.h>
#include "wrappedlibs.h"
#include "debug.h"
#include "wrapper.h"
#include "bridge.h"
#include "librarian/library_private.h"
#include "x64emu.h"
#include "emu/x64emu_private.h"
#include "box64context.h"
#include "sdl2rwops.h"
typedef struct sdl2net_my_s {
} sdl2net_my_t;
static void* getSDL2NetMy(library_t* lib)
{
sdl2net_my_t* my = (sdl2net_my_t*)calloc(1, sizeof(sdl2net_my_t));
#define GO(A, W) my->A = (W)dlsym(lib->priv.w.lib, #A);
#undef GO
return my;
}
static library_t* my_lib = NULL;
const char* sdl2netName = "libSDL2_net-2.0.so.0";
#define LIBNAME sdl2net
#define CUSTOM_INIT \
my_lib = lib; \
lib->altmy = strdup("my2_"); \
lib->priv.w.p2 = getSDL2NetMy(lib);
#define CUSTOM_FINI \
free(lib->priv.w.p2); \
my_lib = NULL;
#include "wrappedlib_init.h"

45
src/wrapped/wrappedsdl2net_private.h Executable file
View File

@ -0,0 +1,45 @@
#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
#error Meh!
#endif
GO(SDLNet_AddSocket, iFpp)
GO(SDLNet_AllocPacket, pFi)
GO(SDLNet_AllocPacketV, pFii)
GO(SDLNet_AllocSocketSet, pFi)
GO(SDLNet_CheckSockets, iFpu)
GO(SDLNet_DelSocket, iFpp)
GO(SDLNet_FreePacket, vFp)
GO(SDLNet_FreePacketV, vFp)
GO(SDLNet_FreeSocketSet, vFp)
GO(SDLNet_GetError, pFv)
//GO(SDLNet_GetLastError,
GO(SDLNet_GetLocalAddresses, iFpi)
GO(SDLNet_Init, iFv)
GO(SDLNet_Linked_Version, pFv)
GO(SDLNet_Quit, vFv)
GO(SDLNet_Read16, WFp)
GO(SDLNet_Read32, uFp)
GO(SDLNet_ResizePacket, iFpi)
GO(SDLNet_ResolveHost, iFppW)
GO(SDLNet_ResolveIP, pFp)
//GOM(SDLNet_SetError, vFEpV)
//GO(SDLNet_SetLastError,
GO(SDLNet_TCP_Accept, pFp)
GO(SDLNet_TCP_Close, vFp)
GO(SDLNet_TCP_GetPeerAddress, pFp)
GO(SDLNet_TCP_Open, pFp)
GO(SDLNet_TCP_Recv, iFppi)
GO(SDLNet_TCP_Send, iFppi)
GO(SDLNet_UDP_Bind, iFpip)
GO(SDLNet_UDP_Close, vFp)
GO(SDLNet_UDP_GetPeerAddress, pFpi)
GO(SDLNet_UDP_Open, pFW)
GO(SDLNet_UDP_Recv, iFpp)
GO(SDLNet_UDP_RecvV, iFpp)
GO(SDLNet_UDP_Send, iFpip)
GO(SDLNet_UDP_SendV, iFppi)
GO(SDLNet_UDP_SetPacketLoss, vFpi)
GO(SDLNet_UDP_Unbind, vFpi)
GO(SDLNet_Write16, vFWp)
GO(SDLNet_Write32, vFup)
GO(SDLNet_version, pFv)