fix: Mac sim-02 compiler issue

TaiJuWu · TaiJuWu · commit 24257516c037 · 2023-10-15T02:54:34.000+08:00
Signed-off-by: TaiJu Wu &lt;tjwu1217@gmail.com&gt;
diff --git a/include/nuttx/spinlock.h b/include/nuttx/spinlock.h
@@ -33,7 +33,8 @@
 #include <nuttx/irq.h>
 
 #ifdef CONFIG_RW_SPINLOCK
-typedef int32_t rwlock_t;
+#include <stdatomic.h>
+typedef atomic_int rwlock_t;
 #define RW_SP_UNLOCKED      0
 #define RW_SP_READ_LOCKED   1
 #define RW_SP_WRITE_LOCKED -1
diff --git a/sched/semaphore/spinlock.c b/sched/semaphore/spinlock.c
@@ -474,7 +474,7 @@ void spin_clrbit(FAR volatile cpu_set_t *set, unsigned int cpu,
 
 void read_lock(FAR volatile rwlock_t *lock)
 {
-  rwlock_t old;
+  int32_t old;
 
   while (true)
     {
@@ -521,7 +521,7 @@ void read_lock(FAR volatile rwlock_t *lock)
 
 bool read_trylock(FAR volatile rwlock_t *lock)
 {
-  rwlock_t old = atomic_load(lock);
+  int32_t old = atomic_load(lock);
 
   if (old >= RW_SP_UNLOCKED &&
       atomic_compare_exchange_strong(lock, &old, old + 1))
@@ -587,7 +587,7 @@ void read_unlock(FAR volatile rwlock_t *lock)
 
 void write_lock(FAR volatile rwlock_t *lock)
 {
-  rwlock_t zero = RW_SP_UNLOCKED;
+  int32_t zero = RW_SP_UNLOCKED;
 
   while (!atomic_compare_exchange_strong(lock, &zero, RW_SP_WRITE_LOCKED))
     {
@@ -625,7 +625,7 @@ void write_lock(FAR volatile rwlock_t *lock)
 
 bool write_trylock(FAR volatile rwlock_t *lock)
 {
-  rwlock_t zero = RW_SP_UNLOCKED;
+  int32_t zero = RW_SP_UNLOCKED;
 
   if (!atomic_compare_exchange_strong(lock, &zero, RW_SP_WRITE_LOCKED))
     {

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ void spin_clrbit(FAR volatile cpu_set_t *set, unsigned int cpu,`
`474`	`474`
`475`	`475`	`void read_lock(FAR volatile rwlock_t *lock)`
`476`	`476`	`{`
`477`		`- rwlock_t old;`
	`477`	`+ int32_t old;`
`478`	`478`
`479`	`479`	`while (true)`
`480`	`480`	`{`
`@@ -521,7 +521,7 @@ void read_lock(FAR volatile rwlock_t *lock)`
`521`	`521`
`522`	`522`	`bool read_trylock(FAR volatile rwlock_t *lock)`
`523`	`523`	`{`
`524`		`- rwlock_t old = atomic_load(lock);`
	`524`	`+ int32_t old = atomic_load(lock);`
`525`	`525`
`526`	`526`	`if (old >= RW_SP_UNLOCKED &&`
`527`	`527`	`atomic_compare_exchange_strong(lock, &old, old + 1))`
`@@ -587,7 +587,7 @@ void read_unlock(FAR volatile rwlock_t *lock)`
`587`	`587`
`588`	`588`	`void write_lock(FAR volatile rwlock_t *lock)`
`589`	`589`	`{`
`590`		`- rwlock_t zero = RW_SP_UNLOCKED;`
	`590`	`+ int32_t zero = RW_SP_UNLOCKED;`
`591`	`591`
`592`	`592`	`while (!atomic_compare_exchange_strong(lock, &zero, RW_SP_WRITE_LOCKED))`
`593`	`593`	`{`
`@@ -625,7 +625,7 @@ void write_lock(FAR volatile rwlock_t *lock)`
`625`	`625`
`626`	`626`	`bool write_trylock(FAR volatile rwlock_t *lock)`
`627`	`627`	`{`
`628`		`- rwlock_t zero = RW_SP_UNLOCKED;`
	`628`	`+ int32_t zero = RW_SP_UNLOCKED;`
`629`	`629`
`630`	`630`	`if (!atomic_compare_exchange_strong(lock, &zero, RW_SP_WRITE_LOCKED))`
`631`	`631`	`{`