espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/xthal_get_interrupt_volatile_v3.1' into 'release/v3.1'

Browse Source 
xtensa: make XTHAL_GET_INTERRUPT, XTHAL_GET_CCOUNT volatile (backport v3.1)

See merge request idf/esp-idf!2712
This commit is contained in:
Ivan Grokhotkov
2018-07-12 17:18:06 +08:00
parent c71c8aea55 d128ff3ecd
commit ed27e75f50
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32/include/xtensa/core-macros.h
View File

@ -335,7 +335,7 @@
__asm__ __volatile__("wsr.intenable %0" :: "a"(__intenable):"memory"); \ __asm__ __volatile__("wsr.intenable %0" :: "a"(__intenable):"memory"); \
} while(0) } while(0)
# define XTHAL_GET_INTERRUPT() ({ int __interrupt; \ # define XTHAL_GET_INTERRUPT() ({ int __interrupt; \
__asm__("rsr.interrupt %0" : "=a"(__interrupt)); \ __asm__ __volatile__("rsr.interrupt %0" : "=a"(__interrupt)); \
__interrupt; }) __interrupt; })
# define XTHAL_SET_INTSET(v) do { int __interrupt = (int)(v); \ # define XTHAL_SET_INTSET(v) do { int __interrupt = (int)(v); \
__asm__ __volatile__("wsr.intset %0" :: "a"(__interrupt):"memory"); \ __asm__ __volatile__("wsr.intset %0" :: "a"(__interrupt):"memory"); \
@ -344,7 +344,7 @@
__asm__ __volatile__("wsr.intclear %0" :: "a"(__interrupt):"memory"); \ __asm__ __volatile__("wsr.intclear %0" :: "a"(__interrupt):"memory"); \
} while(0) } while(0)
# define XTHAL_GET_CCOUNT() ({ int __ccount; \ # define XTHAL_GET_CCOUNT() ({ int __ccount; \
__asm__("rsr.ccount %0" : "=a"(__ccount)); \ __asm__ __volatile__("rsr.ccount %0" : "=a"(__ccount)); \
__ccount; }) __ccount; })
# define XTHAL_SET_CCOUNT(v) do { int __ccount = (int)(v); \ # define XTHAL_SET_CCOUNT(v) do { int __ccount = (int)(v); \
__asm__ __volatile__("wsr.ccount %0" :: "a"(__ccount):"memory"); \ __asm__ __volatile__("wsr.ccount %0" :: "a"(__ccount):"memory"); \