[PATCH 01/10] score: Remove _CPU_Initialize_vectors()

Sebastian Huber sebastian.huber at embedded-brains.de
Wed Jun 23 06:49:27 UTC 2021


This CPU port macro was not used.  Since the _ISR_Vector_table[] is statically
allocated, CPU ports could initialize this table in _CPU_Initialize() if
necessary.  Remove _CPU_Initialize_vectors() to simplify the CPU port
interface.
---
 cpukit/score/cpu/bfin/include/rtems/score/cpu.h    |  9 ---------
 cpukit/score/cpu/lm32/include/rtems/score/cpu.h    |  9 ---------
 cpukit/score/cpu/m68k/include/rtems/score/cpu.h    |  3 ---
 cpukit/score/cpu/moxie/include/rtems/score/cpu.h   |  5 -----
 cpukit/score/cpu/nios2/include/rtems/score/cpu.h   |  2 --
 cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h  | 11 -----------
 cpukit/score/cpu/or1k/include/rtems/score/cpu.h    | 10 ----------
 cpukit/score/cpu/riscv/include/rtems/score/cpu.h   |  2 --
 cpukit/score/cpu/sh/include/rtems/score/cpu.h      |  8 --------
 cpukit/score/cpu/sparc/include/rtems/score/cpu.h   |  5 -----
 cpukit/score/cpu/sparc64/include/rtems/score/cpu.h |  6 ------
 cpukit/score/cpu/x86_64/include/rtems/score/cpu.h  |  2 --
 cpukit/score/src/isr.c                             |  4 ----
 13 files changed, 76 deletions(-)

diff --git a/cpukit/score/cpu/bfin/include/rtems/score/cpu.h b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
index d17dfbd30a..b1063c9eee 100644
--- a/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
@@ -307,15 +307,6 @@ typedef struct {
  */
 /**@{**/
 
-/**
- * Support routine to initialize the RTEMS vector table after it is allocated.
- *
- * Port Specific Information:
- *
- * XXX document implementation including references if appropriate
- */
-#define _CPU_Initialize_vectors()
-
 /**
  * Disable all interrupts for an RTEMS critical section.  The previous
  * level is returned in @a _isr_cookie.
diff --git a/cpukit/score/cpu/lm32/include/rtems/score/cpu.h b/cpukit/score/cpu/lm32/include/rtems/score/cpu.h
index 5c890de53e..29af53a53b 100644
--- a/cpukit/score/cpu/lm32/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/lm32/include/rtems/score/cpu.h
@@ -414,15 +414,6 @@ extern Context_Control_fp _CPU_Null_fp_context;
  */
 /**@{**/
 
-/**
- * Support routine to initialize the RTEMS vector table after it is allocated.
- *
- * Port Specific Information:
- *
- * XXX document implementation including references if appropriate
- */
-#define _CPU_Initialize_vectors()
-
 /**
  * Disable all interrupts for an RTEMS critical section.  The previous
  * level is returned in @a _isr_cookie.
diff --git a/cpukit/score/cpu/m68k/include/rtems/score/cpu.h b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h
index de7f8215bb..65ba0ef496 100644
--- a/cpukit/score/cpu/m68k/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h
@@ -350,15 +350,12 @@ extern void*                     _VBR;
  *  ISR handler macros
  *
  *  These macros perform the following functions:
- *     + initialize the RTEMS vector table
  *     + disable all maskable CPU interrupts
  *     + restore previous interrupt level (enable)
  *     + temporarily restore interrupts (flash)
  *     + set a particular level
  */
 
-#define _CPU_Initialize_vectors()
-
 #define _CPU_ISR_Disable( _level ) \
   m68k_disable_interrupts( _level )
 
diff --git a/cpukit/score/cpu/moxie/include/rtems/score/cpu.h b/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
index c857734a2e..9959892689 100644
--- a/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
@@ -255,11 +255,6 @@ typedef struct {
  *  ISR handler macros
  */
 
-/*
- *  Support routine to initialize the RTEMS vector table after it is allocated.
- */
-#define _CPU_Initialize_vectors()
-
 /*
  *  Disable all interrupts for an RTEMS critical section.  The previous
  *  level is returned in _level.
diff --git a/cpukit/score/cpu/nios2/include/rtems/score/cpu.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
index 8caec19b5b..69c96280f4 100644
--- a/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
@@ -172,8 +172,6 @@ typedef struct {
   uint32_t ipending;
 } CPU_Exception_frame;
 
-#define _CPU_Initialize_vectors()
-
 /**
  * @brief Macro to disable interrupts.
  *
diff --git a/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
index 09f34b4acd..120b51b633 100644
--- a/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h
@@ -615,17 +615,6 @@ extern Context_Control_fp _CPU_Null_fp_context;
  *  ISR handler macros
  */
 
-/**
- * @addtogroup RTEMSScoreCPUExampleInterrupt
- * 
- * Support routine to initialize the RTEMS vector table after it is allocated.
- *
- * Port Specific Information:
- *
- * XXX document implementation including references if appropriate
- */
-#define _CPU_Initialize_vectors()
-
 /**
  * @addtogroup RTEMSScoreCPUExampleInterrupt
  * 
diff --git a/cpukit/score/cpu/or1k/include/rtems/score/cpu.h b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
index 22acfd590e..5cd59df3f4 100644
--- a/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
@@ -243,16 +243,6 @@ typedef Context_Control CPU_Interrupt_frame;
 
 /* ISR handler macros */
 
-/*
- *  Support routine to initialize the RTEMS vector table after it is allocated.
- *
- *  NO_CPU Specific Information:
- *
- *  XXX document implementation including references if appropriate
- */
-
-#define _CPU_Initialize_vectors()
-
 /*
  *  Disable all interrupts for an RTEMS critical section.  The previous
  *  level is returned in _level.
diff --git a/cpukit/score/cpu/riscv/include/rtems/score/cpu.h b/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
index a44b815b12..d9056d0ad1 100644
--- a/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/riscv/include/rtems/score/cpu.h
@@ -147,8 +147,6 @@ typedef struct {
 
 #define CPU_PROVIDES_ISR_IS_IN_PROGRESS FALSE
 
-#define _CPU_Initialize_vectors()
-
 static inline uint32_t riscv_interrupt_disable( void )
 {
   unsigned long mstatus;
diff --git a/cpukit/score/cpu/sh/include/rtems/score/cpu.h b/cpukit/score/cpu/sh/include/rtems/score/cpu.h
index 0df6aa3f83..364a2bc310 100644
--- a/cpukit/score/cpu/sh/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sh/include/rtems/score/cpu.h
@@ -366,14 +366,6 @@ void CPU_delay( uint32_t   microseconds );
  *  ISR handler macros
  */
 
-/*
- *  Support routine to initialize the RTEMS vector table after it is allocated.
- *
- *  SH Specific Information: NONE
- */
-
-#define _CPU_Initialize_vectors()
-
 /*
  *  Disable all interrupts for an RTEMS critical section.  The previous
  *  level is returned in _level.
diff --git a/cpukit/score/cpu/sparc/include/rtems/score/cpu.h b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
index 6c167e3f08..0daf1d9a28 100644
--- a/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
@@ -747,11 +747,6 @@ extern const CPU_Trap_table_entry _CPU_Trap_slot_template;
  *  ISR handler macros
  */
 
-/**
- * Support routine to initialize the RTEMS vector table after it is allocated.
- */
-#define _CPU_Initialize_vectors()
-
 /**
  * Disable all interrupts for a critical section.  The previous
  * level is returned in _level.
diff --git a/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h b/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
index e0f56b8e89..3c41a922e7 100644
--- a/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
@@ -651,12 +651,6 @@ extern const CPU_Trap_table_entry _CPU_Trap_slot_template;
  *  ISR handler macros
  */
 
-/*
- *  Support routine to initialize the RTEMS vector table after it is allocated.
- */
-
-#define _CPU_Initialize_vectors()
-
 /*
  *  Disable all interrupts for a critical section.  The previous
  *  level is returned in _level.
diff --git a/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h b/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h
index 80dbc25214..1e97250188 100644
--- a/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/x86_64/include/rtems/score/cpu.h
@@ -155,8 +155,6 @@ typedef struct {
 
 #ifndef ASM
 
-#define _CPU_Initialize_vectors()
-
 #define _CPU_ISR_Enable(_level)                             \
 {                                                           \
   amd64_enable_interrupts();                                \
diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c
index 519532b283..09b1f37faa 100644
--- a/cpukit/score/src/isr.c
+++ b/cpukit/score/src/isr.c
@@ -44,10 +44,6 @@ void _ISR_Handler_initialization( void )
 
   _ISR_Nest_level = 0;
 
-#if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
-  _CPU_Initialize_vectors();
-#endif
-
   stack_size = rtems_configuration_get_interrupt_stack_size();
   cpu_max = rtems_configuration_get_maximum_processors();
   stack_low = _ISR_Stack_area_begin;
-- 
2.26.2



More information about the devel mailing list