From 5360538bd8689091c2c00d2f3afd12b536a0b0b0 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 7 Apr 2001 00:19:07 +0000 Subject: [PATCH] Update. * sysdeps/i386/i486/atomicity.h: Clean up the asms. --- ChangeLog | 2 ++ sysdeps/i386/i486/atomicity.h | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97efbbe4c3..0a36f67784 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2001-04-06 Ulrich Drepper + * sysdeps/i386/i486/atomicity.h: Clean up the asms. + * sysdeps/generic/e_scalb.c: Don't use FE_INVALID unless it's available. * sysdeps/generic/e_scalbf.c: Likewise. diff --git a/sysdeps/i386/i486/atomicity.h b/sysdeps/i386/i486/atomicity.h index b30363d707..da7e5f2036 100644 --- a/sysdeps/i386/i486/atomicity.h +++ b/sysdeps/i386/i486/atomicity.h @@ -1,5 +1,5 @@ /* Low-level functions for atomic operations. ix86 version, x >= 4. - Copyright (C) 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1997, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ exchange_and_add (volatile uint32_t *mem, uint32_t val) { register uint32_t result; __asm__ __volatile__ ("lock; xaddl %0,%2" - : "=r" (result) : "0" (val), "m" (*mem) : "memory"); + : "=r" (result), "=m" (*mem) : "0" (val), "1" (*mem)); return result; } @@ -37,8 +37,8 @@ static inline void __attribute__ ((unused)) atomic_add (volatile uint32_t *mem, int val) { - __asm__ __volatile__ ("lock; addl %0,%1" - : : "ir" (val), "m" (*mem) : "memory"); + __asm__ __volatile__ ("lock; addl %1,%0" + : "=m" (*mem) : "ir" (val), "0" (*mem)); } static inline char @@ -50,7 +50,7 @@ compare_and_swap (volatile long int *p, long int oldval, long int newval) __asm__ __volatile__ ("lock; cmpxchgl %3, %1; sete %0" : "=q" (ret), "=m" (*p), "=a" (readval) - : "r" (newval), "m" (*p), "a" (oldval)); + : "r" (newval), "1" (*p), "a" (oldval)); return ret; }