andy/phs_v1.0.1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加一些异常处理的注释

Browse Source
This commit is contained in:
andy
2025-03-27 23:29:13 +08:00
parent 437b2ece4c
commit 3d38858db3
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/liteos_m/arch/risc-v/riscv32/gcc/los_dispatch.S
View File

@@ -107,14 +107,14 @@
HalTaskContextSwitch: HalTaskContextSwitch:
PUSH_ALL_REG PUSH_ALL_REG
// a0保存着 mstatus
// clear mpie // clear mpie
li a2, RISCV_MSTATUS_MPIE li a2, RISCV_MSTATUS_MPIE // 0x00000080
not a2, a2 not a2, a2 // 0xffffff7f
and a0, a0, a2 and a0, a0, a2
// get mie // get mie
andi a1, a0, RISCV_MSTATUS_MIE andi a1, a0, RISCV_MSTATUS_MIE // 0x00000008
// must be in machine mode // must be in machine mode
ori a1, a1, 0x180 ori a1, a1, 0x180
@@ -125,24 +125,25 @@ HalTaskContextSwitch:
li a2, RISCV_MSTATUS_MIE li a2, RISCV_MSTATUS_MIE
not a2, a2 not a2, a2
and a0, a0, a2 and a0, a0, a2
// a0 清除 mie后的 mstatus
SREG a0, 16 * REGBYTES(sp) SREG a0, 16 * REGBYTES(sp)
// 把当前程序地址压栈，用于异常地址 // 返回地址
SREG ra, 17 * REGBYTES(sp) SREG ra, 17 * REGBYTES(sp)
la a1, g_losTask la a1, g_losTask
lw a0, 0(a1) lw a0, 0(a1) // g_losTask->runTask
sw sp, TASK_CB_KERNEL_SP(a0) // 把当前sp指针保存到 g_losTask->runTask->stackPointer
sw sp, TASK_CB_KERNEL_SP(a0) // TASK_CB_KERNEL_SP==0
lw a0, 4(a1) lw a0, 4(a1) // g_losTask->newTask
sw a0, 0(a1) sw a0, 0(a1) // g_losTask->runTask=g_losTask->newTask
HalStartToRun: HalStartToRun:
la a1, g_losTask la a1, g_losTask
lw a0, 4(a1) lw a0, 4(a1) // g_losTask->newTask
// retireve stack pointer // retireve stack pointer
lw sp, TASK_CB_KERNEL_SP(a0) lw sp, TASK_CB_KERNEL_SP(a0) // sp=g_losTask->newTask->stackPointer
// enable global interrupts // enable global interrupts
lw t0, 16 * REGBYTES(sp) lw t0, 16 * REGBYTES(sp)
@@ -150,7 +151,7 @@ HalStartToRun:
// retrieve the address at which exception happened // retrieve the address at which exception happened
lw t0, 17 * REGBYTES(sp) lw t0, 17 * REGBYTES(sp)
csrw mepc, t0 csrw mepc, t0 // 修改mepc，随后调用mret就会跳转到这个地址
// retrieve the registers // retrieve the registers
POP_ALL_REG POP_ALL_REG

16
kernel/liteos_m/arch/risc-v/riscv32/gcc/los_exc.S
View File

@@ -145,14 +145,15 @@ HalTrapEntry:
csrw mscratch, sp csrw mscratch, sp
la t0, g_excInfo la t0, g_excInfo
lh t1, 0(t0) lh t1, 0(t0)
// 不为0时跳转
bnez t1, 1f bnez t1, 1f
la sp, __except_stack_top la sp, __except_stack_top
1: 1:
addi t1, t1, 0x1 addi t1, t1, 0x1
sh t1, 0(t0) sh t1, 0(t0) // g_excInfo->nestCnt++
call HalExcEntry call HalExcEntry
la t0, g_excInfo la t0, g_excInfo
sh zero, 0(t0) sh zero, 0(t0) // g_excInfo->nestCnt=0
csrr sp, mscratch csrr sp, mscratch
addi sp, sp, 4 * REGBYTES addi sp, sp, 4 * REGBYTES
lw t0, 16 * REGBYTES(sp) lw t0, 16 * REGBYTES(sp)
@@ -170,19 +171,28 @@ HalTrapEntry:
.global HalTrapVector .global HalTrapVector
.equ TRAP_INTERRUPT_MODE_MASK, 0x80000000 .equ TRAP_INTERRUPT_MODE_MASK, 0x80000000
.align 4 .align 4
// cpu产生异常时会自动跳转到这个地址
// 产生中断时硬件会自动把返回地址保存到mepc中
// 可调用mret将mepc恢复到pc中
HalTrapVector: HalTrapVector:
PUSH_CALLER_REG PUSH_CALLER_REG
// mcause保存异常原因 读取到a0中
csrr a0, mcause csrr a0, mcause
li a1, TRAP_INTERRUPT_MODE_MASK li a1, TRAP_INTERRUPT_MODE_MASK
li a2, MCAUSE_INT_ID_MASK li a2, MCAUSE_INT_ID_MASK // 0x7FFFFFFF
and a1, a0, a1 and a1, a0, a1
and a0, a2, a0 and a0, a2, a0
// 等于0时跳转
beqz a1, HalTrapEntry beqz a1, HalTrapEntry
// 异常处理退出不会返回到这里 // 异常处理退出不会返回到这里
// 保存线程sp指针
csrw mscratch, sp csrw mscratch, sp
la sp, __start_and_irq_stack_top la sp, __start_and_irq_stack_top
// 处理中断 a0 保存着异常原因，如果最高位为0 则为中断号
jal HalHwiInterruptDone jal HalHwiInterruptDone
// 恢复线程sp指针
csrr sp, mscratch csrr sp, mscratch
// 切线程都是在线程栈中完成的
call HalIrqEndCheckNeedSched call HalIrqEndCheckNeedSched
// HalIrqEndCheckNeedSched如果切换了任务，这里会从切换后的任务返回 // HalIrqEndCheckNeedSched如果切换了任务，这里会从切换后的任务返回
POP_CALLER_REG POP_CALLER_REG