diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-04 20:26:45 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-12-04 20:26:45 +0000 |
commit | 0a65ad6bd31151623c711649284bb28ecefb6aff (patch) | |
tree | 204ff0a24098f07f13fac185f7bb2055fb340521 /c/src/lib/libbsp/powerpc/psim/tools | |
parent | 2008-12-04 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-0a65ad6bd31151623c711649284bb28ecefb6aff.tar.bz2 |
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.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/psim/tools')
-rw-r--r-- | c/src/lib/libbsp/powerpc/psim/tools/ChangeLog | 6 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-bottom | 4 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom | 5 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-top.in | 2 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-shared | 11 | ||||
-rwxr-xr-x | c/src/lib/libbsp/powerpc/psim/tools/psim-top.in | 4 |
6 files changed, 22 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog b/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog index 3d74dc6920..28d45d27b3 100644 --- a/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/tools/ChangeLog @@ -1,5 +1,11 @@ 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 diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-bottom b/c/src/lib/libbsp/powerpc/psim/tools/psim-bottom index caac4a1d02..cd7ede0009 100755 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-bottom +++ b/c/src/lib/libbsp/powerpc/psim/tools/psim-bottom @@ -27,6 +27,10 @@ if [ $# -eq 0 ] ; then fatal fi +if [ X${RUN} = X ] ; then + RUN=${rtemsTarget}-run +fi + gen_device_tree ${1} >${TREE_FILE} runone ${1} ${limit} rm -f ${TREE_FILE} diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom b/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom index f85fb42f1d..ec2cd8bc3f 100755 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom +++ b/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-bottom @@ -2,11 +2,10 @@ ## TODO: may want command line ability to turn on some psim tracing # Recognize special argument to force System V IPC support on +use_sysv_ipc="auto" if [ X${1} = "X-psim_sysv" ] ; then use_sysv_ipc="yes" shift -else - use_sysv_ipc="auto" fi ## Generate the GDB Command Script @@ -21,7 +20,7 @@ gen_gdb_script() echo "printf \"Use run to start the RTEMS application\\n\"" } -GDB=powerpc-rtems4.9-gdb +GDB=${rtemsTarget}-gdb gen_device_tree ${1} >${TREE_FILE} gen_gdb_script >${GDB_FILE} 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 index 55038a1860..ea87fe4e94 100755 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-top.in +++ b/c/src/lib/libbsp/powerpc/psim/tools/psim-gdb-top.in @@ -12,7 +12,7 @@ # $Id$ # -GDB=@target_alias@-gdb +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 index e57e14521f..772435ad24 100755 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-shared +++ b/c/src/lib/libbsp/powerpc/psim/tools/psim-shared @@ -1,12 +1,19 @@ 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_sys_ipc="yes" - if [ ${use_sys_ipc} = "yes" ] ; then + if [ ${use_sysv_ipc} = "yes" ] ; then enable_sysv_ipc="yes" value=-1 # for now assume we are slave in this mode else @@ -65,8 +72,6 @@ EOF echo "/shm@0x0c110000/reg 0x0c110000 0x20000" echo "/shm@0x0c110000/key ${RTEMS_SHM_KEY}" fi - -exit 0 } ### run the specified test with the time limit diff --git a/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in b/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in index d14c77e8bb..8e2a34c664 100755 --- a/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in +++ b/c/src/lib/libbsp/powerpc/psim/tools/psim-top.in @@ -13,10 +13,8 @@ # TREE_FILE=psim_tree.${LOGNAME} -if [ X${RUN} = X ] ; then - RUN=@target_alias@-run -fi +rtemsTarget=@target_alias@ progname=${0##*/} # fast basename hack for ksh, bash |