Changeset 320762a in mainline for kernel/arch/arm32/src/atomic.c

Timestamp:

2023-08-02T14:54:45Z (16 months ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

ticket/834-toolchain-update

Children:

29941ab

Parents:

e1d93e3

Message:

arm32 atomic builtins: align with compiler declarations

File:

• kernel/arch/arm32/src/atomic.c (modified) (6 diffs)

kernel/arch/arm32/src/atomic.c

@@ -38 +38 @@
 #include <arch/asm.h>
 
-unsigned __atomic_fetch_add_4(volatile unsigned *mem, unsigned val, int model)
+unsigned __atomic_fetch_add_4(volatile void *mem, unsigned val, int model)
 {
         /*
@@ -45 +45 @@
          */
         ipl_t ipl = interrupts_disable();
-        unsigned ret = *mem;
-        *mem += val;
+        unsigned ret = *((volatile unsigned *)mem);
+        *((volatile unsigned *)mem) += val;
         interrupts_restore(ipl);
         return ret;
 }
 
-unsigned __atomic_fetch_sub_4(volatile unsigned *mem, unsigned val, int model)
+unsigned __atomic_fetch_sub_4(volatile void *mem, unsigned val, int model)
 {
         ipl_t ipl = interrupts_disable();
-        unsigned ret = *mem;
-        *mem -= val;
+        unsigned ret = *((volatile unsigned *)mem);
+        *((volatile unsigned *)mem) -= val;
         interrupts_restore(ipl);
         return ret;
@@ -67 +67 @@
  * returns the previous value of \a *ptr.
  */
-void *__sync_val_compare_and_swap_4(void **ptr, void *expected, void *new_val)
+unsigned __sync_val_compare_and_swap_4(volatile void *ptr, unsigned expected, unsigned new_val)
 {
         /*
@@ -78 +78 @@
         irq_spinlock_lock(&cas_lock, true);
 
-        void *cur_val = *ptr;
+        unsigned cur_val = *((volatile unsigned *)ptr);
 
         if (cur_val == expected) {
-                *ptr = new_val;
+                *((volatile unsigned *)ptr) = new_val;
         }
 
@@ -96 +96 @@
 /* Naive implementations of the newer intrinsics. */
 
-_Bool __atomic_compare_exchange_4(void **mem, void **expected, void *desired, _Bool weak, int success, int failure)
+_Bool __atomic_compare_exchange_4(volatile void *mem, void *expected, unsigned desired, _Bool weak, int success, int failure)
 {
         (void) weak;
@@ -102 +102 @@
         (void) failure;
 
-        void *old = *expected;
-        void *new = __sync_val_compare_and_swap_4(mem, old, desired);
+        unsigned old = *((unsigned *)expected);
+        unsigned new = __sync_val_compare_and_swap_4(mem, old, desired);
         if (old == new) {
                 return 1;
         } else {
-                *expected = new;
+                *((unsigned *)expected) = new;
                 return 0;
         }
 }
 
-void *__atomic_exchange_4(void **mem, void *val, int model)
+unsigned __atomic_exchange_4(volatile void *mem, unsigned val, int model)
 {
         (void) model;
 
         irq_spinlock_lock(&cas_lock, true);
-        void *old = *mem;
-        *mem = val;
+        unsigned old = *((unsigned *)mem);
+        *((unsigned *)mem) = val;
         irq_spinlock_unlock(&cas_lock, true);