aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuuk de Gram <luuk@degram.dev>2022-11-30 17:55:33 +0100
committerLuuk de Gram <luuk@degram.dev>2022-11-30 21:01:09 +0100
commit090deae41dbb79bcbe6a06d0bea0413f21576881 (patch)
tree9f9d33dfcc05756b31816182c2022c386f1487dd /src
parent3933a4bac5179c30cb6a08d6f1e42f9b44ce9599 (diff)
downloadzig-090deae41dbb79bcbe6a06d0bea0413f21576881.tar.gz
zig-090deae41dbb79bcbe6a06d0bea0413f21576881.zip
wasm: enable behavior tests for packed structs
Diffstat (limited to 'src')
-rw-r--r--src/codegen.zig4
-rw-r--r--src/link/Wasm.zig2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/codegen.zig b/src/codegen.zig
index 6f262a8179..5a28ce1860 100644
--- a/src/codegen.zig
+++ b/src/codegen.zig
@@ -570,8 +570,8 @@ pub fn generateSymbol(
// pointer may point to a decl which must be marked used
// but can also result in a relocation. Therefore we handle those seperately.
if (field_ty.zigTypeTag() == .Pointer) {
- std.debug.print("Hit!\n", .{});
- var tmp_list = try std.ArrayList(u8).initCapacity(code.allocator, field_ty.abiSize(target));
+ const field_size = math.cast(usize, field_ty.abiSize(target)) orelse return error.Overflow;
+ var tmp_list = try std.ArrayList(u8).initCapacity(code.allocator, field_size);
defer tmp_list.deinit();
switch (try generateSymbol(bin_file, src_loc, .{
.ty = field_ty,
diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig
index 4e573c9954..04b3e42db5 100644
--- a/src/link/Wasm.zig
+++ b/src/link/Wasm.zig
@@ -1841,7 +1841,7 @@ fn setupStart(wasm: *Wasm) !void {
/// Sets up the memory section of the wasm module, as well as the stack.
fn setupMemory(wasm: *Wasm) !void {
log.debug("Setting up memory layout", .{});
- const page_size = std.wasm.page_size; // 65kb
+ const page_size = std.wasm.page_size; // 64kb
// Use the user-provided stack size or else we use 1MB by default
const stack_size = wasm.base.options.stack_size_override orelse page_size * 16;
const stack_alignment = 16; // wasm's stack alignment as specified by tool-convention