diff options
| author |   miod <miod@openbsd.org> | 2007-04-05 17:35:11 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2007-04-05 17:35:11 +0000 |
| commit | 32f529ed5c1c46dc39089c68b948e09900f20e23 (patch) | |
| tree | dff43d788f085650386f1772d44d3c0d88378478 | |
| parent | Wrap bit operations between splhigh()/splx() for atomicity wrt interrupts. (diff) | |
| download | wireguard-openbsd-32f529ed5c1c46dc39089c68b948e09900f20e23.tar.xz wireguard-openbsd-32f529ed5c1c46dc39089c68b948e09900f20e23.zip | |
Disable interrupts around bit operations for propert atomicity against them.
| -rw-r--r-- | sys/arch/sh/include/atomic.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/arch/sh/include/atomic.h b/sys/arch/sh/include/atomic.h index 736b0e5b87a..9ba0a329bdf 100644 --- a/sys/arch/sh/include/atomic.h +++ b/sys/arch/sh/include/atomic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $ */ +/* $OpenBSD: atomic.h,v 1.3 2007/04/05 17:35:11 miod Exp $ */ /* Public Domain */ @@ -7,16 +7,28 @@ #if defined(_KERNEL) +#include <sh/psl.h> + static __inline void atomic_setbits_int(__volatile unsigned int *uip, unsigned int v) { + unsigned int sr; + + __asm__ __volatile__ ("stc sr, %0" : "=r"(sr)); + __asm__ __volatile__ ("ldc %0, sr" : : "r"(sr | PSL_IMASK)); *uip |= v; + __asm__ __volatile__ ("ldc %0, sr" : : "r"(sr)); } static __inline void atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v) { + unsigned int sr; + + __asm__ __volatile__ ("stc sr, %0" : "=r"(sr)); + __asm__ __volatile__ ("ldc %0, sr" : : "r"(sr | PSL_IMASK)); *uip &= ~v; + __asm__ __volatile__ ("ldc %0, sr" : : "r"(sr)); } #endif /* defined(_KERNEL) */ |