aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/wasm/Emit.zig258
-rw-r--r--src/link/Wasm.zig72
-rw-r--r--src/link/Wasm/Flush.zig28
3 files changed, 326 insertions, 32 deletions
diff --git a/src/arch/wasm/Emit.zig b/src/arch/wasm/Emit.zig
index d4ebbfaf87..322b84134f 100644
--- a/src/arch/wasm/Emit.zig
+++ b/src/arch/wasm/Emit.zig
@@ -30,6 +30,7 @@ pub fn lowerToCode(emit: *Emit) Error!void {
const is_obj = comp.config.output_mode == .Obj;
const target = &comp.root_mod.resolved_target.result;
const is_wasm32 = target.cpu.arch == .wasm32;
+ const function_imports_len: u32 = @intCast(wasm.function_imports.entries.len);
const tags = mir.instruction_tags;
const datas = mir.instruction_datas;
@@ -158,8 +159,8 @@ pub fn lowerToCode(emit: *Emit) Error!void {
});
code.appendNTimesAssumeCapacity(0, 5);
} else {
- const func_index = try wasm.navFunctionIndex(datas[inst].nav_index);
- leb.writeUleb128(code.fixedWriter(), @intFromEnum(func_index)) catch unreachable;
+ const func_index = Wasm.FunctionIndex.fromIpNav(wasm, datas[inst].nav_index).?;
+ leb.writeUleb128(code.fixedWriter(), function_imports_len + @intFromEnum(func_index)) catch unreachable;
}
inst += 1;
@@ -199,8 +200,8 @@ pub fn lowerToCode(emit: *Emit) Error!void {
});
code.appendNTimesAssumeCapacity(0, 5);
} else {
- const func_index = try wasm.tagNameFunctionIndex(datas[inst].ip_index);
- leb.writeUleb128(code.fixedWriter(), @intFromEnum(func_index)) catch unreachable;
+ const func_index = Wasm.FunctionIndex.fromTagNameType(wasm, datas[inst].ip_index).?;
+ leb.writeUleb128(code.fixedWriter(), function_imports_len + @intFromEnum(func_index)) catch unreachable;
}
inst += 1;
@@ -224,8 +225,8 @@ pub fn lowerToCode(emit: *Emit) Error!void {
});
code.appendNTimesAssumeCapacity(0, 5);
} else {
- const func_index = try wasm.symbolNameFunctionIndex(symbol_name);
- leb.writeUleb128(code.fixedWriter(), @intFromEnum(func_index)) catch unreachable;
+ const func_index = Wasm.FunctionIndex.fromSymbolName(wasm, symbol_name).?;
+ leb.writeUleb128(code.fixedWriter(), function_imports_len + @intFromEnum(func_index)) catch unreachable;
}
inst += 1;
@@ -282,7 +283,7 @@ pub fn lowerToCode(emit: *Emit) Error!void {
try code.ensureUnusedCapacity(gpa, 11);
code.appendAssumeCapacity(@intFromEnum(std.wasm.Opcode.i64_const));
const int64: i64 = @bitCast(mir.extraData(Mir.Imm64, datas[inst].payload).data.toInt());
- leb.writeIleb128(code.writer(), int64) catch unreachable;
+ leb.writeIleb128(code.fixedWriter(), int64) catch unreachable;
inst += 1;
continue :loop tags[inst];
@@ -314,7 +315,7 @@ pub fn lowerToCode(emit: *Emit) Error!void {
=> {
try code.ensureUnusedCapacity(gpa, 1 + 20);
code.appendAssumeCapacity(@intFromEnum(tags[inst]));
- encodeMemArg(code, mir.extraData(Mir.MemArg, datas[inst]).data);
+ encodeMemArg(code, mir.extraData(Mir.MemArg, datas[inst].payload).data);
inst += 1;
continue :loop tags[inst];
},
@@ -504,6 +505,13 @@ pub fn lowerToCode(emit: *Emit) Error!void {
continue :loop tags[inst];
},
+ .table_init => @panic("TODO"),
+ .elem_drop => @panic("TODO"),
+ .table_copy => @panic("TODO"),
+ .table_grow => @panic("TODO"),
+ .table_size => @panic("TODO"),
+ .table_fill => @panic("TODO"),
+
_ => unreachable,
}
comptime unreachable;
@@ -560,7 +568,236 @@ pub fn lowerToCode(emit: *Emit) Error!void {
inst += 1;
continue :loop tags[inst];
},
- _ => unreachable,
+
+ .v128_load8x8_s => @panic("TODO"),
+ .v128_load8x8_u => @panic("TODO"),
+ .v128_load16x4_s => @panic("TODO"),
+ .v128_load16x4_u => @panic("TODO"),
+ .v128_load32x2_s => @panic("TODO"),
+ .v128_load32x2_u => @panic("TODO"),
+ .i8x16_swizzle => @panic("TODO"),
+ .i8x16_eq => @panic("TODO"),
+ .i16x8_eq => @panic("TODO"),
+ .i32x4_eq => @panic("TODO"),
+ .i8x16_ne => @panic("TODO"),
+ .i16x8_ne => @panic("TODO"),
+ .i32x4_ne => @panic("TODO"),
+ .i8x16_lt_s => @panic("TODO"),
+ .i16x8_lt_s => @panic("TODO"),
+ .i32x4_lt_s => @panic("TODO"),
+ .i8x16_lt_u => @panic("TODO"),
+ .i16x8_lt_u => @panic("TODO"),
+ .i32x4_lt_u => @panic("TODO"),
+ .i8x16_gt_s => @panic("TODO"),
+ .i16x8_gt_s => @panic("TODO"),
+ .i32x4_gt_s => @panic("TODO"),
+ .i8x16_gt_u => @panic("TODO"),
+ .i16x8_gt_u => @panic("TODO"),
+ .i32x4_gt_u => @panic("TODO"),
+ .i8x16_le_s => @panic("TODO"),
+ .i16x8_le_s => @panic("TODO"),
+ .i32x4_le_s => @panic("TODO"),
+ .i8x16_le_u => @panic("TODO"),
+ .i16x8_le_u => @panic("TODO"),
+ .i32x4_le_u => @panic("TODO"),
+ .i8x16_ge_s => @panic("TODO"),
+ .i16x8_ge_s => @panic("TODO"),
+ .i32x4_ge_s => @panic("TODO"),
+ .i8x16_ge_u => @panic("TODO"),
+ .i16x8_ge_u => @panic("TODO"),
+ .i32x4_ge_u => @panic("TODO"),
+ .f32x4_eq => @panic("TODO"),
+ .f64x2_eq => @panic("TODO"),
+ .f32x4_ne => @panic("TODO"),
+ .f64x2_ne => @panic("TODO"),
+ .f32x4_lt => @panic("TODO"),
+ .f64x2_lt => @panic("TODO"),
+ .f32x4_gt => @panic("TODO"),
+ .f64x2_gt => @panic("TODO"),
+ .f32x4_le => @panic("TODO"),
+ .f64x2_le => @panic("TODO"),
+ .f32x4_ge => @panic("TODO"),
+ .f64x2_ge => @panic("TODO"),
+ .v128_not => @panic("TODO"),
+ .v128_and => @panic("TODO"),
+ .v128_andnot => @panic("TODO"),
+ .v128_or => @panic("TODO"),
+ .v128_xor => @panic("TODO"),
+ .v128_bitselect => @panic("TODO"),
+ .v128_any_true => @panic("TODO"),
+ .v128_load8_lane => @panic("TODO"),
+ .v128_load16_lane => @panic("TODO"),
+ .v128_load32_lane => @panic("TODO"),
+ .v128_load64_lane => @panic("TODO"),
+ .v128_store8_lane => @panic("TODO"),
+ .v128_store16_lane => @panic("TODO"),
+ .v128_store32_lane => @panic("TODO"),
+ .v128_store64_lane => @panic("TODO"),
+ .v128_load32_zero => @panic("TODO"),
+ .v128_load64_zero => @panic("TODO"),
+ .f32x4_demote_f64x2_zero => @panic("TODO"),
+ .f64x2_promote_low_f32x4 => @panic("TODO"),
+ .i8x16_abs => @panic("TODO"),
+ .i16x8_abs => @panic("TODO"),
+ .i32x4_abs => @panic("TODO"),
+ .i64x2_abs => @panic("TODO"),
+ .i8x16_neg => @panic("TODO"),
+ .i16x8_neg => @panic("TODO"),
+ .i32x4_neg => @panic("TODO"),
+ .i64x2_neg => @panic("TODO"),
+ .i8x16_popcnt => @panic("TODO"),
+ .i16x8_q15mulr_sat_s => @panic("TODO"),
+ .i8x16_all_true => @panic("TODO"),
+ .i16x8_all_true => @panic("TODO"),
+ .i32x4_all_true => @panic("TODO"),
+ .i64x2_all_true => @panic("TODO"),
+ .i8x16_bitmask => @panic("TODO"),
+ .i16x8_bitmask => @panic("TODO"),
+ .i32x4_bitmask => @panic("TODO"),
+ .i64x2_bitmask => @panic("TODO"),
+ .i8x16_narrow_i16x8_s => @panic("TODO"),
+ .i16x8_narrow_i32x4_s => @panic("TODO"),
+ .i8x16_narrow_i16x8_u => @panic("TODO"),
+ .i16x8_narrow_i32x4_u => @panic("TODO"),
+ .f32x4_ceil => @panic("TODO"),
+ .i16x8_extend_low_i8x16_s => @panic("TODO"),
+ .i32x4_extend_low_i16x8_s => @panic("TODO"),
+ .i64x2_extend_low_i32x4_s => @panic("TODO"),
+ .f32x4_floor => @panic("TODO"),
+ .i16x8_extend_high_i8x16_s => @panic("TODO"),
+ .i32x4_extend_high_i16x8_s => @panic("TODO"),
+ .i64x2_extend_high_i32x4_s => @panic("TODO"),
+ .f32x4_trunc => @panic("TODO"),
+ .i16x8_extend_low_i8x16_u => @panic("TODO"),
+ .i32x4_extend_low_i16x8_u => @panic("TODO"),
+ .i64x2_extend_low_i32x4_u => @panic("TODO"),
+ .f32x4_nearest => @panic("TODO"),
+ .i16x8_extend_high_i8x16_u => @panic("TODO"),
+ .i32x4_extend_high_i16x8_u => @panic("TODO"),
+ .i64x2_extend_high_i32x4_u => @panic("TODO"),
+ .i8x16_shl => @panic("TODO"),
+ .i16x8_shl => @panic("TODO"),
+ .i32x4_shl => @panic("TODO"),
+ .i64x2_shl => @panic("TODO"),
+ .i8x16_shr_s => @panic("TODO"),
+ .i16x8_shr_s => @panic("TODO"),
+ .i32x4_shr_s => @panic("TODO"),
+ .i64x2_shr_s => @panic("TODO"),
+ .i8x16_shr_u => @panic("TODO"),
+ .i16x8_shr_u => @panic("TODO"),
+ .i32x4_shr_u => @panic("TODO"),
+ .i64x2_shr_u => @panic("TODO"),
+ .i8x16_add => @panic("TODO"),
+ .i16x8_add => @panic("TODO"),
+ .i32x4_add => @panic("TODO"),
+ .i64x2_add => @panic("TODO"),
+ .i8x16_add_sat_s => @panic("TODO"),
+ .i16x8_add_sat_s => @panic("TODO"),
+ .i8x16_add_sat_u => @panic("TODO"),
+ .i16x8_add_sat_u => @panic("TODO"),
+ .i8x16_sub => @panic("TODO"),
+ .i16x8_sub => @panic("TODO"),
+ .i32x4_sub => @panic("TODO"),
+ .i64x2_sub => @panic("TODO"),
+ .i8x16_sub_sat_s => @panic("TODO"),
+ .i16x8_sub_sat_s => @panic("TODO"),
+ .i8x16_sub_sat_u => @panic("TODO"),
+ .i16x8_sub_sat_u => @panic("TODO"),
+ .f64x2_ceil => @panic("TODO"),
+ .f64x2_nearest => @panic("TODO"),
+ .f64x2_floor => @panic("TODO"),
+ .i16x8_mul => @panic("TODO"),
+ .i32x4_mul => @panic("TODO"),
+ .i64x2_mul => @panic("TODO"),
+ .i8x16_min_s => @panic("TODO"),
+ .i16x8_min_s => @panic("TODO"),
+ .i32x4_min_s => @panic("TODO"),
+ .i64x2_eq => @panic("TODO"),
+ .i8x16_min_u => @panic("TODO"),
+ .i16x8_min_u => @panic("TODO"),
+ .i32x4_min_u => @panic("TODO"),
+ .i64x2_ne => @panic("TODO"),
+ .i8x16_max_s => @panic("TODO"),
+ .i16x8_max_s => @panic("TODO"),
+ .i32x4_max_s => @panic("TODO"),
+ .i64x2_lt_s => @panic("TODO"),
+ .i8x16_max_u => @panic("TODO"),
+ .i16x8_max_u => @panic("TODO"),
+ .i32x4_max_u => @panic("TODO"),
+ .i64x2_gt_s => @panic("TODO"),
+ .f64x2_trunc => @panic("TODO"),
+ .i32x4_dot_i16x8_s => @panic("TODO"),
+ .i64x2_le_s => @panic("TODO"),
+ .i8x16_avgr_u => @panic("TODO"),
+ .i16x8_avgr_u => @panic("TODO"),
+ .i64x2_ge_s => @panic("TODO"),
+ .i16x8_extadd_pairwise_i8x16_s => @panic("TODO"),
+ .i16x8_extmul_low_i8x16_s => @panic("TODO"),
+ .i32x4_extmul_low_i16x8_s => @panic("TODO"),
+ .i64x2_extmul_low_i32x4_s => @panic("TODO"),
+ .i16x8_extadd_pairwise_i8x16_u => @panic("TODO"),
+ .i16x8_extmul_high_i8x16_s => @panic("TODO"),
+ .i32x4_extmul_high_i16x8_s => @panic("TODO"),
+ .i64x2_extmul_high_i32x4_s => @panic("TODO"),
+ .i32x4_extadd_pairwise_i16x8_s => @panic("TODO"),
+ .i16x8_extmul_low_i8x16_u => @panic("TODO"),
+ .i32x4_extmul_low_i16x8_u => @panic("TODO"),
+ .i64x2_extmul_low_i32x4_u => @panic("TODO"),
+ .i32x4_extadd_pairwise_i16x8_u => @panic("TODO"),
+ .i16x8_extmul_high_i8x16_u => @panic("TODO"),
+ .i32x4_extmul_high_i16x8_u => @panic("TODO"),
+ .i64x2_extmul_high_i32x4_u => @panic("TODO"),
+ .f32x4_abs => @panic("TODO"),
+ .f64x2_abs => @panic("TODO"),
+ .f32x4_neg => @panic("TODO"),
+ .f64x2_neg => @panic("TODO"),
+ .f32x4_sqrt => @panic("TODO"),
+ .f64x2_sqrt => @panic("TODO"),
+ .f32x4_add => @panic("TODO"),
+ .f64x2_add => @panic("TODO"),
+ .f32x4_sub => @panic("TODO"),
+ .f64x2_sub => @panic("TODO"),
+ .f32x4_mul => @panic("TODO"),
+ .f64x2_mul => @panic("TODO"),
+ .f32x4_div => @panic("TODO"),
+ .f64x2_div => @panic("TODO"),
+ .f32x4_min => @panic("TODO"),
+ .f64x2_min => @panic("TODO"),
+ .f32x4_max => @panic("TODO"),
+ .f64x2_max => @panic("TODO"),
+ .f32x4_pmin => @panic("TODO"),
+ .f64x2_pmin => @panic("TODO"),
+ .f32x4_pmax => @panic("TODO"),
+ .f64x2_pmax => @panic("TODO"),
+ .i32x4_trunc_sat_f32x4_s => @panic("TODO"),
+ .i32x4_trunc_sat_f32x4_u => @panic("TODO"),
+ .f32x4_convert_i32x4_s => @panic("TODO"),
+ .f32x4_convert_i32x4_u => @panic("TODO"),
+ .i32x4_trunc_sat_f64x2_s_zero => @panic("TODO"),
+ .i32x4_trunc_sat_f64x2_u_zero => @panic("TODO"),
+ .f64x2_convert_low_i32x4_s => @panic("TODO"),
+ .f64x2_convert_low_i32x4_u => @panic("TODO"),
+ .i8x16_relaxed_swizzle => @panic("TODO"),
+ .i32x4_relaxed_trunc_f32x4_s => @panic("TODO"),
+ .i32x4_relaxed_trunc_f32x4_u => @panic("TODO"),
+ .i32x4_relaxed_trunc_f64x2_s_zero => @panic("TODO"),
+ .i32x4_relaxed_trunc_f64x2_u_zero => @panic("TODO"),
+ .f32x4_relaxed_madd => @panic("TODO"),
+ .f32x4_relaxed_nmadd => @panic("TODO"),
+ .f64x2_relaxed_madd => @panic("TODO"),
+ .f64x2_relaxed_nmadd => @panic("TODO"),
+ .i8x16_relaxed_laneselect => @panic("TODO"),
+ .i16x8_relaxed_laneselect => @panic("TODO"),
+ .i32x4_relaxed_laneselect => @panic("TODO"),
+ .i64x2_relaxed_laneselect => @panic("TODO"),
+ .f32x4_relaxed_min => @panic("TODO"),
+ .f32x4_relaxed_max => @panic("TODO"),
+ .f64x2_relaxed_min => @panic("TODO"),
+ .f64x2_relaxed_max => @panic("TODO"),
+ .i16x8_relaxed_q15mulr_s => @panic("TODO"),
+ .i16x8_relaxed_dot_i8x16_i7x16_s => @panic("TODO"),
+ .i32x4_relaxed_dot_i8x16_i7x16_add_s => @panic("TODO"),
+ .f32x4_relaxed_dot_bf16x8_add_f32x4 => @panic("TODO"),
}
comptime unreachable;
},
@@ -650,6 +887,9 @@ pub fn lowerToCode(emit: *Emit) Error!void {
inst += 1;
continue :loop tags[inst];
},
+ .memory_atomic_notify => @panic("TODO"),
+ .memory_atomic_wait32 => @panic("TODO"),
+ .memory_atomic_wait64 => @panic("TODO"),
}
comptime unreachable;
},
diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig
index e5b3039c4e..4eba7f7d58 100644
--- a/src/link/Wasm.zig
+++ b/src/link/Wasm.zig
@@ -291,6 +291,16 @@ pub const FunctionIndex = enum(u32) {
return fromResolution(wasm, .fromIpNav(wasm, nav_index));
}
+ pub fn fromTagNameType(wasm: *const Wasm, tag_type: InternPool.Index) ?FunctionIndex {
+ const zcu_func: ZcuFunc.Index = @enumFromInt(wasm.zcu_funcs.getIndex(tag_type) orelse return null);
+ return fromResolution(wasm, .pack(wasm, .{ .zcu_func = zcu_func }));
+ }
+
+ pub fn fromSymbolName(wasm: *const Wasm, name: String) ?FunctionIndex {
+ const import = wasm.object_function_imports.getPtr(name) orelse return null;
+ return fromResolution(wasm, import.resolution);
+ }
+
pub fn fromResolution(wasm: *const Wasm, resolution: FunctionImport.Resolution) ?FunctionIndex {
const i = wasm.functions.getIndex(resolution) orelse return null;
return @enumFromInt(i);
@@ -749,15 +759,14 @@ pub const FunctionImport = extern struct {
.__wasm_init_tls => .__wasm_init_tls,
.__zig_error_names => .__zig_error_names,
_ => {
- const i: u32 = @intFromEnum(r);
- const object_function_index = i - first_object_function;
- if (object_function_index < wasm.object_functions.items.len) {
- return .{ .object_function = @enumFromInt(object_function_index) };
- } else {
- return .{
- .zcu_func = @enumFromInt(object_function_index - wasm.object_functions.items.len),
- };
- }
+ const object_function_index = @intFromEnum(r) - first_object_function;
+
+ const zcu_func_index = if (object_function_index < wasm.object_functions.items.len)
+ return .{ .object_function = @enumFromInt(object_function_index) }
+ else
+ object_function_index - wasm.object_functions.items.len;
+
+ return .{ .zcu_func = @enumFromInt(zcu_func_index) };
},
};
}
@@ -1281,7 +1290,7 @@ pub const DataSegment = extern struct {
return .{ .nav_obj = @enumFromInt(nav_index) };
} else {
const nav_index = if (uav_index < wasm.uavs_exe.entries.len)
- return .{ .uav_obj = @enumFromInt(uav_index) }
+ return .{ .uav_exe = @enumFromInt(uav_index) }
else
uav_index - wasm.uavs_exe.entries.len;
@@ -1297,7 +1306,7 @@ pub const DataSegment = extern struct {
.object => |i| {
const ptr = i.ptr(wasm);
if (ptr.flags.tls) return .tls;
- if (isBss(wasm, ptr.name)) return .zero;
+ if (wasm.isBss(ptr.name)) return .zero;
return .data;
},
inline .uav_exe, .uav_obj => |i| if (i.value(wasm).code.off == .none) .zero else .data,
@@ -1326,6 +1335,10 @@ pub const DataSegment = extern struct {
};
}
+ pub fn isBss(id: Id, wasm: *const Wasm) bool {
+ return id.category(wasm) == .zero;
+ }
+
pub fn name(id: Id, wasm: *const Wasm) []const u8 {
return switch (unpack(id, wasm)) {
.__zig_error_name_table, .uav_exe, .uav_obj => ".data",
@@ -1368,10 +1381,11 @@ pub const DataSegment = extern struct {
}
pub fn isPassive(id: Id, wasm: *const Wasm) bool {
+ if (wasm.base.comp.config.import_memory and !id.isBss(wasm)) return true;
return switch (unpack(id, wasm)) {
- .__zig_error_name_table => true,
+ .__zig_error_name_table => false,
.object => |i| i.ptr(wasm).flags.is_passive,
- .uav_exe, .uav_obj, .nav_exe, .nav_obj => true,
+ .uav_exe, .uav_obj, .nav_exe, .nav_obj => false,
};
}
@@ -3226,6 +3240,7 @@ pub fn uavSymbolIndex(wasm: *Wasm, ip_index: InternPool.Index) Allocator.Error!S
const gpa = comp.gpa;
const name = try wasm.internStringFmt("__anon_{d}", .{@intFromEnum(ip_index)});
const gop = try wasm.symbol_table.getOrPut(gpa, name);
+ gop.value_ptr.* = {};
return @enumFromInt(gop.index);
}
@@ -3238,6 +3253,7 @@ pub fn navSymbolIndex(wasm: *Wasm, nav_index: InternPool.Nav.Index) Allocator.Er
const nav = ip.getNav(nav_index);
const name = try wasm.internString(nav.fqn.toSlice(ip));
const gop = try wasm.symbol_table.getOrPut(gpa, name);
+ gop.value_ptr.* = {};
return @enumFromInt(gop.index);
}
@@ -3250,6 +3266,34 @@ pub fn errorNameTableSymbolIndex(wasm: *Wasm) Allocator.Error!SymbolTableIndex {
return @enumFromInt(gop.index);
}
+pub fn stackPointerSymbolIndex(wasm: *Wasm) Allocator.Error!SymbolTableIndex {
+ const comp = wasm.base.comp;
+ assert(comp.config.output_mode == .Obj);
+ const gpa = comp.gpa;
+ const gop = try wasm.symbol_table.getOrPut(gpa, wasm.preloaded_strings.__stack_pointer);
+ gop.value_ptr.* = {};
+ return @enumFromInt(gop.index);
+}
+
+pub fn tagNameSymbolIndex(wasm: *Wasm, ip_index: InternPool.Index) Allocator.Error!SymbolTableIndex {
+ const comp = wasm.base.comp;
+ assert(comp.config.output_mode == .Obj);
+ const gpa = comp.gpa;
+ const name = try wasm.internStringFmt("__zig_tag_name_{d}", .{@intFromEnum(ip_index)});
+ const gop = try wasm.symbol_table.getOrPut(gpa, name);
+ gop.value_ptr.* = {};
+ return @enumFromInt(gop.index);
+}
+
+pub fn symbolNameIndex(wasm: *Wasm, name: String) Allocator.Error!SymbolTableIndex {
+ const comp = wasm.base.comp;
+ assert(comp.config.output_mode == .Obj);
+ const gpa = comp.gpa;
+ const gop = try wasm.symbol_table.getOrPut(gpa, name);
+ gop.value_ptr.* = {};
+ return @enumFromInt(gop.index);
+}
+
pub fn refUavObj(wasm: *Wasm, pt: Zcu.PerThread, ip_index: InternPool.Index) !UavsObjIndex {
const comp = wasm.base.comp;
const gpa = comp.gpa;
@@ -3276,7 +3320,7 @@ pub fn refUavExe(wasm: *Wasm, pt: Zcu.PerThread, ip_index: InternPool.Index) !Ua
};
}
const uav_index: UavsExeIndex = @enumFromInt(gop.index);
- wasm.data_segments.putAssumeCapacity(.pack(wasm, .{ .uav_exe = uav_index }), @as(u32, undefined));
+ try wasm.data_segments.put(gpa, .pack(wasm, .{ .uav_exe = uav_index }), @as(u32, undefined));
return uav_index;
}
diff --git a/src/link/Wasm/Flush.zig b/src/link/Wasm/Flush.zig
index 0fd6b5851c..89ff2add58 100644
--- a/src/link/Wasm/Flush.zig
+++ b/src/link/Wasm/Flush.zig
@@ -643,10 +643,7 @@ pub fn finish(f: *Flush, wasm: *Wasm) !void {
var group_index: u32 = 0;
var offset: u32 = undefined;
for (segment_ids, segment_offsets) |segment_id, segment_offset| {
- const segment = segment_id.ptr(wasm);
- const segment_payload = segment.payload.slice(wasm);
- if (segment_payload.len == 0) continue;
- if (!import_memory and wasm.isBss(segment.name)) {
+ if (!import_memory and segment_id.isBss(wasm)) {
// It counted for virtual memory but it does not go into the binary.
continue;
}
@@ -655,7 +652,7 @@ pub fn finish(f: *Flush, wasm: *Wasm) !void {
group_index += 1;
offset = 0;
- const flags: Object.DataSegmentFlags = if (segment.flags.is_passive) .passive else .active;
+ const flags: Object.DataSegmentFlags = if (segment_id.isPassive(wasm)) .passive else .active;
try leb.writeUleb128(binary_writer, @intFromEnum(flags));
// when a segment is passive, it's initialized during runtime.
if (flags != .passive) {
@@ -666,8 +663,21 @@ pub fn finish(f: *Flush, wasm: *Wasm) !void {
try binary_bytes.appendNTimes(gpa, 0, segment_offset - offset);
offset = segment_offset;
- try binary_bytes.appendSlice(gpa, segment_payload);
- offset += @intCast(segment_payload.len);
+
+ const code_start = binary_bytes.items.len;
+ append: {
+ const code = switch (segment_id.unpack(wasm)) {
+ .__zig_error_name_table => {
+ if (true) @panic("TODO lower zig error name table");
+ break :append;
+ },
+ .object => |i| i.ptr(wasm).payload,
+ inline .uav_exe, .uav_obj, .nav_exe, .nav_obj => |i| i.value(wasm).code,
+ };
+ try binary_bytes.appendSlice(gpa, code.slice(wasm));
+ }
+ offset += @intCast(binary_bytes.items.len - code_start);
+
if (true) @panic("TODO apply data segment relocations");
}
assert(group_index == f.data_segment_groups.items.len);
@@ -738,7 +748,7 @@ pub fn finish(f: *Flush, wasm: *Wasm) !void {
fn emitNameSection(
wasm: *Wasm,
- data_segments: *const std.AutoArrayHashMapUnmanaged(Wasm.DataSegment.Index, u32),
+ data_segments: *const std.AutoArrayHashMapUnmanaged(Wasm.DataSegment.Id, u32),
binary_bytes: *std.ArrayListUnmanaged(u8),
) !void {
const comp = wasm.base.comp;
@@ -801,7 +811,7 @@ fn emitNameSection(
try leb.writeUleb128(binary_bytes.writer(gpa), total_globals);
for (data_segments.keys(), 0..) |ds, i| {
- const name = ds.ptr(wasm).name.slice(wasm).?;
+ const name = ds.name(wasm);
try leb.writeUleb128(binary_bytes.writer(gpa), @as(u32, @intCast(i)));
try leb.writeUleb128(binary_bytes.writer(gpa), @as(u32, @intCast(name.len)));
try binary_bytes.appendSlice(gpa, name);
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-28 04:42:03 +0000