diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-05-31 16:57:45 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-05-31 16:57:45 +0200 |
| commit | d72b25993c4e582dcfb124f2d99a037cd76ad34c (patch) | |
| tree | 8baae27b1d39343e821fd9aa82475bec8c6b8910 /firmware | |
| parent | 30e815d1044046bdae800b8bdb8dddca635d241d (diff) | |
| download | picorv32-d72b25993c4e582dcfb124f2d99a037cd76ad34c.tar.gz picorv32-d72b25993c4e582dcfb124f2d99a037cd76ad34c.zip | |
Fixed irq.c instr decoder for compressed isa
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/irq.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/firmware/irq.c b/firmware/irq.c index a387524..aa4cd9b 100644 --- a/firmware/irq.c +++ b/firmware/irq.c @@ -30,15 +30,27 @@ uint32_t *irq(uint32_t *regs, uint32_t irqs) if ((irqs & 6) != 0) { - uint32_t pc = regs[0] - 4; + uint32_t pc = regs[0] - 2; uint16_t *instr_hwords = (uint16_t*)pc; - uint32_t instr = instr_hwords[0] | (instr_hwords[1] << 16); + uint32_t instr = *(uint16_t*)pc; + + if ((*instr_hwords & 3) == 3) { + pc -= 2; + instr = (instr << 16) | *(uint16_t*)pc; + } else { + int cnt_3 = 0; + while ((*(--instr_hwords) & 3) == 3 && cnt_3 < 20) cnt_3++; + if ((cnt_3 & 1) != 0) { + pc -= 2; + instr = (instr << 16) | *(uint16_t*)pc; + } + } print_str("\n"); print_str("------------------------------------------------------------\n"); if ((irqs & 2) != 0) { - if (instr == 0x00100073 || (instr & 0xffff) == 9002) { + if (instr == 0x00100073 || instr == 0x9002) { print_str("SBREAK instruction at 0x"); print_hex(pc, 8); print_str("\n"); |