Inline ESP::getCycleCount() to make it safe to call from ISRs (espressif#3165)

dok-net · me-no-dev · commit 7fe2812f7f61 · 2019-09-11T14:29:53.000+03:00
* Inline ESP::getCycleCount() to make it safe to call from ISRs

* Attribute IRAM_ATTR ISR-safe function in addition to inlining.
diff --git a/cores/esp32/Esp.cpp b/cores/esp32/Esp.cpp
@@ -92,13 +92,6 @@ void EspClass::deepSleep(uint32_t time_us)
     esp_deep_sleep(time_us);
 }
 
-uint32_t EspClass::getCycleCount()
-{
-    uint32_t ccount;
-    __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));
-    return ccount;
-}
-
 void EspClass::restart(void)
 {
     esp_restart();
diff --git a/cores/esp32/Esp.h b/cores/esp32/Esp.h
@@ -76,7 +76,7 @@ class EspClass
 
     uint8_t getChipRevision();
     uint32_t getCpuFreqMHz(){ return getCpuFrequencyMhz(); }
-    uint32_t getCycleCount();
+    inline uint32_t getCycleCount() __attribute__((always_inline));
     const char * getSdkVersion();
 
     void deepSleep(uint32_t time_us);
@@ -101,6 +101,13 @@ class EspClass
 
 };
 
+uint32_t IRAM_ATTR EspClass::getCycleCount()
+{
+    uint32_t ccount;
+    __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));
+    return ccount;
+}
+
 extern EspClass ESP;
 
 #endif //ESP_H

Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,6 @@ void EspClass::deepSleep(uint32_t time_us)`
`92`	`92`	`esp_deep_sleep(time_us);`
`93`	`93`	`}`
`94`	`94`
`95`		`-uint32_t EspClass::getCycleCount()`
`96`		`-{`
`97`		`- uint32_t ccount;`
`98`		`- __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));`
`99`		`- return ccount;`
`100`		`-}`
`101`		`-`
`102`	`95`	`void EspClass::restart(void)`
`103`	`96`	`{`
`104`	`97`	`esp_restart();`