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

Timestamp:

2023-10-22T17:55:33Z (14 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:

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

uspace/lib/c/arch/arm32/src/atomic.c

@@ -38 +38 @@
 volatile unsigned *ras_page;
 
-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 *mem0, void *expected0,
+    unsigned desired, bool weak, int success, int failure)
 {
+        volatile unsigned *mem = mem0;
+        unsigned *expected = expected0;
+
         (void) success;
         (void) failure;
         (void) weak;
 
-        unsigned ov = *((unsigned *)expected);
+        unsigned ov = *expected;
         unsigned ret;
 
@@ -66 +70 @@
               [rp0] "=m" (ras_page[0]),
               [rp1] "=m" (ras_page[1]),
-              [addr] "+m" (*((unsigned *)mem))
+              [addr] "+m" (*mem)
             : [ov] "r" (ov),
               [nv] "r" (desired)
@@ -78 +82 @@
                 return true;
 
-        *((unsigned *)expected) = ret;
+        *expected = ret;
         return false;
 }
 
-unsigned short __atomic_fetch_add_2(volatile void *mem, unsigned short val, int model)
+unsigned short __atomic_fetch_add_2(volatile void *mem0, unsigned short val,
+    int model)
 {
+        volatile unsigned short *mem = mem0;
+
         (void) model;
 
@@ -106 +113 @@
               [rp0] "=m" (ras_page[0]),
               [rp1] "=m" (ras_page[1]),
-              [addr] "+m" (*((volatile unsigned short *)mem))
+              [addr] "+m" (*mem)
             : [imm] "r" (val)
         );
@@ -116 +123 @@
 }
 
-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;
+
         (void) model;
 
@@ -140 +149 @@
               [rp0] "=m" (ras_page[0]),
               [rp1] "=m" (ras_page[1]),
-              [addr] "+m" (*((volatile unsigned *)mem))
+              [addr] "+m" (*mem)
             : [imm] "r" (val)
         );