Skip to content

T
Third Party Musl

OpenHarmony / Third Party Musl
1 年多 前同步成功

通知 37
Star 125
Fork 0
T
Third Party Musl
提交 ddc7c4f9 编写于 作者: R Rich Felker
浏览文件
操作

clean up mips64/n32 syscall asm constraints 

ever since inline syscalls were added for (o32) mips in commit
328810d3, the asm has nonsensically
loaded the syscall number, rather than taking $2 as an input
constraint to let the compiler load it. commit
cfc09b1e improved on this somewhat by
allowing a constant syscall number to propagate into an immediate, but
missed that the whole operation made no sense.

now, only $4, $5, $6, $8, and $9 are potential input-only registers.
$2 is always input and output, and $7 is both when it's an argument,
otherwise output-only. previously, $7 was treated as an input (with a
"1" constraint matching its output position) even when it was not an
input, which was arguably undefined behavior (asm input from
indeterminate value). this is corrected.
上级 db2a148d
显示空白变更内容
内联 并排
Showing with 56 addition and 54 deletion
arch/mips64/syscall_arch.h
浏览文件 @ ddc7c4f9
...@@ -53,10 +53,11 @@ static void __stat_fix(struct kernel_stat *kst, struct stat *st) ...@@ -53,10 +53,11 @@ static void __stat_fix(struct kernel_stat *kst, struct stat *st)
static inline long __syscall0(long n) static inline long __syscall0(long n)
{ {
register long r7 __asm__("$7"); register long r7 __asm__("$7");
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7) : "+&r"(r2), "=r"(r7)
:
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
return r7 ? -r2 : r2; return r7 ? -r2 : r2;
} }
...@@ -65,11 +66,11 @@ static inline long __syscall1(long n, long a) ...@@ -65,11 +66,11 @@ static inline long __syscall1(long n, long a)
{ {
register long r4 __asm__("$4") = a; register long r4 __asm__("$4") = a;
register long r7 __asm__("$7"); register long r7 __asm__("$7");
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "=r"(r7)
"r"(r4) : "r"(r4)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
return r7 ? -r2 : r2; return r7 ? -r2 : r2;
} }
...@@ -81,15 +82,15 @@ static inline long __syscall2(long n, long a, long b) ...@@ -81,15 +82,15 @@ static inline long __syscall2(long n, long a, long b)
register long r4 __asm__("$4") = a; register long r4 __asm__("$4") = a;
register long r5 __asm__("$5") = b; register long r5 __asm__("$5") = b;
register long r7 __asm__("$7"); register long r7 __asm__("$7");
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
r5 = (long) &kst; r5 = (long) &kst;
__asm__ __volatile__ ( __asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "=r"(r7)
"r"(r4), "r"(r5) : "r"(r4), "r"(r5)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (r7) return -r2; if (r7) return -r2;
...@@ -109,15 +110,15 @@ static inline long __syscall3(long n, long a, long b, long c) ...@@ -109,15 +110,15 @@ static inline long __syscall3(long n, long a, long b, long c)
register long r5 __asm__("$5") = b; register long r5 __asm__("$5") = b;
register long r6 __asm__("$6") = c; register long r6 __asm__("$6") = c;
register long r7 __asm__("$7"); register long r7 __asm__("$7");
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
r5 = (long) &kst; r5 = (long) &kst;
__asm__ __volatile__ ( __asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "=r"(r7)
"r"(r4), "r"(r5), "r"(r6) : "r"(r4), "r"(r5), "r"(r6)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (r7) return -r2; if (r7) return -r2;
...@@ -137,7 +138,7 @@ static inline long __syscall4(long n, long a, long b, long c, long d) ...@@ -137,7 +138,7 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
register long r5 __asm__("$5") = b; register long r5 __asm__("$5") = b;
register long r6 __asm__("$6") = c; register long r6 __asm__("$6") = c;
register long r7 __asm__("$7") = d; register long r7 __asm__("$7") = d;
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
r5 = (long) &kst; r5 = (long) &kst;
...@@ -145,9 +146,9 @@ static inline long __syscall4(long n, long a, long b, long c, long d) ...@@ -145,9 +146,9 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
r6 = (long) &kst; r6 = (long) &kst;
__asm__ __volatile__ ( __asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "+r"(r7)
"r"(r4), "r"(r5), "r"(r6) : "r"(r4), "r"(r5), "r"(r6)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (r7) return -r2; if (r7) return -r2;
...@@ -170,7 +171,7 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e) ...@@ -170,7 +171,7 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e)
register long r6 __asm__("$6") = c; register long r6 __asm__("$6") = c;
register long r7 __asm__("$7") = d; register long r7 __asm__("$7") = d;
register long r8 __asm__("$8") = e; register long r8 __asm__("$8") = e;
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
r5 = (long) &kst; r5 = (long) &kst;
...@@ -178,9 +179,9 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e) ...@@ -178,9 +179,9 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e)
r6 = (long) &kst; r6 = (long) &kst;
__asm__ __volatile__ ( __asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "+r"(r7)
"r"(r4), "r"(r5), "r"(r6), "r"(r8) : "r"(r4), "r"(r5), "r"(r6), "r"(r8)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (r7) return -r2; if (r7) return -r2;
...@@ -204,7 +205,7 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo ...@@ -204,7 +205,7 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
register long r7 __asm__("$7") = d; register long r7 __asm__("$7") = d;
register long r8 __asm__("$8") = e; register long r8 __asm__("$8") = e;
register long r9 __asm__("$9") = f; register long r9 __asm__("$9") = f;
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
r5 = (long) &kst; r5 = (long) &kst;
...@@ -212,9 +213,9 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo ...@@ -212,9 +213,9 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
r6 = (long) &kst; r6 = (long) &kst;
__asm__ __volatile__ ( __asm__ __volatile__ (
"daddu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "+r"(r7)
"r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9) : "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (r7) return -r2; if (r7) return -r2;
......
arch/mipsn32/syscall_arch.h
浏览文件 @ ddc7c4f9
...@@ -22,10 +22,11 @@ static inline void __stat_fix(long p) ...@@ -22,10 +22,11 @@ static inline void __stat_fix(long p)
static inline long __syscall0(long n) static inline long __syscall0(long n)
{ {
register long r7 __asm__("$7"); register long r7 __asm__("$7");
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"addu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7) : "+&r"(r2), "=r"(r7)
:
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
return r7 ? -r2 : r2; return r7 ? -r2 : r2;
} }
...@@ -34,11 +35,11 @@ static inline long __syscall1(long n, long a) ...@@ -34,11 +35,11 @@ static inline long __syscall1(long n, long a)
{ {
register long r4 __asm__("$4") = a; register long r4 __asm__("$4") = a;
register long r7 __asm__("$7"); register long r7 __asm__("$7");
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"addu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "=r"(r7)
"r"(r4) : "r"(r4)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
return r7 ? -r2 : r2; return r7 ? -r2 : r2;
} }
...@@ -48,11 +49,11 @@ static inline long __syscall2(long n, long a, long b) ...@@ -48,11 +49,11 @@ static inline long __syscall2(long n, long a, long b)
register long r4 __asm__("$4") = a; register long r4 __asm__("$4") = a;
register long r5 __asm__("$5") = b; register long r5 __asm__("$5") = b;
register long r7 __asm__("$7"); register long r7 __asm__("$7");
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"addu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "=r"(r7)
"r"(r4), "r"(r5) : "r"(r4), "r"(r5)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (r7) return -r2; if (r7) return -r2;
long ret = r2; long ret = r2;
...@@ -66,11 +67,11 @@ static inline long __syscall3(long n, long a, long b, long c) ...@@ -66,11 +67,11 @@ static inline long __syscall3(long n, long a, long b, long c)
register long r5 __asm__("$5") = b; register long r5 __asm__("$5") = b;
register long r6 __asm__("$6") = c; register long r6 __asm__("$6") = c;
register long r7 __asm__("$7"); register long r7 __asm__("$7");
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"addu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "=r"(r7)
"r"(r4), "r"(r5), "r"(r6) : "r"(r4), "r"(r5), "r"(r6)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (r7) return -r2; if (r7) return -r2;
long ret = r2; long ret = r2;
...@@ -84,11 +85,11 @@ static inline long __syscall4(long n, long a, long b, long c, long d) ...@@ -84,11 +85,11 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
register long r5 __asm__("$5") = b; register long r5 __asm__("$5") = b;
register long r6 __asm__("$6") = c; register long r6 __asm__("$6") = c;
register long r7 __asm__("$7") = d; register long r7 __asm__("$7") = d;
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"addu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "+r"(r7)
"r"(r4), "r"(r5), "r"(r6) : "r"(r4), "r"(r5), "r"(r6)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (r7) return -r2; if (r7) return -r2;
long ret = r2; long ret = r2;
...@@ -104,11 +105,11 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e) ...@@ -104,11 +105,11 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e)
register long r6 __asm__("$6") = c; register long r6 __asm__("$6") = c;
register long r7 __asm__("$7") = d; register long r7 __asm__("$7") = d;
register long r8 __asm__("$8") = e; register long r8 __asm__("$8") = e;
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"addu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "+r"(r7)
"r"(r4), "r"(r5), "r"(r6), "r"(r8) : "r"(r4), "r"(r5), "r"(r6), "r"(r8)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b); if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b);
if (n == SYS_newfstatat) __stat_fix(c); if (n == SYS_newfstatat) __stat_fix(c);
...@@ -123,11 +124,11 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo ...@@ -123,11 +124,11 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
register long r7 __asm__("$7") = d; register long r7 __asm__("$7") = d;
register long r8 __asm__("$8") = e; register long r8 __asm__("$8") = e;
register long r9 __asm__("$9") = f; register long r9 __asm__("$9") = f;
register long r2 __asm__("$2"); register long r2 __asm__("$2") = n;
__asm__ __volatile__ ( __asm__ __volatile__ (
"addu $2,$0,%2 ; syscall" "syscall"
: "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7), : "+&r"(r2), "+r"(r7)
"r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9) : "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
: SYSCALL_CLOBBERLIST); : SYSCALL_CLOBBERLIST);
if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b); if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b);
if (n == SYS_newfstatat) __stat_fix(c); if (n == SYS_newfstatat) __stat_fix(c);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或