Ticket #182: exit_during_start.diff

c/src/lib/libbsp/shared/bootcard.c

@@ -31 +31 @@
  *  $Id: bootcard.c,v 1.15 2006/11/15 15:20:05 joel Exp $
  */
 
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
 #include <bsp.h>
 
 #if defined(__USE_INIT_FINI__)
@@ -65 +66 @@
 
 int boot_card(int argc, char **argv, char **envp)
 {
-  int    status;
+  int    status = 0;
   static char  *argv_pointer = NULL;
   static char  *envp_pointer = NULL;
   char **argv_p = &argv_pointer;
@@ -115 +116 @@
 #endif
 
   /*
-   * XXX
+   * Invoke the BSP specific pre-device driver initialization code.
    */
 
   bsp_start();
@@ -127 +128 @@
   bsp_isr_level =
     rtems_initialize_executive_early( &BSP_Configuration, &Cpu_table );
 
-  /*
-   *  The atexit hook will be before the static destructor list's entry
-   *  point.
-   */
-
-#if defined(__USE_INIT_FINI__)
-   atexit( _fini );
-#endif
-
-  /*
-   *  Call c_rtems_main() and eventually let the first task or the real
-   *  main() invoke the global constructors if there are any.
-   */
-
-  if ((argc > 0) && argv && argv[0])
-    rtems_progname = argv[0];
-  else
-    rtems_progname = "RTEMS";
-
-  rtems_initialize_executive_late( bsp_isr_level );
-
-  /*
-   *  Perform any BSP specific shutdown actions.
-   */
-
-  bsp_cleanup();
+  if ( _System_state_Get() == SYSTEM_STATE_BETWEEN_EARLY_AND_LATE ) {
+    /*
+     *  The atexit hook will be before the static destructor list's entry
+     *  point.
+     */
+    #if defined(__USE_INIT_FINI__)
+      atexit( _fini );
+    #endif
+
+    /*
+     *  Provide enough information to pass arguments.
+     */
+    if ((argc > 0) && argv && argv[0])
+      rtems_progname = argv[0];
+    else
+      rtems_progname = "RTEMS";
+
+    rtems_initialize_executive_late( bsp_isr_level );
+
+    /*
+     *  Perform any BSP specific shutdown actions.
+     */
+    bsp_cleanup();
+  }
 
   /*
    *  Now return to the start code.
    */
-
   return status;
 }

cpukit/libcsupport/src/newlibc.c

@@ -368 +368 @@
    *  associated with this task.
    */
 
-  libc_wrapup();
+  if (_System_state_Is_up(_System_state_Get()))
+    libc_wrapup();
   rtems_shutdown_executive(status);
   for (;;) ; /* to avoid warnings */
 }
@@ -377 +378 @@
 
 void exit(int status)
 {
-  libc_wrapup();
+  if (_System_state_Is_up(_System_state_Get()))
+    libc_wrapup();
   rtems_shutdown_executive(status);
   for (;;) ; /* to avoid warnings */
 }

cpukit/sapi/src/exinit.c

@@ -125 +125 @@
 
   _CPU_Initialize( cpu_table, _Thread_Dispatch );
 
+
+  /* 
+   * At this point, we should be able to context switch to ourselves
+   * so we can shutdown back to here.
+   */
+  _Context_Switch( &_Thread_BSP_context, &_Thread_BSP_context );
+  if ( _System_state_Get () != SYSTEM_STATE_BEFORE_INITIALIZATION ) {
+    _System_state_Set( SYSTEM_STATE_SHUTDOWN );
+    return bsp_level;
+  }
+
+  _System_state_Set( SYSTEM_STATE_BEFORE_SCORE_INITIALIZATION );
+
   /*
    *  Do this as early as possible to insure no debugging output
    *  is even attempted to be printed.
@@ -257 +270 @@
   if ( _CPU_Table.postdriver_hook )
     (*_CPU_Table.postdriver_hook)();
 
+  _System_state_Set( SYSTEM_STATE_BETWEEN_EARLY_AND_LATE );
   return bsp_level;
 }
 
@@ -296 +310 @@
    uint32_t   result
 )
 {
-  if ( _System_state_Current != SYSTEM_STATE_SHUTDOWN ) {
-    _System_state_Set( SYSTEM_STATE_SHUTDOWN );
-    _Thread_Stop_multitasking();
+  switch ( _System_state_Get() ) {
+    case SYSTEM_STATE_BEFORE_INITIALIZATION:
+    case SYSTEM_STATE_BEFORE_SCORE_INITIALIZATION:
+    case SYSTEM_STATE_BEFORE_MULTITASKING:
+    case SYSTEM_STATE_BEGIN_MULTITASKING:
+    case SYSTEM_STATE_BETWEEN_EARLY_AND_LATE:
+    {
+      Context_Control junk;
+      _System_state_Set( SYSTEM_STATE_FAILED );
+      _Context_Switch( &junk, &_Thread_BSP_context );
+      break;
+    }
+    case SYSTEM_STATE_UP:
+      _System_state_Set( SYSTEM_STATE_SHUTDOWN );
+      _Thread_Stop_multitasking();
+      break;
+    case SYSTEM_STATE_SHUTDOWN:
+    case SYSTEM_STATE_FAILED:
+      break;
   }
 }

cpukit/score/include/rtems/score/sysstate.h

@@ -46 +46 @@
   /** This indicates that the system state is between end of the first
    *  phase of initializatin but before  multitasking is started.
    */
+  SYSTEM_STATE_BEFORE_SCORE_INITIALIZATION,
+  /** This indicates that the system state is between end of SuperCore
+   *  initialization but before  multitasking is started.
+   */
   SYSTEM_STATE_BEFORE_MULTITASKING,
   /** This indicates that the system state is attempting to initiate 
    *  multitasking. 
    */
   SYSTEM_STATE_BEGIN_MULTITASKING,
+  /** This indicates that the system is normal and between
+   *  rtems_initialize_executive_early and rtems_initialize_executive_late.
+   */
+  SYSTEM_STATE_BETWEEN_EARLY_AND_LATE,
   /** This indicates that the system is up and operating normally. */
   SYSTEM_STATE_UP,
   /** This indicates that the system is in the midst of a shutdown. */