Mercurial > pub > dyncall > dyncall
diff dyncallback/dyncall_args_x64.h @ 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 | f5577f6bf97a |
| children |
line wrap: on
line diff
--- a/dyncallback/dyncall_args_x64.h Sat Apr 16 15:00:58 2022 +0200 +++ b/dyncallback/dyncall_args_x64.h Thu Apr 21 13:35:47 2022 +0200 @@ -6,7 +6,7 @@ Description: Callback's Arguments VM - Header for x64 License: - Copyright (c) 2007-2018 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 @@ -28,17 +28,25 @@ #define DYNCALLBACK_ARGS_X64_H #include "dyncall_args.h" -#include "dyncall_callvm_x64.h" /* reuse structures */ +#include "dyncall_callvm_x64.h" /* reuse DCRegCount_x64 and DCRegData_x64_s */ +#include "dyncall_aggregate.h" + struct DCArgs { - /* state */ - int64* stack_ptr; - DCRegCount_x64 reg_count; /* @@@ win64 version should maybe force alignment to 8 in order to be secure */ + /* state */ + int64* stack_ptr; /* offset 0 */ + DCRegCount_x64 reg_count; /* offset 8, size:win 4, size:*nix 8 */ +#if defined(DC_WINDOWS) + int pad_w; /* alignment helper for win/x64 */ +#endif + int aggr_return_register; /* offset 16 */ + int pad; /* offset 20 */ + DCaggr** aggrs; /* offset 24 */ - /* reg data */ - DCRegData_x64_s reg_data; + /* reg data */ + DCRegData_x64_s reg_data; /* offset 32 */ }; #endif /* DYNCALLBACK_ARGS_X64_H */