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

Timestamp:

2023-08-02T14:54:45Z (19 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:

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

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

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