From e042a7868d75b3981de287900088b6bb2e83f130 Mon Sep 17 00:00:00 2001 From: abdul124 Date: Fri, 23 Aug 2024 12:27:57 +0800 Subject: [PATCH] firware: restore exception id order --- src/runtime/src/eh_artiq.rs | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/src/runtime/src/eh_artiq.rs b/src/runtime/src/eh_artiq.rs index 8215ffc..7d882fe 100644 --- a/src/runtime/src/eh_artiq.rs +++ b/src/runtime/src/eh_artiq.rs @@ -404,26 +404,18 @@ extern fn stop_fn(_version: c_int, } // Must be kept in sync with preallocate_runtime_exception_names() in `artiq.compiler.embedding` -static EXCEPTION_ID_LOOKUP: [(&str, u32); 19] = [ - ("RTIOUnderflow", 0), - ("RTIOOverflow", 1), - ("RTIODestinationUnreachable", 2), - ("DMAError", 3), - ("I2CError", 4), - ("CacheError", 5), - ("SPIError", 6), - ("AssertionError", 7), - ("AttributeError", 8), +static EXCEPTION_ID_LOOKUP: [(&str, u32); 11] = [ + ("RuntimeError", 0), + ("RTIOUnderflow", 1), + ("RTIOOverflow", 2), + ("RTIODestinationUnreachable", 3), + ("DMAError", 4), + ("I2CError", 5), + ("CacheError", 6), + ("SPIError", 7), + ("ZeroDivisionError", 8), ("IndexError", 9), - ("IOError", 10), - ("KeyError", 11), - ("NotImplementedError", 12), - ("OverflowError", 13), - ("RuntimeError", 14), - ("TimeoutError", 15), - ("TypeError", 16), - ("ValueError", 17), - ("ZeroDivisionError", 18), + ("UnwrapNoneError", 10), ]; pub fn get_exception_id(name: &str) -> u32 {