1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use __asm instead of asm

Browse Source 
With `--std=c99` option coroutine/arm64/Context.h errs:

```
In file included from cont.c:26:
coroutine/arm64/Context.h:59:5: error: call to undeclared function 'asm'; ISO C99 and later do not support
      implicit function declarations [-Wimplicit-function-declaration]
   59 |     asm ("hint #8;" : "+r"(r17) : "r"(r16));
      |     ^
```

Also move the common function header.
This commit is contained in:
Nobuyoshi Nakada 2024-02-06 12:19:56 +09:00
parent 6219066702
commit 4f6b827e98
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
coroutine/arm64/Context.h
View File

@ -50,22 +50,19 @@ static inline void coroutine_initialize_main(struct coroutine_context * context)
context->stack_pointer = NULL; context->stack_pointer = NULL;
} }
#if defined(__ARM_FEATURE_PAC_DEFAULT) && __ARM_FEATURE_PAC_DEFAULT != 0
// Sign the given instruction address with the given modifier and key A
static inline void *ptrauth_sign_instruction_addr(void *addr, void *modifier) { static inline void *ptrauth_sign_instruction_addr(void *addr, void *modifier) {
#if defined(__ARM_FEATURE_PAC_DEFAULT) && __ARM_FEATURE_PAC_DEFAULT != 0
// Sign the given instruction address with the given modifier and key A
register void *r17 __asm("r17") = addr; register void *r17 __asm("r17") = addr;
register void *r16 __asm("r16") = modifier; register void *r16 __asm("r16") = modifier;
// Use HINT mnemonic instead of PACIA1716 for compatibility with older assemblers. // Use HINT mnemonic instead of PACIA1716 for compatibility with older assemblers.
asm ("hint #8;" : "+r"(r17) : "r"(r16)); __asm ("hint #8;" : "+r"(r17) : "r"(r16));
addr = r17; addr = r17;
return addr;
}
#else #else
// No-op if PAC is not enabled // No-op if PAC is not enabled
static inline void *ptrauth_sign_instruction_addr(void *addr, void *modifier) { #endif
return addr; return addr;
} }
#endif
static inline void coroutine_initialize( static inline void coroutine_initialize(
struct coroutine_context *context, struct coroutine_context *context,