feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Make uxPortCompareSet into a macro. 25uS -> 24uS

Browse Source
This commit is contained in:
Jeroen Domburg
2016-10-17 18:30:13 +08:00
parent 0403d43b19
commit c03549e117
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/freertos/port.c
View File

@@ -263,17 +263,14 @@ void vPortAssertIfInISR()
* *bitwise inverse* of the old mem if the mem wasn't written. This doesn't seem to happen on 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.) * ESP32, though. (Would show up directly if it did because the magic wouldn't match.)
*/ */
uint32_t uxPortCompareSet(volatile uint32_t *mux, uint32_t compare, uint32_t set) #define uxPortCompareSet(mux, compare, set) \
{ __asm__ __volatile__( \
__asm__ __volatile__ ( "WSR %2,SCOMPARE1 \n" \
"WSR %2,SCOMPARE1 \n" //initialize SCOMPARE1 "ISYNC \n" \
"ISYNC \n" //wait sync "S32C1I %0, %1, 0 \n" \
"S32C1I %0, %1, 0 \n" //store id into the lock, if the lock is the same as comparel. Otherwise, no write-access :"=r"(*set) \
:"=r"(set) \ :"r"(mux), "r"(compare), "0"(*set) \
:"r"(mux), "r"(compare), "0"(set) \ ); \
);
return 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.
@@ -310,7 +307,8 @@ void vPortCPUAcquireMutex(portMUX_TYPE *mux) {
irqStatus=portENTER_CRITICAL_NESTED(); irqStatus=portENTER_CRITICAL_NESTED();
do { do {
//Lock mux if it's currently unlocked //Lock mux if it's currently unlocked
res=uxPortCompareSet(&mux->mux, portMUX_FREE_VAL, (xPortGetCoreID()<<portMUX_VAL_SHIFT)|portMUX_MAGIC_VAL); res=(xPortGetCoreID()<<portMUX_VAL_SHIFT)|portMUX_MAGIC_VAL;
uxPortCompareSet(&mux->mux, portMUX_FREE_VAL, &res);
//If it wasn't free and we're the owner of the lock, we are locking recursively. //If it wasn't free and we're the owner of the lock, we are locking recursively.
if ( (res != portMUX_FREE_VAL) && (((res&portMUX_VAL_MASK)>>portMUX_VAL_SHIFT) == xPortGetCoreID()) ) { if ( (res != portMUX_FREE_VAL) && (((res&portMUX_VAL_MASK)>>portMUX_VAL_SHIFT) == xPortGetCoreID()) ) {
//Mux was already locked by us. Just bump the recurse count by one. //Mux was already locked by us. Just bump the recurse count by one.
@@ -362,7 +360,8 @@ portBASE_TYPE vPortCPUReleaseMutex(portMUX_TYPE *mux) {
if ( (mux->mux & portMUX_MAGIC_MASK) != portMUX_MAGIC_VAL ) ets_printf("ERROR: vPortCPUReleaseMutex: mux %p is uninitialized (0x%X)!\n", mux, mux->mux); if ( (mux->mux & portMUX_MAGIC_MASK) != portMUX_MAGIC_VAL ) ets_printf("ERROR: vPortCPUReleaseMutex: mux %p is uninitialized (0x%X)!\n", mux, mux->mux);
#endif #endif
//Unlock mux if it's currently locked with a recurse count of 0 //Unlock mux if it's currently locked with a recurse count of 0
res=uxPortCompareSet(&mux->mux, (xPortGetCoreID()<<portMUX_VAL_SHIFT)|portMUX_MAGIC_VAL, portMUX_FREE_VAL); res=portMUX_FREE_VAL;
uxPortCompareSet(&mux->mux, (xPortGetCoreID()<<portMUX_VAL_SHIFT)|portMUX_MAGIC_VAL, &res);
if ( res == portMUX_FREE_VAL ) { if ( res == portMUX_FREE_VAL ) {
#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG #ifdef CONFIG_FREERTOS_PORTMUX_DEBUG