nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

lock: Use stdatomic.h (#56)

Browse source 
Provides the same assembly output while using the standardized interface

e.g.

0000000000000000 <set_priv_smc_in_progress>:
   0:   90000000    adrp    x0, 0 <set_priv_smc_in_progress>
   4:   91000000    add x0, x0, #0x0
   8:   52800022    mov w2, #0x1                    // #1
   c:   d503201f    nop
  10:   085ffc01    ldaxrb  w1, [x0]
  14:   08037c02    stxrb   w3, w2, [x0]
  18:   35ffffc3    cbnz    w3, 10 <set_priv_smc_in_progress+0x10>
  1c:   72001c3f    tst w1, #0xff
  20:   54ffff81    b.ne    10 <set_priv_smc_in_progress+0x10>  // b.any
  24:   d65f03c0    ret
This commit is contained in:
Mat M 2018-02-26 01:59:48 -05:00 committed by SciresM
parent 461105a501
commit c94cfe4898
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
exosphere/src/lock.h
View file

@ -1,25 +1,26 @@
#ifndef EXOSPHERE_LOCK_H #ifndef EXOSPHERE_LOCK_H
#define EXOSPHERE_LOCK_H #define EXOSPHERE_LOCK_H
#include <stdatomic.h>
#include <stdbool.h> #include <stdbool.h>
/* Simple atomics driver for Exosphere. */ /* Simple atomics driver for Exosphere. */
/* Acquire a lock. */ /* Acquire a lock. */
static inline void lock_acquire(bool *l) { static inline void lock_acquire(atomic_flag *flag) {
while (__atomic_test_and_set(l, __ATOMIC_ACQUIRE)) { while (atomic_flag_test_and_set_explicit(flag, memory_order_acquire)) {
/* Wait to acquire lock. */ /* Wait to acquire lock. */
} }
} }
/* Release a lock. */ /* Release a lock. */
static inline void lock_release(bool *l) { static inline void lock_release(atomic_flag *flag) {
__atomic_clear(l, __ATOMIC_RELEASE); atomic_flag_clear_explicit(flag, memory_order_release);
} }
/* Try to acquire a lock. */ /* Try to acquire a lock. */
static inline bool lock_try_acquire(bool *l) { static inline bool lock_try_acquire(atomic_flag *flag) {
return __atomic_test_and_set(l, __ATOMIC_ACQUIRE); return atomic_flag_test_and_set_explicit(flag, memory_order_acquire);
} }
#endif #endif

5
exosphere/src/smc_api.c
View file

@ -1,3 +1,4 @@
#include <stdatomic.h>
#include <stdint.h> #include <stdint.h>
#include "utils.h" #include "utils.h"
@ -106,8 +107,8 @@ smc_table_t g_smc_tables[2] = {
} }
}; };
bool g_is_user_smc_in_progress = false; static atomic_flag g_is_user_smc_in_progress = ATOMIC_FLAG_INIT;
bool g_is_priv_smc_in_progress = false; static atomic_flag g_is_priv_smc_in_progress = ATOMIC_FLAG_INIT;
uintptr_t get_smc_core012_stack_address(void) { uintptr_t get_smc_core012_stack_address(void) {
return tzram_get_segment_address(TZRAM_SEGMENT_ID_CORE012_STACK) + 0x1000; return tzram_get_segment_address(TZRAM_SEGMENT_ID_CORE012_STACK) + 0x1000;