From 0403d43b194f5c7c77dd246aece7d936d6985fce Mon Sep 17 00:00:00 2001
From: Jeroen Domburg <git@j0h.nl>
Date: Mon, 17 Oct 2016 18:09:15 +0800
Subject: [PATCH] Optimize xPortGetCoreID to 2-instruction inline assembly.

---
 components/freertos/include/freertos/portable.h      |  3 +--
 .../freertos/include/freertos/xtensa_context.h       |  7 +------
 components/freertos/panic.c                          |  1 -
 components/freertos/portasm.S                        | 12 ------------
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/components/freertos/include/freertos/portable.h b/components/freertos/include/freertos/portable.h
index 4030ca0c0..58e690366 100644
--- 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 3167c8472..b748a0d1a 100644
--- 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 940086735..6a87679d1 100644
--- 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 65406b0b0..3a45b19a3 100644
--- 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