mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-25 08:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure WebAssembly stack pointer is aligned in libretro builds

Browse source
This commit is contained in:
刘皓 2025-03-22 19:33:16 -04:00
parent 207a5263e5
commit 06f3c064b7
No known key found for this signature in database
GPG key ID: 7901753DB465B711
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
binding-sandbox/binding-base.h
View file

@ -48,6 +48,12 @@
# define SERIALIZE_VALUE(value) SERIALIZE_32(value) # define SERIALIZE_VALUE(value) SERIALIZE_32(value)
#endif #endif
// LLVM uses a stack alignment of 16 on WebAssembly targets
#define WASMSTACKALIGN 16
// Same as `sizeof(T)`, but rounds the result up to the nearest multiple of the WebAssembly stack alignment
#define SIZEOF_WASMSTACKALIGN(T) ((sizeof(T) + (size_t)(WASMSTACKALIGN - 1)) & ~(size_t)(WASMSTACKALIGN - 1))
namespace mkxp_sandbox { namespace mkxp_sandbox {
struct binding_base { struct binding_base {
private: private:
@ -121,9 +127,10 @@ namespace mkxp_sandbox {
bind, bind,
stack_frame_destructor, stack_frame_destructor,
boost::typeindex::type_id<T>(), boost::typeindex::type_id<T>(),
(sp -= sizeof(T)) (sp -= SIZEOF_WASMSTACKALIGN(T))
); );
assert(sp % sizeof(VALUE) == 0); assert(sp % sizeof(VALUE) == 0);
assert(sp % WASMSTACKALIGN == 0);
new(*bind + sp) T(bind); new(*bind + sp) T(bind);
} else if (fiber.stack_ptr > fiber.stack.size()) { } else if (fiber.stack_ptr > fiber.stack.size()) {
throw SandboxTrapException(); throw SandboxTrapException();
@ -141,9 +148,10 @@ namespace mkxp_sandbox {
bind, bind,
stack_frame_destructor, stack_frame_destructor,
boost::typeindex::type_id<T>(), boost::typeindex::type_id<T>(),
(sp -= sizeof(T)) (sp -= SIZEOF_WASMSTACKALIGN(T))
); );
assert(sp % sizeof(VALUE) == 0); assert(sp % sizeof(VALUE) == 0);
assert(sp % WASMSTACKALIGN == 0);
new(*bind + sp) T(bind); new(*bind + sp) T(bind);
w2c_ruby_rb_wasm_set_stack_pointer(&bind.instance(), sp); w2c_ruby_rb_wasm_set_stack_pointer(&bind.instance(), sp);
return sp; return sp;
@ -164,7 +172,7 @@ namespace mkxp_sandbox {
assert(fiber.stack.size() == fiber.stack_ptr); assert(fiber.stack.size() == fiber.stack_ptr);
assert(fiber.stack.back().type == boost::typeindex::type_id<T>()); assert(fiber.stack.back().type == boost::typeindex::type_id<T>());
w2c_ruby_rb_wasm_set_stack_pointer(&bind.instance(), fiber.stack.back().ptr + sizeof(T)); w2c_ruby_rb_wasm_set_stack_pointer(&bind.instance(), fiber.stack.back().ptr + SIZEOF_WASMSTACKALIGN(T));
fiber.stack.pop_back(); fiber.stack.pop_back();
} }