From e9a8c3fe10aea80f7efd00cbd459e49dfa0d4ccb Mon Sep 17 00:00:00 2001 From: abdul124 Date: Wed, 21 Aug 2024 16:35:03 +0800 Subject: [PATCH] firmware: add unit tests for exception sync --- src/libksupport/src/eh_artiq.rs | 30 +++++++++++++++++++++++++++--- src/libksupport/src/kernel/api.rs | 7 +++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/libksupport/src/eh_artiq.rs b/src/libksupport/src/eh_artiq.rs index 1587e47..a0f0519 100644 --- a/src/libksupport/src/eh_artiq.rs +++ b/src/libksupport/src/eh_artiq.rs @@ -15,7 +15,7 @@ use core::mem; use core_io::Error as ReadError; -use cslice::CSlice; +use cslice::{AsCSlice, CSlice}; use dwarf::eh::{self, EHAction, EHContext}; use io::{Cursor, ProtoRead}; use libc::{c_int, c_void, uintptr_t}; @@ -222,8 +222,6 @@ pub unsafe fn artiq_personality( } pub unsafe extern "C" fn raise(exception: *const Exception) -> ! { - use cslice::AsCSlice; - let count = EXCEPTION_BUFFER.exception_count; let stack = &mut EXCEPTION_BUFFER.exception_stack; let diff = exception as isize - EXCEPTION_BUFFER.exceptions.as_ptr() as isize; @@ -533,3 +531,29 @@ macro_rules! artiq_raise { }}; ($name:expr, $message:expr) => {{ artiq_raise!($name, $message, 0, 0, 0) }}; } + +/// Takes as input exception id from host +/// Generates a new exception with: +/// * `id` set to `exn_id` +/// * `message` set to corresponding exception name from `EXCEPTION_ID_LOOKUP` +/// +/// The message is matched on host to ensure correct exception is being referred +/// This test checks the synchronization of exception ids for runtime errors +#[no_mangle] +pub extern "C" fn test_exception_id_sync(exn_id: u32) { + let message = EXCEPTION_ID_LOOKUP + .iter() + .find_map(|&(name, id)| if id == exn_id { Some(name) } else { None }) + .unwrap_or("unallocated internal exception id"); + + let exn = Exception { + id: exn_id, + file: file!().as_c_slice(), + line: 0, + column: 0, + function: "test_exception_id_sync".as_c_slice(), + message: message.as_c_slice(), + param: [0, 0, 0], + }; + unsafe { raise(&exn) }; +} diff --git a/src/libksupport/src/kernel/api.rs b/src/libksupport/src/kernel/api.rs index 836e81e..caaa2fc 100644 --- a/src/libksupport/src/kernel/api.rs +++ b/src/libksupport/src/kernel/api.rs @@ -319,6 +319,13 @@ pub fn resolve(required: &[u8]) -> Option { } api!(yn = yn) }, + /* + * syscall for unit tests + * Used in `artiq.tests.coredevice.test_exceptions.ExceptionTest.test_raise_exceptions_kernel` + * This syscall checks that the exception IDs used in the Python `EmbeddingMap` (in `artiq.language.embedding`) + * match the `EXCEPTION_ID_LOOKUP` defined in the firmware (`libksupport::src::eh_artiq`) + */ + api!(test_exception_id_sync = eh_artiq::test_exception_id_sync) ]; api.iter() .find(|&&(exported, _)| exported.as_bytes() == required)