[<prev] [day] [month] [year] [list]
Message-ID: <20260416141949.2549730-1-alex@alexrp.com>
Date: Thu, 16 Apr 2026 16:19:49 +0200
From: Alex Rønne Petersen <alex@...xrp.com>
To: musl@...ts.openwall.com
Cc: Alex Rønne Petersen <alex@...xrp.com>
Subject: [PATCH v2] mipsn32: pass syscall arguments as long long instead of long
This matches what is done for the x32 port. As far as I can tell based on kernel
and glibc sources, this is the expected kABI for mipsn32 since the syscall path
uses the n32 calling convention, i.e. full 64-bit registers. Before this patch,
you would get compiler warnings about truncation of off_t values in various
syscall wrappers.
As for x32, I left the return type (and r2 register variable type) as long since
lseek() remains the only syscall with a 64-bit return type on ILP32 targets.
This change has been tested by running Zig's module tests for
mips64-linux-muslabin32 and mips64el-linux-muslabin32 with no regressions.
---
arch/mipsn32/syscall_arch.h | 67 +++++++++++++++++++------------------
1 file changed, 35 insertions(+), 32 deletions(-)
diff --git a/arch/mipsn32/syscall_arch.h b/arch/mipsn32/syscall_arch.h
index c681905d..19ea2766 100644
--- a/arch/mipsn32/syscall_arch.h
+++ b/arch/mipsn32/syscall_arch.h
@@ -1,6 +1,9 @@
#define __SYSCALL_LL_E(x) (x)
#define __SYSCALL_LL_O(x) (x)
+#define __scc(X) sizeof(1?(X):0ULL) < 8 ? (unsigned long) (X) : (long long) (X)
+typedef long long syscall_arg_t;
+
#define SYSCALL_RLIM_INFINITY (-1UL/2)
#if __mips_isa_rev >= 6
@@ -13,9 +16,9 @@
"$14", "$15", "$24", "$25", "hi", "lo", "memory"
#endif
-static inline long __syscall0(long n)
+static inline long __syscall0(long long n)
{
- register long r7 __asm__("$7");
+ register long long r7 __asm__("$7");
register long r2 __asm__("$2");
__asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall"
@@ -25,10 +28,10 @@ static inline long __syscall0(long n)
return r7 && r2>0 ? -r2 : r2;
}
-static inline long __syscall1(long n, long a)
+static inline long __syscall1(long long n, long long a)
{
- register long r4 __asm__("$4") = a;
- register long r7 __asm__("$7");
+ register long long r4 __asm__("$4") = a;
+ register long long r7 __asm__("$7");
register long r2 __asm__("$2");
__asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall"
@@ -38,11 +41,11 @@ static inline long __syscall1(long n, long a)
return r7 && r2>0 ? -r2 : r2;
}
-static inline long __syscall2(long n, long a, long b)
+static inline long __syscall2(long long n, long long a, long long b)
{
- register long r4 __asm__("$4") = a;
- register long r5 __asm__("$5") = b;
- register long r7 __asm__("$7");
+ register long long r4 __asm__("$4") = a;
+ register long long r5 __asm__("$5") = b;
+ register long long r7 __asm__("$7");
register long r2 __asm__("$2");
__asm__ __volatile__ (
@@ -53,12 +56,12 @@ static inline long __syscall2(long n, long a, long b)
return r7 && r2>0 ? -r2 : r2;
}
-static inline long __syscall3(long n, long a, long b, long c)
+static inline long __syscall3(long long n, long long a, long long b, long long c)
{
- register long r4 __asm__("$4") = a;
- register long r5 __asm__("$5") = b;
- register long r6 __asm__("$6") = c;
- register long r7 __asm__("$7");
+ register long long r4 __asm__("$4") = a;
+ register long long r5 __asm__("$5") = b;
+ register long long r6 __asm__("$6") = c;
+ register long long r7 __asm__("$7");
register long r2 __asm__("$2");
__asm__ __volatile__ (
@@ -69,12 +72,12 @@ static inline long __syscall3(long n, long a, long b, long c)
return r7 && r2>0 ? -r2 : r2;
}
-static inline long __syscall4(long n, long a, long b, long c, long d)
+static inline long __syscall4(long long n, long long a, long long b, long long c, long long d)
{
- register long r4 __asm__("$4") = a;
- register long r5 __asm__("$5") = b;
- register long r6 __asm__("$6") = c;
- register long r7 __asm__("$7") = d;
+ register long long r4 __asm__("$4") = a;
+ register long long r5 __asm__("$5") = b;
+ register long long r6 __asm__("$6") = c;
+ register long long r7 __asm__("$7") = d;
register long r2 __asm__("$2");
__asm__ __volatile__ (
@@ -85,13 +88,13 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
return r7 && r2>0 ? -r2 : r2;
}
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+static inline long __syscall5(long long n, long long a, long long b, long long c, long long d, long long e)
{
- register long r4 __asm__("$4") = a;
- register long r5 __asm__("$5") = b;
- register long r6 __asm__("$6") = c;
- register long r7 __asm__("$7") = d;
- register long r8 __asm__("$8") = e;
+ register long long r4 __asm__("$4") = a;
+ register long long r5 __asm__("$5") = b;
+ register long long r6 __asm__("$6") = c;
+ register long long r7 __asm__("$7") = d;
+ register long long r8 __asm__("$8") = e;
register long r2 __asm__("$2");
__asm__ __volatile__ (
@@ -102,14 +105,14 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e)
return r7 && r2>0 ? -r2 : r2;
}
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+static inline long __syscall6(long long n, long long a, long long b, long long c, long long d, long long e, long long f)
{
- register long r4 __asm__("$4") = a;
- register long r5 __asm__("$5") = b;
- register long r6 __asm__("$6") = c;
- register long r7 __asm__("$7") = d;
- register long r8 __asm__("$8") = e;
- register long r9 __asm__("$9") = f;
+ register long long r4 __asm__("$4") = a;
+ register long long r5 __asm__("$5") = b;
+ register long long r6 __asm__("$6") = c;
+ register long long r7 __asm__("$7") = d;
+ register long long r8 __asm__("$8") = e;
+ register long long r9 __asm__("$9") = f;
register long r2 __asm__("$2");
__asm__ __volatile__ (
--
2.51.0
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
