2011-07-20 Joel Sherrill <joel.sherrill@oarcorp.com>

	* gdb-sim-run.in: Add option to skip critical section tests.
	* pc386.in: Default to core2duo CPU.
	* rtems-gdb-macros-4.11: Update to 4.11.

4 files changed, 37 insertions, 16 deletions

diff --git a/sim-scripts/ChangeLog b/sim-scripts/ChangeLog
index a7d9a86..78bcbb7 100644
--- a/sim-scripts/ChangeLog
+++ b/sim-scripts/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-20	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* gdb-sim-run.in: Add option to skip critical section tests.
+	* pc386.in: Default to core2duo CPU.
+	* rtems-gdb-macros-4.11: Update to 4.11.
+
 2011-03-14	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* gdb-sim-run.in: Add another generic failure message.
diff --git a/sim-scripts/gdb-sim-run.in b/sim-scripts/gdb-sim-run.in
index 6fdd0a3..cdea4ab 100755
--- a/sim-scripts/gdb-sim-run.in
+++ b/sim-scripts/gdb-sim-run.in
@@ -32,6 +32,7 @@ USAGE=\
 	-G	   -- put simulator in GDB server mode (default=no)
 	-i	   -- interactive (default=no time limit)
 	-s	   -- force System V IPC support (default=no)
+	-S	   -- skip Interrupt Critical Section Tests (default=no)
         -l limit   -- specify time limit (default is 'BSP dependent')
         -L dir     -- specify log directory (default is 'log')
         -T         -- rtems-test command mode
@@ -88,8 +89,9 @@ doTrace="no"
 enable_display_adapter="no"
 enable_network="no"
 rtems_test="no"
+skipIntrCriticalTest="no"
 
-while getopts "vcCgGil:L:DsNT" OPT
+while getopts "vcCgGil:L:DsSNT" OPT
 do
  case "$OPT" in
    v) verbose="yes";;
@@ -103,6 +105,7 @@ do
    l) defaultLimit="$OPTARG";;
    L) logdir="$OPTARG";;
    s) use_sysv_ipc="yes";;
+   S) skipIntrCriticalTest="yes";;
    t) doTrace="yes";;
    T) rtems_test="yes";;
    *) fatal;;
@@ -409,20 +412,30 @@ do
 
   ## If the test is known to be interactive or locks up and we are
   ## in batch mode, skip it.
-  case ${toRun} in
+  case ${baseToRun} in
     monitor*|termios.*|fileio*|capture*)
-        warn "skipping interactive ${toRun}"
+        warn "skipping interactive ${baseToRun}"
+        continue
+        ;;
+    spintrcritical*|psxintrcritical*)
+        if [ ${skipIntrCriticalTest} = "yes" ] ; then
+          warn "skipping Interrupt Critical Section test ${baseToRun}"
+          continue
+        fi
+        ;;
+    appstart*)
+        warn "skipping intermediate file ${baseToRun}"
         continue
         ;;
     *-node2*)
         fatal "MP tests not supported"
-        warn "Skipping ${toRun}; 'runtest' runs both nodes when for *-node1"
+        warn "Skipping ${baseToRun}; 'runtest' runs both nodes when for *-node1"
         continue;;
     *-node1*)
-      warn "Running both nodes associated with ${toRun}"
+      warn "Running both nodes associated with ${baseToRun}"
       ;;
     pppd*)
-      warn "skipping long running ${toRun}"
+      warn "skipping long running ${baseToRun}"
       continue
       ;;
    esac
diff --git a/sim-scripts/pc386.in b/sim-scripts/pc386.in
index d420a93..29c05d6 100644
--- a/sim-scripts/pc386.in
+++ b/sim-scripts/pc386.in
@@ -59,8 +59,9 @@ runARGS()
   # -cpu 486
   # can also redirect to file with file:log/"`basename ${1} .exe`
   SERIAL_ARG="stdio"
-  echo "-m 512 -boot a -cpu 486 -fda ${fd0Image} -hda fat:${hd0Dir} ${COVERAGE_ARG} \
-         -monitor null -nographic -serial ${SERIAL_ARG} --no-reboot"
+  echo "-m 512 -boot a -cpu core2duo \
+       -fda ${fd0Image} -hda fat:${hd0Dir} ${COVERAGE_ARG} \
+       -monitor null -nographic -serial ${SERIAL_ARG} --no-reboot"
 }
 
 checkBSPFaults()
diff --git a/sim-scripts/rtems-gdb-macros-4.11 b/sim-scripts/rtems-gdb-macros-4.11
index 718f826..83ce933 100644
--- a/sim-scripts/rtems-gdb-macros-4.11
+++ b/sim-scripts/rtems-gdb-macros-4.11
@@ -55,7 +55,7 @@
 #    rtems_check_state
 #
 
-echo Loading GDB Macro Package for RTEMS 4.10...\n
+echo Loading GDB Macro Package for RTEMS 4.11...\n
 
 #############################################################################
 ########                   Public Helper Macros                      ########
@@ -317,8 +317,8 @@ define rtems_helper_score_threadq
   set $queues = &$tq->Queues
   while $pri_index < $limit
     set $chain = &$queues.Priority[$pri_index]
-    set $ptail = &$chain->permanent_null
-    set $next = $chain->first
+    set $ptail = &$chain->Head.fill
+    set $next = $chain->Head.Node.next
     while $next != $ptail
       set $t = (struct Thread_Control_struct *)$next
       printf "0x%08x@%d ", $t->Object.id, $t->current_priority
@@ -392,8 +392,8 @@ end
 #    arg0 = pointer to Watchdog delta chain
 #
 define rtems_helper_score_watchdog_chain
-  set $permt = &$arg0.permanent_null
-  set $node = $arg0.first
+  set $permt = &$arg0.Tail.Node
+  set $node = $arg0.Head.Node.next
 
   if $node == $permt
     printf "Empty\n"
@@ -908,10 +908,11 @@ end
 #
 # ARGUMENTS: NONE
 #
-# TODO: For 4.6, check object information table for non-NULL
+# TODO: NONE
 define rtems_tasks
-  printf "Executing: 0x%x, Heir: 0x%x\n", _Thread_Executing->Object.id, \
-    _Thread_Heir.Object.id
+  printf "Executing: 0x%x, Heir: 0x%x\n", \
+    _Per_CPU[0].executing->Object.id, \
+    _Per_CPU[0].heir.Object.id
   printf "================================================================\n"
   printf "Internal Tasks\n"
   rtems_helper_show_tasks  _Thread_Internal_information