From 93f3cb30e48d5de341bda09fa806120e2bc3f3ad Mon Sep 17 00:00:00 2001 From: Shicheng Chu <1468559561@qq.com> Date: Tue, 4 Apr 2023 21:06:27 +0800 Subject: [kernel] 将rt_thread结构体改为显式继承rt_object (#7131) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libcpu/aarch64/common/trap.c | 4 ++-- libcpu/arm/AT91SAM7X/trap.c | 2 +- libcpu/arm/am335x/trap.c | 6 +++--- libcpu/arm/arm926/trap.c | 6 +++--- libcpu/arm/cortex-m0/cpuport.c | 2 +- libcpu/arm/cortex-m23/cpuport.c | 2 +- libcpu/arm/cortex-m3/cpuport.c | 2 +- libcpu/arm/cortex-m33/cpuport.c | 2 +- libcpu/arm/cortex-m4/cpuport.c | 2 +- libcpu/arm/cortex-m7/cpuport.c | 2 +- libcpu/arm/cortex-r4/trap.c | 2 +- libcpu/arm/lpc24xx/trap.c | 10 +++++----- libcpu/arm/s3c24x0/trap.c | 6 +++--- libcpu/arm/sep4020/trap.c | 6 +++--- libcpu/risc-v/k210/interrupt.c | 2 +- libcpu/risc-v/t-head/c906/backtrace.c | 2 +- libcpu/risc-v/t-head/c906/trap.c | 4 ++-- libcpu/risc-v/virt64/backtrace.c | 2 +- libcpu/risc-v/virt64/trap.c | 4 ++-- libcpu/rx/cpuport.c | 2 +- libcpu/sim/posix/cpu_port.c | 4 ++-- libcpu/sim/win32/cpu_port.c | 2 +- libcpu/unicore32/sep6200/trap.c | 6 +++--- 23 files changed, 41 insertions(+), 41 deletions(-) (limited to 'libcpu') diff --git a/libcpu/aarch64/common/trap.c b/libcpu/aarch64/common/trap.c index 59378d08e4..dd5468daf1 100644 --- a/libcpu/aarch64/common/trap.c +++ b/libcpu/aarch64/common/trap.c @@ -289,7 +289,7 @@ void rt_hw_trap_exception(struct rt_hw_exp_stack *regs) #endif process_exception(esr, regs->pc); rt_hw_show_register(regs); - rt_kprintf("current: %s\n", rt_thread_self()->name); + rt_kprintf("current: %s\n", rt_thread_self()->parent.name); #ifdef RT_USING_LWP check_user_fault(regs, 0, "user fault"); #endif @@ -304,7 +304,7 @@ void rt_hw_trap_serror(struct rt_hw_exp_stack *regs) { rt_kprintf("SError\n"); rt_hw_show_register(regs); - rt_kprintf("current: %s\n", rt_thread_self()->name); + rt_kprintf("current: %s\n", rt_thread_self()->parent.name); #ifdef RT_USING_FINSH list_thread(); #endif diff --git a/libcpu/arm/AT91SAM7X/trap.c b/libcpu/arm/AT91SAM7X/trap.c index 3c012dd85e..b2dfdb4949 100644 --- a/libcpu/arm/AT91SAM7X/trap.c +++ b/libcpu/arm/AT91SAM7X/trap.c @@ -41,7 +41,7 @@ void rt_hw_trap_fiq(void) extern struct rt_thread* rt_current_thread; void rt_hw_trap_abort(void) { - rt_kprintf("Abort occured!!! Thread [%s] suspended.\n",rt_current_thread->name); + rt_kprintf("Abort occured!!! Thread [%s] suspended.\n",rt_current_thread->parent.name); rt_thread_suspend(rt_current_thread); rt_schedule(); diff --git a/libcpu/arm/am335x/trap.c b/libcpu/arm/am335x/trap.c index 19cb31ad67..d8893d2a94 100644 --- a/libcpu/arm/am335x/trap.c +++ b/libcpu/arm/am335x/trap.c @@ -65,7 +65,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("undefined instruction\n"); - rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->name); + rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); @@ -103,7 +103,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("prefetch abort\n"); - rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->name); + rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); @@ -131,7 +131,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("data abort\n"); - rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->name); + rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/arm926/trap.c b/libcpu/arm/arm926/trap.c index a1458f9bdf..64fc274ca9 100644 --- a/libcpu/arm/arm926/trap.c +++ b/libcpu/arm/arm926/trap.c @@ -88,7 +88,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("undefined instruction\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); @@ -140,7 +140,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("prefetch abort\n"); - rt_kprintf("thread - %.*s stack:\n", RT_NAME_MAX, rt_current_thread->name); + rt_kprintf("thread - %.*s stack:\n", RT_NAME_MAX, rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); @@ -168,7 +168,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("data abort\n"); - rt_kprintf("thread - %.*s stack:\n", RT_NAME_MAX, rt_current_thread->name); + rt_kprintf("thread - %.*s stack:\n", RT_NAME_MAX, rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/cortex-m0/cpuport.c b/libcpu/arm/cortex-m0/cpuport.c index 4d53640b2d..2d326364cf 100644 --- a/libcpu/arm/cortex-m0/cpuport.c +++ b/libcpu/arm/cortex-m0/cpuport.c @@ -108,7 +108,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) rt_kprintf("r01: 0x%08x\n", contex->r1); rt_kprintf("r00: 0x%08x\n", contex->r0); - rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); + rt_kprintf("hard fault on thread: %s\n", rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/cortex-m23/cpuport.c b/libcpu/arm/cortex-m23/cpuport.c index 1385118211..7533f2811f 100644 --- a/libcpu/arm/cortex-m23/cpuport.c +++ b/libcpu/arm/cortex-m23/cpuport.c @@ -109,7 +109,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) rt_kprintf("r01: 0x%08x\n", contex->r1); rt_kprintf("r00: 0x%08x\n", contex->r0); - rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); + rt_kprintf("hard fault on thread: %s\n", rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c index 75449fad3a..65fc7969c6 100644 --- a/libcpu/arm/cortex-m3/cpuport.c +++ b/libcpu/arm/cortex-m3/cpuport.c @@ -325,7 +325,7 @@ void rt_hw_hard_fault_exception(struct exception_info * exception_info) if(exception_info->exc_return & (1 << 2) ) { - rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->name); + rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/cortex-m33/cpuport.c b/libcpu/arm/cortex-m33/cpuport.c index a713665539..9c110c7f55 100644 --- a/libcpu/arm/cortex-m33/cpuport.c +++ b/libcpu/arm/cortex-m33/cpuport.c @@ -462,7 +462,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) if (exception_info->exc_return & (1 << 2)) { - rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->name); + rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c index 903c228f82..1674d846e0 100644 --- a/libcpu/arm/cortex-m4/cpuport.c +++ b/libcpu/arm/cortex-m4/cpuport.c @@ -405,7 +405,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) if (exception_info->exc_return & (1 << 2)) { - rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->name); + rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/cortex-m7/cpuport.c b/libcpu/arm/cortex-m7/cpuport.c index 510a51dde1..14fee85262 100644 --- a/libcpu/arm/cortex-m7/cpuport.c +++ b/libcpu/arm/cortex-m7/cpuport.c @@ -404,7 +404,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) if (exception_info->exc_return & (1 << 2)) { - rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->name); + rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/cortex-r4/trap.c b/libcpu/arm/cortex-r4/trap.c index 3ff3d297c0..961c21445c 100644 --- a/libcpu/arm/cortex-r4/trap.c +++ b/libcpu/arm/cortex-r4/trap.c @@ -50,7 +50,7 @@ void rt_hw_trap_udef(struct rt_hw_exp_stack *regs) rt_kprintf("undefined instruction\n"); rt_hw_show_register(regs); if (rt_thread_self() != RT_NULL) - rt_kprintf("Current Thread: %s\n", rt_thread_self()->name); + rt_kprintf("Current Thread: %s\n", rt_thread_self()->parent.name); rt_hw_cpu_shutdown(); } diff --git a/libcpu/arm/lpc24xx/trap.c b/libcpu/arm/lpc24xx/trap.c index 7ad7328a93..e773b54ffb 100644 --- a/libcpu/arm/lpc24xx/trap.c +++ b/libcpu/arm/lpc24xx/trap.c @@ -49,7 +49,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_kprintf("undefined instruction\n"); rt_hw_show_register(regs); if (rt_thread_self() != RT_NULL) - rt_kprintf("Current Thread: %s\n", rt_thread_self()->name); + rt_kprintf("Current Thread: %s\n", rt_thread_self()->parent.name); rt_hw_cpu_shutdown(); } @@ -67,7 +67,7 @@ void rt_hw_trap_swi(struct rt_hw_register *regs) rt_kprintf("software interrupt\n"); rt_hw_show_register(regs); if (rt_thread_self() != RT_NULL) - rt_kprintf("Current Thread: %s\n", rt_thread_self()->name); + rt_kprintf("Current Thread: %s\n", rt_thread_self()->parent.name); rt_hw_cpu_shutdown(); } @@ -84,7 +84,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_kprintf("prefetch abort\n"); rt_hw_show_register(regs); if (rt_thread_self() != RT_NULL) - rt_kprintf("Current Thread: %s\n", rt_thread_self()->name); + rt_kprintf("Current Thread: %s\n", rt_thread_self()->parent.name); rt_hw_cpu_shutdown(); } @@ -101,7 +101,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_kprintf("Data Abort "); rt_hw_show_register(regs); if (rt_thread_self() != RT_NULL) - rt_kprintf("Current Thread: %s\n", rt_thread_self()->name); + rt_kprintf("Current Thread: %s\n", rt_thread_self()->parent.name); rt_hw_cpu_shutdown(); } @@ -117,7 +117,7 @@ void rt_hw_trap_resv(struct rt_hw_register *regs) rt_kprintf("not used\n"); rt_hw_show_register(regs); if (rt_thread_self() != RT_NULL) - rt_kprintf("Current Thread: %s\n", rt_thread_self()->name); + rt_kprintf("Current Thread: %s\n", rt_thread_self()->parent.name); rt_hw_cpu_shutdown(); } diff --git a/libcpu/arm/s3c24x0/trap.c b/libcpu/arm/s3c24x0/trap.c index c4be806dc6..e1881df991 100644 --- a/libcpu/arm/s3c24x0/trap.c +++ b/libcpu/arm/s3c24x0/trap.c @@ -56,7 +56,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("undefined instruction\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); @@ -94,7 +94,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("prefetch abort\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); @@ -115,7 +115,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("data abort\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); diff --git a/libcpu/arm/sep4020/trap.c b/libcpu/arm/sep4020/trap.c index 441a55bd6d..594d902a5b 100644 --- a/libcpu/arm/sep4020/trap.c +++ b/libcpu/arm/sep4020/trap.c @@ -53,7 +53,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("undefined instruction\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); rt_hw_backtrace((rt_uint32_t *)regs->fp, (rt_uint32_t)rt_current_thread->entry); rt_hw_cpu_shutdown(); @@ -89,7 +89,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("prefetch abort\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); rt_hw_backtrace((rt_uint32_t *)regs->fp, (rt_uint32_t)rt_current_thread->entry); rt_hw_cpu_shutdown(); @@ -108,7 +108,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("data abort\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); rt_hw_backtrace((rt_uint32_t *)regs->fp, (rt_uint32_t)rt_current_thread->entry); rt_hw_cpu_shutdown(); 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"); diff --git a/libcpu/rx/cpuport.c b/libcpu/rx/cpuport.c index 20ae133bb1..3425b6b9c9 100644 --- a/libcpu/rx/cpuport.c +++ b/libcpu/rx/cpuport.c @@ -126,7 +126,7 @@ void rt_hw_hard_fault_exception(struct stack_frame* exception_contex) rt_kprintf("acchi: 0x%08x\n", exception_contex->ACCHI); rt_kprintf("acclo: 0x%08x\n", exception_contex->ACCLO); } - rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); + rt_kprintf("hard fault on thread: %s\n", rt_current_thread->parent.name); #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif diff --git a/libcpu/sim/posix/cpu_port.c b/libcpu/sim/posix/cpu_port.c index dc3e9379dd..636f82cde1 100644 --- a/libcpu/sim/posix/cpu_port.c +++ b/libcpu/sim/posix/cpu_port.c @@ -163,11 +163,11 @@ static void *thread_run(void *parameter) tid = rt_thread_self(); TRACE("pid <%08x> tid <%s> starts...\n", (unsigned int)(thread->pthread), - tid->name); + tid->parent.name); thread->rtthread = tid; thread->task(thread->para); TRACE("pid <%08x> tid <%s> exit...\n", (unsigned int)(thread->pthread), - tid->name); + tid->parent.name); thread->exit(); /*TODO: diff --git a/libcpu/sim/win32/cpu_port.c b/libcpu/sim/win32/cpu_port.c index b7510819b9..4f8b32271b 100644 --- a/libcpu/sim/win32/cpu_port.c +++ b/libcpu/sim/win32/cpu_port.c @@ -147,7 +147,7 @@ static DWORD WINAPI thread_run( LPVOID lpThreadParameter ) rt_thread_t tid = rt_thread_self(); win_thread_t *pWinThread = (win_thread_t *)lpThreadParameter; - SetThreadName(GetCurrentThreadId(), tid->name); + SetThreadName(GetCurrentThreadId(), tid->parent.name); pWinThread->Entry(pWinThread->Param); diff --git a/libcpu/unicore32/sep6200/trap.c b/libcpu/unicore32/sep6200/trap.c index f2f342cfbe..a6a8e166dc 100644 --- a/libcpu/unicore32/sep6200/trap.c +++ b/libcpu/unicore32/sep6200/trap.c @@ -53,7 +53,7 @@ void rt_hw_trap_extn(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("extn instruction\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); rt_hw_backtrace((rt_uint32_t *)regs->fp, (rt_uint32_t)rt_current_thread->entry); rt_hw_cpu_shutdown(); @@ -89,7 +89,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("prefetch abort\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); rt_hw_backtrace((rt_uint32_t *)regs->fp, (rt_uint32_t)rt_current_thread->entry); rt_hw_cpu_shutdown(); @@ -108,7 +108,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_hw_show_register(regs); rt_kprintf("data abort\n"); - rt_kprintf("thread - %s stack:\n", rt_current_thread->name); + rt_kprintf("thread - %s stack:\n", rt_current_thread->parent.name); rt_hw_backtrace((rt_uint32_t *)regs->fp, (rt_uint32_t)rt_current_thread->entry); rt_hw_cpu_shutdown(); -- cgit v1.3.1