Mercurial > pub > dyncall > dyncall
diff dyncallback/dyncall_callback_x86.c @ 533:71c884e610f0
- integration of patches from Raphael Luba, Thekla, Inc.:
* integration of aggregate-by-value (struct, union) support patch for x64 (win and sysv)
* windows/x64 asm additions to specify how stack unwinds (help for debuggers, exception handling, etc.)
* see Changelog for details
- new calling convention modes for thiscalls (platform agnostic, was specific before)
* new signature character for platform agnostic thiscalls ('*' / DC_SIGCHAR_CC_THISCALL)
- dcCallF(), dcVCallF(), dcArgF() and dcVArgF():
* added support for aggregates-by-value (wasn't part of patch)
* change that those functions don't implicitly call dcReset() anymore, which was unflexible (breaking change)
- added macros to feature test implementation for aggregate-by-value and syscall support
- changed libdyncall_s.lib and libdyncallback_s.lib order in callback test makefiles, as some toolchains are picky about order
- doc:
* man page updates to describe aggregate interface
* manual overview changes to highlight platforms with aggregate-by-value support
- test/plain: replaced tests w/ old/stale sctruct interface with new aggregate one
author | Tassilo Philipp |
---|---|
date | Thu, 21 Apr 2022 13:35:47 +0200 |
parents | ddfb9577a00e |
children |
line wrap: on
line diff
--- a/dyncallback/dyncall_callback_x86.c Sat Apr 16 15:00:58 2022 +0200 +++ b/dyncallback/dyncall_callback_x86.c Thu Apr 21 13:35:47 2022 +0200 @@ -6,7 +6,7 @@ Description: Callback - Implementation for x86 License: - Copyright (c) 2007-2020 Daniel Adler <dadler@uni-goettingen.de>, + Copyright (c) 2007-2022 Daniel Adler <dadler@uni-goettingen.de>, Tassilo Philipp <tphilipp@potion-studios.com> Permission to use, copy, modify, and distribute this software for any @@ -29,6 +29,7 @@ #include "dyncall_thunk.h" #include "dyncall_args_x86.h" + /* Callback symbol. */ extern void dcCallbackThunkEntry(); @@ -47,16 +48,16 @@ * cdecl,stdcall,thiscall_ms,fastcall_ms,fastcall_gnu */ -static int dcbCleanupSize_x86_cdecl(const char* signature) +static int dcbCleanupSize_x86_cdecl(const DCsigchar* signature) { return 0; } -static int dcbCleanupSize_x86_std(const char* signature) +static int dcbCleanupSize_x86_std(const DCsigchar* signature) { - const char* ptr = signature; + const DCsigchar* ptr = signature; int size = 0; - char ch; + DCsigchar ch; while( (ch = *ptr++) != DC_SIGCHAR_ENDARG ) { switch(ch) { case DC_SIGCHAR_BOOL: @@ -83,11 +84,11 @@ return size; } -static int dcbCleanupSize_x86_this_ms(const char* signature) +static int dcbCleanupSize_x86_this_ms(const DCsigchar* signature) { - const char* ptr = signature; + const DCsigchar* ptr = signature; int size = 0; - char ch; + DCsigchar ch; while( (ch = *ptr++) != DC_SIGCHAR_ENDARG ) { switch(ch) @@ -116,12 +117,12 @@ return size; } -static int dcbCleanupSize_x86_fast_ms(const char* signature) +static int dcbCleanupSize_x86_fast_ms(const DCsigchar* signature) { - const char* ptr = signature; + const DCsigchar* ptr = signature; int size = 0; int regs = 0; - char ch; + DCsigchar ch; while( (ch = *ptr++) != DC_SIGCHAR_ENDARG ) { switch(ch) @@ -155,10 +156,10 @@ return size; } -static int dcbCleanupSize_x86_fast_gnu(const char* signature) +static int dcbCleanupSize_x86_fast_gnu(const DCsigchar* signature) { - const char* ptr = signature; - char ch; + const DCsigchar* ptr = signature; + DCsigchar ch; int size = 0; int regs = 0; while( (ch = *ptr++) != DC_SIGCHAR_ENDARG ) { @@ -183,9 +184,10 @@ return size; } -void dcbInitCallback(DCCallback* pcb, const char* signature, DCCallbackHandler* handler, void* userdata) + +void dcbInitCallback2(DCCallback* pcb, const DCsigchar* signature, DCCallbackHandler* handler, void* userdata, DCaggr *const * aggrs) { - const char* ptr; + const DCsigchar* ptr; int mode; pcb->handler = handler; pcb->userdata = userdata; @@ -221,6 +223,9 @@ pcb->args_vt = &dcArgsVT_fast_gnu; pcb->stack_cleanup = dcbCleanupSize_x86_fast_gnu(ptr); break; +#if defined(DC_WINDOWS) && defined(DC__C_MSVC) + case DC_CALL_C_DEFAULT_THIS: +#endif case DC_CALL_C_X86_WIN32_THIS_MS: pcb->args_vt = &dcArgsVT_this_ms; pcb->stack_cleanup = dcbCleanupSize_x86_this_ms(ptr); @@ -248,19 +253,16 @@ #endif } -/* - * callback constructor - */ -DCCallback* dcbNewCallback(const char* signature, DCCallbackHandler* handler, void* userdata) + +DCCallback* dcbNewCallback2(const DCsigchar* signature, DCCallbackHandler* handler, void* userdata, DCaggr *const * aggrs) { - int err; DCCallback* pcb; - err = dcAllocWX(sizeof(DCCallback), (void**) &pcb); + int err = dcAllocWX(sizeof(DCCallback), (void**) &pcb); if(err) return NULL; + dcbInitCallback2(pcb, signature, handler, userdata, aggrs); dcbInitThunk(&pcb->thunk, dcCallbackThunkEntry); - dcbInitCallback(pcb, signature, handler, userdata); err = dcInitExecWX(pcb, sizeof(DCCallback)); if(err) { @@ -271,16 +273,3 @@ return pcb; } -/* - * free - */ - -void dcbFreeCallback(DCCallback* pcb) -{ - dcFreeWX(pcb, sizeof(DCCallback)); -} - -void* dcbGetUserData(DCCallback* pcb) -{ - return pcb->userdata; -}