diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-06-06 10:46:52 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-06-06 10:46:52 +0200 |
| commit | f4bb91b060211884fc0b85479fb6becf20daeb1f (patch) | |
| tree | d971e626fe57262b7830211644f043477b33c562 /firmware | |
| parent | 490a7345191f9841fa953d18b27c8485171406ce (diff) | |
| download | picorv32-f4bb91b060211884fc0b85479fb6becf20daeb1f.tar.gz picorv32-f4bb91b060211884fc0b85479fb6becf20daeb1f.zip | |
RISC-V ISA 2.1 now calls "sbreak" officially "ebreak"
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/irq.c | 6 | ||||
| -rw-r--r-- | firmware/multest.c | 2 | ||||
| -rw-r--r-- | firmware/sieve.c | 2 | ||||
| -rw-r--r-- | firmware/start.S | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/firmware/irq.c b/firmware/irq.c index aaa141d..13dcb57 100644 --- a/firmware/irq.c +++ b/firmware/irq.c @@ -30,7 +30,7 @@ uint32_t *irq(uint32_t *regs, uint32_t irqs) else print_hex(instr, 4); print_str("\n"); - __asm__ volatile ("sbreak"); + __asm__ volatile ("ebreak"); } } @@ -62,7 +62,7 @@ uint32_t *irq(uint32_t *regs, uint32_t irqs) if ((irqs & 2) != 0) { if (instr == 0x00100073 || instr == 0x9002) { - print_str("SBREAK instruction at 0x"); + print_str("EBREAK instruction at 0x"); print_hex(pc, 8); print_str("\n"); } else { @@ -132,7 +132,7 @@ uint32_t *irq(uint32_t *regs, uint32_t irqs) print_dec(timer_irq_count); print_str("\n"); - __asm__ volatile ("sbreak"); + __asm__ volatile ("ebreak"); } return regs; diff --git a/firmware/multest.c b/firmware/multest.c index 5b68555..93e48df 100644 --- a/firmware/multest.c +++ b/firmware/multest.c @@ -75,7 +75,7 @@ void multest(void) if (s_mul != h_mul || s_mulh != h_mulh || s_mulhsu != h_mulhsu || s_mulhu != h_mulhu) { print_str("ERROR!\n"); - __asm__ volatile ("sbreak"); + __asm__ volatile ("ebreak"); return; } diff --git a/firmware/sieve.c b/firmware/sieve.c index c31e942..ff945eb 100644 --- a/firmware/sieve.c +++ b/firmware/sieve.c @@ -78,7 +78,7 @@ void sieve(void) print_str(" OK\n"); } else { print_str(" ERROR\n"); - __asm__ volatile ("sbreak"); + __asm__ volatile ("ebreak"); } } diff --git a/firmware/start.S b/firmware/start.S index 403ac24..e256cac 100644 --- a/firmware/start.S +++ b/firmware/start.S @@ -260,7 +260,7 @@ irq_vec: // new irq_regs address returned from C code in a0 addi a1, zero, 0x200 beq a0, a1, 1f - sbreak + ebreak 1: #ifdef ENABLE_FASTIRQ @@ -478,8 +478,8 @@ start: sw a4,0(a0) sw a5,0(a0) - /* break */ - sbreak + /* trap */ + ebreak /* Hard mul functions for multest.c |