Skip to content

Commit 158d964

Browse files
bors[bot]laanwj
andauthored
Merge #56
56: Exception handler may return r=Disasm a=laanwj We need exceptions to be able to return. For example, after fixing the issue that caused them in the first place (e.g. paging), or after emulating missing instructions and possibly updating `mepc`. Co-authored-by: Wladimir J. van der Laan <[email protected]>
2 parents ba85a0e + 48cc1ec commit 158d964

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

riscv-rt/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ pub struct TrapFrame {
416416
#[export_name = "_start_trap_rust"]
417417
pub extern "C" fn start_trap_rust(trap_frame: *const TrapFrame) {
418418
extern "C" {
419-
fn ExceptionHandler(trap_frame: &TrapFrame) -> !;
419+
fn ExceptionHandler(trap_frame: &TrapFrame);
420420
fn DefaultHandler();
421421
}
422422

0 commit comments

Comments
 (0)