mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 06:25:31 +00:00
provided __asm version of assembly code for atomic atomic operations
for better compatibility. (this is a temporary resolution so that this one won't block other tests. we'll revisit this change when we figure out performance implication of the __asm version.)
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: atomic.h,v 1.2 2005/06/04 05:32:48 jinmei Exp $ */
|
||||
/* $Id: atomic.h,v 1.3 2005/06/16 21:57:59 jinmei Exp $ */
|
||||
|
||||
/*
|
||||
* This code was written based on FreeBSD's kernel source whose copyright
|
||||
@@ -107,7 +107,7 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
|
||||
"2:",
|
||||
p, cmpval, val));
|
||||
}
|
||||
#else /* ISC_PLATFORM_USEOSFASM */
|
||||
#elif defined (ISC_PLATFORM_USEGCCASM)
|
||||
static inline isc_int32_t
|
||||
isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) {
|
||||
isc_int32_t temp, prev;
|
||||
@@ -161,6 +161,10 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
|
||||
|
||||
return (prev);
|
||||
}
|
||||
#endif /* ISC_PLATFORM_USEOSFASM */
|
||||
#else
|
||||
|
||||
#error "unsupported compiler. disable atomic ops by --disable-atomic"
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* ISC_ATOMIC_H */
|
||||
|
@@ -15,7 +15,7 @@
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: platform.h.in,v 1.38 2005/06/04 05:32:48 jinmei Exp $ */
|
||||
/* $Id: platform.h.in,v 1.39 2005/06/16 21:57:59 jinmei Exp $ */
|
||||
|
||||
#ifndef ISC_PLATFORM_H
|
||||
#define ISC_PLATFORM_H 1
|
||||
@@ -235,11 +235,21 @@
|
||||
*/
|
||||
@ISC_PLATFORM_HAVECMPXCHG@
|
||||
|
||||
/*
|
||||
* Define if gcc ASM extension is available
|
||||
*/
|
||||
@ISC_PLATFORM_USEGCCASM@
|
||||
|
||||
/*
|
||||
* Define if Tru64 style ASM syntax must be used.
|
||||
*/
|
||||
@ISC_PLATFORM_USEOSFASM@
|
||||
|
||||
/*
|
||||
* Define if the standard __asm function must be used.
|
||||
*/
|
||||
@ISC_PLATFORM_USESTDASM@
|
||||
|
||||
#ifndef ISC_PLATFORM_USEDECLSPEC
|
||||
#define LIBISC_EXTERNAL_DATA
|
||||
#define LIBDNS_EXTERNAL_DATA
|
||||
|
@@ -14,7 +14,7 @@
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: atomic.h,v 1.2 2005/06/04 05:32:49 jinmei Exp $ */
|
||||
/* $Id: atomic.h,v 1.3 2005/06/16 21:58:00 jinmei Exp $ */
|
||||
|
||||
/*
|
||||
* This code was written based on FreeBSD's kernel source whose copyright
|
||||
@@ -59,6 +59,8 @@
|
||||
|
||||
#define ASI_P 0x80 /* Primary Address Space Identifier */
|
||||
|
||||
#ifdef ISC_PLATFORM_USEGCCASM
|
||||
|
||||
/*
|
||||
* This routine atomically increments the value stored in 'p' by 'val', and
|
||||
* returns the previous value.
|
||||
@@ -116,4 +118,10 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
|
||||
return (temp);
|
||||
}
|
||||
|
||||
#else /* ISC_PLATFORM_USEGCCASM */
|
||||
|
||||
#error "unsupported compiler. disable atomic ops by --disable-atomic"
|
||||
|
||||
#endif /* ISC_PLATFORM_USEGCCASM */
|
||||
|
||||
#endif /* ISC_ATOMIC_H */
|
||||
|
@@ -14,7 +14,7 @@
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: atomic.h,v 1.2 2005/06/04 05:32:50 jinmei Exp $ */
|
||||
/* $Id: atomic.h,v 1.3 2005/06/16 21:58:00 jinmei Exp $ */
|
||||
|
||||
#ifndef ISC_ATOMIC_H
|
||||
#define ISC_ATOMIC_H 1
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <isc/platform.h>
|
||||
#include <isc/types.h>
|
||||
|
||||
#ifdef ISC_PLATFORM_USEGCCASM
|
||||
/*
|
||||
* This routine atomically increments the value stored in 'p' by 'val', and
|
||||
* returns the previous value.
|
||||
@@ -55,6 +56,7 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) {
|
||||
*/
|
||||
"lock;"
|
||||
#endif
|
||||
|
||||
"xchgl %1, %0"
|
||||
:
|
||||
: "r"(val), "m"(*p)
|
||||
@@ -80,4 +82,79 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
|
||||
return (cmpval);
|
||||
}
|
||||
|
||||
#elif defined(ISC_PLATFORM_USESTDASM)
|
||||
/*
|
||||
* The followings are "generic" assembly code which implements the same
|
||||
* functionality in case the gcc extension cannot be used. It should be
|
||||
* better to avoid inlining below, since we directly refer to specific
|
||||
* positions of the stack frame, which would not actually point to the
|
||||
* intended address in the embedded mnemonic.
|
||||
*
|
||||
* XXX: this code may also not work on a 64-bit (w/o gcc) machine.
|
||||
*/
|
||||
#include <isc/util.h> /* for 'UNUSED' macro */
|
||||
|
||||
static isc_int32_t
|
||||
isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) {
|
||||
UNUSED(p);
|
||||
UNUSED(val);
|
||||
|
||||
__asm (
|
||||
"movl 8(%ebp), %ecx\n"
|
||||
"movl 12(%ebp), %edx\n"
|
||||
#ifdef ISC_PLATFORM_USETHREADS
|
||||
"lock;"
|
||||
#endif
|
||||
"xadd %edx, (%ecx)\n"
|
||||
|
||||
/*
|
||||
* set the return value directly in the register so that we
|
||||
* can avoid guessing the correct position in the stack for a
|
||||
* local variable.
|
||||
*/
|
||||
"movl %edx, %eax"
|
||||
);
|
||||
}
|
||||
|
||||
static void
|
||||
isc_atomic_store(isc_int32_t *p, isc_int32_t val) {
|
||||
UNUSED(p);
|
||||
UNUSED(val);
|
||||
|
||||
__asm (
|
||||
"movl 8(%ebp), %ecx\n"
|
||||
"movl 12(%ebp), %edx\n"
|
||||
#ifdef ISC_PLATFORM_USETHREADS
|
||||
"lock;"
|
||||
#endif
|
||||
"xchgl (%ecx), %edx\n"
|
||||
);
|
||||
}
|
||||
|
||||
static isc_int32_t
|
||||
isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
|
||||
UNUSED(p);
|
||||
UNUSED(cmpval);
|
||||
UNUSED(val);
|
||||
|
||||
__asm (
|
||||
"movl 8(%ebp), %ecx\n"
|
||||
"movl 12(%ebp), %eax\n" /* must be %eax for cmpxchgl */
|
||||
"movl 16(%ebp), %edx\n"
|
||||
#ifdef ISC_PLATFORM_USETHREADS
|
||||
"lock;"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* If (%ecx) == %eax then (%ecx) := %edx.
|
||||
% %eax is set to old (%ecx), which will be the return value.
|
||||
*/
|
||||
"cmpxchgl %edx, (%ecx)"
|
||||
);
|
||||
}
|
||||
#else /* !ISC_PLATFORM_USEGCCASM && !ISC_PLATFORM_USESTDASM */
|
||||
|
||||
#error "unsupported compiler. disable atomic ops by --disable-atomic"
|
||||
|
||||
#endif
|
||||
#endif /* ISC_ATOMIC_H */
|
||||
|
Reference in New Issue
Block a user