From f56d1ec1be992fd37957ba2b7e8226fac7be0d23 Mon Sep 17 00:00:00 2001 From: Bamboo Date: Wed, 5 Oct 2016 00:39:04 +0000 Subject: [PATCH] [STYLE_FIX] --- .../aarch32/sel4/sel4_arch/syscalls.h | 38 +++--- .../ia32/sel4/sel4_arch/syscalls.h | 122 +++++++++--------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/syscalls.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/syscalls.h index 298357c6c..82e3e81b9 100644 --- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/syscalls.h +++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/syscalls.h @@ -64,7 +64,7 @@ arm_sys_send(seL4_Word sys, seL4_Word dest, seL4_Word info_arg, seL4_Word mr0, s asm volatile ( "swi $0" : "+r" (destptr), "+r" (msg0), "+r" (msg1), "+r" (msg2), - "+r" (msg3), "+r" (info) + "+r" (msg3), "+r" (info) : "r"(scno) ); } @@ -84,7 +84,7 @@ static inline void arm_sys_reply(seL4_Word sys, seL4_Word info_arg, seL4_Word mr asm volatile ( "swi $0" : "+r" (msg0), "+r" (msg1), "+r" (msg2), "+r" (msg3), - "+r" (info) + "+r" (info) : "r"(scno) ); } @@ -121,7 +121,7 @@ arm_sys_recv(seL4_Word sys, seL4_Word src, seL4_Word *out_badge, seL4_Word *out_ asm volatile ( "swi $0" : "=r" (msg0), "=r" (msg1), "=r" (msg2), "=r" (msg3), - "=r" (info), "+r" (src_and_badge) + "=r" (info), "+r" (src_and_badge) : "r"(scno) : "memory" ); @@ -150,7 +150,7 @@ arm_sys_send_recv(seL4_Word sys, seL4_Word dest, seL4_Word *out_badge, seL4_Word asm volatile ( "swi $0" : "+r" (msg0), "+r" (msg1), "+r" (msg2), "+r" (msg3), - "+r" (info), "+r" (destptr) + "+r" (info), "+r" (destptr) : "r"(scno) : "memory" ); @@ -184,11 +184,11 @@ seL4_SendWithMRs(seL4_CPtr dest, seL4_MessageInfo_t msgInfo, seL4_Word *mr0, seL4_Word *mr1, seL4_Word *mr2, seL4_Word *mr3) { arm_sys_send(seL4_SysSend, dest, msgInfo.words[0], - mr0 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr0 : 0, - mr1 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr1 : 0, - mr2 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr2 : 0, - mr3 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr3 : 0 - ); + mr0 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr0 : 0, + mr1 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr1 : 0, + mr2 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr2 : 0, + mr3 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr3 : 0 + ); } static inline void @@ -202,11 +202,11 @@ seL4_NBSendWithMRs(seL4_CPtr dest, seL4_MessageInfo_t msgInfo, seL4_Word *mr0, seL4_Word *mr1, seL4_Word *mr2, seL4_Word *mr3) { arm_sys_send(seL4_SysNBSend, dest, msgInfo.words[0], - mr0 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr0 : 0, - mr1 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr1 : 0, - mr2 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr2 : 0, - mr3 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr3 : 0 - ); + mr0 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr0 : 0, + mr1 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr1 : 0, + mr2 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr2 : 0, + mr3 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr3 : 0 + ); } static inline void @@ -220,11 +220,11 @@ seL4_ReplyWithMRs(seL4_MessageInfo_t msgInfo, seL4_Word *mr0, seL4_Word *mr1, seL4_Word *mr2, seL4_Word *mr3) { arm_sys_reply(seL4_SysReply, msgInfo.words[0], - mr0 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr0 : 0, - mr1 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr1 : 0, - mr2 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr2 : 0, - mr3 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr3 : 0 - ); + mr0 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr0 : 0, + mr1 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr1 : 0, + mr2 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr2 : 0, + mr3 != seL4_Null && seL4_MessageInfo_get_length(msgInfo) > 0 ? *mr3 : 0 + ); } static inline void diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h index 87b1e8d92..99e2456b4 100644 --- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h +++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/syscalls.h @@ -43,9 +43,9 @@ x86_sys_send(seL4_Word sys, seL4_Word dest, seL4_Word info, seL4_Word mr1, seL4_ "popl %%ebp \n" : "+d" (dest) : "a" (sys), - "S" (info), - "D" (mr1), - "c" (mr2) + "S" (info), + "D" (mr1), + "c" (mr2) ); } @@ -64,9 +64,9 @@ x86_sys_reply(seL4_Word sys, seL4_Word info, seL4_Word mr1, seL4_Word mr2) "popl %%ebp \n" : : "a" (sys), - "S" (info), - "D" (mr1), - "c" (mr2) + "S" (info), + "D" (mr1), + "c" (mr2) : "%edx" ); } @@ -86,7 +86,7 @@ x86_sys_send_null(seL4_Word sys, seL4_Word src, seL4_Word info) "popl %%ebp \n" : "+d" (src) : "a" (sys), - "S" (info) + "S" (info) : "%ecx" ); } @@ -107,12 +107,12 @@ x86_sys_recv(seL4_Word sys, seL4_Word src, seL4_Word *out_badge, seL4_Word *out_ "movl %%ebp, %%ecx \n" "popl %%ebp \n" : - "=d" (*out_badge), - "=S" (*out_info), - "=D" (*out_mr1), - "=c" (*out_mr2) + "=d" (*out_badge), + "=S" (*out_info), + "=D" (*out_mr1), + "=c" (*out_mr2) : "a" (sys), - "d" (src) + "d" (src) : "memory" ); } @@ -134,15 +134,15 @@ x86_sys_send_recv(seL4_Word sys, seL4_Word dest, seL4_Word *out_badge, seL4_Word "movl %%ebp, %%ecx \n" "popl %%ebp \n" : - "=S" (*out_info), - "=D" (*in_out_mr1), - "=c" (*in_out_mr2), - "=d" (*out_badge) + "=S" (*out_info), + "=D" (*in_out_mr1), + "=c" (*in_out_mr2), + "=d" (*out_badge) : "a" (sys), - "S" (info), - "D" (*in_out_mr1), - "c" (*in_out_mr2), - "d" (dest) + "S" (info), + "D" (*in_out_mr1), + "c" (*in_out_mr2), + "d" (dest) : "memory" ); } @@ -180,10 +180,10 @@ x86_sys_send(seL4_Word sys, seL4_Word dest, seL4_Word info, seL4_Word mr1, seL4_ "popl %%ebp \n" : : "a" (sys), - "b" (dest), - "S" (info), - "D" (mr1), - "c" (mr2) + "b" (dest), + "S" (info), + "D" (mr1), + "c" (mr2) : "%edx" ); } @@ -201,9 +201,9 @@ x86_sys_reply(seL4_Word sys, seL4_Word info, seL4_Word mr1, seL4_Word mr2) "popl %%ebp \n" : : "a" (sys), - "S" (info), - "D" (mr1), - "c" (mr2) + "S" (info), + "D" (mr1), + "c" (mr2) : "%ebx", "%edx" ); } @@ -212,39 +212,39 @@ static inline void x86_sys_send_null(seL4_Word sys, seL4_Word dest, seL4_Word info) { asm volatile ( \ - "pushl %%ebp \n" - "movl %%esp, %%ecx \n" - "leal 1f, %%edx \n" - "1: \n" - "sysenter \n" - "popl %%ebp \n" - : - : "a" (sys), - "b" (dest), - "S" (info) - : "%ecx", "edx" - ); + "pushl %%ebp \n" + "movl %%esp, %%ecx \n" + "leal 1f, %%edx \n" + "1: \n" + "sysenter \n" + "popl %%ebp \n" + : + : "a" (sys), + "b" (dest), + "S" (info) + : "%ecx", "edx" + ); } static inline void x86_sys_recv(seL4_Word sys, seL4_Word src, seL4_Word *out_badge, seL4_Word *out_info, seL4_Word *out_mr1, seL4_Word *out_mr2) { asm volatile ( \ - "pushl %%ebp \n" - "movl %%esp, %%ecx \n" - "leal 1f, %%edx \n" - "1: \n" - "sysenter \n" - "movl %%ebp, %%ecx \n" - "popl %%ebp \n" - : "=b" (*out_badge), - "=S" (*out_info), - "=D" (*out_mr1), - "=c" (*out_mr2) - : "a" (sys), - "b" (src) - : "%edx", "memory" - ); + "pushl %%ebp \n" + "movl %%esp, %%ecx \n" + "leal 1f, %%edx \n" + "1: \n" + "sysenter \n" + "movl %%ebp, %%ecx \n" + "popl %%ebp \n" + : "=b" (*out_badge), + "=S" (*out_info), + "=D" (*out_mr1), + "=c" (*out_mr2) + : "a" (sys), + "b" (src) + : "%edx", "memory" + ); } static inline void @@ -260,14 +260,14 @@ x86_sys_send_recv(seL4_Word sys, seL4_Word dest, seL4_Word *out_badge, seL4_Word "movl %%ebp, %%ecx \n" "popl %%ebp \n" : "=S" (*out_info), - "=D" (*in_out_mr1), - "=c" (*in_out_mr2), - "=b" (*out_badge) + "=D" (*in_out_mr1), + "=c" (*in_out_mr2), + "=b" (*out_badge) : "a" (sys), - "S" (info), - "D" (*in_out_mr1), - "c" (*in_out_mr2), - "b" (dest) + "S" (info), + "D" (*in_out_mr1), + "c" (*in_out_mr2), + "b" (dest) : "%edx", "memory" ); }