luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-05 00:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

bitlock: don't use asm goto on older gcc

Browse Source 
asm goto was addded in gcc 4.5 so don't try to use it on gcc versions
older than this one. This is achieved by explicitly checking gcc
version, an alternative would be to try to compile a program using
asm volatile in configure.

https://bugzilla.gnome.org/show_bug.cgi?id=651959
This commit is contained in:
Christophe Fergeau 2011-06-08 11:18:26 +02:00 committed by Matthias Clasen
parent d6b341c38c
commit 602f8baa0b
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glib/gbitlock.c
View File

@ -181,6 +181,12 @@ g_futex_wake (const volatile gint *address)
#define CONTENTION_CLASSES 11 #define CONTENTION_CLASSES 11
static volatile gint g_bit_lock_contended[CONTENTION_CLASSES]; static volatile gint g_bit_lock_contended[CONTENTION_CLASSES];
#if (defined (i386) || defined (__amd64__))
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
#define USE_ASM_GOTO 1
#endif
#endif
/** /**
* g_bit_lock: * g_bit_lock:
* @address: a pointer to an integer * @address: a pointer to an integer
@ -206,7 +212,7 @@ void
g_bit_lock (volatile gint *address, g_bit_lock (volatile gint *address,
gint lock_bit) gint lock_bit)
{ {
#if defined (__GNUC__) && (defined (i386) || defined (__amd64__)) #ifdef USE_ASM_GOTO
retry: retry:
asm volatile goto ("lock bts %1, (%0)\n" asm volatile goto ("lock bts %1, (%0)\n"
"jc %l[contended]" "jc %l[contended]"
@ -277,7 +283,7 @@ gboolean
g_bit_trylock (volatile gint *address, g_bit_trylock (volatile gint *address,
gint lock_bit) gint lock_bit)
{ {
#if defined (__GNUC__) && (defined (i386) || defined (__amd64__)) #ifdef USE_ASM_GOTO
gboolean result; gboolean result;
asm volatile ("lock bts %2, (%1)\n" asm volatile ("lock bts %2, (%1)\n"
@ -317,7 +323,7 @@ void
g_bit_unlock (volatile gint *address, g_bit_unlock (volatile gint *address,
gint lock_bit) gint lock_bit)
{ {
#if defined (__GNUC__) && (defined (i386) || defined (__amd64__)) #ifdef USE_ASM_GOTO
asm volatile ("lock btr %1, (%0)" asm volatile ("lock btr %1, (%0)"
: /* no output */ : /* no output */
: "r" (address), "r" (lock_bit) : "r" (address), "r" (lock_bit)
@ -393,7 +399,7 @@ void
g_return_if_fail (lock_bit < 32); g_return_if_fail (lock_bit < 32);
{ {
#if defined (__GNUC__) && (defined (i386) || defined (__amd64__)) #ifdef USE_ASM_GOTO
retry: retry:
asm volatile goto ("lock bts %1, (%0)\n" asm volatile goto ("lock bts %1, (%0)\n"
"jc %l[contended]" "jc %l[contended]"
@ -463,7 +469,7 @@ gboolean
g_return_val_if_fail (lock_bit < 32, FALSE); g_return_val_if_fail (lock_bit < 32, FALSE);
{ {
#if defined (__GNUC__) && (defined (i386) || defined (__amd64__)) #ifdef USE_ASM_GOTO
gboolean result; gboolean result;
asm volatile ("lock bts %2, (%1)\n" asm volatile ("lock bts %2, (%1)\n"
@ -508,7 +514,7 @@ void
g_return_if_fail (lock_bit < 32); g_return_if_fail (lock_bit < 32);
{ {
#if defined (__GNUC__) && (defined (i386) || defined (__amd64__)) #ifdef USE_ASM_GOTO
asm volatile ("lock btr %1, (%0)" asm volatile ("lock btr %1, (%0)"
: /* no output */ : /* no output */
: "r" (address), "r" ((gsize) lock_bit) : "r" (address), "r" ((gsize) lock_bit)