mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

[master] fix isc_atomic_xadd() on MIPS

Browse Source 
4414.	[bug]		Corrected a bug in the MIPS implementation of
			isc_atomic_xadd(). [RT #41965]

Submitted by Lamont Jones (lamont@debian.org). Closes Debian issue #406409.
This commit is contained in:
Evan Hunt 2016-07-19 11:10:43 -07:00
parent 203b6934f4
commit ad2611f9af
2 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
4414. [bug] Corrected a bug in the MIPS implementation of
isc_atomic_xadd(). [RT #41965]
4413. [bug] GSSAPI negotiation could fail if GSS_S_CONTINUE_NEEDED 4413. [bug] GSSAPI negotiation could fail if GSS_S_CONTINUE_NEEDED
was returned. [RT #42733] was returned. [RT #42733]

66
lib/isc/mips/include/isc/atomic.h
View File

@ -23,18 +23,20 @@ static inline isc_int32_t
isc_atomic_xadd(isc_int32_t *p, int val) { isc_atomic_xadd(isc_int32_t *p, int val) {
isc_int32_t orig; isc_int32_t orig;
/* add is a cheat, since MIPS has no mov instruction */ __asm__ __volatile__ (
__asm__ volatile ( " .set push \n"
"1:" " .set mips2 \n"
"ll $3, %1\n" " .set noreorder \n"
"add %0, $0, $3\n" " .set noat \n"
"add $3, $3, %2\n" "1: ll $1, %1 \n"
"sc $3, %1\n" " addu %0, $1, %2 \n"
"beq $3, 0, 1b" " sc %0, %1 \n"
: "=&r"(orig) " beqz %0, 1b \n"
: "m"(*p), "r"(val) " move %0, $1 \n"
: "memory", "$3" " .set pop \n"
); : "=&r" (orig), "+R" (*p)
: "r" (val)
: "memory");
return (orig); return (orig);
} }
@ -44,16 +46,7 @@ isc_atomic_xadd(isc_int32_t *p, int val) {
*/ */
static inline void static inline void
isc_atomic_store(isc_int32_t *p, isc_int32_t val) { isc_atomic_store(isc_int32_t *p, isc_int32_t val) {
__asm__ volatile ( *p = val;
"1:"
"ll $3, %0\n"
"add $3, $0, %1\n"
"sc $3, %0\n"
"beq $3, 0, 1b"
:
: "m"(*p), "r"(val)
: "memory", "$3"
);
} }
/* /*
@ -64,20 +57,23 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) {
static inline isc_int32_t static inline isc_int32_t
isc_atomic_cmpxchg(isc_int32_t *p, int cmpval, int val) { isc_atomic_cmpxchg(isc_int32_t *p, int cmpval, int val) {
isc_int32_t orig; isc_int32_t orig;
isc_int32_t tmp;
__asm__ volatile( __asm__ __volatile__ (
"1:" " .set push \n"
"ll $3, %1\n" " .set mips2 \n"
"add %0, $0, $3\n" " .set noreorder \n"
"bne $3, %2, 2f\n" " .set noat \n"
"add $3, $0, %3\n" "1: ll $1, %1 \n"
"sc $3, %1\n" " bne $1, %3, 2f \n"
"beq $3, 0, 1b\n" " move %2, %4 \n"
"2:" " sc %2, %1 \n"
: "=&r"(orig) " beqz %2, 1b \n"
: "m"(*p), "r"(cmpval), "r"(val) "2: move %0, $1 \n"
: "memory", "$3" " .set pop \n"
); : "=&r"(orig), "+R" (*p), "=r" (tmp)
: "r"(cmpval), "r"(val)
: "memory");
return (orig); return (orig);
} }