WIP - add tables local declaration

zephyrproject-rtos · Dec 11, 2023 · 8bf86a3 · 8bf86a3
1 parent c70797e
commit 8bf86a3
Show file tree

Hide file tree

Showing 7 changed files with 687 additions and 284 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1226,10 +1226,11 @@ if(CONFIG_GEN_ISR_TABLES)
   # isr_tables.c is generated from ${ZEPHYR_LINK_STAGE_EXECUTABLE} by
   # gen_isr_tables.py
   add_custom_command(
-    OUTPUT isr_tables.c
+    OUTPUT isr_tables.c isr_tables.ld
     COMMAND ${PYTHON_EXECUTABLE}
     ${ZEPHYR_BASE}/scripts/build/gen_isr_tables.py
     --output-source isr_tables.c
+    --linker-output-file isr_tables.ld
     --kernel $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
     --intlist-section .intList
     --intlist-section intList

diff --git a/arch/arm/core/vector_table.ld b/arch/arm/core/vector_table.ld
@@ -53,4 +53,8 @@ KEEP(*(".exc_vector_table.*"))
 
 KEEP(*(.vectors))
 
+#if LINKER_ZEPHYR_FINAL
+INCLUDE zephyr/isr_tables.ld
+#endif
+
 _vector_end = .;
diff --git a/include/zephyr/arch/arm64/scripts/linker.ld b/include/zephyr/arch/arm64/scripts/linker.ld
@@ -107,6 +107,9 @@ SECTIONS
 
         KEEP(*(.vectors))
 
+	#if LINKER_ZEPHYR_FINAL
+	INCLUDE zephyr/isr_tables.ld
+	#endif
         _vector_end = .;
 
         *(.text)

diff --git a/include/zephyr/sw_isr_table.h b/include/zephyr/sw_isr_table.h
@@ -92,8 +92,8 @@ struct _isr_list_sname {
 
 #ifdef CONFIG_SHARED_INTERRUPTS
 struct z_shared_isr_client {
-	void (*isr)(const void *arg);
 	const void *arg;
+	void (*isr)(const void *arg);
 };
 
 struct z_shared_isr_table_entry {