wutnewlib: Use OSCompareAndSwapAtomicEx for sbrk

devkitPro · Aug 5, 2022 · 42292fa · 42292fa
1 parent e81c3a1
commit 42292fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libraries/wutnewlib/wut_lock.c b/libraries/wutnewlib/wut_lock.c
@@ -6,7 +6,7 @@
 #define MAX_LOCKS 16
 
 static OSMutex sLibcLocks[MAX_LOCKS];
-static uint32_t sLibcLockUsedMask = 0;
+static volatile uint32_t sLibcLockUsedMask = 0;
 
 static inline bool
 __wut_is_lock_valid(int *lock)

diff --git a/libraries/wutnewlib/wut_sbrk.c b/libraries/wutnewlib/wut_sbrk.c
@@ -14,17 +14,17 @@ void *
 __wut_sbrk_r(struct _reent *r,
              ptrdiff_t incr)
 {
-   uint32_t oldSize, newSize;
+   uint32_t newSize;
+   uint32_t oldSize = sHeapSize;
 
    do {
-      oldSize = sHeapSize;
       newSize = oldSize + incr;
 
       if (newSize > sHeapMaxSize) {
          r->_errno = ENOMEM;
          return (void *)-1;
       }
-   } while (!OSCompareAndSwapAtomic(&sHeapSize, oldSize, newSize));
+   } while (!OSCompareAndSwapAtomicEx(&sHeapSize, oldSize, newSize, &oldSize));
 
    return ((uint8_t *)sHeapBase) + oldSize;
 }