Changeset 1c6c3e1d in mainline for kernel/arch/arm32/src/atomic.c

Timestamp:

2023-10-22T17:55:33Z (15 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

File:

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

kernel/arch/arm32/src/atomic.c

@@ -38 +38 @@
 #include <arch/asm.h>
 
-unsigned __atomic_fetch_add_4(volatile void *mem, unsigned val, int model)
+unsigned __atomic_fetch_add_4(volatile void *mem0, unsigned val, int model)
 {
+        volatile unsigned *mem = mem0;
+
         /*
          * This implementation is for UP pre-ARMv6 systems where we do not have
@@ -45 +47 @@
          */
         ipl_t ipl = interrupts_disable();
-        unsigned ret = *((volatile unsigned *)mem);
-        *((volatile unsigned *)mem) += val;
+        unsigned ret = *mem;
+        *mem += val;
         interrupts_restore(ipl);
         return ret;
 }
 
-unsigned __atomic_fetch_sub_4(volatile void *mem, unsigned val, int model)
+unsigned __atomic_fetch_sub_4(volatile void *mem0, unsigned val, int model)
 {
+        volatile unsigned *mem = mem0;
+
         ipl_t ipl = interrupts_disable();
-        unsigned ret = *((volatile unsigned *)mem);
-        *((volatile unsigned *)mem) -= val;
+        unsigned ret = *mem;
+        *mem -= val;
         interrupts_restore(ipl);
         return ret;
@@ -67 +71 @@
  * returns the previous value of \a *ptr.
  */
-unsigned __sync_val_compare_and_swap_4(volatile void *ptr, unsigned expected, unsigned new_val)
+unsigned __sync_val_compare_and_swap_4(volatile void *ptr0, unsigned expected,
+    unsigned new_val)
 {
+        volatile unsigned *ptr = ptr0;
+
         /*
          * Using an interrupt disabling spinlock might still lead to deadlock
@@ -78 +85 @@
         irq_spinlock_lock(&cas_lock, true);
 
-        unsigned cur_val = *((volatile unsigned *)ptr);
+        unsigned cur_val = *ptr;
 
         if (cur_val == expected) {
-                *((volatile unsigned *)ptr) = new_val;
+                *ptr = new_val;
         }
 
@@ -96 +103 @@
 /* Naive implementations of the newer intrinsics. */
 
-_Bool __atomic_compare_exchange_4(volatile void *mem, void *expected, unsigned desired, _Bool weak, int success, int failure)
+_Bool __atomic_compare_exchange_4(volatile void *mem, void *expected0,
+    unsigned desired, _Bool weak, int success, int failure)
 {
+        unsigned *expected = expected0;
+
         (void) weak;
         (void) success;
         (void) failure;
 
-        unsigned old = *((unsigned *)expected);
+        unsigned old = *expected;
         unsigned new = __sync_val_compare_and_swap_4(mem, old, desired);
         if (old == new) {
                 return 1;
         } else {
-                *((unsigned *)expected) = new;
+                *expected = new;
                 return 0;
         }
 }
 
-unsigned __atomic_exchange_4(volatile void *mem, unsigned val, int model)
+unsigned __atomic_exchange_4(volatile void *mem0, unsigned val, int model)
 {
+        volatile unsigned *mem = mem0;
+
         (void) model;
 
         irq_spinlock_lock(&cas_lock, true);
-        unsigned old = *((unsigned *)mem);
-        *((unsigned *)mem) = val;
+        unsigned old = *mem;
+        *mem = val;
         irq_spinlock_unlock(&cas_lock, true);