walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

atomic: __PHYSFS_ATOMIC_(DECR|INCR) should return final value. 

Fixes #46.
This commit is contained in:
Ryan C. Gordon 2022-09-29 10:53:18 -04:00
parent 496817a9e8
commit 4d9bcc3d1a
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/physfs.c
View File

@ -102,8 +102,8 @@ static inline int __PHYSFS_atomicAdd(int *ptrval, const int val)
{ {
int retval; int retval;
__PHYSFS_platformGrabMutex(stateLock); __PHYSFS_platformGrabMutex(stateLock);
*ptrval += val;
retval = *ptrval; retval = *ptrval;
*ptrval = retval + val;
__PHYSFS_platformReleaseMutex(stateLock); __PHYSFS_platformReleaseMutex(stateLock);
return retval; return retval;
} /* __PHYSFS_atomicAdd */ } /* __PHYSFS_atomicAdd */

9
src/physfs_internal.h
View File

@ -109,14 +109,15 @@ const void *__PHYSFS_winrtCalcPrefDir(void);
#endif #endif
/* atomic operations. */ /* atomic operations. */
/* increment/decrement operations return the final incremented/decremented value. */
#if defined(_MSC_VER) && (_MSC_VER >= 1500) #if defined(_MSC_VER) && (_MSC_VER >= 1500)
#include <intrin.h> #include <intrin.h>
__PHYSFS_COMPILE_TIME_ASSERT(LongEqualsInt, sizeof (int) == sizeof (long)); __PHYSFS_COMPILE_TIME_ASSERT(LongEqualsInt, sizeof (int) == sizeof (long));
#define __PHYSFS_ATOMIC_INCR(ptrval) _InterlockedIncrement((long*)(ptrval)) #define __PHYSFS_ATOMIC_INCR(ptrval) _InterlockedIncrement((long*)(ptrval))
#define __PHYSFS_ATOMIC_DECR(ptrval) _InterlockedDecrement((long*)(ptrval)) #define __PHYSFS_ATOMIC_DECR(ptrval) _InterlockedDecrement((long*)(ptrval))
#elif defined(__clang__) || (defined(__GNUC__) && (((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100)) >= 40100)) #elif defined(__clang__) || (defined(__GNUC__) && (((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100)) >= 40100))
#define __PHYSFS_ATOMIC_INCR(ptrval) __sync_fetch_and_add(ptrval, 1) #define __PHYSFS_ATOMIC_INCR(ptrval) __sync_add_and_fetch(ptrval, 1)
#define __PHYSFS_ATOMIC_DECR(ptrval) __sync_fetch_and_add(ptrval, -1) #define __PHYSFS_ATOMIC_DECR(ptrval) __sync_add_and_fetch(ptrval, -1)
#elif defined(__WATCOMC__) && defined(__386__) #elif defined(__WATCOMC__) && defined(__386__)
extern __inline int _xadd_watcom(volatile int *a, int v); extern __inline int _xadd_watcom(volatile int *a, int v);
#pragma aux _xadd_watcom = \ #pragma aux _xadd_watcom = \
@ -124,8 +125,8 @@ extern __inline int _xadd_watcom(volatile int *a, int v);
parm [ecx] [eax] \ parm [ecx] [eax] \
value [eax] \ value [eax] \
modify exact [eax]; modify exact [eax];
#define __PHYSFS_ATOMIC_INCR(ptrval) _xadd_watcom(ptrval, 1) #define __PHYSFS_ATOMIC_INCR(ptrval) (_xadd_watcom(ptrval, 1)+1)
#define __PHYSFS_ATOMIC_DECR(ptrval) _xadd_watcom(ptrval, -1) #define __PHYSFS_ATOMIC_DECR(ptrval) (_xadd_watcom(ptrval, -1)-1)
#else #else
#define PHYSFS_NEED_ATOMIC_OP_FALLBACK 1 #define PHYSFS_NEED_ATOMIC_OP_FALLBACK 1
int __PHYSFS_ATOMIC_INCR(int *ptrval); int __PHYSFS_ATOMIC_INCR(int *ptrval);