diff options
Diffstat (limited to 'regress/sys')
| -rw-r--r-- | regress/sys/arch/hppa/probe/probe.c | 10 | ||||
| -rw-r--r-- | regress/sys/arch/hppa/sfuid/sfuid.c | 4 | ||||
| -rw-r--r-- | regress/sys/arch/i386/ldt/testldt.c | 22 | ||||
| -rw-r--r-- | regress/sys/arch/m88k/usertrap/trap.c | 4 | ||||
| -rw-r--r-- | regress/sys/arch/sparc64/emul-popc/simm/simm13.c | 8 | ||||
| -rw-r--r-- | regress/sys/kern/noexec/noexec.c | 6 |
6 files changed, 27 insertions, 27 deletions
diff --git a/regress/sys/arch/hppa/probe/probe.c b/regress/sys/arch/hppa/probe/probe.c index 32c671498f3..057a0b63b8e 100644 --- a/regress/sys/arch/hppa/probe/probe.c +++ b/regress/sys/arch/hppa/probe/probe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: probe.c,v 1.1 2004/05/12 22:54:13 mickey Exp $ */ +/* $OpenBSD: probe.c,v 1.2 2014/04/18 14:38:21 guenther Exp $ */ /* * Written by Michael Shalayeff, 2004. Public Domain. @@ -14,13 +14,13 @@ char moo[] = "moo"; /* writable */ const char blah[] = "blah"; /* not */ volatile char *label; -#define prober(r,a) __asm __volatile( \ +#define prober(r,a) __asm volatile( \ "prober (%2),%1,%0" : "=r" (r) : "r" (3), "r" (a)); -#define proberi(r,a) __asm __volatile( \ +#define proberi(r,a) __asm volatile( \ "proberi (%2),%1,%0" : "=r" (r) : "i" (3), "r" (a)); -#define probew(r,a) __asm __volatile( \ +#define probew(r,a) __asm volatile( \ "probew (%2),%1,%0" : "=r" (r) : "r" (3), "r" (a)); -#define probewi(r,a) __asm __volatile( \ +#define probewi(r,a) __asm volatile( \ "probewi (%2),%1,%0" : "=r" (r) : "i" (3), "r" (a)); void diff --git a/regress/sys/arch/hppa/sfuid/sfuid.c b/regress/sys/arch/hppa/sfuid/sfuid.c index 6c27e5b7a6a..53256210111 100644 --- a/regress/sys/arch/hppa/sfuid/sfuid.c +++ b/regress/sys/arch/hppa/sfuid/sfuid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfuid.c,v 1.1 2004/05/13 01:22:05 mickey Exp $ */ +/* $OpenBSD: sfuid.c,v 1.2 2014/04/18 14:38:21 guenther Exp $ */ /* * Written by Michael Shalayeff, 2004. Public Domain. @@ -10,7 +10,7 @@ #include <stdio.h> #include <err.h> -#define sfuid(i,r) __asm __volatile( \ +#define sfuid(i,r) __asm volatile( \ "spop1,%1,0 %0" : "=r" (r) : "i" (i)) volatile int sfu; diff --git a/regress/sys/arch/i386/ldt/testldt.c b/regress/sys/arch/i386/ldt/testldt.c index 7d5865eda2e..3258f8cec50 100644 --- a/regress/sys/arch/i386/ldt/testldt.c +++ b/regress/sys/arch/i386/ldt/testldt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: testldt.c,v 1.8 2003/09/02 23:52:17 david Exp $ */ +/* $OpenBSD: testldt.c,v 1.9 2014/04/18 14:38:21 guenther Exp $ */ /* $NetBSD: testldt.c,v 1.4 1995/04/20 22:42:38 cgd Exp $ */ #include <stdio.h> @@ -18,7 +18,7 @@ struct sigaction segv_act; static inline void set_fs(unsigned long val) { - __asm__ __volatile__("mov %0,%%fs"::"r" ((unsigned short) val)); + __asm__ volatile("mov %0,%%fs"::"r" ((unsigned short) val)); } static inline unsigned char @@ -51,8 +51,8 @@ static void gated_call(void) { printf("Called from call gate..."); - __asm__ __volatile__("popl %ebp"); - __asm__ __volatile__(".byte 0xcb"); + __asm__ volatile("popl %ebp"); + __asm__ volatile(".byte 0xcb"); } static struct segment_descriptor * @@ -260,13 +260,13 @@ main(int argc, char *argv[]) printf("setldt returned: %d\n", err); #endif - __asm__ __volatile__(".byte 0x9a"); /* This is a call to a call gate. */ - __asm__ __volatile__(".byte 0x00"); /* Value is ignored in a call gate but can be used. */ - __asm__ __volatile__(".byte 0x00"); /* by the called procedure. */ - __asm__ __volatile__(".byte 0x00"); - __asm__ __volatile__(".byte 0x00"); - __asm__ __volatile__(".byte 0x2f"); /* Selector 0x002f. This is index = 5 (the call gate), */ - __asm__ __volatile__(".byte 0x00"); /* and a requestor priveledge level of 3. */ + __asm__ volatile(".byte 0x9a"); /* This is a call to a call gate. */ + __asm__ volatile(".byte 0x00"); /* Value is ignored in a call gate but can be used. */ + __asm__ volatile(".byte 0x00"); /* by the called procedure. */ + __asm__ volatile(".byte 0x00"); + __asm__ volatile(".byte 0x00"); + __asm__ volatile(".byte 0x2f"); /* Selector 0x002f. This is index = 5 (the call gate), */ + __asm__ volatile(".byte 0x00"); /* and a requestor priveledge level of 3. */ printf("Gated call returned\n"); exit (0); diff --git a/regress/sys/arch/m88k/usertrap/trap.c b/regress/sys/arch/m88k/usertrap/trap.c index c5ff7b213c0..aa5eaf90bc1 100644 --- a/regress/sys/arch/m88k/usertrap/trap.c +++ b/regress/sys/arch/m88k/usertrap/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.2 2013/01/07 05:24:51 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.3 2014/04/18 14:38:21 guenther Exp $ */ /* * Simple test program to check what happens when userland tries to trap. @@ -9,7 +9,7 @@ #define TRAP(num) \ case num: \ - __asm__ __volatile__ ("tb0 0, %r0, " __STRING(num) ); \ + __asm__ volatile ("tb0 0, %r0, " __STRING(num) ); \ break; int diff --git a/regress/sys/arch/sparc64/emul-popc/simm/simm13.c b/regress/sys/arch/sparc64/emul-popc/simm/simm13.c index 86d45a98190..a477a432d05 100644 --- a/regress/sys/arch/sparc64/emul-popc/simm/simm13.c +++ b/regress/sys/arch/sparc64/emul-popc/simm/simm13.c @@ -1,4 +1,4 @@ -/* $OpenBSD: simm13.c,v 1.5 2003/08/19 19:24:07 jason Exp $ */ +/* $OpenBSD: simm13.c,v 1.6 2014/04/18 14:38:21 guenther Exp $ */ /* * Copyright (c) 2003 Jason L. Wright (jason@thought.net) @@ -53,10 +53,10 @@ gen_simm(u_int32_t *p, int imm) * popc imm, %o0 */ p[0] = I_JMPLri(I_G0, I_O7, 8); - __asm __volatile("iflush %0+0" : : "r" (p + 0)); + __asm volatile("iflush %0+0" : : "r" (p + 0)); p[1] = _I_OP3_R_RI(I_O0, IOP3_POPC, I_G0, imm); - __asm __volatile("iflush %0+0" : : "r" (p + 1)); - __asm __volatile("nop;nop;nop;nop;nop"); + __asm volatile("iflush %0+0" : : "r" (p + 1)); + __asm volatile("nop;nop;nop;nop;nop"); } int64_t diff --git a/regress/sys/kern/noexec/noexec.c b/regress/sys/kern/noexec/noexec.c index fe15bd81766..65be84475cf 100644 --- a/regress/sys/kern/noexec/noexec.c +++ b/regress/sys/kern/noexec/noexec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: noexec.c,v 1.14 2014/01/10 13:45:00 jsing Exp $ */ +/* $OpenBSD: noexec.c,v 1.15 2014/04/18 14:38:21 guenther Exp $ */ /* * Copyright (c) 2002,2003 Michael Shalayeff @@ -55,7 +55,7 @@ static void fdcache(void *p, size_t size) { #ifdef __hppa__ - __asm __volatile( /* XXX this hardcodes the TESTSZ */ + __asm volatile( /* XXX this hardcodes the TESTSZ */ "fdc,m %1(%0)\n\t" "fdc,m %1(%0)\n\t" "fdc,m %1(%0)\n\t" @@ -71,7 +71,7 @@ fdcache(void *p, size_t size) int i; for (i = 0; i < TESTSZ; i += 8) - __asm __volatile("flush %0" : : "r" (s + i) : "memory"); + __asm volatile("flush %0" : : "r" (s + i) : "memory"); #endif } |