diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/riscv-rv32i/init.S | 21 | ||||
| -rw-r--r-- | core/riscv-rv32i/task.c | 29 |
2 files changed, 26 insertions, 24 deletions
diff --git a/core/riscv-rv32i/init.S b/core/riscv-rv32i/init.S index 0bc99052da..eee72503d3 100644 --- a/core/riscv-rv32i/init.S +++ b/core/riscv-rv32i/init.S @@ -183,9 +183,19 @@ __sp_16byte_aligned: /* This interrupt is unhandled */ j unhandled_interrupt __irq_handler: + /* save a0, a1, and a2 for syscall */ + addi sp, sp, -4*3 + sw a0, 0(sp) + sw a1, 1*4(sp) + sw a2, 2*4(sp) jal start_irq_handler - /* t0 = -1 if it cannot find the corresponding interrupt source */ - bltz t0, unhandled_interrupt + /* a0 = -1 if it cannot find the corresponding interrupt source */ + bltz a0, unhandled_interrupt + /* restore a0, a1, and a2 */ + lw a0, 0(sp) + lw a1, 1*4(sp) + lw a2, 2*4(sp) + addi sp, sp, 4*3 /* get EC interrupt group 0-15 or 16:ecall */ la t0, ec_int_group /* get corresponding isr */ @@ -332,10 +342,11 @@ unhandled_ec_irq: unhandled_interrupt: li tp, 0xBAD0 __unhandled_irq: - slli tp, tp, 8 - csrr t0, mcause + slli tp, tp, 16 + la t0, ec_int + lw t0, 0(t0) add tp, tp, t0 - j excep_handler /* display exception with TP 80bad[0|1]<irq> */ + j excep_handler /* display exception with TP bad[0|1]<ec_int> */ .global excep_handler excep_handler: diff --git a/core/riscv-rv32i/task.c b/core/riscv-rv32i/task.c index ae1609e9a2..58a5e06ba3 100644 --- a/core/riscv-rv32i/task.c +++ b/core/riscv-rv32i/task.c @@ -311,14 +311,14 @@ void __ram_code update_exc_start_time(void) #endif } -void __ram_code start_irq_handler(void) +/** + * The beginning of interrupt handler of c language code. + * + * @param none + * @return -1 if it cannot find the corresponding interrupt source. + */ +int __ram_code start_irq_handler(void) { - /* save a0, a1, and a2 for syscall */ - asm volatile ("addi sp, sp, -4*3"); - asm volatile ("sw a0, 0(sp)"); - asm volatile ("sw a1, 1*4(sp)"); - asm volatile ("sw a2, 2*4(sp)"); - in_interrupt = 1; /* If this is a SW interrupt */ @@ -330,9 +330,8 @@ void __ram_code start_irq_handler(void) * Determine interrupt number. * -1 if it cannot find the corresponding interrupt source. */ - ec_int = chip_get_ec_int(); - if (ec_int == -1) - goto error; + if (chip_get_ec_int() == -1) + return -1; ec_int_group = chip_get_intc_group(ec_int); } @@ -350,15 +349,7 @@ void __ram_code start_irq_handler(void) irq_dist[ec_int]++; #endif -error: - /* cannot use return statement because a0 has been used */ - asm volatile ("add t0, zero, %0" :: "r"(ec_int)); - - /* restore a0, a1, and a2 */ - asm volatile ("lw a0, 0(sp)"); - asm volatile ("lw a1, 1*4(sp)"); - asm volatile ("lw a2, 2*4(sp)"); - asm volatile ("addi sp, sp, 4*3"); + return EC_SUCCESS; } void __ram_code end_irq_handler(void) |