diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/cortex-m/init.S | 2 | ||||
| -rw-r--r-- | core/cortex-m/irq_handler.h | 2 | ||||
| -rw-r--r-- | core/cortex-m/switch.S | 2 | ||||
| -rw-r--r-- | core/cortex-m0/init.S | 2 | ||||
| -rw-r--r-- | core/cortex-m0/switch.S | 2 | ||||
| -rw-r--r-- | core/nds32/switch.S | 4 | ||||
| -rw-r--r-- | core/riscv-rv32i/switch.S | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/core/cortex-m/init.S b/core/cortex-m/init.S index 5b7afb2ed8..19b98b0afb 100644 --- a/core/cortex-m/init.S +++ b/core/cortex-m/init.S @@ -103,7 +103,7 @@ _data_end: _data_lma_start: .long __data_lma_start -/* Dummy functions to avoid linker complaints */ +/* Mock functions to avoid linker complaints */ .global __aeabi_unwind_cpp_pr0 .global __aeabi_unwind_cpp_pr1 .global __aeabi_unwind_cpp_pr2 diff --git a/core/cortex-m/irq_handler.h b/core/cortex-m/irq_handler.h index 657a494c93..ae5d95cd94 100644 --- a/core/cortex-m/irq_handler.h +++ b/core/cortex-m/irq_handler.h @@ -25,7 +25,7 @@ #define DECLARE_IRQ_(irq, routine, priority) \ void IRQ_HANDLER(irq)(void) __attribute__((naked)); \ typedef struct { \ - int dummy[irq >= CONFIG_IRQ_COUNT ? -1 : 1]; \ + int fake[irq >= CONFIG_IRQ_COUNT ? -1 : 1]; \ } irq_num_check_##irq; \ void __keep routine(void); \ void IRQ_HANDLER(irq)(void) \ diff --git a/core/cortex-m/switch.S b/core/cortex-m/switch.S index ae76b64c37..f56c5e4c74 100644 --- a/core/cortex-m/switch.S +++ b/core/cortex-m/switch.S @@ -80,7 +80,7 @@ __switchto: .global __task_start .thumb_func __task_start: - ldr r2,=scratchpad @ area used as dummy thread stack for the first switch + ldr r2,=scratchpad @ area used as thread stack for the first switch mov r3, #2 @ use : priv. mode / thread stack / no floating point @ setting FP to unused here means first context switch @ will not store FP regs diff --git a/core/cortex-m0/init.S b/core/cortex-m0/init.S index c76f5a3ba3..5047d18380 100644 --- a/core/cortex-m0/init.S +++ b/core/cortex-m0/init.S @@ -111,7 +111,7 @@ _data_end: _data_lma_start: .long __data_lma_start -/* Dummy functions to avoid linker complaints */ +/* Mock functions to avoid linker complaints */ .global __aeabi_unwind_cpp_pr0 .global __aeabi_unwind_cpp_pr1 .global __aeabi_unwind_cpp_pr2 diff --git a/core/cortex-m0/switch.S b/core/cortex-m0/switch.S index ed1148e21b..a27d929816 100644 --- a/core/cortex-m0/switch.S +++ b/core/cortex-m0/switch.S @@ -64,7 +64,7 @@ __switchto: .global __task_start .thumb_func __task_start: - ldr r2,=scratchpad @ area used as dummy thread stack for the first switch + ldr r2,=scratchpad @ area used as thread stack for the first switch movs r3, #2 @ use : priv. mode / thread stack / no floating point adds r2, #17*4 @ put the pointer at the top of the stack movs r1, #0 @ __Schedule parameter : re-schedule nothing diff --git a/core/nds32/switch.S b/core/nds32/switch.S index 95a94e63e5..11fc0d76cd 100644 --- a/core/nds32/switch.S +++ b/core/nds32/switch.S @@ -80,7 +80,7 @@ __switch_task: */ .global __task_start __task_start: - /* area used as dummy thread stack for the first switch */ + /* area used as thread stack for the first switch */ la $r3, scratchpad movi55 $r4, 1 @@ -88,7 +88,7 @@ __task_start: movi55 $r1, 0 /* syscall 2nd parameter : re-schedule nothing */ movi55 $r0, 0 /* syscall 1st parameter : de-schedule nothing */ - /* put the dummy stack pointer at the top of the stack in scratchpad */ + /* put the stack pointer at the top of the stack in scratchpad */ addi $sp, $r3, 4 * 18 /* we are ready to re-schedule */ swi.gp $r4, [ + need_resched] diff --git a/core/riscv-rv32i/switch.S b/core/riscv-rv32i/switch.S index b31e75076a..d6c00b8591 100644 --- a/core/riscv-rv32i/switch.S +++ b/core/riscv-rv32i/switch.S @@ -148,13 +148,13 @@ __switch_task: .global __task_start __task_start: csrci mstatus, 0x8 - /* area used as dummy thread stack for the first switch */ + /* area used as thread stack for the first switch */ la a3, scratchpad li a4, 1 li a2, 0 /* system call 3rd parameter : not an IRQ emulation */ li a1, 0 /* system call 2nd parameter : re-schedule nothing */ li a0, 0 /* system call 1st parameter : de-schedule nothing */ - /* put the dummy stack pointer at the top of the stack in scratchpad */ + /* put the stack pointer at the top of the stack in scratchpad */ addi sp, a3, 4 * TASK_SCRATCHPAD_SIZE /* we are ready to re-schedule */ la t0, need_resched |