From c386ddbd4c4f2e9dd9a0fbe72ad13334378bad98 Mon Sep 17 00:00:00 2001 From: Daniel Schepler Date: Tue, 31 May 2016 19:38:08 +0100 Subject: [PATCH] Add support for x32 (from the Yocto project) Origin: vendor Forwarded: no Bug-Debian: 702183 Last-Update: 2013-05-06 Gbp-Pq: Name 00_arches_x32.patch --- harness/main.c | 2 +- src/syscall-x86_64.h | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/harness/main.c b/harness/main.c index 99232ef..ce760cd 100644 --- a/harness/main.c +++ b/harness/main.c @@ -14,7 +14,7 @@ #if __LP64__ == 0 #if defined(__i386__) || defined(__powerpc__) || defined(__mips__) #define KERNEL_RW_POINTER ((void *)0xc0010000) -#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) || defined(__sh__) +#elif defined(__arm__) || defined(__m68k__) || defined(__s390__) || defined(__sh__) || defined(__x86_64__) #define KERNEL_RW_POINTER ((void *)0x00010000) #elif defined(__hppa__) #define KERNEL_RW_POINTER ((void *)0x10100000) diff --git a/src/syscall-x86_64.h b/src/syscall-x86_64.h index 9361856..5412764 100644 --- a/src/syscall-x86_64.h +++ b/src/syscall-x86_64.h @@ -1,8 +1,18 @@ +#ifndef __NR_io_setup #define __NR_io_setup 206 +#endif +#ifndef __NR_io_destroy #define __NR_io_destroy 207 +#endif +#ifndef __NR_io_getevents #define __NR_io_getevents 208 +#endif +#ifndef __NR_io_submit #define __NR_io_submit 209 +#endif +#ifndef __NR_io_cancel #define __NR_io_cancel 210 +#endif #define __syscall_clobber "r11","rcx","memory" #define __syscall "syscall" @@ -42,10 +52,11 @@ return __res; \ type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ { \ long __res; \ -__asm__ volatile ("movq %5,%%r10 ;" __syscall \ +register long __a4 asm ("r10") = (long) arg4; \ +__asm__ volatile (__syscall \ : "=a" (__res) \ : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ - "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \ + "d" ((long)(arg3)),"r" (__a4)); \ return __res; \ } @@ -54,10 +65,11 @@ return __res; \ type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ { \ long __res; \ -__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \ +register long __a4 asm ("r10") = (long) arg4; \ +register long __a5 asm ("r8") = (long) arg5; \ +__asm__ volatile (__syscall \ : "=a" (__res) \ : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ - "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \ - __syscall_clobber,"r8","r10" ); \ + "d" ((long)(arg3)),"r" (__a4),"r" (__a5)); \ return __res; \ } -- 2.30.2