mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-21 06:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

wasm-linker: implement TLS relocations

Browse Source
This commit is contained in:
Luuk de Gram 2023-07-16 16:31:07 +02:00
parent 388589987c
commit 376e1b4603
No known key found for this signature in database
GPG Key ID: A8CFE58E4DC7D664
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/link/Wasm.zig
View File

@ -2153,7 +2153,14 @@ fn allocateVirtualAddresses(wasm: *Wasm) void {
const segment_name = segment_info[symbol.index].outputName(merge_segment);
const segment_index = wasm.data_segments.get(segment_name).?;
const segment = wasm.segments.items[segment_index];
symbol.virtual_address = atom.offset + segment.offset;
// TLS symbols have their virtual address set relative to their own TLS segment,
// rather than the entire Data section.
if (symbol.hasFlag(.WASM_SYM_TLS)) {
symbol.virtual_address = atom.offset;
} else {
symbol.virtual_address = atom.offset + segment.offset;
}
}
}

13
src/link/Wasm/Atom.zig
View File

@ -174,14 +174,14 @@ fn relocationValue(atom: Atom, relocation: types.Relocation, wasm_bin: *const Wa
return 0;
}
const va = @as(i64, @intCast(symbol.virtual_address));
return @as(u32, @intCast(va + relocation.addend));
return @intCast(va + relocation.addend);
},
.R_WASM_EVENT_INDEX_LEB => return symbol.index,
.R_WASM_SECTION_OFFSET_I32 => {
const target_atom_index = wasm_bin.symbol_atom.get(target_loc).?;
const target_atom = wasm_bin.getAtom(target_atom_index);
const rel_value = @as(i32, @intCast(target_atom.offset)) + relocation.addend;
return @as(u32, @intCast(rel_value));
const rel_value: i32 = @intCast(target_atom.offset);
return @intCast(rel_value + relocation.addend);
},
.R_WASM_FUNCTION_OFFSET_I32 => {
const target_atom_index = wasm_bin.symbol_atom.get(target_loc) orelse {
@ -189,13 +189,14 @@ fn relocationValue(atom: Atom, relocation: types.Relocation, wasm_bin: *const Wa
};
const target_atom = wasm_bin.getAtom(target_atom_index);
const offset: u32 = 11 + Wasm.getULEB128Size(target_atom.size); // Header (11 bytes fixed-size) + body size (leb-encoded)
const rel_value = @as(i32, @intCast(target_atom.offset + offset)) + relocation.addend;
return @as(u32, @intCast(rel_value));
const rel_value: i32 = @intCast(target_atom.offset + offset);
return @intCast(rel_value + relocation.addend);
},
.R_WASM_MEMORY_ADDR_TLS_SLEB,
.R_WASM_MEMORY_ADDR_TLS_SLEB64,
=> {
@panic("TODO: Implement TLS relocations");
const va: i32 = @intCast(symbol.virtual_address);
return @intCast(va + relocation.addend);
},
}
}