Changeset 0451b44 in rtems

Timestamp:

04/15/98 00:02:10 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

9b64c2d5

Parents:

7780978

Message:

Per suggestion from Eric Norum, went from one initial extension set
to multiple. This lets the stack check extension be installed
at system initialization time and avoids the BSP having to
even know about its existence.

Files:

• c/src/exec/sapi/headers/confdefs.h (modified) (2 diffs)
• c/src/exec/sapi/headers/config.h (modified) (1 diff)
• c/src/exec/sapi/include/confdefs.h (modified) (2 diffs)
• c/src/exec/sapi/include/rtems/config.h (modified) (1 diff)
• c/src/exec/sapi/src/exinit.c (modified) (1 diff)
• c/src/exec/score/headers/userext.h (modified) (1 diff)
• c/src/exec/score/include/rtems/score/userext.h (modified) (1 diff)
• c/src/exec/score/inline/rtems/score/userext.inl (modified) (2 diffs)
• c/src/exec/score/inline/userext.inl (modified) (2 diffs)
• cpukit/sapi/include/confdefs.h (modified) (2 diffs)
• cpukit/sapi/include/rtems/config.h (modified) (1 diff)
• cpukit/sapi/src/exinit.c (modified) (1 diff)
• cpukit/score/include/rtems/score/userext.h (modified) (1 diff)
• cpukit/score/inline/rtems/score/userext.inl (modified) (2 diffs)

c/src/exec/sapi/headers/confdefs.h

@@ -285 +285 @@
 #endif
 
-#ifndef CONFIGURE_INITIAL_EXTENSIONS  
-#define CONFIGURE_INITIAL_EXTENSIONS         NULL
+/*
+ *  Initial Extension Set
+ */
+
+#ifdef CONFIGURE_INIT
+#ifdef STACK_CHECKER_ON
+#include <stackchk.h>
+#endif
+
+rtems_extensions_table Configuration_Initial_Extensions[] = {
+#ifdef CONFIGURE_INITIAL_EXTENSIONS
+    CONFIGURE_INITIAL_EXTENSIONS,
+#endif
+#ifdef STACK_CHECKER_ON
+    STACK_CHECKER_EXTENSION,
+#endif
+    { NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+};
+
+#define CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
+  ((sizeof(Configuration_Initial_Extensions) / \
+    sizeof(rtems_extensions_table)) - 1)
+
 #endif
 
@@ -531 +552 @@
     sizeof(rtems_driver_address_table),      /* number of device drivers */
   Device_drivers,                            /* pointer to driver table */
-  CONFIGURE_INITIAL_EXTENSIONS,              /* pointer to initial extensions */
+  CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS,    /* number of initial extensions */
+  Configuration_Initial_Extensions,          /* pointer to initial extensions */
   CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
   &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */

c/src/exec/sapi/headers/config.h

@@ -82 +82 @@
   unsigned32                        number_of_device_drivers;
   rtems_driver_address_table       *Device_driver_table;
+  unsigned32                        number_of_initial_extensions;
   rtems_extensions_table           *User_extension_table;
   rtems_multiprocessing_table      *User_multiprocessing_table;

c/src/exec/sapi/include/confdefs.h

@@ -285 +285 @@
 #endif
 
-#ifndef CONFIGURE_INITIAL_EXTENSIONS  
-#define CONFIGURE_INITIAL_EXTENSIONS         NULL
+/*
+ *  Initial Extension Set
+ */
+
+#ifdef CONFIGURE_INIT
+#ifdef STACK_CHECKER_ON
+#include <stackchk.h>
+#endif
+
+rtems_extensions_table Configuration_Initial_Extensions[] = {
+#ifdef CONFIGURE_INITIAL_EXTENSIONS
+    CONFIGURE_INITIAL_EXTENSIONS,
+#endif
+#ifdef STACK_CHECKER_ON
+    STACK_CHECKER_EXTENSION,
+#endif
+    { NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+};
+
+#define CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
+  ((sizeof(Configuration_Initial_Extensions) / \
+    sizeof(rtems_extensions_table)) - 1)
+
 #endif
 
@@ -531 +552 @@
     sizeof(rtems_driver_address_table),      /* number of device drivers */
   Device_drivers,                            /* pointer to driver table */
-  CONFIGURE_INITIAL_EXTENSIONS,              /* pointer to initial extensions */
+  CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS,    /* number of initial extensions */
+  Configuration_Initial_Extensions,          /* pointer to initial extensions */
   CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
   &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */

c/src/exec/sapi/include/rtems/config.h

@@ -82 +82 @@
   unsigned32                        number_of_device_drivers;
   rtems_driver_address_table       *Device_driver_table;
+  unsigned32                        number_of_initial_extensions;
   rtems_extensions_table           *User_extension_table;
   rtems_multiprocessing_table      *User_multiprocessing_table;

c/src/exec/sapi/src/exinit.c

@@ -150 +150 @@
   _Thread_Dispatch_initialization();
 
-  _User_extensions_Handler_initialization(
-    configuration_table->User_extension_table
-  );
-
   _Workspace_Handler_initialization(
      (void *)configuration_table->work_space_start,
      configuration_table->work_space_size
+  );
+
+  _User_extensions_Handler_initialization(
+    configuration_table->number_of_initial_extensions,
+    configuration_table->User_extension_table
   );
 

c/src/exec/score/headers/userext.h

@@ -102 +102 @@
 
 /*
- *  The following contains the static extension set which may be
- *  configured by the application.
- */
-
-SCORE_EXTERN User_extensions_Control _User_extensions_Initial;
-
-/*
  *  The following is used to manage the list of active extensions.
  */

c/src/exec/score/include/rtems/score/userext.h

@@ -102 +102 @@
 
 /*
- *  The following contains the static extension set which may be
- *  configured by the application.
- */
-
-SCORE_EXTERN User_extensions_Control _User_extensions_Initial;
-
-/*
  *  The following is used to manage the list of active extensions.
  */

c/src/exec/score/inline/rtems/score/userext.inl

@@ -18 +18 @@
 #define __USER_EXTENSIONS_inl
 
+#include <rtems/score/wkspace.h>
+
 /*PAGE
  *
@@ -28 +30 @@
 
 RTEMS_INLINE_ROUTINE void _User_extensions_Handler_initialization (
+    unsigned32              number_of_extensions,
     User_extensions_Table  *initial_extensions
 )
 {
+  User_extensions_Control *extension;
+  unsigned32               i;
+
   _Chain_Initialize_empty( &_User_extensions_List );
 
   if ( initial_extensions ) {
-    _User_extensions_Initial.Callouts = *initial_extensions;
-    _Chain_Append( &_User_extensions_List, &_User_extensions_Initial.Node );
+    for (i=0 ; i<number_of_extensions ; i++ ) {
+      extension =
+         _Workspace_Allocate_or_fatal_error( sizeof(User_extensions_Control) );
+
+      extension->Callouts = initial_extensions[i];
+      _Chain_Append( &_User_extensions_List, &extension->Node );
+    }
   }
 }

c/src/exec/score/inline/userext.inl

@@ -18 +18 @@
 #define __USER_EXTENSIONS_inl
 
+#include <rtems/score/wkspace.h>
+
 /*PAGE
  *
@@ -28 +30 @@
 
 RTEMS_INLINE_ROUTINE void _User_extensions_Handler_initialization (
+    unsigned32              number_of_extensions,
     User_extensions_Table  *initial_extensions
 )
 {
+  User_extensions_Control *extension;
+  unsigned32               i;
+
   _Chain_Initialize_empty( &_User_extensions_List );
 
   if ( initial_extensions ) {
-    _User_extensions_Initial.Callouts = *initial_extensions;
-    _Chain_Append( &_User_extensions_List, &_User_extensions_Initial.Node );
+    for (i=0 ; i<number_of_extensions ; i++ ) {
+      extension =
+         _Workspace_Allocate_or_fatal_error( sizeof(User_extensions_Control) );
+
+      extension->Callouts = initial_extensions[i];
+      _Chain_Append( &_User_extensions_List, &extension->Node );
+    }
   }
 }

cpukit/sapi/include/confdefs.h

@@ -285 +285 @@
 #endif
 
-#ifndef CONFIGURE_INITIAL_EXTENSIONS  
-#define CONFIGURE_INITIAL_EXTENSIONS         NULL
+/*
+ *  Initial Extension Set
+ */
+
+#ifdef CONFIGURE_INIT
+#ifdef STACK_CHECKER_ON
+#include <stackchk.h>
+#endif
+
+rtems_extensions_table Configuration_Initial_Extensions[] = {
+#ifdef CONFIGURE_INITIAL_EXTENSIONS
+    CONFIGURE_INITIAL_EXTENSIONS,
+#endif
+#ifdef STACK_CHECKER_ON
+    STACK_CHECKER_EXTENSION,
+#endif
+    { NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+};
+
+#define CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS \
+  ((sizeof(Configuration_Initial_Extensions) / \
+    sizeof(rtems_extensions_table)) - 1)
+
 #endif
 
@@ -531 +552 @@
     sizeof(rtems_driver_address_table),      /* number of device drivers */
   Device_drivers,                            /* pointer to driver table */
-  CONFIGURE_INITIAL_EXTENSIONS,              /* pointer to initial extensions */
+  CONFIGURE_NUMBER_OF_INITIAL_EXTENSIONS,    /* number of initial extensions */
+  Configuration_Initial_Extensions,          /* pointer to initial extensions */
   CONFIGURE_MULTIPROCESSING_TABLE,           /* pointer to MP config table */
   &Configuration_RTEMS_API,                  /* pointer to RTEMS API config */

cpukit/sapi/include/rtems/config.h

@@ -82 +82 @@
   unsigned32                        number_of_device_drivers;
   rtems_driver_address_table       *Device_driver_table;
+  unsigned32                        number_of_initial_extensions;
   rtems_extensions_table           *User_extension_table;
   rtems_multiprocessing_table      *User_multiprocessing_table;

cpukit/sapi/src/exinit.c

@@ -150 +150 @@
   _Thread_Dispatch_initialization();
 
-  _User_extensions_Handler_initialization(
-    configuration_table->User_extension_table
-  );
-
   _Workspace_Handler_initialization(
      (void *)configuration_table->work_space_start,
      configuration_table->work_space_size
+  );
+
+  _User_extensions_Handler_initialization(
+    configuration_table->number_of_initial_extensions,
+    configuration_table->User_extension_table
   );
 

cpukit/score/include/rtems/score/userext.h

@@ -102 +102 @@
 
 /*
- *  The following contains the static extension set which may be
- *  configured by the application.
- */
-
-SCORE_EXTERN User_extensions_Control _User_extensions_Initial;
-
-/*
  *  The following is used to manage the list of active extensions.
  */

cpukit/score/inline/rtems/score/userext.inl

@@ -18 +18 @@
 #define __USER_EXTENSIONS_inl
 
+#include <rtems/score/wkspace.h>
+
 /*PAGE
  *
@@ -28 +30 @@
 
 RTEMS_INLINE_ROUTINE void _User_extensions_Handler_initialization (
+    unsigned32              number_of_extensions,
     User_extensions_Table  *initial_extensions
 )
 {
+  User_extensions_Control *extension;
+  unsigned32               i;
+
   _Chain_Initialize_empty( &_User_extensions_List );
 
   if ( initial_extensions ) {
-    _User_extensions_Initial.Callouts = *initial_extensions;
-    _Chain_Append( &_User_extensions_List, &_User_extensions_Initial.Node );
+    for (i=0 ; i<number_of_extensions ; i++ ) {
+      extension =
+         _Workspace_Allocate_or_fatal_error( sizeof(User_extensions_Control) );
+
+      extension->Callouts = initial_extensions[i];
+      _Chain_Append( &_User_extensions_List, &extension->Node );
+    }
   }
 }