Updated to current source and removed warnings.

5 files changed, 119 insertions, 309 deletions

diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
index 229bfa3eef..0877918685 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in
@@ -4,39 +4,29 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+VPATH = @srcdir@:@srcdir@/../../../shared
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 PGM=${ARCH}/startup.rel
 
 # C source names, if any, go here -- minus the .c
-C_PIECES=bspstart sbrk setvec genpvec vmeintr
+C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec genpvec vmeintr
 C_FILES=$(C_PIECES:%=%.c)
 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
-CC_PIECES=rtems-ctor
-CC_FILES=$(CC_PIECES:%=%.cc)
-CC_O_FILES=$(CC_PIECES:%=${ARCH}/%.o)
-
 H_FILES=
 
 # Assembly source names, if any, go here -- minus the .s
-S_PIECES=bspclean
+S_PIECES=
 S_FILES=$(S_PIECES:%=%.s)
 S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
 
 SRCS=linkcmds $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)
 
-# We install the RTEMS constructor as a separate .o
-# so it can be easily place correctly by the compiler config file.
-INSTALLED_O_FILES=$(ARCH)/rtems-ctor.o
-
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -65,4 +55,3 @@ ${PGM}: ${SRCS} ${OBJS}
 
 all:	${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM)
 	$(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib
-	$(INSTALL_VARIANT) $(INSTALLED_O_FILES) ${PROJECT_RELEASE}/lib
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
index fba086515c..1cb84d7d6b 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
@@ -20,11 +20,6 @@
 #include <libcsupport.h>
 
 #include <string.h>
-#include <fcntl.h>
-
-#ifdef STACK_CHECKER_ON
-#include <stackchk.h>
-#endif
 
 /*
  *  The original table from the application and our copy of it with
@@ -36,21 +31,22 @@ rtems_configuration_table         BSP_Configuration;
 rtems_cpu_table                   Cpu_table;
 rtems_unsigned32                  bsp_isr_level;
 
-/*  PAGE
- *
- *  bsp_libc_init
- *
- *  Initialize whatever libc we are using called from bsp_postdriver_hook.
- *
- *  Input parameters: NONE
+/*
+ *  Use the shared implementations of the following routines
+ */
+
+void bsp_postdriver_hook(void);
+void bsp_libc_init( void *, unsigned32, int );
+
+/*PAGE
  *
- *  Output parameters:  NONE
+ *  bsp_pretasking_hook
  *
- *  Return values: NONE
- *  
+ *  BSP pretasking hook.  Called just before drivers are initialized.
+ *  Used to setup libc and install any BSP extensions.
  */
 
-void bsp_libc_init(void)
+void bsp_pretasking_hook(void)
 {
   extern int end;
   rtems_unsigned32 heap_start;
@@ -63,55 +59,7 @@ void bsp_libc_init(void)
   heap_size = BSP_Configuration.work_space_start - (void *)&end;
   heap_size &= 0xfffffff0;  /* keep it as a multiple of 16 bytes */
 
-  RTEMS_Malloc_Initialize((void *) heap_start, heap_size, 0);
-
-  /*
-   *  Init the RTEMS libio facility to provide UNIX-like system
-   *  calls for use by newlib (ie: provide __rtems_open, __rtems_close, etc)
-   *  Uses malloc() to get area for the iops, so must be after malloc init
-   */
- 
-  rtems_libio_init();
- 
-  /*
-   * Set up for the libc handling.
-   */
- 
-  if (BSP_Configuration.ticks_per_timeslice > 0)
-    libc_init(1);                /* reentrant if possible */
-  else
-    libc_init(0);                /* non-reentrant */
-
-}
-
-
-/*  PAGE
- *
- *  bsp_pretasking_hook
- *
- *  BSP pretasking hook.  Called just before drivers are initialized.
- *  Used to setup libc and install any BSP extensions.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- *  
- */
-
-void bsp_pretasking_hook(void)
-{
-  bsp_libc_init();
-
-#ifdef STACK_CHECKER_ON
-  /*
-   *  Initialize the stack bounds checker
-   *  We can either turn it on here or from the app.
-   */
-
-  Stack_check_Initialize();
-#endif
+  bsp_libc_init((void *) heap_start, heap_size, 0);
 
 #ifdef RTEMS_DEBUG
   rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
@@ -136,56 +84,11 @@ void bsp_predriver_hook(void)
   initialize_external_exception_vector();
 }
 
-/*  PAGE
- *
- *  bsp_postdriver_hook
- *
- *  After drivers are setup, register some "filenames"
- *  and open stdin, stdout, stderr files
- *
- *  Newlib will automatically associate the files with these
- *  (it hardcodes the numbers)
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- *  
- */
- 
-void bsp_postdriver_hook(void)
-{
-  int stdin_fd, stdout_fd, stderr_fd;
-  int error_code;
- 
-  error_code = 'S' << 24 | 'T' << 16;
- 
-  if ((stdin_fd = __rtems_open("/dev/console", O_RDONLY, 0)) == -1)
-    rtems_fatal_error_occurred( error_code | 'D' << 8 | '0' );
- 
-  if ((stdout_fd = __rtems_open("/dev/console", O_WRONLY, 0)) == -1)
-    rtems_fatal_error_occurred( error_code | 'D' << 8 | '1' );
- 
-  if ((stderr_fd = __rtems_open("/dev/console", O_WRONLY, 0)) == -1)
-    rtems_fatal_error_occurred( error_code | 'D' << 8 | '2' );
- 
-  if ((stdin_fd != 0) || (stdout_fd != 1) || (stderr_fd != 2))
-    rtems_fatal_error_occurred( error_code | 'I' << 8 | 'O' );
-}
-
-/*  PAGE
+/*PAGE
  *
  *  bsp_start
  *
  *  This routine does the bulk of the system initialization.
- *
- *  Input parameters: NONE
- *
- *  Output parameters:  NONE
- *
- *  Return values: NONE
- *  
  */
 
 void bsp_start( void )
@@ -198,58 +101,15 @@ void bsp_start( void )
    * check how the real board comes up. This is critical to
    * getting the source to work with the debugger.
    */
+
   _CPU_MSR_SET( msr_value );
    
   /*
-   * Set up our hooks
-   * Make sure libc_init is done before drivers initialized so that
-   * they can use atexit()
-   */
-
-  Cpu_table.exceptions_in_RAM = TRUE;
-
-  Cpu_table.pretasking_hook = bsp_pretasking_hook;    /* init libc, etc. */
-
-  Cpu_table.predriver_hook = bsp_predriver_hook;
-
-  Cpu_table.postdriver_hook = bsp_postdriver_hook;
-
-  Cpu_table.idle_task = NULL;  /* do not override system IDLE task */
-
-  Cpu_table.clicks_per_usec = 66 / 4; /* XXX get from linkcmds */
-
-
-  /*
-   *  SIS does zero out memory BUT only when IT begins execution.  Thus
-   *  if we want to have a clean slate in the workspace each time we
-   *  begin execution of OUR application, then we must zero the workspace.
-   */
-
-  Cpu_table.do_zero_of_workspace = TRUE;
-
-  /*
-   *  This should be enough interrupt stack.
-   */
-
-  Cpu_table.interrupt_stack_size = (12 * 1024);
-
-  /*
-   *  DMV170 does not support MP configurations so there is really no way
-   *  to check this out.
+   *  Need to "allocate" the memory for the RTEMS Workspace and
+   *  tell the RTEMS configuration where it is.  This memory is
+   *  not malloc'ed.  It is just "pulled from the air".
    */
 
-  Cpu_table.extra_mpci_receive_server_stack = 0;
-
-  /*
-   *  Copy the table and allocate memory for the RTEMS Workspace
-   */
-
-  BSP_Configuration = Configuration;
-
-#if defined(RTEMS_POSIX_API)
-  BSP_Configuration.work_space_size *= 3;
-#endif
-
   work_space_start = 
     (unsigned char *)&RAM_END - BSP_Configuration.work_space_size;
 
@@ -261,52 +121,21 @@ void bsp_start( void )
   BSP_Configuration.work_space_start = work_space_start;
 
   /*
-   * Add 1 region for RTEMS Malloc
-   */
-
-  BSP_Configuration.RTEMS_api_configuration->maximum_regions++;
-
-  /*
    *  Account for the console's resources
    */
 
   console_reserve_resources( &BSP_Configuration );
 
-#ifdef RTEMS_NEWLIB
-  /*
-   * Add 1 extension for newlib libc
-   */
-
-  BSP_Configuration.maximum_extensions++;
-#endif
-
-#ifdef STACK_CHECKER_ON
   /*
-   * Add 1 extension for stack checker
+   *  initialize the CPU table for this BSP
    */
 
-  BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
-   * Add 1 extension for MPCI_fatal
-   */
-
-  if (BSP_Configuration.User_multiprocessing_table)
-    BSP_Configuration.maximum_extensions++;
-
-  /*
-   *  Initialize RTEMS. main() will finish it up and start multitasking.
-   */
+  Cpu_table.exceptions_in_RAM = TRUE;
+  Cpu_table.pretasking_hook   = bsp_pretasking_hook;    /* init libc, etc. */
+  Cpu_table.predriver_hook    = bsp_predriver_hook;
+  Cpu_table.postdriver_hook   = bsp_postdriver_hook;
+  Cpu_table.clicks_per_usec   = 66 / 4;  /* XXX get from linkcmds */
 
-  rtems_libio_config( &BSP_Configuration, BSP_LIBIO_MAX_FDS );
- 
-  bsp_isr_level = rtems_initialize_executive_early(
-     &BSP_Configuration,
-     &Cpu_table
-  );
+  Cpu_table.do_zero_of_workspace = TRUE;
+  Cpu_table.interrupt_stack_size = (12 * 1024);
 }
-
-
-
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c b/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c
index 98989c2401..09918845b1 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/genpvec.c
@@ -46,8 +46,47 @@ EE_ISR_Type       ISR_Nodes [NUM_LIRQ_HANDLERS];
 rtems_unsigned16  Nodes_Used; 
 Chain_Control     ISR_Array  [NUM_LIRQ];
 
+/*PAGE
+ *
+ * external_exception_ISR
+ *
+ * This interrupt service routine is called for an External Exception.
+ *
+ *  Input parameters:
+ *    vector - vector number representing the external exception vector.
+ *
+ *  Output parameters:  NONE
+ *
+ *  Return values: 
+ */
+
+rtems_isr external_exception_ISR (
+  rtems_vector_number   vector             /* IN  */
+)
+{ 
+ rtems_unsigned16    index;
+ Chain_Node          *node;
+ EE_ISR_Type         *ee_isr;
+ 
+ /*
+  * Read vector.
+  */
+ index = 0;
 
-/*  PAGE
+ node = ISR_Array[ index ].first;
+ while ( !_Chain_Is_tail( &ISR_Array[ index ], node ) ) {
+   ee_isr = (EE_ISR_Type *) node;
+   (*ee_isr->handler)( ee_isr->vector );
+   node = node->next;
+ }
+
+ /*
+  * Clear the interrupt.
+  */
+}
+
+
+/*PAGE
  *
  *  initialize_external_exception_vector
  *
@@ -80,7 +119,7 @@ void initialize_external_exception_vector ()
            PPC_IRQ_EXTERNAL , (rtems_isr_entry *) &previous_isr );
 }
 
-/*  PAGE
+/*PAGE
  *
  *  set_EE_vector
  *
@@ -95,6 +134,7 @@ void initialize_external_exception_vector ()
  *
  *  Return values:
  */
+
 rtems_isr_entry  set_EE_vector(
   rtems_isr_entry     handler,      /* isr routine        */
   rtems_vector_number vector        /* vector number      */
@@ -145,40 +185,3 @@ rtems_isr_entry  set_EE_vector(
   return 0;
 }
 
-/*  PAGE
- *
- * external_exception_ISR
- *
- * This interrupt service routine is called for an External Exception.
- *
- *  Input parameters:
- *    vector - vector number representing the external exception vector.
- *
- *  Output parameters:  NONE
- *
- *  Return values: 
- */
-
-rtems_isr external_exception_ISR (
-  rtems_vector_number   vector             /* IN  */
-)
-{ 
- rtems_unsigned16    index;
- EE_ISR_Type         *node;
- 
- /*
-  * Read vector.
-  */
- index = 0;
-
- node = ISR_Array[ index ].first;
- while ( !_Chain_Is_tail( &ISR_Array[ index ], node ) ) {
-   (*node->handler)( node->vector );
-   node = node->Node.next;
- }
-
- /*
-  * Clear the interrupt.
-  */
-}
-
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds b/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds
index 80b586dbad..9a33355599 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/linkcmds
@@ -50,16 +50,16 @@ SECTIONS
     *(.descriptors)
     /* .gnu.warning sections are handled specially by elf32.em.  */
     *(.gnu.warning)
-  } =0
-  .init		  : { *(.init)		} =0
-  .fini		  : { *(.fini)		} =0
-  .rodata	  : { *(.rodata)  }
-  .rodata1	  : { *(.rodata1) }
+  } >RAM
+  .init		  : { *(.init)		} >RAM
+  .fini		  : { *(.fini)		} >RAM
+  .rodata	  : { *(.rodata)  	} >RAM
+  .rodata1	  : { *(.rodata1) 	} >RAM
   _etext = .;
   PROVIDE (etext = .);
   PROVIDE (__SDATA2_START__ = .);
-  .sdata2   : { *(.sdata2) }
-  .sbss2   : { *(.sbss2) }
+  .sdata2	  : { *(.sdata2) 	} >RAM
+  .sbss2	  : { *(.sbss2) 	} >RAM
   PROVIDE (__SBSS2_END__ = .);
   /* Adjust the address for the data segment.  We want to adjust up to
      the same address within the page on the next page up.  It would
@@ -81,44 +81,53 @@ SECTIONS
   {
     *(.data)
     CONSTRUCTORS
-  }
+  } >RAM
   PROVIDE (__EXCEPT_START__ = .);
-  .gcc_except_table   : { *(.gcc_except_table) }
+  .gcc_except_table   : { *(.gcc_except_table) } >RAM
   PROVIDE (__EXCEPT_END__ = .);
 
-  .data1   : { *(.data1) }
-  .got1		  : { *(.got1) }
-  .dynamic	  : { *(.dynamic) }
+  .data1	  : { *(.data1) 	} >RAM
+  .got1		  : { *(.got1) 		} >RAM
+  .dynamic	  : { *(.dynamic) 	} >RAM
   /* Put .ctors and .dtors next to the .got2 section, so that the pointers
      get relocated with -mrelocatable. Also put in the .fixup pointers.
      The current compiler no longer needs this, but keep it around for 2.7.2  */
-		PROVIDE (_GOT2_START_ = .);
-  .got2		  :  { *(.got2) }
-		PROVIDE (__GOT2_END__ = .);
-		PROVIDE (__CTOR_LIST__ = .);
-  .ctors	  : { *(.ctors) }
-		PROVIDE (__CTOR_END__ = .);
-		PROVIDE (__DTOR_LIST__ = .);
-  .dtors	  : { *(.dtors) }
-		PROVIDE (__DTOR_END__ = .);
-		PROVIDE (_FIXUP_START_ = .);
-  .fixup	  : { *(.fixup) }
-		PROVIDE (_FIXUP_END_ = .);
-		PROVIDE (__FIXUP_END__ = .);
-		PROVIDE (_GOT2_END_ = .);
-		PROVIDE (_GOT_START_ = .);
+  PROVIDE (_GOT2_START_ = .);
+  PROVIDE (__GOT2_START__ = .);
+  .got2		  :  { *(.got2) 	} >RAM
+  PROVIDE (_GOT2_END_ = .);
+  PROVIDE (__GOT2_END__ = .);
+
+  PROVIDE (__CTOR_LIST__ = .);
+  .ctors	  : { *(.ctors) 	} >RAM
+  PROVIDE (__CTOR_END__ = .);
+
+  PROVIDE (__DTOR_LIST__ = .);
+  .dtors	  : { *(.dtors) 	} >RAM
+  PROVIDE (__DTOR_END__ = .);
+
+  PROVIDE (_FIXUP_START_ = .);
+  PROVIDE (__FIXUP_START__ = .);
+  .fixup	  : { *(.fixup) 	} >RAM
+  PROVIDE (_FIXUP_END_ = .);
+  PROVIDE (__FIXUP_END__ = .);
+
+  PROVIDE (_GOT2_END_ = .);
+  PROVIDE (_GOT_START_ = .);
   s.got = .;
-  .got		  : { *(.got) }
-  .got.plt	  : { *(.got.plt) }
-		PROVIDE (_GOT_END_ = .);
-		PROVIDE (__GOT_END__ = .);
+  .got		  : { *(.got) 		} >RAM
+  .got.plt	  : { *(.got.plt) 	} >RAM
+  PROVIDE (_GOT_END_ = .);
+  PROVIDE (__GOT_END__ = .);
+
   /* We want the small data sections together, so single-instruction offsets
      can access them all, and initialized data all before uninitialized, so
      we can shorten the on-disk segment size.  */
   PROVIDE (__SDATA_START__ = .);
-  .sdata	  : { *(.sdata) }
+  .sdata	  : { *(.sdata) 	} >RAM
   _edata  =  .;
   PROVIDE (edata = .);
+
   PROVIDE (RAM_END = 4M);
   .sbss      :
   {
@@ -126,7 +135,7 @@ SECTIONS
     *(.sbss)
     *(.scommon)
     PROVIDE (__sbss_end = .);
-  }
+  } >RAM
   PROVIDE (__SBSS_END__ = .);
   .bss       :
   {
@@ -134,7 +143,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
-  }
+  } >RAM
   . =  ALIGN(8) + 0x8000;
   PROVIDE (__stack = .);
   _end = . ;
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c b/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c
index 4fb6333da8..5bb96cf792 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/setvec.c
@@ -12,8 +12,6 @@
  *  RETURNS:
  *    address of previous interrupt handler
  *
- *  Derived from c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c:
- *
  *  COPYRIGHT (c) 1989-1997.
  *  On-Line Applications Research Corporation (OAR).
  *  Copyright assigned to U.S. Government, 1994.
@@ -28,23 +26,6 @@
 #include <rtems.h>
 #include <bsp.h>
 
-
-/*  PAGE
- *
- *  set_vector
- *
- *  This routine installs vector number vector. 
- *  
- *  Input parameters:
- *    handler - routine to call when the interupt occurs
- *    vector  - vector id
- *    type    - RAW or RTEMS vector
- *
- *  Output parameters:  NONE
- *
- *  Return values:      Removed interupt routine or 0 if none.
- */
-
 rtems_isr_entry set_vector(                    /* returns old vector */
   rtems_isr_entry     handler,                  /* isr routine        */
   rtems_vector_number vector,                   /* vector number      */
@@ -54,7 +35,6 @@ rtems_isr_entry set_vector(                    /* returns old vector */
   rtems_isr_entry previous_isr;
   rtems_status_code status;
 
-
   /* 
    * vectors greater than PPC603e_IRQ_LAST are handled by the General purpose
    * interupt handler.
@@ -63,8 +43,8 @@ rtems_isr_entry set_vector(                    /* returns old vector */
     set_EE_vector ( handler, vector );
   }
   else  {
-    status = rtems_interrupt_catch
-           ( handler, vector, (rtems_isr_entry *) &previous_isr );
+    status = rtems_interrupt_catch(
+       handler, vector, (rtems_isr_entry *) &previous_isr );
   }
   return previous_isr;
 }