From b8fcdddcbb192fc367ff04bbd753b9deb69b09f3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 28 May 2016 18:12:58 +0200 Subject: nios2: sync support with glibc Only static linking is supported for now. More debugging and analyzing for ld.so, TLS and NPTL is required. But at least you can bootup a static root fileystem in Qemu. --- libc/sysdeps/linux/nios2/bits/syscalls.h | 173 +++++++++++++++---------------- 1 file changed, 82 insertions(+), 91 deletions(-) (limited to 'libc/sysdeps/linux/nios2/bits/syscalls.h') diff --git a/libc/sysdeps/linux/nios2/bits/syscalls.h b/libc/sysdeps/linux/nios2/bits/syscalls.h index 5be5d4d86..2b12343a6 100644 --- a/libc/sysdeps/linux/nios2/bits/syscalls.h +++ b/libc/sysdeps/linux/nios2/bits/syscalls.h @@ -4,106 +4,97 @@ # error "Never use directly; include instead." #endif -#define TRAP_ID_SYSCALL 0 +#ifdef __ASSEMBLER__ -#ifndef __ASSEMBLER__ +#undef DO_CALL +#define DO_CALL(syscall_name, args) \ + DOARGS_##args \ + movi r2, SYS_ify(syscall_name); \ + trap; -#include - -#define __syscall_return(type, res) \ - do { \ - if (unlikely(INTERNAL_SYSCALL_ERROR_P(res, ))) { \ - __set_errno(INTERNAL_SYSCALL_ERRNO(res, )); \ - res = (unsigned long) -1; \ - } \ - return (type) (res); \ - } while (0) +#define DOARGS_0 /* nothing */ +#define DOARGS_1 /* nothing */ +#define DOARGS_2 /* nothing */ +#define DOARGS_3 /* nothing */ +#define DOARGS_4 /* nothing */ +#define DOARGS_5 ldw r8, 0(sp); +#define DOARGS_6 ldw r9, 4(sp); ldw r8, 0(sp); -#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ -(__extension__ \ - ({ \ - long __res; \ - __asm__ __volatile__ ( \ - "movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ - "movi r3, %1\n\t" /* __NR_##name */ \ - ASM_ARGS_##nr \ - "trap\n\t" \ - "mov %0, r2\n\t" /* syscall return */ \ - : "=r" (__res) /* %0 */ \ - : "i" (name) /* %1 */ \ - , "i" (TRAP_ID_SYSCALL) /* %2 */ \ - MAP_ARGS_##nr (args) /* %3-%8 */ \ - : "r2" \ - , "r3" \ - CLOB_ARGS_##nr /* Clobbered */ \ - ); \ - __res; \ - }) \ -) +#else -#define INTERNAL_SYSCALL_ERROR_P(val, err) \ - ((unsigned long)(val) >= (unsigned long)(-125)) - -#define ASM_ARGS_0 -#define MAP_ARGS_0() -#define CLOB_ARGS_0 - -#define ASM_ARGS_1 \ - "mov r4, %3\n\t" -#define MAP_ARGS_1(a) \ - , "r" ((long) a) -#define CLOB_ARGS_1 \ - , "r4" +#include -#define ASM_ARGS_2 \ - ASM_ARGS_1 \ - "mov r5, %4\n\t" -#define MAP_ARGS_2(a, b) \ - MAP_ARGS_1(a) \ - , "r" ((long) b) -#define CLOB_ARGS_2 \ - CLOB_ARGS_1 \ - , "r5" +#undef INTERNAL_SYSCALL_DECL +#define INTERNAL_SYSCALL_DECL(err) unsigned int err __attribute__((unused)) -#define ASM_ARGS_3 \ - ASM_ARGS_2 \ - "mov r6, %5\n\t" -#define MAP_ARGS_3(a, b, c) \ - MAP_ARGS_2(a, b) \ - , "r" ((long) c) -#define CLOB_ARGS_3 \ - CLOB_ARGS_2 \ - , "r6" +#undef INTERNAL_SYSCALL_ERROR_P +#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (unsigned int) (err)) -#define ASM_ARGS_4 \ - ASM_ARGS_3 \ - "mov r7, %6\n\t" -#define MAP_ARGS_4(a, b, c, d) \ - MAP_ARGS_3(a, b, c) \ - , "r" ((long) d) -#define CLOB_ARGS_4 \ - CLOB_ARGS_3 \ - , "r7" +#undef INTERNAL_SYSCALL_ERRNO +#define INTERNAL_SYSCALL_ERRNO(val, err) ((void) (err), val) -#define ASM_ARGS_5 \ - ASM_ARGS_4 \ - "mov r8, %7\n\t" -#define MAP_ARGS_5(a, b, c, d, e) \ - MAP_ARGS_4(a, b, c, d) \ - , "r" ((long) e) -#define CLOB_ARGS_5 \ - CLOB_ARGS_4 \ - , "r8" +#undef INTERNAL_SYSCALL_NCS +#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ + ({ unsigned int _sys_result; \ + { \ + LOAD_ARGS_##nr (args) \ + LOAD_REGS_##nr \ + register int _r2 __asm__ ("r2") = (int)(name); \ + register int _sys_err __asm__ ("r7"); \ + __asm__ volatile ("trap" \ + : "+r" (_r2), "=r" (_sys_err) \ + : ASM_ARGS_##nr \ + : "memory"); \ + _sys_result = _r2; \ + err = _sys_err; \ + } \ + (int) _sys_result; }) -#define ASM_ARGS_6 \ - ASM_ARGS_5 \ - "mov r9, %8\n\t" -#define MAP_ARGS_6(a, b, c, d, e, f) \ - MAP_ARGS_5(a, b, c, d, e) \ - , "r" ((long) f) -#define CLOB_ARGS_6 \ - CLOB_ARGS_5 \ - , "r9" +#define LOAD_ARGS_0() +#define LOAD_REGS_0 +#define ASM_ARGS_0 +#define LOAD_ARGS_1(a1) \ + LOAD_ARGS_0 () \ + int __arg1 = (int) (a1); +#define LOAD_REGS_1 \ + register int _r4 __asm__ ("r4") = __arg1; \ + LOAD_REGS_0 +#define ASM_ARGS_1 "r" (_r4) +#define LOAD_ARGS_2(a1, a2) \ + LOAD_ARGS_1 (a1) \ + int __arg2 = (int) (a2); +#define LOAD_REGS_2 \ + register int _r5 __asm__ ("r5") = __arg2; \ + LOAD_REGS_1 +#define ASM_ARGS_2 ASM_ARGS_1, "r" (_r5) +#define LOAD_ARGS_3(a1, a2, a3) \ + LOAD_ARGS_2 (a1, a2) \ + int __arg3 = (int) (a3); +#define LOAD_REGS_3 \ + register int _r6 __asm__ ("r6") = __arg3; \ + LOAD_REGS_2 +#define ASM_ARGS_3 ASM_ARGS_2, "r" (_r6) +#define LOAD_ARGS_4(a1, a2, a3, a4) \ + LOAD_ARGS_3 (a1, a2, a3) \ + int __arg4 = (int) (a4); +#define LOAD_REGS_4 \ + register int _r7 __asm__ ("r7") = __arg4; \ + LOAD_REGS_3 +#define ASM_ARGS_4 ASM_ARGS_3, "r" (_r7) +#define LOAD_ARGS_5(a1, a2, a3, a4, a5) \ + LOAD_ARGS_4 (a1, a2, a3, a4) \ + int __arg5 = (int) (a5); +#define LOAD_REGS_5 \ + register int _r8 __asm__ ("r8") = __arg5; \ + LOAD_REGS_4 +#define ASM_ARGS_5 ASM_ARGS_4, "r" (_r8) +#define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6) \ + LOAD_ARGS_5 (a1, a2, a3, a4, a5) \ + int __arg6 = (int) (a6); +#define LOAD_REGS_6 \ + register int _r9 __asm__ ("r9") = __arg6; \ + LOAD_REGS_5 +#define ASM_ARGS_6 ASM_ARGS_5, "r" (_r9) #endif /* __ASSEMBLER__ */ #endif /* _BITS_SYSCALLS_H */ -- cgit v1.2.3