2001-11-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Add @exceptions@ to SUBDIRS.
	* configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from
	make/custom/dmv177.cfg;
	Rename PPC_USE_INSTRUCTION_CACHE to DMV177_USE_INSTRUCTION_CACHE,
	Add RTEMS_PPC_EXCEPTIONS([old]).
	* include/Makefile.am: include force-preinstall.am.
	* startup/bspstart.c: Rename PPC_USE_INSTRUCTION_CACHE to
	DMV177_USE_INSTRUCTION_CACHE.
	* wrapup/Makefile.am: Apply @exceptions@.

c/src/lib/libbsp/powerpc/dmv177/ChangeLog

@@ -1,3 +1,15 @@
+2001-11-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add @exceptions@ to SUBDIRS.
+	* configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from
+	make/custom/dmv177.cfg;
+	Rename PPC_USE_INSTRUCTION_CACHE to DMV177_USE_INSTRUCTION_CACHE,
+	Add RTEMS_PPC_EXCEPTIONS([old]).
+	* include/Makefile.am: include force-preinstall.am.
+	* startup/bspstart.c: Rename PPC_USE_INSTRUCTION_CACHE to
+	DMV177_USE_INSTRUCTION_CACHE.
+	* wrapup/Makefile.am: Apply @exceptions@.
+
 2001-10-25	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/linkcmds: Added _init and _fini.

c/src/lib/libbsp/powerpc/dmv177/Makefile.am

@@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUBDIRS = include clock console startup start timer scv64 tod sonic wrapup
+SUBDIRS = include clock console startup start timer scv64 tod sonic \
+    @exceptions@ wrapup
 
 include $(top_srcdir)/../../bsp.am
 

c/src/lib/libbsp/powerpc/dmv177/configure.ac

@@ -25,10 +25,32 @@ RTEMS_CANONICAL_HOST
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
 ## bsp-specific options
-CONSOLE_USE_INTERRUPTS=${CONSOLE_USE_INTERRUPTS-0}
-AC_DEFINE_UNQUOTED([CONSOLE_USE_INTERRUPTS],
-  [$CONSOLE_USE_INTERRUPTS],
-  [whether using console interrupts])
+RTEMS_BSPOPTS_SET([CONSOLE_USE_INTERRUPTS],[*],[0])
+RTEMS_BSPOPTS_HELP([CONSOLE_USE_INTERRUPTS],
+[whether using console interrupts])
+
+RTEMS_BSPOPTS_SET([PPC_USE_SPRG],[*],[0])
+RTEMS_BSPOPTS_HELP([PPC_USE_SPRG],
+[If defined, then the PowerPC specific code in RTEMS will use some
+of the special purpose registers to slightly optimize interrupt
+response time.  The use of these registers can conflict with
+other tools like debuggers.])
+
+RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[0])
+RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
+[If set != 0, then the PowerPC specific code in RTEMS will use
+ data cache instructions to optimize the context switch code.
+ This code can conflict with debuggers or emulators.  It is known
+ to break the Corelis PowerPC emulator with at least some combinations
+ of PowerPC 603e revisions and emulator versions.
+ The BSP actually contains the call that enables this.])
+
+RTEMS_BSPOPTS_SET([DMV177_USE_INSTRUCTION_CACHE],[*],[1])
+RTEMS_BSPOPTS_HELP([DMV177_USE_INSTRUCTION_CACHE],
+[If set != 0, then the PowerPC specific code in RTEMS will use
+ data cache instructions to optimize the context switch code.
+ This code can conflict with debuggers or emulators.
+ The BSP actually contains the call that enables this.])
 
 AM_CONFIG_HEADER(include/bspopts.h)
 RTEMS_PROJECT_ROOT
@@ -44,5 +66,9 @@ start/Makefile
 startup/Makefile
 timer/Makefile
 tod/Makefile
-wrapup/Makefile])
+wrapup/Makefile
+])
+
+RTEMS_PPC_EXCEPTIONS([old])
+
 AC_OUTPUT

c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am

@@ -23,4 +23,5 @@ TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
 
 all-local: $(TMPINSTALL_FILES)
 
+include $(top_srcdir)/../../../../../../automake/force-preinstall.am
 include $(top_srcdir)/../../../../../../automake/local.am

c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c

@@ -129,7 +129,7 @@ void bsp_start( void )
    *  Enable whatever caching is desired
    */
 
-#if ( PPC_USE_INSTRUCTION_CACHE )
+#if ( DMV177_USE_INSTRUCTION_CACHE )
   rtems_cache_enable_instruction();
 #endif
 

c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am

@@ -14,7 +14,7 @@ BSP_PIECES = startup clock console scv64 timer tod $(NETWORKING)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
-    $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
+    ../@exceptions@/$(ARCH)/rtems-cpu.rel \
     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o)
 LIB = $(ARCH)/libbsp.a