From 59bd74a01c41ee00ebc3f5d92401fe91b421aebd Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 15 Feb 2026 03:29:50 +0800 Subject: [PATCH] panic directly on illegal instruction the original stub for illegal instruction handling advances the program counter - this was copypasta from the kernel irq routine, where this behavior is needed to handle syscalls. However, this behavior is contra-indicated for the purpose of dying on a bollard - you don't want to skip past the bollard for any reason. --- bao1x-boot/boot0/src/platform/bao1x/irq.rs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/bao1x-boot/boot0/src/platform/bao1x/irq.rs b/bao1x-boot/boot0/src/platform/bao1x/irq.rs index 76f2a284e..138b22a15 100644 --- a/bao1x-boot/boot0/src/platform/bao1x/irq.rs +++ b/bao1x-boot/boot0/src/platform/bao1x/irq.rs @@ -164,16 +164,6 @@ pub extern "C" fn trap_handler( // crate::println!("cause {:x}", cause.bits()); // 2 is illegal instruction if cause.bits() == 2 { - // skip past the illegal instruction, in case that's what we want to do... - unsafe { - #[rustfmt::skip] - core::arch::asm!( - "csrr t0, mepc", - "addi t0, t0, 4", - "csrw mepc, t0", - ); - } - // ...but also panic. panic!("Illegal Instruction"); } else if cause.bits() == 4 { let epc = riscv::register::mepc::read();