jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-27 07:32:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

zld: add nop to reloc module

Browse Source
This commit is contained in:
Jakub Konka 2021-02-27 21:32:03 +01:00
parent d2008db623
commit 7e32947871
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/link/MachO/Zld.zig
View File

@ -16,7 +16,6 @@ const CodeSignature = @import("CodeSignature.zig");
const Archive = @import("Archive.zig");
const Object = @import("Object.zig");
const Trie = @import("Trie.zig");
const aarch64 = @import("../../codegen/aarch64.zig");
usingnamespace @import("commands.zig");
usingnamespace @import("bind.zig");
@ -566,14 +565,14 @@ fn writeStubHelperCommon(self: *Zld) !void {
// adr x17, disp
mem.writeIntLittle(u32, code[0..4], Arm64.adr(17, @bitCast(u21, displacement)).toU32());
// nop
mem.writeIntLittle(u32, code[4..8], aarch64.Instruction.nop().toU32());
mem.writeIntLittle(u32, code[4..8], Arm64.nop().toU32());
break :data_blk_outer;
}
data_blk: {
const new_this_addr = this_addr + @sizeOf(u32);
const displacement = math.cast(i21, target_addr - new_this_addr) catch |_| break :data_blk;
// nop
mem.writeIntLittle(u32, code[0..4], aarch64.Instruction.nop().toU32());
mem.writeIntLittle(u32, code[0..4], Arm64.nop().toU32());
// adr x17, disp
mem.writeIntLittle(u32, code[4..8], Arm64.adr(17, @bitCast(u21, displacement)).toU32());
break :data_blk_outer;
@ -601,7 +600,7 @@ fn writeStubHelperCommon(self: *Zld) !void {
// ldr x16, label
mem.writeIntLittle(u32, code[12..16], Arm64.ldr(16, literal, 1).toU32());
// nop
mem.writeIntLittle(u32, code[16..20], aarch64.Instruction.nop().toU32());
mem.writeIntLittle(u32, code[16..20], Arm64.nop().toU32());
break :binder_blk_outer;
}
binder_blk: {
@ -611,7 +610,7 @@ fn writeStubHelperCommon(self: *Zld) !void {
log.warn("2: disp=0x{x}, literal=0x{x}", .{ displacement, literal });
// Pad with nop to please division.
// nop
mem.writeIntLittle(u32, code[12..16], aarch64.Instruction.nop().toU32());
mem.writeIntLittle(u32, code[12..16], Arm64.nop().toU32());
// ldr x16, label
mem.writeIntLittle(u32, code[16..20], Arm64.ldr(16, literal, 1).toU32());
break :binder_blk_outer;
@ -697,7 +696,7 @@ fn writeStub(self: *Zld, index: u32) !void {
// ldr x16, literal
mem.writeIntLittle(u32, code[0..4], Arm64.ldr(16, literal, 1).toU32());
// nop
mem.writeIntLittle(u32, code[4..8], aarch64.Instruction.nop().toU32());
mem.writeIntLittle(u32, code[4..8], Arm64.nop().toU32());
break :outer;
}
inner: {
@ -705,7 +704,7 @@ fn writeStub(self: *Zld, index: u32) !void {
const displacement = math.divExact(u64, target_addr - new_this_addr, 4) catch |_| break :inner;
const literal = math.cast(u18, displacement) catch |_| break :inner;
// nop
mem.writeIntLittle(u32, code[0..4], aarch64.Instruction.nop().toU32());
mem.writeIntLittle(u32, code[0..4], Arm64.nop().toU32());
// ldr x16, literal
mem.writeIntLittle(u32, code[4..8], Arm64.ldr(16, literal, 1).toU32());
break :outer;

10
src/link/MachO/reloc.zig
View File

@ -42,6 +42,9 @@ pub const Arm64 = union(enum) {
_1: u9 = 0b0_0_100010_0,
size: u1,
},
Nop: packed struct {
fixed: u32 = 0b1101010100_0_00_011_0010_0000_000_11111,
},
pub fn toU32(self: Arm64) u32 {
const as_u32 = switch (self) {
@ -51,6 +54,7 @@ pub const Arm64 = union(enum) {
.LoadRegister => |x| @bitCast(u32, x),
.LoadLiteral => |x| @bitCast(u32, x),
.Add => |x| @bitCast(u32, x),
.Nop => |x| @bitCast(u32, x),
};
return as_u32;
}
@ -165,6 +169,12 @@ pub const Arm64 = union(enum) {
};
}
pub fn nop() Arm64 {
return Arm64{
.Nop = .{},
};
}
pub fn isArithmetic(inst: *const [4]u8) bool {
const group_decode = @truncate(u5, inst[3]);
log.debug("{b}", .{group_decode});