ytshih/osc2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: lab3 bug

Browse Source
This commit is contained in:
Yi-Ting Shih
2025-04-01 18:34:59 +08:00
parent fc91808c1b
commit 2d572cea4d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/exception_table.S
View File

@@ -46,11 +46,11 @@
ldp x28, x29, [sp, 16 * 14] ldp x28, x29, [sp, 16 * 14]
ldp x30, lr, [sp, 16 * 15] ldp x30, lr, [sp, 16 * 15]
mrs x0, spsr_el1
mrs x1, elr_el1
mrs x2, esr_el1
ldp x0, x1, [sp, 16 * 16] ldp x0, x1, [sp, 16 * 16]
ldr x2, [sp, 16 * 17] ldr x2, [sp, 16 * 17]
msr spsr_el1, x0
msr elr_el1, x1
msr esr_el1, x2
add sp, sp, 36 * 8 add sp, sp, 36 * 8
.endm .endm

3
kernel/lib/interrupt.c
View File

@@ -105,7 +105,8 @@ void irq_handler(void)
void wfe(void) void wfe(void)
{ {
if (!global_interrupt_pool) { if (!global_interrupt_pool) {
asm volatile("wfe"); // asm volatile("wfe");
asm volatile("nop");
return; return;
} }