2010-01-13 Glenn Humphrey <glenn.humphrey@OARcorp.com>

	* gdb-sim-run.in, pc386.in, qemu-gumstix.in, qemuppc.in, uC5282.in:
	Removed explicit conversion from a trace. It is now being read as a
	trace from covmerge.

6 files changed, 14 insertions, 35 deletions

diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog
index 404bc06..ae8707b 100644
--- a/sim-scripts/ChangeLog
+++ b/sim-scripts/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-13	Glenn Humphrey <glenn.humphrey@OARcorp.com>
+
+	* gdb-sim-run.in, pc386.in, qemu-gumstix.in, qemuppc.in, uC5282.in:
+	Removed explicit conversion from a trace. It is now being read as a
+	trace from covmerge.
+
 2009-10-19	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* gdb-sim-run.in: Attempt to detect assertions as generic exits.
diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in
index a49547d..1a3273e 100755
--- a/sim-scripts/gdb-sim-run.in
+++ b/sim-scripts/gdb-sim-run.in
@@ -453,6 +453,7 @@ do
   # some BSPs produce trace oriented files which need to be converted
   # to object coverage maps
   if [ ${coverage} = "yes" -a ${bspNeedsTraceConversion} = "yes" ] ; then
+    test ${verbose} = "yes" && echo Converting trace map for ${toRun}
     convertTraceToCoverageMap ${toRun}
   fi
 
diff --git a/sim-scripts/pc386.in b/sim-scripts/pc386.in
index 18f532d..95c36d1 100644
--- a/sim-scripts/pc386.in
+++ b/sim-scripts/pc386.in
@@ -5,12 +5,11 @@
 #
 
 bspUsesGDBSimulator="no"
-runBSP=${HOME}/qemu-coverage/install/bin/qemu
+runBSP=${HOME}/qemu_coverage/install-r6588/bin/qemu
 if [ ! -r ${runBSP} ] ; then
   runBSP=qemu
 fi
 bspNeedsDos2Unix="yes"
-bspNeedsTraceConversion="yes"
 bspRunsFailRandomly="yes"
 
 # Set the defaults based upon arguments given and do some error checking
@@ -53,8 +52,8 @@ runARGS()
   cp ${1} ${hd0Dir}/test.exe
 
   if [ ${coverage} = yes ] ; then
-     rm -f trace ${1}.tra
-     COVERAGE_ARG="-trace ${1}.tra"
+     rm -f trace ${1}.cov
+     COVERAGE_ARG="-trace ${1}.cov"
   fi
 
   # can also redirect to file with file:log/"`basename ${1} .exe`
@@ -107,9 +106,4 @@ bspLimit()
   echo ${limit}
 }
 
-convertTraceToCoverageMap()
-{
-  trace_converter -l 100000 -h 200000 -f QEMU ${1}.tra ${1}.cov 
-}
-
 bspGeneratesDeviceTree="no"
diff --git a/sim-scripts/qemu-gumstix.in b/sim-scripts/qemu-gumstix.in
index a9fff07..9187f80 100644
--- a/sim-scripts/qemu-gumstix.in
+++ b/sim-scripts/qemu-gumstix.in
@@ -12,7 +12,6 @@ if [ -r ${HOME}/qemu-coverage/install/bin/qemu-system-arm ] ; then
 else
   runBSP=qemu-system-arm
 fi
-bspNeedsTraceConversion="yes"
 bspNeedsDos2Unix="yes"
 bspGeneratesDeviceTree="yes"
 bspInputDevice=qemu-gumstix.cmds
@@ -38,12 +37,6 @@ runARGS()
          -pflash ${FLASH} ${COVERAGE_ARG}"
 }
 
-convertTraceToCoverageMap()
-{
-  # 512K of code space covered
-  trace_converter -l a0000000 -h a0080000 -f QEMU ${1}.tra ${1}.cov 
-}
-
 checkBSPFaults()
 {
   return 0
diff --git a/sim-scripts/qemuppc.in b/sim-scripts/qemuppc.in
index 9bedede..8aa1404 100644
--- a/sim-scripts/qemuppc.in
+++ b/sim-scripts/qemuppc.in
@@ -7,29 +7,20 @@
 bspUsesGDBSimulator="no"
 # bspGeneratesGDBCommands="yes"
 # bspSupportsGDBServerMode="yes"
-bspNeedsTraceConversion="yes"
-if [ -r ${HOME}/qemu-coverage/install/bin/qemu-system-ppc ] ; then
-  runBSP=${HOME}/qemu-coverage/install/bin/qemu-system-ppc
-else
+runBSP=${HOME}/qemu_coverage/install-11/bin/qemu-system-ppc
+if [ ! -r ${runBSP} ] ; then
   runBSP=qemu-system-ppc
 fi
 bspNeedsDos2Unix="yes"
 
 runARGS()
 {
-  objcopy ${1} -O binary ${1}.bin
-
   if [ ${coverage} = yes ] ; then
-     COVERAGE_ARG="-trace ${1}.tra"
+    COVERAGE_ARG="-trace ${1}.tra"
   fi
 
   echo "-nographic -M prep -boot n -no-reboot ${COVERAGE_ARG} \
-	    -L `dirname ${1}` -bios `basename ${1}.bin`"
-}
-
-convertTraceToCoverageMap()
-{
-  trace_converter -l ffc00000 -h ffc80000 -f QEMU ${1}.tra ${1}.cov 
+	    -L `dirname ${1}` -bios `basename ${1}`"
 }
 
 checkBSPFaults()
diff --git a/sim-scripts/uC5282.in b/sim-scripts/uC5282.in
index 05ad1eb..31b2dc1 100644
--- a/sim-scripts/uC5282.in
+++ b/sim-scripts/uC5282.in
@@ -7,7 +7,6 @@
 bspUsesGDBSimulator="no"
 # bspGeneratesGDBCommands="yes"
 # bspSupportsGDBServerMode="yes"
-bspNeedsTraceConversion="yes"
 
 if [ -r ${HOME}/qemu-coverage/install/bin/qemu-system-m68k ] ; then
   runBSP=${HOME}/qemu-coverage/install/bin/qemu-system-m68k
@@ -27,11 +26,6 @@ runARGS()
   echo "-M uc5282 -nographic ${COVERAGE_ARG} -kernel ${1}"
 }
 
-convertTraceToCoverageMap()
-{
-  trace_converter -l 40000 -h 140000 -f QEMU ${1}.tra ${1}.cov 
-}
-
 checkBSPFaults()
 {
   return 0