Skip to content

Commit 74ec827

Browse files
committed
Fix syscall for macos
1 parent bf46a06 commit 74ec827

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ license = "MIT/Apache-2.0"
77
name = "sc"
88
readme = "README.md"
99
repository = "https://github.com/japaric/syscall.rs"
10-
version = "0.2.2"
10+
version = "0.2.3"

src/platform/macos-x86_64/mod.rs

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@
1111
1212
pub mod nr;
1313

14+
const MACOS_SYSCALL_PREFIX: usize = 33554432;
15+
1416
#[inline(always)]
1517
pub unsafe fn syscall0(n: usize) -> usize {
1618
let ret: usize;
19+
let syscall = n + MACOS_SYSCALL_PREFIX;
1720
llvm_asm!("syscall" : "={rax}"(ret)
18-
: "{rax}"(n)
21+
: "{rax}"(syscall)
1922
: "rcx", "r11", "memory"
2023
: "volatile");
2124
ret
@@ -24,8 +27,9 @@ pub unsafe fn syscall0(n: usize) -> usize {
2427
#[inline(always)]
2528
pub unsafe fn syscall1(n: usize, a1: usize) -> usize {
2629
let ret: usize;
30+
let syscall = n + MACOS_SYSCALL_PREFIX;
2731
llvm_asm!("syscall" : "={rax}"(ret)
28-
: "{rax}"(n), "{rdi}"(a1)
32+
: "{rax}"(syscall), "{rdi}"(a1)
2933
: "rcx", "r11", "memory"
3034
: "volatile");
3135
ret
@@ -34,8 +38,9 @@ pub unsafe fn syscall1(n: usize, a1: usize) -> usize {
3438
#[inline(always)]
3539
pub unsafe fn syscall2(n: usize, a1: usize, a2: usize) -> usize {
3640
let ret: usize;
41+
let syscall = n + MACOS_SYSCALL_PREFIX;
3742
llvm_asm!("syscall" : "={rax}"(ret)
38-
: "{rax}"(n), "{rdi}"(a1), "{rsi}"(a2)
43+
: "{rax}"(syscall), "{rdi}"(a1), "{rsi}"(a2)
3944
: "rcx", "r11", "memory"
4045
: "volatile");
4146
ret
@@ -44,8 +49,9 @@ pub unsafe fn syscall2(n: usize, a1: usize, a2: usize) -> usize {
4449
#[inline(always)]
4550
pub unsafe fn syscall3(n: usize, a1: usize, a2: usize, a3: usize) -> usize {
4651
let ret: usize;
52+
let syscall = n + MACOS_SYSCALL_PREFIX;
4753
llvm_asm!("syscall" : "={rax}"(ret)
48-
: "{rax}"(n), "{rdi}"(a1), "{rsi}"(a2), "{rdx}"(a3)
54+
: "{rax}"(syscall), "{rdi}"(a1), "{rsi}"(a2), "{rdx}"(a3)
4955
: "rcx", "r11", "memory"
5056
: "volatile");
5157
ret
@@ -59,8 +65,9 @@ pub unsafe fn syscall4(n: usize,
5965
a4: usize)
6066
-> usize {
6167
let ret: usize;
68+
let syscall = n + MACOS_SYSCALL_PREFIX;
6269
llvm_asm!("syscall" : "={rax}"(ret)
63-
: "{rax}"(n), "{rdi}"(a1), "{rsi}"(a2), "{rdx}"(a3),
70+
: "{rax}"(syscall), "{rdi}"(a1), "{rsi}"(a2), "{rdx}"(a3),
6471
"{r10}"(a4)
6572
: "rcx", "r11", "memory"
6673
: "volatile");
@@ -76,8 +83,9 @@ pub unsafe fn syscall5(n: usize,
7683
a5: usize)
7784
-> usize {
7885
let ret: usize;
86+
let syscall = n + MACOS_SYSCALL_PREFIX;
7987
llvm_asm!("syscall" : "={rax}"(ret)
80-
: "{rax}"(n), "{rdi}"(a1), "{rsi}"(a2), "{rdx}"(a3),
88+
: "{rax}"(syscall), "{rdi}"(a1), "{rsi}"(a2), "{rdx}"(a3),
8189
"{r10}"(a4), "{r8}"(a5)
8290
: "rcx", "r11", "memory"
8391
: "volatile");
@@ -94,8 +102,9 @@ pub unsafe fn syscall6(n: usize,
94102
a6: usize)
95103
-> usize {
96104
let ret: usize;
105+
let syscall = n + MACOS_SYSCALL_PREFIX;
97106
llvm_asm!("syscall" : "={rax}"(ret)
98-
: "{rax}"(n), "{rdi}"(a1), "{rsi}"(a2), "{rdx}"(a3),
107+
: "{rax}"(syscall), "{rdi}"(a1), "{rsi}"(a2), "{rdx}"(a3),
99108
"{r10}"(a4), "{r8}"(a5), "{r9}"(a6)
100109
: "rcx", "r11", "memory"
101110
: "volatile");

0 commit comments

Comments
 (0)