innov
/
xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify context_switch parameters

This commit is contained in:
songyanguang 2025-01-16 20:14:00 +08:00
parent b8c77c5758
commit eb5f73251c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Ubiquitous/XiZi_AIoT/softkernel/trap/software_irq_handler.c
View File

@ -52,21 +52,24 @@ void software_irq_dispatch(struct trapframe* tf)
assert(p_intr_driver != NULL); assert(p_intr_driver != NULL);
// get current task // get current task
struct CPU* cpu = cur_cpu();
struct Thread* cur_task = cur_cpu()->task; struct Thread* cur_task = cur_cpu()->task;
/// @todo: Handle dead task /// @todo: Handle dead task
int syscall_num = -1; int syscall_num = -1;
if (cur_task && cur_task->state != DEAD) { if (cur_task && cur_task->state != DEAD) {
cur_task->thread_context.trapframe = tf; cur_task->thread_context.trapframe = tf;
// call syscall // call syscall
int ret = arch_syscall(cur_task->thread_context.trapframe, &syscall_num); int ret = arch_syscall(cur_task->thread_context.trapframe, &syscall_num);
arch_set_return(tf, ret); arch_set_return(tf, ret);
} }
if ((cur_cpu()->task == NULL && cur_task != NULL) || cur_task->state != RUNNING) { if ((cur_cpu()->task == NULL && cur_task != NULL) || cur_task->state != RUNNING) {
cur_cpu()->task = NULL; cur_cpu()->task = NULL;
#ifndef __riscv
context_switch(&cur_task->thread_context.context, cur_cpu()->scheduler); context_switch(&cur_task->thread_context.context, cur_cpu()->scheduler);
#else
context_switch(&cur_task->thread_context.context, &cpu->scheduler);
#endif
} }
if (syscall_num == SYSCALL_EXIT) { if (syscall_num == SYSCALL_EXIT) {
panic("Exit reaches"); panic("Exit reaches");
@ -74,4 +77,4 @@ void software_irq_dispatch(struct trapframe* tf)
assert(cur_task == cur_cpu()->task); assert(cur_task == cur_cpu()->task);
xizi_leave_kernel(); xizi_leave_kernel();
} }