diff options
| author | Shicheng Chu <[email protected]> | 2023-04-04 21:06:27 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-04 09:06:27 -0400 |
| commit | 93f3cb30e48d5de341bda09fa806120e2bc3f3ad (patch) | |
| tree | b23b2343674fecbc3fdfbcd49220488da21472ed /libcpu/risc-v | |
| parent | 8a52e65013d1abb7cfc032409000533000ccd0c2 (diff) | |
[kernel] 将rt_thread结构体改为显式继承rt_object (#7131)
Diffstat (limited to 'libcpu/risc-v')
| -rw-r--r-- | libcpu/risc-v/k210/interrupt.c | 2 | ||||
| -rw-r--r-- | libcpu/risc-v/t-head/c906/backtrace.c | 2 | ||||
| -rw-r--r-- | libcpu/risc-v/t-head/c906/trap.c | 4 | ||||
| -rw-r--r-- | libcpu/risc-v/virt64/backtrace.c | 2 | ||||
| -rw-r--r-- | libcpu/risc-v/virt64/trap.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libcpu/risc-v/k210/interrupt.c b/libcpu/risc-v/k210/interrupt.c index 23d11c1813..6e62a2cfb5 100644 --- a/libcpu/risc-v/k210/interrupt.c +++ b/libcpu/risc-v/k210/interrupt.c @@ -388,7 +388,7 @@ uintptr_t handle_trap(uintptr_t mcause, uintptr_t epc, uintptr_t * sp) rt_kprintf("\n"); print_stack_frame(sp); rt_kprintf("exception pc => 0x%08x\n", epc); - rt_kprintf("current thread: %.*s\n", RT_NAME_MAX, tid->name); + rt_kprintf("current thread: %.*s\n", RT_NAME_MAX, tid->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif diff --git a/libcpu/risc-v/t-head/c906/backtrace.c b/libcpu/risc-v/t-head/c906/backtrace.c index c10d9f3522..0bcfa0b9d9 100644 --- a/libcpu/risc-v/t-head/c906/backtrace.c +++ b/libcpu/risc-v/t-head/c906/backtrace.c @@ -131,7 +131,7 @@ extern struct rt_thread *rt_current_thread; static char *_get_elf_name(size_t sepc) { - return IN_USERSPACE ? rt_current_thread->name : "rtthread.elf"; + return IN_USERSPACE ? rt_current_thread->parent.name : "rtthread.elf"; } #endif /* RT_USING_SMART */ diff --git a/libcpu/risc-v/t-head/c906/trap.c b/libcpu/risc-v/t-head/c906/trap.c index c95facb0f7..184765507b 100644 --- a/libcpu/risc-v/t-head/c906/trap.c +++ b/libcpu/risc-v/t-head/c906/trap.c @@ -220,7 +220,7 @@ void handle_user(rt_size_t scause, rt_size_t stval, rt_size_t sepc, struct rt_hw rt_hw_backtrace((uint32_t *)sp->s0_fp, sepc); - LOG_E("User Fault, killing thread: %s", rt_thread_self()->name); + LOG_E("User Fault, killing thread: %s", rt_thread_self()->parent.name); EXIT_TRAP; sys_exit(-1); @@ -332,7 +332,7 @@ void handle_trap(rt_size_t scause, rt_size_t stval, rt_size_t sepc, struct rt_hw rt_kprintf("scause:0x%p,stval:0x%p,sepc:0x%p\n", scause, stval, sepc); dump_regs(sp); rt_kprintf("--------------Thread list--------------\n"); - rt_kprintf("current thread: %s\n", rt_thread_self()->name); + rt_kprintf("current thread: %s\n", rt_thread_self()->parent.name); extern struct rt_thread *rt_current_thread; rt_kprintf("--------------Backtrace--------------\n"); diff --git a/libcpu/risc-v/virt64/backtrace.c b/libcpu/risc-v/virt64/backtrace.c index c10d9f3522..0bcfa0b9d9 100644 --- a/libcpu/risc-v/virt64/backtrace.c +++ b/libcpu/risc-v/virt64/backtrace.c @@ -131,7 +131,7 @@ extern struct rt_thread *rt_current_thread; static char *_get_elf_name(size_t sepc) { - return IN_USERSPACE ? rt_current_thread->name : "rtthread.elf"; + return IN_USERSPACE ? rt_current_thread->parent.name : "rtthread.elf"; } #endif /* RT_USING_SMART */ diff --git a/libcpu/risc-v/virt64/trap.c b/libcpu/risc-v/virt64/trap.c index 944cee629a..f8413c9d78 100644 --- a/libcpu/risc-v/virt64/trap.c +++ b/libcpu/risc-v/virt64/trap.c @@ -217,7 +217,7 @@ void handle_user(rt_size_t scause, rt_size_t stval, rt_size_t sepc, struct rt_hw rt_hw_backtrace((uint32_t *)sp->s0_fp, sepc); - LOG_E("User Fault, killing thread: %s", rt_thread_self()->name); + LOG_E("User Fault, killing thread: %s", rt_thread_self()->parent.name); EXIT_TRAP; sys_exit(-1); @@ -344,7 +344,7 @@ void handle_trap(rt_size_t scause, rt_size_t stval, rt_size_t sepc, struct rt_hw rt_kprintf("scause:0x%p,stval:0x%p,sepc:0x%p\n", scause, stval, sepc); dump_regs(sp); rt_kprintf("--------------Thread list--------------\n"); - rt_kprintf("current thread: %s\n", rt_thread_self()->name); + rt_kprintf("current thread: %s\n", rt_thread_self()->parent.name); extern struct rt_thread *rt_current_thread; rt_kprintf("--------------Backtrace--------------\n"); |