Skip to content

Commit cfdc0f0

Browse files
alexrpalexrp
committed
std.os.linux: replace usize/isize in arch bits with fixed types for clarity
1 parent fc7a5f2 commit cfdc0f0

File tree

16 files changed

+432
-432
lines changed

16 files changed

+432
-432
lines changed

‎lib/std/os/linux/aarch64.zig‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,43 @@ const stack_t = linux.stack_t;
1414
const sigset_t = linux.sigset_t;
1515
const timespec = std.os.linux.timespec;
1616

17-
pub fn syscall0(number: SYS) usize {
17+
pub fn syscall0(number: SYS) u64 {
1818
return asm volatile ("svc #0"
19-
: [ret] "={x0}" (-> usize),
19+
: [ret] "={x0}" (-> u64),
2020
: [number] "{x8}" (@intFromEnum(number)),
2121
: .{ .memory = true });
2222
}
2323

24-
pub fn syscall1(number: SYS, arg1: usize) usize {
24+
pub fn syscall1(number: SYS, arg1: u64) u64 {
2525
return asm volatile ("svc #0"
26-
: [ret] "={x0}" (-> usize),
26+
: [ret] "={x0}" (-> u64),
2727
: [number] "{x8}" (@intFromEnum(number)),
2828
[arg1] "{x0}" (arg1),
2929
: .{ .memory = true });
3030
}
3131

32-
pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
32+
pub fn syscall2(number: SYS, arg1: u64, arg2: u64) u64 {
3333
return asm volatile ("svc #0"
34-
: [ret] "={x0}" (-> usize),
34+
: [ret] "={x0}" (-> u64),
3535
: [number] "{x8}" (@intFromEnum(number)),
3636
[arg1] "{x0}" (arg1),
3737
[arg2] "{x1}" (arg2),
3838
: .{ .memory = true });
3939
}
4040

41-
pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
41+
pub fn syscall3(number: SYS, arg1: u64, arg2: u64, arg3: u64) u64 {
4242
return asm volatile ("svc #0"
43-
: [ret] "={x0}" (-> usize),
43+
: [ret] "={x0}" (-> u64),
4444
: [number] "{x8}" (@intFromEnum(number)),
4545
[arg1] "{x0}" (arg1),
4646
[arg2] "{x1}" (arg2),
4747
[arg3] "{x2}" (arg3),
4848
: .{ .memory = true });
4949
}
5050

51-
pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
51+
pub fn syscall4(number: SYS, arg1: u64, arg2: u64, arg3: u64, arg4: u64) u64 {
5252
return asm volatile ("svc #0"
53-
: [ret] "={x0}" (-> usize),
53+
: [ret] "={x0}" (-> u64),
5454
: [number] "{x8}" (@intFromEnum(number)),
5555
[arg1] "{x0}" (arg1),
5656
[arg2] "{x1}" (arg2),
@@ -59,9 +59,9 @@ pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize)
5959
: .{ .memory = true });
6060
}
6161

62-
pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
62+
pub fn syscall5(number: SYS, arg1: u64, arg2: u64, arg3: u64, arg4: u64, arg5: u64) u64 {
6363
return asm volatile ("svc #0"
64-
: [ret] "={x0}" (-> usize),
64+
: [ret] "={x0}" (-> u64),
6565
: [number] "{x8}" (@intFromEnum(number)),
6666
[arg1] "{x0}" (arg1),
6767
[arg2] "{x1}" (arg2),
@@ -73,15 +73,15 @@ pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize,
7373

7474
pub fn syscall6(
7575
number: SYS,
76-
arg1: usize,
77-
arg2: usize,
78-
arg3: usize,
79-
arg4: usize,
80-
arg5: usize,
81-
arg6: usize,
82-
) usize {
76+
arg1: u64,
77+
arg2: u64,
78+
arg3: u64,
79+
arg4: u64,
80+
arg5: u64,
81+
arg6: u64,
82+
) u64 {
8383
return asm volatile ("svc #0"
84-
: [ret] "={x0}" (-> usize),
84+
: [ret] "={x0}" (-> u64),
8585
: [number] "{x8}" (@intFromEnum(number)),
8686
[arg1] "{x0}" (arg1),
8787
[arg2] "{x1}" (arg2),
@@ -92,7 +92,7 @@ pub fn syscall6(
9292
: .{ .memory = true });
9393
}
9494

95-
pub fn clone() callconv(.naked) usize {
95+
pub fn clone() callconv(.naked) u64 {
9696
// __clone(func, stack, flags, arg, ptid, tls, ctid)
9797
// x0, x1, w2, x3, x4, x5, x6
9898
//
@@ -192,12 +192,12 @@ pub const Flock = extern struct {
192192

193193
pub const blksize_t = i32;
194194
pub const nlink_t = u32;
195-
pub const time_t = isize;
195+
pub const time_t = i64;
196196
pub const mode_t = u32;
197-
pub const off_t = isize;
198-
pub const ino_t = usize;
199-
pub const dev_t = usize;
200-
pub const blkcnt_t = isize;
197+
pub const off_t = i64;
198+
pub const ino_t = u64;
199+
pub const dev_t = u64;
200+
pub const blkcnt_t = i64;
201201

202202
// The `stat` definition used by the Linux kernel.
203203
pub const Stat = extern struct {
@@ -208,7 +208,7 @@ pub const Stat = extern struct {
208208
uid: uid_t,
209209
gid: gid_t,
210210
rdev: dev_t,
211-
__pad: usize,
211+
__pad: u64,
212212
size: off_t,
213213
blksize: blksize_t,
214214
__pad2: i32,

‎lib/std/os/linux/arm.zig‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,43 @@ const pid_t = linux.pid_t;
1313
const sockaddr = linux.sockaddr;
1414
const timespec = linux.timespec;
1515

16-
pub fn syscall0(number: SYS) usize {
16+
pub fn syscall0(number: SYS) u32 {
1717
return asm volatile ("svc #0"
18-
: [ret] "={r0}" (-> usize),
18+
: [ret] "={r0}" (-> u32),
1919
: [number] "{r7}" (@intFromEnum(number)),
2020
: .{ .memory = true });
2121
}
2222

23-
pub fn syscall1(number: SYS, arg1: usize) usize {
23+
pub fn syscall1(number: SYS, arg1: u32) u32 {
2424
return asm volatile ("svc #0"
25-
: [ret] "={r0}" (-> usize),
25+
: [ret] "={r0}" (-> u32),
2626
: [number] "{r7}" (@intFromEnum(number)),
2727
[arg1] "{r0}" (arg1),
2828
: .{ .memory = true });
2929
}
3030

31-
pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
31+
pub fn syscall2(number: SYS, arg1: u32, arg2: u32) u32 {
3232
return asm volatile ("svc #0"
33-
: [ret] "={r0}" (-> usize),
33+
: [ret] "={r0}" (-> u32),
3434
: [number] "{r7}" (@intFromEnum(number)),
3535
[arg1] "{r0}" (arg1),
3636
[arg2] "{r1}" (arg2),
3737
: .{ .memory = true });
3838
}
3939

40-
pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
40+
pub fn syscall3(number: SYS, arg1: u32, arg2: u32, arg3: u32) u32 {
4141
return asm volatile ("svc #0"
42-
: [ret] "={r0}" (-> usize),
42+
: [ret] "={r0}" (-> u32),
4343
: [number] "{r7}" (@intFromEnum(number)),
4444
[arg1] "{r0}" (arg1),
4545
[arg2] "{r1}" (arg2),
4646
[arg3] "{r2}" (arg3),
4747
: .{ .memory = true });
4848
}
4949

50-
pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
50+
pub fn syscall4(number: SYS, arg1: u32, arg2: u32, arg3: u32, arg4: u32) u32 {
5151
return asm volatile ("svc #0"
52-
: [ret] "={r0}" (-> usize),
52+
: [ret] "={r0}" (-> u32),
5353
: [number] "{r7}" (@intFromEnum(number)),
5454
[arg1] "{r0}" (arg1),
5555
[arg2] "{r1}" (arg2),
@@ -58,9 +58,9 @@ pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize)
5858
: .{ .memory = true });
5959
}
6060

61-
pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
61+
pub fn syscall5(number: SYS, arg1: u32, arg2: u32, arg3: u32, arg4: u32, arg5: u32) u32 {
6262
return asm volatile ("svc #0"
63-
: [ret] "={r0}" (-> usize),
63+
: [ret] "={r0}" (-> u32),
6464
: [number] "{r7}" (@intFromEnum(number)),
6565
[arg1] "{r0}" (arg1),
6666
[arg2] "{r1}" (arg2),
@@ -72,15 +72,15 @@ pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize,
7272

7373
pub fn syscall6(
7474
number: SYS,
75-
arg1: usize,
76-
arg2: usize,
77-
arg3: usize,
78-
arg4: usize,
79-
arg5: usize,
80-
arg6: usize,
81-
) usize {
75+
arg1: u32,
76+
arg2: u32,
77+
arg3: u32,
78+
arg4: u32,
79+
arg5: u32,
80+
arg6: u32,
81+
) u32 {
8282
return asm volatile ("svc #0"
83-
: [ret] "={r0}" (-> usize),
83+
: [ret] "={r0}" (-> u32),
8484
: [number] "{r7}" (@intFromEnum(number)),
8585
[arg1] "{r0}" (arg1),
8686
[arg2] "{r1}" (arg2),
@@ -91,7 +91,7 @@ pub fn syscall6(
9191
: .{ .memory = true });
9292
}
9393

94-
pub fn clone() callconv(.naked) usize {
94+
pub fn clone() callconv(.naked) u32 {
9595
// __clone(func, stack, flags, arg, ptid, tls, ctid)
9696
// r0, r1, r2, r3, +0, +4, +8
9797
//
@@ -228,7 +228,7 @@ pub const Flock = extern struct {
228228

229229
pub const blksize_t = i32;
230230
pub const nlink_t = u32;
231-
pub const time_t = isize;
231+
pub const time_t = i32;
232232
pub const mode_t = u32;
233233
pub const off_t = i64;
234234
pub const ino_t = u64;

‎lib/std/os/linux/hexagon.zig‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,43 @@ const stack_t = linux.stack_t;
1313
const sigset_t = linux.sigset_t;
1414
const timespec = std.os.linux.timespec;
1515

16-
pub fn syscall0(number: SYS) usize {
16+
pub fn syscall0(number: SYS) u32 {
1717
return asm volatile ("trap0(#1)"
18-
: [ret] "={r0}" (-> usize),
18+
: [ret] "={r0}" (-> u32),
1919
: [number] "{r6}" (@intFromEnum(number)),
2020
: .{ .memory = true });
2121
}
2222

23-
pub fn syscall1(number: SYS, arg1: usize) usize {
23+
pub fn syscall1(number: SYS, arg1: u32) u32 {
2424
return asm volatile ("trap0(#1)"
25-
: [ret] "={r0}" (-> usize),
25+
: [ret] "={r0}" (-> u32),
2626
: [number] "{r6}" (@intFromEnum(number)),
2727
[arg1] "{r0}" (arg1),
2828
: .{ .memory = true });
2929
}
3030

31-
pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize {
31+
pub fn syscall2(number: SYS, arg1: u32, arg2: u32) u32 {
3232
return asm volatile ("trap0(#1)"
33-
: [ret] "={r0}" (-> usize),
33+
: [ret] "={r0}" (-> u32),
3434
: [number] "{r6}" (@intFromEnum(number)),
3535
[arg1] "{r0}" (arg1),
3636
[arg2] "{r1}" (arg2),
3737
: .{ .memory = true });
3838
}
3939

40-
pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize {
40+
pub fn syscall3(number: SYS, arg1: u32, arg2: u32, arg3: u32) u32 {
4141
return asm volatile ("trap0(#1)"
42-
: [ret] "={r0}" (-> usize),
42+
: [ret] "={r0}" (-> u32),
4343
: [number] "{r6}" (@intFromEnum(number)),
4444
[arg1] "{r0}" (arg1),
4545
[arg2] "{r1}" (arg2),
4646
[arg3] "{r2}" (arg3),
4747
: .{ .memory = true });
4848
}
4949

50-
pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize {
50+
pub fn syscall4(number: SYS, arg1: u32, arg2: u32, arg3: u32, arg4: u32) u32 {
5151
return asm volatile ("trap0(#1)"
52-
: [ret] "={r0}" (-> usize),
52+
: [ret] "={r0}" (-> u32),
5353
: [number] "{r6}" (@intFromEnum(number)),
5454
[arg1] "{r0}" (arg1),
5555
[arg2] "{r1}" (arg2),
@@ -58,9 +58,9 @@ pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize)
5858
: .{ .memory = true });
5959
}
6060

61-
pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize {
61+
pub fn syscall5(number: SYS, arg1: u32, arg2: u32, arg3: u32, arg4: u32, arg5: u32) u32 {
6262
return asm volatile ("trap0(#1)"
63-
: [ret] "={r0}" (-> usize),
63+
: [ret] "={r0}" (-> u32),
6464
: [number] "{r6}" (@intFromEnum(number)),
6565
[arg1] "{r0}" (arg1),
6666
[arg2] "{r1}" (arg2),
@@ -72,15 +72,15 @@ pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize,
7272

7373
pub fn syscall6(
7474
number: SYS,
75-
arg1: usize,
76-
arg2: usize,
77-
arg3: usize,
78-
arg4: usize,
79-
arg5: usize,
80-
arg6: usize,
81-
) usize {
75+
arg1: u32,
76+
arg2: u32,
77+
arg3: u32,
78+
arg4: u32,
79+
arg5: u32,
80+
arg6: u32,
81+
) u32 {
8282
return asm volatile ("trap0(#1)"
83-
: [ret] "={r0}" (-> usize),
83+
: [ret] "={r0}" (-> u32),
8484
: [number] "{r6}" (@intFromEnum(number)),
8585
[arg1] "{r0}" (arg1),
8686
[arg2] "{r1}" (arg2),
@@ -91,7 +91,7 @@ pub fn syscall6(
9191
: .{ .memory = true });
9292
}
9393

94-
pub fn clone() callconv(.naked) usize {
94+
pub fn clone() callconv(.naked) u32 {
9595
// __clone(func, stack, flags, arg, ptid, tls, ctid)
9696
// r0, r1, r2, r3, r4, r5, +0
9797
//

0 commit comments

Comments
 (0)