patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

riscv: Rename __irq_wrapper to _isr_wrapper

Browse source 
For some reasons RISCV is the only arch where the vector table entry is
called __irq_wrapper instead of _isr_wrapper. This is not only a
cosmetic change but Zephyr expects the common ISR handler to be called
_isr_wrapper (for example when generating the IRQ vector table).

Change it.

find ./ -type f -exec sed -i 's/__irq_wrapper/_isr_wrapper/g' {} \;

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2022-06-21 10:43:40 +02:00 committed by Anas Nashif
parent 7f6b762a73
commit 741b9dc65d
8 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/riscv/core/isr.S
View file

@ -112,7 +112,7 @@ GDATA(_k_syscall_table)
#endif #endif
/* exports */ /* exports */
GTEXT(__irq_wrapper) GTEXT(_isr_wrapper)
/* use ABI name of registers for the sake of simplicity */ /* use ABI name of registers for the sake of simplicity */
@ -140,7 +140,7 @@ GTEXT(__irq_wrapper)
/* /*
* Handler called upon each exception/interrupt/fault * Handler called upon each exception/interrupt/fault
*/ */
SECTION_FUNC(exception.entry, __irq_wrapper) SECTION_FUNC(exception.entry, _isr_wrapper)
#ifdef CONFIG_USERSPACE #ifdef CONFIG_USERSPACE
/* /*

2
soc/riscv/esp32c3/linker.ld
View file

@ -203,7 +203,7 @@ SECTIONS
_iram_text_start = ABSOLUTE(.); _iram_text_start = ABSOLUTE(.);
KEEP(*(.exception.entry*)); /* contains __irq_wrapper */ KEEP(*(.exception.entry*)); /* contains _isr_wrapper */
*(.exception.other*) *(.exception.other*)
. = ALIGN(4); . = ALIGN(4);

4
soc/riscv/esp32c3/vectors.S
View file

@ -10,7 +10,7 @@
#include <zephyr/toolchain.h> #include <zephyr/toolchain.h>
/* Imports */ /* Imports */
GTEXT(__irq_wrapper) GTEXT(_isr_wrapper)
/* This is the vector table. MTVEC points here. /* This is the vector table. MTVEC points here.
* *
@ -31,5 +31,5 @@ _esp32c3_vector_table:
.option push .option push
.option norvc .option norvc
.rept (32) .rept (32)
j __irq_wrapper /* 32 identical entries, all pointing to the interrupt handler */ j _isr_wrapper /* 32 identical entries, all pointing to the interrupt handler */
.endr .endr

72
soc/riscv/openisa_rv32m1/vector.S
View file

@ -8,7 +8,7 @@
/* Imports */ /* Imports */
GTEXT(__initialize) GTEXT(__initialize)
GTEXT(__irq_wrapper) GTEXT(_isr_wrapper)
/* Exports */ /* Exports */
GTEXT(__start) GTEXT(__start)
@ -33,44 +33,44 @@ SECTION_FUNC(vectors, ivt)
.option norvc .option norvc
/* Interrupts */ /* Interrupts */
j __irq_wrapper /* IRQ 0 */ j _isr_wrapper /* IRQ 0 */
j __irq_wrapper /* IRQ 1 */ j _isr_wrapper /* IRQ 1 */
j __irq_wrapper /* IRQ 2 */ j _isr_wrapper /* IRQ 2 */
j __irq_wrapper /* IRQ 3 */ j _isr_wrapper /* IRQ 3 */
j __irq_wrapper /* IRQ 4 */ j _isr_wrapper /* IRQ 4 */
j __irq_wrapper /* IRQ 5 */ j _isr_wrapper /* IRQ 5 */
j __irq_wrapper /* IRQ 6 */ j _isr_wrapper /* IRQ 6 */
j __irq_wrapper /* IRQ 7 */ j _isr_wrapper /* IRQ 7 */
j __irq_wrapper /* IRQ 8 */ j _isr_wrapper /* IRQ 8 */
j __irq_wrapper /* IRQ 9 */ j _isr_wrapper /* IRQ 9 */
j __irq_wrapper /* IRQ 10 */ j _isr_wrapper /* IRQ 10 */
j __irq_wrapper /* IRQ 11 */ j _isr_wrapper /* IRQ 11 */
j __irq_wrapper /* IRQ 12 */ j _isr_wrapper /* IRQ 12 */
j __irq_wrapper /* IRQ 13 */ j _isr_wrapper /* IRQ 13 */
j __irq_wrapper /* IRQ 14 */ j _isr_wrapper /* IRQ 14 */
j __irq_wrapper /* IRQ 15 */ j _isr_wrapper /* IRQ 15 */
j __irq_wrapper /* IRQ 16 */ j _isr_wrapper /* IRQ 16 */
j __irq_wrapper /* IRQ 17 */ j _isr_wrapper /* IRQ 17 */
j __irq_wrapper /* IRQ 18 */ j _isr_wrapper /* IRQ 18 */
j __irq_wrapper /* IRQ 19 */ j _isr_wrapper /* IRQ 19 */
j __irq_wrapper /* IRQ 20 */ j _isr_wrapper /* IRQ 20 */
j __irq_wrapper /* IRQ 21 */ j _isr_wrapper /* IRQ 21 */
j __irq_wrapper /* IRQ 22 */ j _isr_wrapper /* IRQ 22 */
j __irq_wrapper /* IRQ 23 */ j _isr_wrapper /* IRQ 23 */
j __irq_wrapper /* IRQ 24 */ j _isr_wrapper /* IRQ 24 */
j __irq_wrapper /* IRQ 25 */ j _isr_wrapper /* IRQ 25 */
j __irq_wrapper /* IRQ 26 */ j _isr_wrapper /* IRQ 26 */
j __irq_wrapper /* IRQ 27 */ j _isr_wrapper /* IRQ 27 */
j __irq_wrapper /* IRQ 28 */ j _isr_wrapper /* IRQ 28 */
j __irq_wrapper /* IRQ 29 */ j _isr_wrapper /* IRQ 29 */
j __irq_wrapper /* IRQ 30 */ j _isr_wrapper /* IRQ 30 */
j __irq_wrapper /* IRQ 31 */ j _isr_wrapper /* IRQ 31 */
/* Exceptions */ /* Exceptions */
j __start /* reset */ j __start /* reset */
j __irq_wrapper /* illegal instruction */ j _isr_wrapper /* illegal instruction */
j __irq_wrapper /* ecall */ j _isr_wrapper /* ecall */
j __irq_wrapper /* load store eunit error */ j _isr_wrapper /* load store eunit error */
SECTION_FUNC(vectors, __start) SECTION_FUNC(vectors, __start)
/* Set mtvec to point at ivt. */ /* Set mtvec to point at ivt. */

2
soc/riscv/openisa_rv32m1/vector_table.ld
View file

@ -25,7 +25,7 @@
#endif #endif
KEEP(*(.reset.*)) KEEP(*(.reset.*))
KEEP(*(".exception.entry.*")) /* contains __irq_wrapper */ KEEP(*(".exception.entry.*")) /* contains _isr_wrapper */
*(".exception.other.*") *(".exception.other.*")
KEEP(*(.openocd_debug)) KEEP(*(.openocd_debug))

6
soc/riscv/riscv-ite/common/vector.S
View file

@ -13,7 +13,7 @@ GTEXT(__start)
/* imports */ /* imports */
GTEXT(__initialize) GTEXT(__initialize)
GTEXT(__irq_wrapper) GTEXT(_isr_wrapper)
SECTION_FUNC(vectors, __start) SECTION_FUNC(vectors, __start)
#ifdef CONFIG_RISCV_GP #ifdef CONFIG_RISCV_GP
@ -28,9 +28,9 @@ SECTION_FUNC(vectors, __start)
/* /*
* Set mtvec (Machine Trap-Vector Base-Address Register) * Set mtvec (Machine Trap-Vector Base-Address Register)
* to __irq_wrapper. * to _isr_wrapper.
*/ */
la t0, __irq_wrapper la t0, _isr_wrapper
csrw mtvec, t0 csrw mtvec, t0
csrwi mie, 0 csrwi mie, 0

8
soc/riscv/riscv-privilege/common/vector.S
View file

@ -12,7 +12,7 @@ GTEXT(__start)
/* imports */ /* imports */
GTEXT(__initialize) GTEXT(__initialize)
GTEXT(__irq_wrapper) GTEXT(_isr_wrapper)
SECTION_FUNC(vectors, __start) SECTION_FUNC(vectors, __start)
#if defined(CONFIG_RISCV_GP) #if defined(CONFIG_RISCV_GP)
@ -43,9 +43,9 @@ SECTION_FUNC(vectors, __start)
#else #else
/* /*
* Set mtvec (Machine Trap-Vector Base-Address Register) * Set mtvec (Machine Trap-Vector Base-Address Register)
* to __irq_wrapper. * to _isr_wrapper.
*/ */
la t0, __irq_wrapper la t0, _isr_wrapper
#endif #endif
csrw mtvec, t0 csrw mtvec, t0
@ -59,6 +59,6 @@ SECTION_FUNC(reset, __ivt)
.option norvc .option norvc
.balign 0x100 /* must be 256 byte aligned per specification */ .balign 0x100 /* must be 256 byte aligned per specification */
.rept (CONFIG_NUM_IRQS) .rept (CONFIG_NUM_IRQS)
j __irq_wrapper j _isr_wrapper
.endr .endr
#endif #endif

2
soc/riscv/riscv-privilege/gd32vf103/entry.S
View file

@ -57,4 +57,4 @@ _start0800:
.align 6 .align 6
trap_entry: trap_entry:
tail __irq_wrapper tail _isr_wrapper