diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-06-11 17:23:34 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-06-11 17:23:34 +0000 |
commit | cf5dfce19bc33dfecb27f9f6c45dea30f6565f5e (patch) | |
tree | 703b28ad98ce5eb225418d378b6dea00cd2cb5fa /c/src/lib/libbsp/powerpc/psim | |
parent | 2011-06-11 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-cf5dfce19bc33dfecb27f9f6c45dea30f6565f5e.tar.bz2 |
2011-06-11 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac: runtest for this BSP obsoleted by
rtems-testing/sim-scripts support. Please use those scripts.
* tools/.cvsignore, tools/ChangeLog, tools/Makefile.am,
tools/configure.ac, tools/psim-bottom, tools/psim-gdb-bottom,
tools/psim-gdb-top.in, tools/psim-shared, tools/psim-top.in,
tools/runtest-bottom, tools/runtest-top.in: Removed.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/psim')
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/ChangeLog | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/tools/.cvsignore | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/tools/ChangeLog | 232 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/tools/Makefile.am | 47 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/tools/configure.ac | 25 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-bottom | 48 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom | 57 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-top.in | 18 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-shared | 180 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-top.in | 45 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom | 136 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in | 104 |
14 files changed, 9 insertions, 904 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index 55f3b1eba1..504bf21d56 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,12 @@ +2011-06-11 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac: runtest for this BSP obsoleted by + rtems-testing/sim-scripts support. Please use those scripts. + * tools/.cvsignore, tools/ChangeLog, tools/Makefile.am, + tools/configure.ac, tools/psim-bottom, tools/psim-gdb-bottom, + tools/psim-gdb-top.in, tools/psim-shared, tools/psim-top.in, + tools/runtest-bottom, tools/runtest-top.in: Removed. + 2011-05-17 Till Straumann <strauman@slac.stanford.edu> PR1797/bsps diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am index 13af27d89d..28c465cd57 100644 --- a/c/src/lib/libbsp/powerpc/psim/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am @@ -4,8 +4,6 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal -SUBDIRS = . tools - include $(top_srcdir)/../../../../automake/compile.am include_bspdir = $(includedir)/bsp diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac index 9b9ca92ed1..a25872879d 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.ac +++ b/c/src/lib/libbsp/powerpc/psim/configure.ac @@ -19,8 +19,6 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") -RTEMS_CONFIG_BUILD_SUBDIRS(tools) - 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 diff --git a/c/src/lib/libbsp/powerpc/psim/tools/.cvsignore b/c/src/lib/libbsp/powerpc/psim/tools/.cvsignore deleted file mode 100644 index baba64eafa..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -aclocal.m4 -autom4te*.cache -config.cache -config.log -config.status -configure -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog b/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog deleted file mode 100644 index bbb888c25b..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog +++ /dev/null @@ -1,232 +0,0 @@ -2011-02-25 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.ac: Remove RTEMS_CANONICAL_TARGET_CPU. - -2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.ac: Require autoconf-2.68, automake-1.11.1. - -2009-09-11 Till Straumann <Till.Straumann@TU-Berlin.de> - - * psim-top.in, psim-bottom: Added support for options - -d (print device tree and exit), -h (usage info) and - -n (enable NIC support). - - * psim-gdb-bottom: Added support for options -s (force sysv IPC), - -h (usage info) and -n (enable NIC support). - Allow user to override GDB variable from environment. - - * psim-shared: cat NIC properties into device file if the - user had specified '-n'. - - * runtest-top.in: removed unsupported options -o, -d from - usage info. - -2009-04-14 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> - - * psim-gdb-bottom: Adapt name of assert function for breakpoint - -2009-01-05 Joel Sherrill <joel.sherrill@oarcorp.com> - - * psim-shared: Add catching a hardware exception and assertion as - reasons to kill simulator. - -2008-12-05 Joel Sherrill <joel.sherrill@oarcorp.com> - - * psim-shared, runtest-bottom: Tidy up more bugs. - -2008-12-04 Joel Sherrill <joel.sherrill@oarcorp.com> - - * psim-bottom, psim-gdb-bottom, psim-gdb-top.in, psim-shared, - psim-top.in: Clean up and works better. Uses argv[0] to override - configured target name. - -2008-12-04 Joel Sherrill <joel.sherrill@oarcorp.com> - - * psim-bottom, psim-gdb-bottom, psim-shared, psim-top.in: Add ability - to force psim configuration to include System V IPC devices even when - the test does not appear to be multiprocessing. This is used by some - RTEMS application developers for system simulation and could be used - to simulate a framebuffer if a UNIX process mirrored the buffer. - -2008-09-08 Joel Sherrill <joel.sherrill@oarcorp.com> - - * runtest-bottom: Work on .exe and .ralf files. - -2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> - - * psim-gdb-bottom: Also break on C_exception_handler so we can see what - caused the exception. This indicates an error in the program. - -2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> - - * psim-shared, psim-top.in, runtest-bottom, runtest-top.in: Now running - mptests. - -2008-09-03 Joel Sherrill <joel.sherrill@oarcorp.com> - - * Makefile.am, configure.ac: Rework psim scripts to share code for - creating device trees and actually running the tests. Overhaul the - device tree generated to always include a block of Flash and a - Real-Time Clock. When running MP tests enable the shared memory and - semaphore devices. - * psim-bottom, psim-gdb-bottom, psim-gdb-top.in, psim-shared, - psim-top.in, runtest-bottom, runtest-top.in: New files. - * psim, psim-gdb, runtest: Removed. - -2008-08-05 Joel Sherrill <joel.sherrill@OARcorp.com> - - * runtest: Strip .exe or .ralf from file names. - -2008-07-01 Joel Sherrill <joel.sherrill@oarcorp.com> - - * psim-gdb: Change 4.8 to 4.9. - -2008-03-11 Joel Sherrill <joel.sherrill@oarcorp.com> - - * runtest: Skip all fatal error tests. - -2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com> - - * runtest: Change 4.8 to 4.9. - -2007-09-04 Joel Sherrill <joel.sherrill@OARcorp.com> - - * runtest: Add capture to list of interative tests to skip in batch - mode. - -2007-01-26 Ralf Corsépius <ralf.corsepius@rtems.org> - - * Makefile.am: Use MKDIR_P instead of mkdir_p. - -2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.ac: New BUG-REPORT address. - -2006-11-17 Joel Sherrill <joel@OARcorp.com> - - * psim, psim-gdb, runtest: Change toolname to match 4.8. - -2006-10-17 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.ac: Require autoconf-2.60. Require automake-1.10. - -2006-01-23 Joel Sherrill <joel@OARcorp.com> - - * runtest: Add pvr setting. - -2006-01-20 Joel Sherrill <joel@OARcorp.com> - - * psim: Enhance to add limit on how long a single test is allowed to - execute. This can be used to significantly enhance the reliability of - long batch test runs. - -2006-01-08 Joel Sherrill <joel@OARcorp.com> - - * psim, psim-gdb: Add setting of PVR to 0xfffe0000 since psim needs a - special processor version value or exceptions will not work. - -2005-01-03 Ralf Corsepius <ralf.corsepius@rtems.org> - - * Makefile.am: Reflect psim-gdb having been added. - -2004-12-30 Joel Sherrill <joel@OARcorp.com> - - * Makefile.am, psim: Split psim into two files. - * psim-gdb: New file. - -2004-09-24 Ralf Corsepius <ralf_corsepius@rtems.org> - - * configure.ac: Require automake > 1.9. - -2004-01-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. - Add PRE/TMPINSTALL_FILES to CLEANFILES. - -2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Reworked. - -2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * configure.ac: Require automake >= 1.8, autoconf >= 2.59. - -2003-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Misc cleanups and fixes. - -2003-08-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Reflect having moved aclocal/. - -2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Reflect having moved automake/. - -2003-08-11 Thomas Doerfler<Thomas.Doerfler@imd-systems.de> - - PR 369/filesystem - * runtest: Add sample application to show the use of the - DOSFS functions - -2003-08-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * configure.ac: Use rtems-bugs@rtems.com as bug report email address. - -2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * configure.ac: Remove AC_CONFIG_AUX_DIR. - -2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * configure.ac: AM_INIT_AUTOMAKE([1.7.2]). - -2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * configure.ac: AC_PREREQ(2.57). - -2002-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * .cvsignore: Reformat. - Add autom4te*cache. - Remove autom4te.cache. - -2002-07-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Add transform and bsptools_bindir hacks. - * configure.ac: Add RTEMS_ENV_RTEMSBSP. - -2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * configure.ac: - AC_INIT(package,_RTEMS_VERSION,_RTEMS_BUGS). - AM_INIT_AUTOMAKE([no-define foreign 1.6]). - * Makefile.am: Remove AUTOMAKE_OPTIONS. - -2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * .cvsignore: Add autom4te.cache for autoconf > 2.52. - * configure.in: Remove. - * configure.ac: New file, generated from configure.in by autoupdate. - -2001-09-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Use 'TMPINSTALL_FILES ='. - -2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. - -2000-11-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: Switch to ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal. - -2000-10-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> - - * Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros. - Switch to GNU canonicalization. - -2000-08-10 Joel Sherrill <joel@OARcorp.com> - - * ChangeLog: New file. diff --git a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am deleted file mode 100644 index dc08efff1a..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## -## $Id$ -## - -ACLOCAL_AMFLAGS = -I ../../../../../aclocal - -transform = -bsptools_bindir = ${exec_prefix}/@RTEMS_BSP@/tests -bsptools_bin_SCRIPTS = psim psim-gdb runtest - -## HACK: install to build-tree -all-local: psim $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = - -$(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp): - @$(MKDIR_P) $(PROJECT_ROOT)/@RTEMS_BSP@/tests - @: > $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp) -TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp) - -psim: psim-top psim-shared psim-bottom - cat $^ >$@ - chmod +x $@ - -psim-gdb: psim-gdb-top psim-shared psim-gdb-bottom - cat $^ >$@ - chmod +x $@ - -runtest: runtest-top psim-shared runtest-bottom - cat $^ >$@ - chmod +x $@ - -$(PROJECT_ROOT)/@RTEMS_BSP@/tests/psim: psim $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp) - $(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/psim -TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/psim - -$(PROJECT_ROOT)/@RTEMS_BSP@/tests/psim-gdb: psim-gdb $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp) - $(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/psim-gdb -TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/psim-gdb - -$(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest: runtest $(PROJECT_ROOT)/@RTEMS_BSP@/tests/$(dirstamp) - $(INSTALL_SCRIPT) $< $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest -TMPINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/tests/runtest - -CLEANFILES = $(TMPINSTALL_FILES) psim psim-gdb - -include $(top_srcdir)/../../../../../automake/host.am diff --git a/c/src/lib/libbsp/powerpc/psim/tools/configure.ac b/c/src/lib/libbsp/powerpc/psim/tools/configure.ac deleted file mode 100644 index 8a4839f0dd..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/configure.ac +++ /dev/null @@ -1,25 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ([2.68]) -AC_INIT([rtems-c-src-lib-libbsp-powerpc-psim-tools],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) -AC_CONFIG_SRCDIR([psim-top.in]) -RTEMS_TOP(../../../../../../..) - -AM_INIT_AUTOMAKE([no-define foreign 1.11.1]) -AM_MAINTAINER_MODE -RTEMS_ENV_RTEMSBSP - -RTEMS_PATH_KSH - -RTEMS_PROJECT_ROOT -RTEMS_TOOLPATHS - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -psim-top -psim-gdb-top -runtest-top -]) -AC_OUTPUT diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-bottom b/c/src/lib/libbsp/powerpc/psim/tools/psim-bottom deleted file mode 100755 index e8cca83899..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-bottom +++ /dev/null @@ -1,48 +0,0 @@ -# -# process the options -# -# defaults for getopt vars -# - -verbose="" -limit="0" -use_sysv_ipc="auto" -device_tree_only="" -enable_if_sim="" - -## TODO: may want command line ability to turn on some psim tracing -while getopts vhsdnl: OPT -do - case "$OPT" in - v) verbose="yes";; - h) echo "$USAGE"; exit 0;; - l) limit="$OPTARG";; - s) use_sysv_ipc="yes";; - d) device_tree_only="yes";; - n) enable_if_sim="yes";; - *) fatal;; - esac -done -shiftcount=`expr $OPTIND - 1` -shift $shiftcount - -args=$* - -if [ $# -eq 0 ] ; then - fatal -fi - -if [ X${device_tree_only} = Xyes ] ; then - gen_device_tree ${1} > "`basename ${1} .exe`".device - exit $? -fi - -if [ X${RUN} = X ] ; then - RUN=${rtemsTarget}-run -fi - -gen_device_tree ${1} >${TREE_FILE} -runone ${1} ${limit} -rm -f ${TREE_FILE} -exit $? - diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom b/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom deleted file mode 100755 index 4e030e5ccd..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom +++ /dev/null @@ -1,57 +0,0 @@ -progname=${0##*/} # fast basename hack for ksh, bash - -USAGE=\ -"usage: $progname [ -opts ] [prog] - -s -- force System V IPC support on (default=auto) - -n -- enable NIC support ***REQUIRES PATCHED GDB/PSIM*** - -h -- this message -" - -# Recognize special argument to force System V IPC support on -use_sysv_ipc="auto" -enable_if_sim="" - -## TODO: may want command line ability to turn on some psim tracing -while getopts snh OPT -do - case "$OPT" in - s) use_sysv_ipc="yes";; - n) enable_if_sim="yes";; - h) echo "$USAGE"; exit 0;; - *) echo "unknown option"; echo "$USAGE"; exit 0;; - esac -done -shiftcount=`expr $OPTIND - 1` -shift $shiftcount - -args=$* - -if [ X${1} = "X-psim_sysv" ] ; then - use_sysv_ipc="yes" - shift -fi - -## Generate the GDB Command Script -gen_gdb_script() -{ - echo "tar sim -f ${TREE_FILE}" - echo "load" - echo "b _Internal_error_Occurred" - echo "b rtems_fatal_error_occurred" - echo "b __assert_func" - echo "b C_exception_handler" - echo "printf \"Use run to start the RTEMS application\\n\"" -} - -if [ X${GDB} = X ] ; then - GDB=${rtemsTarget}-gdb -fi - -gen_device_tree ${1} >${TREE_FILE} -gen_gdb_script >${GDB_FILE} - -${GDB} -x ${GDB_FILE} $* - -rm -f ${GDB_FILE} ${TREEFILE} -exit $? - diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-top.in b/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-top.in deleted file mode 100755 index 35bbaa36b6..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-top.in +++ /dev/null @@ -1,18 +0,0 @@ -#! @KSH@ -p -# -# Shell script to ease invocation of the powerpc simulator with gdb -# -# COPYRIGHT (c) 1989-2008. -# On-Line Applications Research Corporation (OAR). -# -# The license and distribution terms for this file may be -# found in the file LICENSE in this distribution or at -# http://www.rtems.com/license/LICENSE. -# -# $Id$ -# - -rtemsTarget=@target_alias@ - -GDB_FILE=gdb_tree.${LOGNAME} - diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-shared b/c/src/lib/libbsp/powerpc/psim/tools/psim-shared deleted file mode 100755 index 25addb7a5b..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-shared +++ /dev/null @@ -1,180 +0,0 @@ - -TREE_FILE=psim_tree.${LOGNAME} - -case $0 in - *4.8*) rtemsTarget=powerpc-rtems4.8 ;; - *4.9*) rtemsTarget=powerpc-rtems4.9 ;; - *4.10*) rtemsTarget=powerpc-rtems4.10 ;; - *) ;; -esac - -### Generate the PSIM device tree based upon the type of application being run -gen_device_tree() -{ - enable_sysv_ipc="yes" - - if [ ${use_sysv_ipc} = "yes" ] ; then - enable_sysv_ipc="yes" - value=-1 # for now assume we are slave in this mode - else - case ${1} in - *node*) - enable_sysv_devices="yes" - case ${1} in - *node1*) value=1 ;; - *) value=-1 ;; - esac - ;; - *) - enable_sysv_devices="no" - ;; - esac - fi - - if [ ${enable_sysv_devices} = "yes" ] ; then - if [ X${RTEMS_SHM_SEMAPHORE_KEY} = X -o X${RTEMS_SHM_KEY} = X ] ; then - fatal RTEMS_SHM_SEMAPHORE_KEY and/or RTEMS_SHM_KEY not set - fi - fi - - if [ X${RAM_SIZE} = X ] ; then - if [ X${NM} = X ] ; then - NM=${rtemsTarget}-nm - fi - RAM_SIZE=`$NM ${1} | awk '/\<RamSize\>/{print "0x"$1}'` - fi - - cat <<EOF -# -# Device Tree for PSIM -# -# Automatically Generated -- DO NOT EDIT!! -# -/#address-cells 1 -/openprom/init/register/pvr 0xfffe0000 -# This must be >= than linkcmds defined RamSize! -/openprom/options/oea-memory-size $RAM_SIZE -##### EEPROM @ 0x0c000000 for 512K -/eeprom@0x0c000000/reg 0x0c000000 0x80000 -/eeprom@0x0c000000/nr-sectors 8 -/eeprom@0x0c000000/sector-size 0x10000 -/eeprom@0x0c000000/byte-write-delay 1000 -/eeprom@0x0c000000/sector-start-delay 100 -/eeprom@0x0c000000/erase-delay 1000 -/eeprom@0x0c000000/manufacture-code 0x01 -/eeprom@0x0c000000/device-code 0xa4 - -##### NVRAM/RTC NVRAM Portion is 0x0c080000 for 512K -##### NVRAM/RTC RTC Portion is 0x0c100000 for 12 -/nvram@0x0c080000/reg 0x0c080000 524300 -/nvram@0x0c080000/timezone -3600 - -##### OPENPIC @ 0x0c130000 - 0x0c170000 (512K) -/opic@0x0c130000/reg 0x0c130000 0 0x0c130000 0x40000 -/opic@0x0c130000/interrupt-ranges 0 0 0 16 -/opic@0x0c130000/device_type open-pic -# interupt out -> CPU's interrupt pin -/opic@0x0c130000 > intr0 int /cpus/cpu@0 -EOF - - if [ X${enable_if_sim} = Xyes ] ; then - cat <<EOF - -#### ETHTAP @ 0x0c100020 for 0x40 -# -# NOTE 'ethtap' currently (200902) requires psim to -# be patched -- also, it is only supported on -# a linux host. -# the 'ethtap' device transfers data from/to the -# simulated network interface to/from a 'ethertap' -# interface on the linux host (consult tun/tap -# device documentation). -# A very useful tool is 'tunctl' which allows for -# configuring user-accessible, persistent 'tap' -# devices so that psim may be executed w/o special -# (root) privileges. - -/ethtap@0x0c100020/reg 0x0c100020 0x40 -# route interrupt to open-pic -/ethtap@0x0c100020 > 0 irq0 /opic@0x0c130000 -# 'tun' device on host -/ethtap@0x0c100020/tun-device "/dev/net/tun" -# name of 'tap' device to use -/ethtap@0x0c100020/tap-ifname "tap0" -# ethernet address of simulated IF -/ethtap@0x0c100020/hw-address "00:00:00:22:11:00" -# generate CRC and append to received packet before -# handing over to the simulation. This is mostly for -# debugging the rtems device driver. If unsure, leave 'false'. -/ethtap@0x0c100020/enable-crc false -EOF - fi - - if [ ${enable_sysv_devices} = yes ] ; then - echo "##### System V IPC (Semaphore) 0x0c100010 for 12" - echo "/sem@0x0c100010/reg 0x0c100010 12" - echo "/sem@0x0c100010/key ${RTEMS_SHM_SEMAPHORE_KEY}" - echo "/sem@0x0c100010/value ${value}" - echo - echo "##### System V IPC (Shared Memory) 0x0c110000 for 128K" - echo "/shm@0x0c110000/reg 0x0c110000 0x20000" - echo "/shm@0x0c110000/key ${RTEMS_SHM_KEY}" - fi -} - -### run the specified test with the time limit -runone() -{ - testname=${1} - max_run_time=${2} - if [ $# -eq 3 ] ; then - treefile=${3} - else - treefile=${TREE_FILE} - fi - if [ ${max_run_time} -eq 0 ] ; then - #echo run ${testname} forever - ${RUN} -f ${treefile} ${RUN_DEBUG} ${testname} - else - log=`echo ${testname} | sed -e 's/.exe$/.log/' -e 's/.ralf$/.log/'` - #echo run ${testname} for maximum ${max_run_time} seconds - ${RUN} -f ${treefile} ${RUN_DEBUG} ${testname} >${log} 2>&1 & - pid=$! - - # Make sure it won't run forever... - time_run=0 - while [ $time_run -lt $max_run_time ] - do - # sleep 1s at a time waiting for job to finish or timer to expire - # if job has exited, then we exit, too. - sleep 1 - kill -0 $pid 2> /dev/null - running=$? - if [ $running -eq 0 ] ; then - time_run=$((time_run + 5)) - if [ $time_run -ge $max_run_time ]; then - kill -9 $pid 2> /dev/null - ran_too_long="yes" - echo "${testname} killed after running ${max_run_time} seconds" - fi - grep "Suspending faulting task" ${log} >/dev/null 2>&1 - Fault=$? - grep "assertion failed" ${log} >/dev/null 2>&1 - Assert=$? - if [ $Fault -eq 0 -o $Assert -eq 0 ] ; then - kill -9 $pid 2> /dev/null - echo "${testname} failed after ${max_run_time} seconds" - ran_too_long="no" - break - fi - else - ran_too_long="no" - break - fi - done - cat ${log} - rm -f ${log} - fi - -} - diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in b/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in deleted file mode 100755 index 4b1d29650f..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in +++ /dev/null @@ -1,45 +0,0 @@ -#! @KSH@ -p -# -# Shell script to ease invocation of the powerpc simulator -# -# COPYRIGHT (c) 1989-2008. -# On-Line Applications Research Corporation (OAR). -# -# The license and distribution terms for this file may be -# found in the file LICENSE in this distribution or at -# http://www.rtems.com/license/LICENSE. -# -# $Id$ -# - -TREE_FILE=psim_tree.${LOGNAME} - -rtemsTarget=@target_alias@ - -progname=${0##*/} # fast basename hack for ksh, bash - -USAGE=\ -"usage: $progname [ -opts ] test [ test ... ] - -v -- verbose - -h -- this message - -s -- force System V IPC support on (default=auto) - -l limit -- specify time limit (default is 'no limit') - -d -- generate device tree as 'test'.device and exit - -n -- enable NIC support ***REQUIRES PATCHED PSIM*** -" - -# log an error to stderr -prerr() -{ - echo "$*" >&2 -} - -fatal() { - [ "$1" ] && prerr $* - prerr "$USAGE" - exit 1 -} - -warn() { - [ "$1" ] && prerr $* -} diff --git a/c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom b/c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom deleted file mode 100755 index 1796ab0dd1..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/runtest-bottom +++ /dev/null @@ -1,136 +0,0 @@ -# -# Run the tests -# - -tests="$args" -if [ ! "$tests" ] -then - set -- `ls -1 *.exe *.ralf 2>/dev/null` - tests="$*" -fi - -use_sysv_ipc="auto" - -[ -d $logdir ] || - mkdir $logdir || fatal "could not create log directory ($logdir)" - -# where the tmp files go -trap "test_exit" 1 2 3 13 14 15 - -for tfile in $tests -do - echo $tfile | grep "exe$" >/dev/null - if [ $? -eq 0 ] ; then - ext=.exe - else - ext=.ralf - fi - tname=`basename $tfile ${ext}` - cpus="1" - TEST_TYPE="single" - - case $tname in - # size is no longer interactive. - capture* | monitor* | termios* | fileio* | pppd*) - warn "Skipping $tname; it is interactive" - continue - ;; - *-node2*) - warn "Skipping $tname; 'runtest' runs both nodes when for *-node1" - continue;; - *-node1*) - warn "Running both nodes associated with $tname" - variant=`echo $tname | sed 's/.*-node[12]//' | sed 's/\.exe//'` - tname=`echo $tname | sed 's/-node.*//'` - TEST_TYPE="mp" - ;; - minimum*|stackchk*|*fatal*|termio*) - continue ;; - esac - - if [ $TEST_TYPE = "mp" ] - then - cpus="1 2" - - logfile1=$logdir/${tname}_1${variant} - logfile2=$logdir/${tname}_2${variant} - infofile1=$logfile1.info - infofile2=$logfile2.info - - rm -f ${logfile1} ${logfile2} - - date=`date` - echo "Starting $tname at $date" - - # XXX -c ${instruction_limit} - - gen_device_tree ${tname}-node1${variant}${ext} >${TREE_FILE}_1 - gen_device_tree ${tname}-node2${variant}${ext} >${TREE_FILE}_2 - - runone ${tname}-node1${variant}${ext} \ - ${max_run_time} ${TREE_FILE}_1 | \ - sed -e 's/^M//' -e '/^$/d' > ${logfile1} & - runone ${tname}-node2${variant}${ext} \ - ${max_run_time} ${TREE_FILE}_2 | \ - sed -e 's/^M//' -e '/^$/d' > ${logfile2} & - wait - - #rm -f ${TREE_FILE}_1 ${TREE_FILE}_2 - fi - - if [ $TEST_TYPE = "single" ] - then - logfile=$logdir/${tname}_1 - infofile=$logfile.info - - rm -f ${logfile}.tmp* - - date=`date` - echo "Starting $tname at $date" - - # Spin off the simulator in the background - # -c could be used to set an instruction limit - gen_device_tree ${tfile} >${TREE_FILE} - runone ${tfile} ${max_run_time} | \ - sed -e 's/^M//' -e '/^$/d' > ${logfile} - - rm -f ${TREE_FILE} - fi - - # Create the info files - for cpu in $cpus - do - { - echo "$date" - echo "Test run on: `uname -n`" - echo "Host Information:" - echo `uname -a` - echo - - cat ${logdir}/${tname}_${cpu} - - if [ "$ran_too_long" = "yes" ] - then - echo "Test did NOT finish normally; killed after $max_run_time seconds" - fi - - echo - date; - } > ${logdir}/${tname}_${cpu}.info - done - - if [ "$cpus" = "1" ] - then - mv ${infofile} $logdir/${tname}.info - mv ${logfile} $logdir/${tname} - fi - -done - -echo "Tests completed at " `date` -test_exit 0 - -# Local Variables: *** -# mode:ksh *** -# End: *** - diff --git a/c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in b/c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in deleted file mode 100755 index 8694c7e379..0000000000 --- a/c/src/lib/libbsp/powerpc/psim/tools/runtest-top.in +++ /dev/null @@ -1,104 +0,0 @@ -#!@KSH@ -p -# -# Run rtems tests on the powerpc simulator -# This program generates a simulator script to run each test -# Typically the test is then run, although it can be generated -# and left as a file using -s -# -# COPYRIGHT (c) 1989-2008. -# On-Line Applications Research Corporation (OAR). -# -# The license and distribution terms for this file may be -# found in the file LICENSE in this distribution or at -# http://www.rtems.com/license/LICENSE. -# -# $Id$ -# - -# progname=`basename $0` -progname=${0##*/} # fast basename hack for ksh, bash -if [ X${RUN} = X ] ; then - RUN=@target_alias@-run -fi - -USAGE=\ -"usage: $progname [ -opts ] test [ test ... ] - -v -- verbose - -l logdir -- specify log directory (default is 'logdir') - - Specify test as 'test' or 'test.exe'. - All multiprocessing tests *must* be specified simply as 'mp01', etc. -" - -# export everything -set -a - -# log an error to stderr -prerr() -{ - echo "$*" >&2 -} - -fatal() { - [ "$1" ] && prerr $* - prerr "$USAGE" - exit 1 -} - -warn() { - [ "$1" ] && prerr $* -} - -# print args, 1 per line -ml_echo() -{ - for l - do - echo "$l" - done -} - -# run at normal and signalled exit -test_exit() -{ - exit_code=$1 - - rm -f ${logfile}.tmp* - [ "$sim_pid" ] && kill -9 $sim_pid - - exit $exit_code -} - -# -# process the options -# -# defaults for getopt vars -# -# max_run_time is defaulted to 5 minutes -# - -verbose="" -logdir=log -update_on_tick="no" -max_run_time=$((5 * 60)) -instruction_limit=1000000000 - -while getopts vl: OPT -do - case "$OPT" in - v) verbose="yes";; - l) logdir="$OPTARG";; - *) fatal;; - esac -done - -let $((shiftcount = $OPTIND - 1)) -shift $shiftcount - -args=$* - -# -# Check some parameters -# - -# XXX nothing to check so far |