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

x86_64: remove returns from naked functions

Browse Source
This commit is contained in:
Jacob Young 2023-04-02 22:25:53 -04:00 committed by Jakub Konka
parent 1980f5479b
commit fde1ec5d0e
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/std/os/linux/x86.zig
View File

@ -125,36 +125,44 @@ pub extern fn clone(func: CloneFn, stack: usize, flags: u32, arg: usize, ptid: *
pub fn restore() callconv(.Naked) void {
switch (@import("builtin").zig_backend) {
.stage2_c => return asm volatile (
.stage2_c => asm volatile (
\\ movl %[number], %%eax
\\ int $0x80
\\ ret
:
: [number] "i" (@enumToInt(SYS.sigreturn)),
: "memory"
),
else => return asm volatile ("int $0x80"
else => asm volatile (
\\ int $0x80
\\ ret
:
: [number] "{eax}" (@enumToInt(SYS.sigreturn)),
: "memory"
),
}
unreachable;
}
pub fn restore_rt() callconv(.Naked) void {
switch (@import("builtin").zig_backend) {
.stage2_c => return asm volatile (
.stage2_c => asm volatile (
\\ movl %[number], %%eax
\\ int $0x80
\\ ret
:
: [number] "i" (@enumToInt(SYS.rt_sigreturn)),
: "memory"
),
else => return asm volatile ("int $0x80"
else => asm volatile (
\\ int $0x80
\\ ret
:
: [number] "{eax}" (@enumToInt(SYS.rt_sigreturn)),
: "memory"
),
}
unreachable;
}
pub const O = struct {

7
lib/std/os/linux/x86_64.zig
View File

@ -109,7 +109,7 @@ pub const restore = restore_rt;
pub fn restore_rt() callconv(.Naked) void {
switch (@import("builtin").zig_backend) {
.stage2_c => return asm volatile (
.stage2_c => asm volatile (
\\ movl %[number], %%eax
\\ syscall
\\ retq
@ -117,12 +117,15 @@ pub fn restore_rt() callconv(.Naked) void {
: [number] "i" (@enumToInt(SYS.rt_sigreturn)),
: "rcx", "r11", "memory"
),
else => return asm volatile ("syscall"
else => asm volatile (
\\ syscall
\\ retq
:
: [number] "{rax}" (@enumToInt(SYS.rt_sigreturn)),
: "rcx", "r11", "memory"
),
}
unreachable;
}
pub const mode_t = usize;