mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-08 06:44:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

netbsd: add mcontext_t for aarch64

Browse source 
- test `lib/std/std.zig` passes
- stack traces work
This commit is contained in:
Michael Dusan 2023-01-17 18:14:53 -05:00 • committed by Andrew Kelley
parent 7f604b6f48
commit c9f7b32fbd
3 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/std/c/netbsd.zig
View file

@ -1061,17 +1061,37 @@ pub const sigset_t = extern struct {
pub const empty_sigset = sigset_t{ .__bits = [_]u32{0} ** SIG.WORDS }; pub const empty_sigset = sigset_t{ .__bits = [_]u32{0} ** SIG.WORDS };
// XXX x86_64 specific pub const mcontext_t = switch (builtin.cpu.arch) {
pub const mcontext_t = extern struct { .aarch64 => extern struct {
gregs: [26]u64, gregs: [35]u64,
mc_tlsbase: u64, fregs: [528]u8 align(16),
fpregs: [512]u8 align(8), spare: [8]u64,
},
.x86_64 => extern struct {
gregs: [26]u64,
mc_tlsbase: u64,
fpregs: [512]u8 align(8),
},
else => struct {},
}; };
pub const REG = struct { pub const REG = switch (builtin.cpu.arch) {
pub const RBP = 12; .aarch64 => struct {
pub const RIP = 21; pub const FP = 29;
pub const RSP = 24; pub const SP = 31;
pub const PC = 32;
},
.arm => struct {
pub const FP = 11;
pub const SP = 13;
pub const PC = 15;
},
.x86_64 => struct {
pub const RBP = 12;
pub const RIP = 21;
pub const RSP = 24;
},
else => struct {},
}; };
pub const ucontext_t = extern struct { pub const ucontext_t = extern struct {

2
lib/std/debug.zig
View file

@ -1985,11 +1985,13 @@ fn handleSegfaultPosix(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const any
const ctx = @ptrCast(*const os.ucontext_t, @alignCast(@alignOf(os.ucontext_t), ctx_ptr)); const ctx = @ptrCast(*const os.ucontext_t, @alignCast(@alignOf(os.ucontext_t), ctx_ptr));
const ip = switch (native_os) { const ip = switch (native_os) {
.macos => @intCast(usize, ctx.mcontext.ss.pc), .macos => @intCast(usize, ctx.mcontext.ss.pc),
.netbsd => @intCast(usize, ctx.mcontext.gregs[os.REG.PC]),
else => @intCast(usize, ctx.mcontext.pc), else => @intCast(usize, ctx.mcontext.pc),
}; };
// x29 is the ABI-designated frame pointer // x29 is the ABI-designated frame pointer
const bp = switch (native_os) { const bp = switch (native_os) {
.macos => @intCast(usize, ctx.mcontext.ss.fp), .macos => @intCast(usize, ctx.mcontext.ss.fp),
.netbsd => @intCast(usize, ctx.mcontext.gregs[os.REG.FP]),
else => @intCast(usize, ctx.mcontext.regs[29]), else => @intCast(usize, ctx.mcontext.regs[29]),
}; };
dumpStackTraceFromBase(bp, ip); dumpStackTraceFromBase(bp, ip);

2
src/crash_report.zig
View file

@ -237,11 +237,13 @@ fn handleSegfaultPosix(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const any
const ctx = @ptrCast(*const os.ucontext_t, @alignCast(@alignOf(os.ucontext_t), ctx_ptr)); const ctx = @ptrCast(*const os.ucontext_t, @alignCast(@alignOf(os.ucontext_t), ctx_ptr));
const ip = switch (native_os) { const ip = switch (native_os) {
.macos => @intCast(usize, ctx.mcontext.ss.pc), .macos => @intCast(usize, ctx.mcontext.ss.pc),
.netbsd => @intCast(usize, ctx.mcontext.gregs[os.REG.PC]),
else => @intCast(usize, ctx.mcontext.pc), else => @intCast(usize, ctx.mcontext.pc),
}; };
// x29 is the ABI-designated frame pointer // x29 is the ABI-designated frame pointer
const bp = switch (native_os) { const bp = switch (native_os) {
.macos => @intCast(usize, ctx.mcontext.ss.fp), .macos => @intCast(usize, ctx.mcontext.ss.fp),
.netbsd => @intCast(usize, ctx.mcontext.gregs[os.REG.FP]),
else => @intCast(usize, ctx.mcontext.regs[29]), else => @intCast(usize, ctx.mcontext.regs[29]),
}; };
break :ctx StackContext{ .exception = .{ .bp = bp, .ip = ip } }; break :ctx StackContext{ .exception = .{ .bp = bp, .ip = ip } };