espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 07:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change inline assembly bits from macros to inline functions

Browse Source
This commit is contained in:
Jeroen Domburg
2016-10-20 11:23:59 +08:00
parent d00ef1607e
commit 2d393f0530
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/freertos/include/freertos/portable.h
View File

@@ -192,7 +192,14 @@ void vPortEndScheduler( void ) PRIVILEGED_FUNCTION;
#endif #endif
/* Multi-core: get current core ID */ /* Multi-core: get current core ID */
#define xPortGetCoreID() __extension__({int id; asm volatile("rsr.prid %0; extui %0,%0,13,1":"=r"(id)); id;}) inline uint32_t xPortGetCoreID() {
int id;
asm volatile(
"rsr.prid %0\n"
" extui %0,%0,13,1"
:"=r"(id));
return id;
}
#ifdef __cplusplus #ifdef __cplusplus
} }

20
components/freertos/include/freertos/portmacro.h
View File

@@ -225,6 +225,26 @@ static inline unsigned portENTER_CRITICAL_NESTED() { unsigned state = XTOS_SET_I
#define portCLEAR_INTERRUPT_MASK_FROM_ISR(state) portEXIT_CRITICAL_NESTED(state) #define portCLEAR_INTERRUPT_MASK_FROM_ISR(state) portEXIT_CRITICAL_NESTED(state)
/*
* Wrapper for the Xtensa compare-and-set instruction. This subroutine will atomically compare
* *mux to compare, and if it's the same, will set *mux to set. It will return the old value
* of *addr in *set.
*
* Warning: From the ISA docs: in some (unspecified) cases, the s32c1i instruction may return the
* *bitwise inverse* of the old mem if the mem wasn't written. This doesn't seem to happen on the
* ESP32, though. (Would show up directly if it did because the magic wouldn't match.)
*/
inline void uxPortCompareSet(volatile uint32_t *addr, uint32_t compare, uint32_t *set) {
__asm__ __volatile__(
"WSR %2,SCOMPARE1 \n"
"ISYNC \n"
"S32C1I %0, %1, 0 \n"
:"=r"(*set)
:"r"(addr), "r"(compare), "0"(*set)
);
}
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Architecture specifics. */ /* Architecture specifics. */

19
components/freertos/port.c
View File

@@ -253,25 +253,6 @@ void vPortAssertIfInISR()
configASSERT(port_interruptNesting[xPortGetCoreID()]==0) configASSERT(port_interruptNesting[xPortGetCoreID()]==0)
} }
/*
* Wrapper for the Xtensa compare-and-set instruction. This subroutine will atomically compare
* *mux to compare, and if it's the same, will set *mux to set. It will return the old value
* of *addr.
*
* Warning: From the ISA docs: in some (unspecified) cases, the s32c1i instruction may return the
* *bitwise inverse* of the old mem if the mem wasn't written. This doesn't seem to happen on the
* ESP32, though. (Would show up directly if it did because the magic wouldn't match.)
*/
#define uxPortCompareSet(mux, compare, set) \
__asm__ __volatile__( \
"WSR %2,SCOMPARE1 \n" \
"ISYNC \n" \
"S32C1I %0, %1, 0 \n" \
:"=r"(*set) \
:"r"(mux), "r"(compare), "0"(*set) \
); \
/* /*
* For kernel use: Initialize a per-CPU mux. Mux will be initialized unlocked. * For kernel use: Initialize a per-CPU mux. Mux will be initialized unlocked.
*/ */