2010-04-20 Joel Sherrill <joel.sherrilL@oarcorp.com>

	* .cvsignore, Makefile, bf537Stamp.in, ezkit533.in: Move current
	scripts to skyeye named ones so the default is to use the new
	simulator in gdb.
	* bf537Stamp-skyeye.in, ezkit533-skyeye.in: New files.

7 files changed, 139 insertions, 29 deletions

diff --git a/sim-scripts/.cvsignore b/sim-scripts/.cvsignore
index 5bc84a2..120867c 100644
--- a/sim-scripts/.cvsignore
+++ b/sim-scripts/.cvsignore
@@ -3,6 +3,8 @@ ant5206-gdb
 avrtest
 bf537Stamp
 bf537Stamp-gdb
+bf537Stamp-skyeye
+bf537Stamp-skyeye-gdb
 csb337
 csb337-gdb
 csb350
@@ -15,6 +17,8 @@ erc32
 erc32-gdb
 ezkit533
 ezkit533-gdb
+ezkit533-skyeye
+ezkit533-skyeye-gdb
 gdbarmsim
 gdbarmsim-gdb
 gumstix
diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog
index 96526b3..791ebe0 100644
--- a/sim-scripts/ChangeLog
+++ b/sim-scripts/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-20	Joel Sherrill <joel.sherrilL@oarcorp.com>
+
+	* .cvsignore, Makefile, bf537Stamp.in, ezkit533.in: Move current
+	scripts to skyeye named ones so the default is to use the new
+	simulator in gdb.
+	* bf537Stamp-skyeye.in, ezkit533-skyeye.in: New files.
+
 2010-04-13	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* pc386.in: Specify CPU as 486
diff --git a/sim-scripts/Makefile b/sim-scripts/Makefile
index bf49140..b12125f 100644
--- a/sim-scripts/Makefile
+++ b/sim-scripts/Makefile
@@ -3,9 +3,10 @@
 #
 
 INSTALL_DIR=../bin
-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
+GDBSIM_SCRIPTS=bf537Stamp ezkit533 gdbarmsim h8sim jmr3904 lm32_evr \
+  m32csim m32rsim psim sis simsh
+SKYEYE_SCRIPTS=ant5206 bf537Stamp-skyeye csb337 csb350 csb360 edb7312 \
+  ezkit533-skyeye gumstix rtl22xx smdk2410 leon2-skyeye
 
 TSIM_SCRIPTS=erc32 leon2 leon3
 QEMU_SCRIPTS=pc386 qemuppc qemu-gumstix qemu-leon2 qemu-lm32_evr uC5282
@@ -62,8 +63,8 @@ csb350: gdb-sim-run.in gdb-sim.in csb350.in
 csb360: gdb-sim-run.in gdb-sim.in csb360.in
 	./mkrun yes M68K-Coldfire m68k csb360
 
-bf537Stamp: gdb-sim-run.in gdb-sim.in bf537Stamp.in
-	./mkrun yes Blackfin bfin bf537Stamp
+bf537Stamp-skyeye: gdb-sim-run.in gdb-sim.in bf537Stamp-skyeye.in
+	./mkrun yes Blackfin bfin bf537Stamp-skyeye
 
 edb7312: gdb-sim-run.in gdb-sim.in edb7312.in
 	./mkrun yes ARM arm edb7312
@@ -77,8 +78,8 @@ rtl22xx: gdb-sim-run.in gdb-sim.in rtl22xx.in
 smdk2410: gdb-sim-run.in gdb-sim.in smdk2410.in
 	./mkrun yes ARM arm smdk2410
 
-ezkit533: gdb-sim-run.in gdb-sim.in ezkit533.in
-	./mkrun yes Blackfin bfin ezkit533
+ezkit533-skyeye: gdb-sim-run.in gdb-sim.in ezkit533-skyeye.in
+	./mkrun yes Blackfin bfin ezkit533-skyeye
 
 leon2-skyeye: gdb-sim-run.in gdb-sim.in leon2-skyeye.in
 	./mkrun yes SPARC sparc leon2-skyeye
@@ -94,6 +95,12 @@ leon3: gdb-sim-run.in gdb-sim.in leon3.in tsim-support
 	./mkrun yes SPARC sparc leon3
 
 ### GDB Simulator BSPs
+bf537Stamp bf537Stamp-gdb: gdb-sim-run.in gdb-sim.in bf537Stamp.in
+	./mkrun yes Blackfin bfin bf537Stamp
+
+ezkit533 ezkit533-gdb: gdb-sim-run.in gdb-sim.in ezkit533.in
+	./mkrun yes Blackfin bfin ezkit533
+
 gdbarmsim gdbarmsim-gdb: gdb-sim-run.in gdb-sim.in gdbarmsim.in
 	./mkrun yes ARM arm gdbarmsim
 
diff --git a/sim-scripts/bf537Stamp-skyeye.in b/sim-scripts/bf537Stamp-skyeye.in
new file mode 100644
index 0000000..c3da1ad
--- /dev/null
+++ b/sim-scripts/bf537Stamp-skyeye.in
@@ -0,0 +1,39 @@
+#
+#  Blackfin/bf537Stamp Support 
+#
+#  $Id$
+#
+
+##INSERT SKYEYE SUPPORT HERE
+
+checkBSPFaults()
+{
+  bspExited_ARM
+  return $?
+}
+
+bspLimit()
+{
+  testname=$1
+  case ${testname} in
+    *stackchk*)limit=5 ;;
+    *fatal*)   limit=1 ;;
+    *minimum*) limit=1 ;;
+    *psxtime*) limit=180 ;;
+    *)         limit=60 ;;
+  esac
+  echo ${limit}
+}
+
+bspGeneratesDeviceTree="yes"
+bspTreeFile=bf537Stamp.conf
+
+### Generate the PSIM device tree based upon the type of application being run
+bspGenerateDeviceTree()
+{
+cat <<EOF
+arch:blackfin
+mach:bf537
+uart: mod=pipe, desc_in=/dev/null, desc_out=/dev/stdout
+EOF
+}
diff --git a/sim-scripts/bf537Stamp.in b/sim-scripts/bf537Stamp.in
index c3da1ad..80176c9 100644
--- a/sim-scripts/bf537Stamp.in
+++ b/sim-scripts/bf537Stamp.in
@@ -1,15 +1,25 @@
 #
-#  Blackfin/bf537Stamp Support 
+#  Blackfin BF537 Stamp Support 
 #
 #  $Id$
 #
 
-##INSERT SKYEYE SUPPORT HERE
+runARGS()
+{
+  echo "--env operating --model bf537 ${1}"
+}
 
 checkBSPFaults()
 {
-  bspExited_ARM
-  return $?
+  logfile=$1
+  grep "^Unhandled exception" ${logfile}
+  exceptionExit=$?
+  grep "^mips-core: " ${logfile}
+  badAccessExit=$?
+  if [ $badAccessExit -eq 0 -o $exceptionExit -eq 0 ] ; then
+    return 1
+  fi
+  return 0
 }
 
 bspLimit()
@@ -25,15 +35,12 @@ bspLimit()
   echo ${limit}
 }
 
-bspGeneratesDeviceTree="yes"
-bspTreeFile=bf537Stamp.conf
+bspGeneratesGDBCommands="yes"
 
-### Generate the PSIM device tree based upon the type of application being run
-bspGenerateDeviceTree()
+bspGenerateGDBCommands()
 {
 cat <<EOF
-arch:blackfin
-mach:bf537
-uart: mod=pipe, desc_in=/dev/null, desc_out=/dev/stdout
+target sim --env operating --model bf537
+load
 EOF
 }
diff --git a/sim-scripts/ezkit533-skyeye.in b/sim-scripts/ezkit533-skyeye.in
new file mode 100644
index 0000000..1c6b08a
--- /dev/null
+++ b/sim-scripts/ezkit533-skyeye.in
@@ -0,0 +1,39 @@
+#
+#  Blackfin/ezkit533 Support 
+#
+#  $Id$
+#
+
+##INSERT SKYEYE SUPPORT HERE
+
+checkBSPFaults()
+{
+  bspExited_ARM
+  return $?
+}
+
+bspLimit()
+{
+  testname=$1
+  case ${testname} in
+    *stackchk*)limit=5 ;;
+    *fatal*)   limit=1 ;;
+    *minimum*) limit=1 ;;
+    *psxtime*) limit=180 ;;
+    *)         limit=60 ;;
+  esac
+  echo ${limit}
+}
+
+bspGeneratesDeviceTree="yes"
+bspTreeFile=ezkit533.conf
+
+### Generate the PSIM device tree based upon the type of application being run
+bspGenerateDeviceTree()
+{
+cat <<EOF
+arch:blackfin
+mach:bf533
+uart: mod=pipe, desc_in=/dev/null, desc_out=/dev/stdout
+EOF
+}
diff --git a/sim-scripts/ezkit533.in b/sim-scripts/ezkit533.in
index 1c6b08a..986da0a 100644
--- a/sim-scripts/ezkit533.in
+++ b/sim-scripts/ezkit533.in
@@ -1,15 +1,25 @@
 #
-#  Blackfin/ezkit533 Support 
+#  Blackfin ezKit533 Support 
 #
 #  $Id$
 #
 
-##INSERT SKYEYE SUPPORT HERE
+runARGS()
+{
+  echo "--env operating --model bf533 ${1}"
+}
 
 checkBSPFaults()
 {
-  bspExited_ARM
-  return $?
+  logfile=$1
+  grep "^Unhandled exception" ${logfile}
+  exceptionExit=$?
+  grep "^mips-core: " ${logfile}
+  badAccessExit=$?
+  if [ $badAccessExit -eq 0 -o $exceptionExit -eq 0 ] ; then
+    return 1
+  fi
+  return 0
 }
 
 bspLimit()
@@ -25,15 +35,12 @@ bspLimit()
   echo ${limit}
 }
 
-bspGeneratesDeviceTree="yes"
-bspTreeFile=ezkit533.conf
+bspGeneratesGDBCommands="yes"
 
-### Generate the PSIM device tree based upon the type of application being run
-bspGenerateDeviceTree()
+bspGenerateGDBCommands()
 {
 cat <<EOF
-arch:blackfin
-mach:bf533
-uart: mod=pipe, desc_in=/dev/null, desc_out=/dev/stdout
+target sim --env operating --model bf533
+load
 EOF
 }