score: Rename interrupt stack symbols

Rename

  * _Configuration_Interrupt_stack_area_begin in _ISR_Stack_area_begin,
  * _Configuration_Interrupt_stack_area_end in _ISR_Stack_area_end, and
  * _Configuration_Interrupt_stack_size in _ISR_Stack_size.

Move definitions to <rtems/score/isr.h>.  The new names are considerable
shorter and in the right namespace.

Update #3459.

6 files changed, 34 insertions, 33 deletions

diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index 15d0947ea3..b7ba7e9d11 100644
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -1176,16 +1176,16 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
 
 #ifdef CONFIGURE_INIT
   RTEMS_DEFINE_GLOBAL_SYMBOL(
-    _Configuration_Interrupt_stack_size,
+    _ISR_Stack_size,
     CONFIGURE_INTERRUPT_STACK_SIZE
   );
 
-  char _Configuration_Interrupt_stack_area_begin[
+  char _ISR_Stack_area_begin[
     _CONFIGURE_MAXIMUM_PROCESSORS * CONFIGURE_INTERRUPT_STACK_SIZE
   ] RTEMS_ALIGNED( CPU_INTERRUPT_STACK_ALIGNMENT )
   RTEMS_SECTION( ".rtemsstack.interrupt.begin" );
 
-  const char _Configuration_Interrupt_stack_area_end[ 0 ]
+  const char _ISR_Stack_area_end[ 0 ]
     RTEMS_SECTION( ".rtemsstack.interrupt.end" ) = { };
 #endif
 
diff --git a/cpukit/include/rtems/config.h b/cpukit/include/rtems/config.h
index c910aa07bb..23b6132c38 100644
--- a/cpukit/include/rtems/config.h
+++ b/cpukit/include/rtems/config.h
@@ -32,6 +32,7 @@ extern "C" {
  */
 
 #include <rtems/score/object.h>
+#include <rtems/score/isr.h>
 #include <rtems/score/watchdog.h>
 #include <rtems/rtems/config.h>
 #include <rtems/posix/config.h>
@@ -294,34 +295,8 @@ extern const rtems_configuration_table Configuration;
 #define rtems_configuration_get_idle_task_stack_size() \
         (Configuration.idle_task_stack_size)
 
-/**
- * @brief Global symbol with a value equal to the configure interrupt stack size.
- *
- * This global symbol is defined by the application configuration option
- * CONFIGURE_INIT_TASK_STACK_SIZE via <rtems/confdefs.h>.
- */
-RTEMS_DECLARE_GLOBAL_SYMBOL( _Configuration_Interrupt_stack_size );
-
-/**
- * @brief The interrupt stack area begin.
- *
- * The interrupt stack area is defined by the application configuration via
- * <rtems/confdefs.h>.  The size of the area depends on
- * CONFIGURE_INIT_TASK_STACK_SIZE and CONFIGURE_MAXIMUM_PROCESSORS.
- */
-extern char _Configuration_Interrupt_stack_area_begin[];
-
-/**
- * @brief The interrupt stack area end.
- *
- * The interrupt stack area is defined by the application configuration via
- * <rtems/confdefs.h>.  The size of the area depends on
- * CONFIGURE_INIT_TASK_STACK_SIZE and CONFIGURE_MAXIMUM_PROCESSORS.
- */
-extern const char _Configuration_Interrupt_stack_area_end[];
-
 #define rtems_configuration_get_interrupt_stack_size() \
-        ((size_t) _Configuration_Interrupt_stack_size)
+        ((size_t) _ISR_Stack_size)
 
 #define rtems_configuration_get_stack_allocate_init_hook() \
         (Configuration.stack_allocate_init_hook)
diff --git a/cpukit/include/rtems/score/isr.h b/cpukit/include/rtems/score/isr.h
index d9c03b807f..58dbb843c6 100644
--- a/cpukit/include/rtems/score/isr.h
+++ b/cpukit/include/rtems/score/isr.h
@@ -77,6 +77,32 @@ extern ISR_Handler_entry _ISR_Vector_table[ CPU_INTERRUPT_NUMBER_OF_VECTORS ];
 #endif
 
 /**
+ * @brief Global symbol with a value equal to the configure interrupt stack size.
+ *
+ * This global symbol is defined by the application configuration option
+ * CONFIGURE_INIT_TASK_STACK_SIZE via <rtems/confdefs.h>.
+ */
+RTEMS_DECLARE_GLOBAL_SYMBOL( _ISR_Stack_size );
+
+/**
+ * @brief The interrupt stack area begin.
+ *
+ * The interrupt stack area is defined by the application configuration via
+ * <rtems/confdefs.h>.  The size of the area depends on
+ * CONFIGURE_INIT_TASK_STACK_SIZE and CONFIGURE_MAXIMUM_PROCESSORS.
+ */
+extern char _ISR_Stack_area_begin[];
+
+/**
+ * @brief The interrupt stack area end.
+ *
+ * The interrupt stack area is defined by the application configuration via
+ * <rtems/confdefs.h>.  The size of the area depends on
+ * CONFIGURE_INIT_TASK_STACK_SIZE and CONFIGURE_MAXIMUM_PROCESSORS.
+ */
+extern const char _ISR_Stack_area_end[];
+
+/**
  *  @brief Initialize the ISR handler.
  *
  *  This routine performs the initialization necessary for the ISR handler.
diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c
index 3670210f5b..ce7d1a08cb 100644
--- a/cpukit/libmisc/stackchk/check.c
+++ b/cpukit/libmisc/stackchk/check.c
@@ -502,7 +502,7 @@ static void Stack_check_Prepare_interrupt_stacks( void )
   uint32_t      cpu_max;
 
   stack.size = rtems_configuration_get_interrupt_stack_size();
-  stack.area = _Configuration_Interrupt_stack_area_begin;
+  stack.area = _ISR_Stack_area_begin;
   cpu_max = rtems_configuration_get_maximum_processors();
 
   for ( cpu_index = 0; cpu_index < cpu_max; ++cpu_index ) {
diff --git a/cpukit/score/cpu/m68k/cpu.c b/cpukit/score/cpu/m68k/cpu.c
index 77a91535c3..87e0fe384d 100644
--- a/cpukit/score/cpu/m68k/cpu.c
+++ b/cpukit/score/cpu/m68k/cpu.c
@@ -62,7 +62,7 @@ int (*_FPSP_install_raw_handler)(
 static void m68k_install_interrupt_stack( void )
 {
 #if ( M68K_HAS_SEPARATE_STACKS == 1 )
-  uintptr_t isp = (uintptr_t) _Configuration_Interrupt_stack_area_end;
+  uintptr_t isp = (uintptr_t) _ISR_Stack_area_end;
 
   __asm__ volatile ( "movec %0,%%isp" : "=r" (isp) : "0" (isp) );
 #endif
diff --git a/cpukit/score/src/isr.c b/cpukit/score/src/isr.c
index 6a1b307f42..4a7bc5fcce 100644
--- a/cpukit/score/src/isr.c
+++ b/cpukit/score/src/isr.c
@@ -48,7 +48,7 @@ void _ISR_Handler_initialization( void )
 
   stack_size = rtems_configuration_get_interrupt_stack_size();
   cpu_max = rtems_configuration_get_maximum_processors();
-  stack_low = _Configuration_Interrupt_stack_area_begin;
+  stack_low = _ISR_Stack_area_begin;
 
   for ( cpu_index = 0 ; cpu_index < cpu_max; ++cpu_index ) {
     Per_CPU_Control *cpu;