Skip to content

Implement ov_read_filter callback wrapper for libvorbisfile #3604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gigachadmma69 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Implement ov_read_filter callback wrapper for libvorbisfile #3604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/emu/x64printer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6839,6 +6839,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 ", %" 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 == iFEppppppipp) {
Expand Down
4 changes: 3 additions & 1 deletion src/wrapped/generated/wrappedvorbisfiletypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +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*);

#define SUPER() ADDED_FUNCTIONS() \
GO(ov_open_callbacks, iFppplPPPP_t) \
GO(ov_test_callbacks, iFppplPPPP_t)
GO(ov_test_callbacks, iFppplPPPP_t) \
GO(ov_read_filter, iFppiiiippp_t)

#endif // __wrappedvorbisfileTYPES_H_
2 changes: 2 additions & 0 deletions src/wrapped/generated/wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3727,6 +3727,7 @@ typedef int32_t (*iFEipiipippi_t)(x64emu_t*, int32_t, void*, int32_t, int32_t, v
typedef int32_t (*iFEpiiiiippp_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*, void*);
typedef int32_t (*iFEpuppupppp_t)(x64emu_t*, void*, uint32_t, void*, void*, uint32_t, void*, void*, void*, void*);
typedef int32_t (*iFEpupppLppL_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, uintptr_t, void*, void*, uintptr_t);
typedef int32_t (*iFEppiiiippp_t)(x64emu_t*, void*, void*, int32_t, int32_t, int32_t, int32_t, void*, void*, void*);
typedef int32_t (*iFEppLuppupp_t)(x64emu_t*, void*, void*, uintptr_t, uint32_t, void*, void*, uint32_t, void*, void*);
typedef int32_t (*iFEppppppipp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, int32_t, void*, void*);
typedef int32_t (*iFEpppppppip_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*, int32_t, void*);
Expand Down Expand Up @@ -7820,6 +7821,7 @@ void iFEipiipippi(x64emu_t *emu, uintptr_t fcn) { iFEipiipippi_t fn = (iFEipiipi
void iFEpiiiiippp(x64emu_t *emu, uintptr_t fcn) { iFEpiiiiippp_t fn = (iFEpiiiiippp_t)fcn; R_RAX=(int)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
void iFEpuppupppp(x64emu_t *emu, uintptr_t fcn) { iFEpuppupppp_t fn = (iFEpuppupppp_t)fcn; R_RAX=(int)fn(emu, (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)); }
void iFEpupppLppL(x64emu_t *emu, uintptr_t fcn) { iFEpupppLppL_t fn = (iFEpupppLppL_t)fcn; R_RAX=(int)fn(emu, (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)); }
void iFEppiiiippp(x64emu_t *emu, uintptr_t fcn) { iFEppiiiippp_t fn = (iFEppiiiippp_t)fcn; R_RAX=(int)fn(emu, (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)); }
void iFEppLuppupp(x64emu_t *emu, uintptr_t fcn) { iFEppLuppupp_t fn = (iFEppLuppupp_t)fcn; R_RAX=(int)fn(emu, (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)); }
void iFEppppppipp(x64emu_t *emu, uintptr_t fcn) { iFEppppppipp_t fn = (iFEppppppipp_t)fcn; R_RAX=(int)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
void iFEpppppppip(x64emu_t *emu, uintptr_t fcn) { iFEpppppppip_t fn = (iFEpppppppip_t)fcn; R_RAX=(int)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
Expand Down
1 change: 1 addition & 0 deletions src/wrapped/generated/wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,6 +3738,7 @@ 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 iFEppppppipp(x64emu_t *emu, uintptr_t fnc);
void iFEpppppppip(x64emu_t *emu, uintptr_t fnc);
Expand Down
29 changes: 29 additions & 0 deletions src/wrapped/wrappedvorbisfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ typedef struct {
} ov_callbacks;

typedef int32_t (*iFppplC_t)(void*, void*, void*, long, ov_callbacks);
typedef int32_t (*iFppiiiippp_t)(void*, void*, int, int, int, int, void*, void(*)(float**, long, long, void*), void*);

#define SUPER() \
GO(ov_open_callbacks, iFppplC_t) \
GO(ov_test_callbacks, iFppplC_t) \
GO(ov_read_filter, iFppiiiippp_t) \

#include "wrappercallback.h"

Expand Down Expand Up @@ -136,6 +138,28 @@ static void* findtellFct(void* fct)
printf_log(LOG_NONE, "Warning, no more slot for vorbisfile tell callback\n");
return NULL;
}
// filter (for ov_read_filter: void (*filter)(float **pcm, long channels, long samples, void *filter_param))
#define GO(A) \
static uintptr_t my_filter_fct_##A = 0; \
static void my_filter_##A(float** pcm, long channels, long samples, void* filter_param) \
{ \
RunFunctionFmt(my_filter_fct_##A, "pllp", pcm, channels, samples, filter_param);\
}
SUPER()
#undef GO
static void* findfilterFct(void* fct)
{
if(!fct) return NULL;
if(GetNativeFnc((uintptr_t)fct)) return GetNativeFnc((uintptr_t)fct);
#define GO(A) if(my_filter_fct_##A == (uintptr_t)fct) return my_filter_##A;
SUPER()
#undef GO
#define GO(A) if(my_filter_fct_##A == 0) {my_filter_fct_##A = (uintptr_t)fct; return my_filter_##A; }
SUPER()
#undef GO
printf_log(LOG_NONE, "Warning, no more slot for vorbisfile filter callback\n");
return NULL;
}

#undef SUPER

Expand All @@ -161,4 +185,9 @@ EXPORT int32_t my_ov_test_callbacks(x64emu_t* emu, void* datasource, void* vf, v
return ret;
}

EXPORT int32_t my_ov_read_filter(x64emu_t* emu, void* vf, void* buffer, int length, int bigendianp, int word, int sgned, void* bitstream, void* filter, void* filter_param)
{
return my->ov_read_filter(vf, buffer, length, bigendianp, word, sgned, bitstream, findfilterFct(filter), filter_param);
}

#include "wrappedlib_init.h"
2 changes: 1 addition & 1 deletion src/wrapped/wrappedvorbisfile_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GO(ov_raw_seek_lap,iFpi)
GO(ov_raw_tell,IFp)
GO(ov_raw_total,IFpi)
GO(ov_read,iFppiiiip)
//GO(ov_read_filter,iFppiiiipBp)
GOM(ov_read_filter,iFEppiiiippp)
GO(ov_read_float,iFppip)
GO(ov_seekable,iFp)
GO(ov_serialnumber,iFpi)
Expand Down
Loading