Optimize xPortGetCoreID to 2-instruction inline assembly.

diff --git a/components/freertos/include/freertos/portable.h b/components/freertos/include/freertos/portable.h
index 4030ca0c03af4db3bc37f8928ab5d1e2187c5d64..58e6903664b824a26109d9310dc418e4159d7747 100644 (file)
--- a/components/freertos/include/freertos/portable.h
+++ b/components/freertos/include/freertos/portable.h
@@ -192,8 +192,7 @@ void vPortEndScheduler( void ) PRIVILEGED_FUNCTION;
 #endif
 
 /* Multi-core: get current core ID */
-int xPortGetCoreID( void );
-
+#define xPortGetCoreID() __extension__({int id; asm volatile("rsr.prid %0; extui %0,%0,13,1":"=r"(id)); id;})
 
 #ifdef __cplusplus
 }

diff --git a/components/freertos/include/freertos/xtensa_context.h b/components/freertos/include/freertos/xtensa_context.h
index 3167c84726eb0a78d3d4a75eb9bbd3184c63d546..b748a0d1a7373d3de0b3b7f55ca231aa55f2a099 100644 (file)
--- a/components/freertos/include/freertos/xtensa_context.h
+++ b/components/freertos/include/freertos/xtensa_context.h
@@ -322,12 +322,7 @@ STRUCT_END(XtSolFrame)
 #ifdef __ASSEMBLER__
        .macro getcoreid reg
        rsr.prid \reg
-       bbci \reg,1,1f
-       movi \reg,1
-       j 2f
-1:
-       movi \reg,0
-2:
+       extui \reg,\reg,13,1
        .endm
 #endif
 

diff --git a/components/freertos/panic.c b/components/freertos/panic.c
index 94008673563de8c0ae82887a8a992f4a36774abc..6a87679d1344222d7a7db96f24aae4ea125bc698 100644 (file)
--- a/components/freertos/panic.c
+++ b/components/freertos/panic.c
@@ -76,7 +76,6 @@ inline static void panicPutHex(int a) { }
 inline static void panicPutDec(int a) { }
 #endif
 
-int xPortGetCoreID();
 
 void  __attribute__((weak)) vApplicationStackOverflowHook( TaskHandle_t xTask, signed char *pcTaskName ) {
        panicPutStr("***ERROR*** A stack overflow in task ");

diff --git a/components/freertos/portasm.S b/components/freertos/portasm.S
index 65406b0b06a5ba78e1c6dc6ec628307cc7da4567..3a45b19a326339f18624deb612f5b15e799c3a84 100644 (file)
--- a/components/freertos/portasm.S
+++ b/components/freertos/portasm.S
@@ -51,18 +51,6 @@ port_switch_flag:
 
     .text
 
-
-
-/* C function to get proc ID.*/
-       .global xPortGetCoreID
-       .type xPortGetCoreID,@function
-       .align 4
-xPortGetCoreID:
-       ENTRY(16)
-       getcoreid a2
-       RET(16)
-
-
 /*
 *******************************************************************************
 * _frxt_setup_switch