2009-08-13 Joel Sherrill <joel.sherrill@OARcorp.com>

	* .cvsignore, Makefile, edb7312.in, gdb-sim-run.in, skyeye-support: Add
	support for invoking a simulator external to gdb in gdb server mode.
	Have the gdb commands generated to include attaching to that server
	instance.

6 files changed, 65 insertions, 21 deletions

diff --git a/sim-scripts/.cvsignore b/sim-scripts/.cvsignore
index 7a260fd..ba9b6b3 100644
--- a/sim-scripts/.cvsignore
+++ b/sim-scripts/.cvsignore
@@ -1,19 +1,28 @@
 ant5206
+ant5206-gdb
 avrtest
 bf537Stamp
+bf537Stamp-gdb
 csb337
+csb337-gdb
 csb350
+csb350-gdb
 csb360
+csb360-gdb
 edb7312
+edb7312-gdb
 erc32
 ezkit533
+ezkit533-gdb
 gumstix
+gumstix-gdb
 h8sim
 h8sim-gdb
 jmr3904
 jmr3904-gdb
 leon2
 leon2-skyeye
+leon2-skyeye-gdb
 leon3
 m32csim
 m32csim-gdb
@@ -23,9 +32,11 @@ psim
 psim-gdb
 qemu-rtems
 rtl22xx
-smdk2410
+rtl22xx-gdb
 simsh
 simsh-gdb
 sis
 sis-gdb
+smdk2410
+smdk2410-gdb
 usleep
diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog
index 13d3a29..1083a4d 100644
--- a/sim-scripts/ChangeLog
+++ b/sim-scripts/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-13	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* .cvsignore, Makefile, edb7312.in, gdb-sim-run.in, skyeye-support: Add
+	support for invoking a simulator external to gdb in gdb server mode.
+	Have the gdb commands generated to include attaching to that server
+	instance.
+
 2009-08-12	Josh Switnicki <josh.switnicki@utoronto.ca>
 
 	* .cvsignore, Makefile, gdb-sim-run.in: Add support for avrtest BSP
diff --git a/sim-scripts/Makefile b/sim-scripts/Makefile
index 5a345ce..aea5c01 100644
--- a/sim-scripts/Makefile
+++ b/sim-scripts/Makefile
@@ -3,15 +3,16 @@
 #
 
 INSTALL_DIR=../bin
-GDBSIM_SCRIPTS=h8sim h8sim-gdb jmr3904 jmr3904-gdb \
-  m32csim m32csim-gdb m32rsim m32rsim-gdb psim psim-gdb \
-  sis sis-gdb simsh simsh-gdb
+GDBSIM_SCRIPTS=h8sim jmr3904 m32csim m32rsim psim sis simsh
 SKYEYE_SCRIPTS=ant5206 bf537Stamp csb337 csb350 csb360 edb7312 ezkit533 \
   gumstix rtl22xx smdk2410 leon2-skyeye
+
 TSIM_SCRIPTS=erc32 leon2 leon3
 QEMU_SCRIPTS=qemu-rtems
 OTHER_SCRIPTS=avrtest
-GENERATED_SCRIPTS=${GDBSIM_SCRIPTS} ${SKYEYE_SCRIPTS} \
+GENERATED_SCRIPTS=\
+  ${GDBSIM_SCRIPTS} $(GDBSIM_SCRIPTS:%=%-gdb) \
+  ${SKYEYE_SCRIPTS} $(SKYEYE_SCRIPTS:%=%-gdb) \
   ${TSIM_SCRIPTS} ${QEMU_SCRIPTS} ${OTHER_SCRIPTS}
 
 COMPILED_PROGRAMS=usleep
@@ -32,37 +33,37 @@ qemu-rtems: gdb-sim-run.in qemu-rtems.in
 
 ### Skyeye Simulator BSPs
 ant5206: gdb-sim-run.in ant5206.in
-	./mkrun no M68K-Coldfire m68k ant5206
+	./mkrun yes M68K-Coldfire m68k ant5206
 
 csb337: gdb-sim-run.in csb337.in
-	./mkrun no ARM arm csb337
+	./mkrun yes ARM arm csb337
 
 csb350: gdb-sim-run.in csb350.in
-	./mkrun no MIPS mips csb350
+	./mkrun yes MIPS mips csb350
 
 csb360: gdb-sim-run.in csb360.in
-	./mkrun no M68K-Coldfire m68k csb360
+	./mkrun yes M68K-Coldfire m68k csb360
 
 bf537Stamp: gdb-sim-run.in bf537Stamp.in
-	./mkrun no Blackfin bfin bf537Stamp
+	./mkrun yes Blackfin bfin bf537Stamp
 
 edb7312: gdb-sim-run.in edb7312.in
-	./mkrun no ARM arm edb7312
+	./mkrun yes ARM arm edb7312
 
 gumstix: gdb-sim-run.in gumstix.in
-	./mkrun no ARM arm gumstix
+	./mkrun yes ARM arm gumstix
 
 rtl22xx: gdb-sim-run.in rtl22xx.in
-	./mkrun no ARM arm rtl22xx
+	./mkrun yes ARM arm rtl22xx
 
 smdk2410: gdb-sim-run.in smdk2410.in
-	./mkrun no ARM arm smdk2410
+	./mkrun yes ARM arm smdk2410
 
 ezkit533: gdb-sim-run.in ezkit533.in
-	./mkrun no Blackfin bfin ezkit533
+	./mkrun yes Blackfin bfin ezkit533
 
 leon2-skyeye: gdb-sim-run.in leon2-skyeye.in
-	./mkrun no SPARC sparc leon2-skyeye
+	./mkrun yes SPARC sparc leon2-skyeye
 
 ### TSIM Simulator BSPs
 erc32: gdb-sim-run.in erc32.in tsim-support
diff --git a/sim-scripts/edb7312.in b/sim-scripts/edb7312.in
index b81a619..3797d21 100644
--- a/sim-scripts/edb7312.in
+++ b/sim-scripts/edb7312.in
@@ -10,6 +10,11 @@ runARGS()
   echo "-c ${bspTreeFile} -e ${1}"
 }
 
+gdbServerARGS()
+{
+  echo "-c ${bspTreeFile} -d"
+}
+
 checkBSPFaults()
 {
   bspExited_ARM
diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in
index 3adb26a..f6a21ba 100755
--- a/sim-scripts/gdb-sim-run.in
+++ b/sim-scripts/gdb-sim-run.in
@@ -26,15 +26,17 @@ USAGE=\
 	-c	   -- enabled coverage (default=no)
 	-C	   -- cat test output if not interactive (default=no)
 	-g	   -- generate device tree and exit (default=no)
+	-G	   -- put simulator in GDB server mode (default=no)
 	-i	   -- interactive (default=no time limit)
 	-s	   -- force System V IPC support (default=no)
         -l limit   -- specify time limit (default is 'BSP dependent')
         -L dir     -- specify log directory (default is 'log')
 
-System V IPC and Coverage are not supported by all BSPs or simulators.
-
-When you generate a device tree and exit, remember to specify an executable.
-Otherwise, the script won't know what to generate it for.
+NOTES:
+  + System V IPC and Coverage are not supported by all BSPs or simulators.
+  + GDB Server mode is only supported by stand-along simulators.
+  + When you generate a device tree and exit, remember to specify an
+    executable.  Otherwise, the script won't know what to generate it for.
 "
 
 #   log an error to stderr
@@ -74,17 +76,19 @@ coverage="no"
 verbose="no"
 defaultLimit="not_set"
 interactive="no"
+gdb_server_mode="no"
 use_sysv_ipc="no"
 generate_tree_and_exit="no"
 logdir="log"
 
-while getopts "vcCgil:L:s" OPT
+while getopts "vcCgGil:L:s" OPT
 do
  case "$OPT" in
    v) verbose="yes";;
    c) coverage="yes";;
    C) doCatOutput="yes";;
    g) generate_tree_and_exit="yes" ;;
+   G) gdb_server_mode="yes" ;;
    i) interactive="yes";;
    l) defaultLimit="$OPTARG";;
    L) loggir="$OPTARG";;
@@ -117,6 +121,7 @@ bspSupportsSystemVIPC="no"
 bspUsesGDBSimulator="yes"
 bspNeedsDos2Unix="no"
 bspSimTrustedToExit="no"
+bspSupportsGDBServerMode="no"
 
 for v in 4.10 4.9 4.8 4.7 ""
 do
@@ -341,6 +346,12 @@ do
     fi
   fi
 
+  if [ ${bspSupportsGDBServerMode} = "yes" -a ${gdb_server_mode} = "yes" ];then
+    test ${verbose} == 'yes' && echo ${runBSP} `runARGS ${toRun}`
+    ${runBSP} `gdbServerARGS ${toRun}`
+    exit 0
+  fi
+
   if [ ${interactive} = "yes" ] ; then
     test ${verbose} = "yes" && \
       echo INTERACTIVE runtest ${toRun} ${testtype} 0
diff --git a/sim-scripts/skyeye-support b/sim-scripts/skyeye-support
index c3b836d..10190ea 100644
--- a/sim-scripts/skyeye-support
+++ b/sim-scripts/skyeye-support
@@ -5,12 +5,21 @@
 #
 
 bspUsesGDBSimulator="no"
+bspSupportsGDBServerMode="yes"
 bspNeedsDos2Unix="yes"
+bspGeneratesGDBCommands="no"
+
 if [ ${coverage} = "yes" ] ; then
   bspRunFatal="yes"
 fi
 runBSP=skyeye
 
+bspGenerateGDBCommands()
+{
+  tar remote :12345
+  load
+}
+
 bspLimit()
 {
   tname=$1