Add script to run gdb ARM simulator.

5 files changed, 50 insertions, 4 deletions

diff --git a/sim-scripts/.cvsignore b/sim-scripts/.cvsignore
index 0b447d9..d2acbb8 100644
--- a/sim-scripts/.cvsignore
+++ b/sim-scripts/.cvsignore
@@ -15,6 +15,8 @@ erc32
 erc32-gdb
 ezkit533
 ezkit533-gdb
+gdbarmsim
+gdbarmsim-gdb
 gumstix
 gumstix-gdb
 h8sim
diff --git a/sim-scripts/Makefile b/sim-scripts/Makefile
index feca9db..341bbc1 100644
--- a/sim-scripts/Makefile
+++ b/sim-scripts/Makefile
@@ -3,7 +3,7 @@
 #
 
 INSTALL_DIR=../bin
-GDBSIM_SCRIPTS=h8sim jmr3904 lm32_evr m32csim m32rsim psim sis simsh
+GDBSIM_SCRIPTS=gdbarmsim h8sim jmr3904 lm32_evr m32csim m32rsim psim sis simsh
 SKYEYE_SCRIPTS=ant5206 bf537Stamp csb337 csb350 csb360 edb7312 ezkit533 \
   gumstix rtl22xx smdk2410 leon2-skyeye
 
@@ -91,6 +91,9 @@ leon3: gdb-sim-run.in gdb-sim.in leon3.in tsim-support
 	./mkrun yes SPARC sparc leon3
 
 ### GDB Simulator BSPs
+gdbarmsim gdbarmsim-gdb: gdb-sim-run.in gdb-sim.in gdbarmsim.in
+	./mkrun yes ARM arm gdbarmsim
+
 h8sim h8sim-gdb: gdb-sim-run.in gdb-sim.in h8sim.in
 	./mkrun yes H8300 h8300 h8sim
 
diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in
index efda7fc..9dba185 100755
--- a/sim-scripts/gdb-sim-run.in
+++ b/sim-scripts/gdb-sim-run.in
@@ -135,6 +135,7 @@ bspNeedsSttySane="yes"
 bspNeedsTraceConversion="no"
 bspRunsFailRandomly="no"
 bspInputDevice=/dev/console
+bspRedirectInput=no
 
 for v in 4.10 4.9 4.8 4.7 ""
 do
@@ -280,7 +281,11 @@ runtest()
 
   if [ ${max_run_time} -eq 0 ] ; then
     #echo run ${testname} forever
-    ${runBSP} `runARGS ${testname}` <${bspInputDevice}
+    if [ ${bspRedirectInput} = yes ] ; then
+      ${runBSP} `runARGS ${testname}` <${bspInputDevice}
+    else
+      ${runBSP} `runARGS ${testname}`
+    fi
     return
   fi
 
@@ -291,12 +296,20 @@ runtest()
   logfile=${logdir}/${tname}
 
   if [ ${bspSimTrustedToExit} = "yes" ] ; then
-    ${runBSP} `runARGS ${testname}`  <${bspInputDevice} >${logfile} 2>&1
+    if [ ${bspRedirectInput} = yes ] ; then
+      ${runBSP} `runARGS ${testname}` <${bspInputDevice} >${logfile} 2>&1
+    else
+      ${runBSP} `runARGS ${testname}` >${logfile} 2>&1
+    fi
     catLog ${logfile}
     return
   fi
 
-  ${runBSP} `runARGS ${testname}`  <${bspInputDevice} >${logfile} 2>&1 &
+  if [ ${bspRedirectInput} = yes ] ; then
+    ${runBSP} `runARGS ${testname}` <${bspInputDevice} >${logfile} 2>&1 &
+  else
+    ${runBSP} `runARGS ${testname}` >${logfile} 2>&1 &
+  fi
   pid=$!
 
   # Make sure it won't run forever...
diff --git a/sim-scripts/gdbarmsim.in b/sim-scripts/gdbarmsim.in
new file mode 100644
index 0000000..4b29df7
--- /dev/null
+++ b/sim-scripts/gdbarmsim.in
@@ -0,0 +1,27 @@
+#
+#  ARM/gdbarmsim Support 
+#
+#  $Id$
+#
+
+runARGS()
+{
+  echo ${1}
+}
+
+checkBSPFaults()
+{
+  return 0
+}
+
+bspLimit()
+{
+  testname=$1
+  case ${testname} in
+    *stackchk*)limit=5 ;;
+    *fatal*)   limit=1 ;;
+    *psxtime*) limit=180 ;;
+    *)         limit=60 ;;
+  esac
+  echo ${limit}
+}
diff --git a/sim-scripts/qemu-gumstix.in b/sim-scripts/qemu-gumstix.in
index 7977c11..26c61d5 100644
--- a/sim-scripts/qemu-gumstix.in
+++ b/sim-scripts/qemu-gumstix.in
@@ -17,6 +17,7 @@ bspNeedsDos2Unix="yes"
 bspGeneratesDeviceTree="yes"
 bspInputDevice=qemu-gumstix.cmds
 bspTreeFile=qemu-gumstix.cmds
+bspRedirectInput=yes
 
 runARGS()
 {