adds ISR check that is closer to productive code

This approach patches the existing trap handler to call the test routine
This commit is contained in:
2026-03-21 20:27:16 +01:00
parent 8bcbc9881e
commit 7307a86860
3 changed files with 44 additions and 1 deletions

View File

@@ -3,11 +3,15 @@ set(THREADX4TGFS_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
set(MOONLIGHT_SRC_DIR ${MOONLIGHT_ROOT}/src) set(MOONLIGHT_SRC_DIR ${MOONLIGHT_ROOT}/src)
set(MOONLIGHT_INC_DIR ${MOONLIGHT_ROOT}/inc) set(MOONLIGHT_INC_DIR ${MOONLIGHT_ROOT}/inc)
if(NOT DEFINED MOONLIGHT_TRAP_SOURCE)
set(MOONLIGHT_TRAP_SOURCE ${MOONLIGHT_SRC_DIR}/trap_non_vectored.c)
endif()
set(MOONLIGHT_PLATFORM_SOURCES set(MOONLIGHT_PLATFORM_SOURCES
${THREADX4TGFS_ROOT}/port/picolibc/port.c ${THREADX4TGFS_ROOT}/port/picolibc/port.c
${MOONLIGHT_SRC_DIR}/bootup.c ${MOONLIGHT_SRC_DIR}/bootup.c
${MOONLIGHT_SRC_DIR}/board.c ${MOONLIGHT_SRC_DIR}/board.c
${MOONLIGHT_SRC_DIR}/trap_non_vectored.c ${MOONLIGHT_TRAP_SOURCE}
${MOONLIGHT_SRC_DIR}/exception.c ${MOONLIGHT_SRC_DIR}/exception.c
${MOONLIGHT_SRC_DIR}/vector_table.c) ${MOONLIGHT_SRC_DIR}/vector_table.c)

View File

@@ -24,6 +24,18 @@ enable_testing()
set(TARGET_MEM "ram_dram" CACHE STRING "memory map to use") set(TARGET_MEM "ram_dram" CACHE STRING "memory map to use")
set(CMAKE_EXECUTABLE_SUFFIX_C ".elf") set(CMAKE_EXECUTABLE_SUFFIX_C ".elf")
set(MOONLIGHT_TRAP_SOURCE_INPUT ${THREADX4TGFS_ROOT}/port/moonlight/src/trap_non_vectored.c)
set(MOONLIGHT_TRAP_SOURCE ${CMAKE_BINARY_DIR}/generated/trap_non_vectored.c)
execute_process(
COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/threadx/generate_trap_file.sh
${MOONLIGHT_TRAP_SOURCE_INPUT}
${MOONLIGHT_TRAP_SOURCE}
RESULT_VARIABLE MOONLIGHT_TRAP_GENERATE_RESULT
)
if(NOT MOONLIGHT_TRAP_GENERATE_RESULT EQUAL 0)
message(FATAL_ERROR "Failed to generate regression trap source")
endif()
add_subdirectory(${THREADX4TGFS_ROOT}/port/moonlight ${CMAKE_BINARY_DIR}/port/moonlight) add_subdirectory(${THREADX4TGFS_ROOT}/port/moonlight ${CMAKE_BINARY_DIR}/port/moonlight)
function(setup_target TARGET) function(setup_target TARGET)

View File

@@ -0,0 +1,27 @@
#!/bin/bash
set -eu
src="$1"
dst="$2"
extern_anchor='extern void _tx_timer_interrupt(void);'
call_anchor='_tx_timer_interrupt();'
line=$(grep -n -F "$extern_anchor" "$src" | head -n 1 | cut -d: -f1)
if [ -z "$line" ]; then
echo "failed to find _tx_timer_interrupt declaration anchor in trap source" >&2
exit 1
fi
sed "${line}a\\
extern void test_interrupt_dispatch(void);" "$src" > "$dst.tmp1"
line=$(grep -n -F "$call_anchor" "$dst.tmp1" | head -n 1 | cut -d: -f1)
if [ -z "$line" ]; then
echo "failed to find _tx_timer_interrupt call anchor in trap source" >&2
rm -f "$dst.tmp1"
exit 1
fi
mkdir -p "$(dirname "$dst")"
sed "${line}i\\
test_interrupt_dispatch();" "$dst.tmp1" > "$dst"
rm -f "$dst.tmp1"