hb-istep does not work when listing a range of named steps

Change-Id: I6544b475446bf07e6d56d571534d06147218f476
RTC: 99671
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9500
Tested-by: Jenkins Server
Reviewed-by: William H. Schwartz <whs@us.ibm.com>
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 49 insertions, 22 deletions

diff --git a/src/build/debug/Hostboot/Istep.pm b/src/build/debug/Hostboot/Istep.pm
index b51b62f8f..3da6b3216 100755
--- a/src/build/debug/Hostboot/Istep.pm
+++ b/src/build/debug/Hostboot/Istep.pm
@@ -6,7 +6,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2011,2013
+# COPYRIGHT International Business Machines Corp. 2011,2014
 #
 # p1
 #
@@ -459,7 +459,6 @@ sub get_istep_list()
 sub print_istep_list( )
 {
     my  $hdrflag    =   1;
-    my  $col        =   0;
 
     ## ::userDisplay   " IStep Name\n";
     ##::userDisplay   "---------------------------------------------------\n";
@@ -478,22 +477,10 @@ sub print_istep_list( )
                 }
                 ## will truncate after 40 chars, hopefully this will not be an issue
                 my $ss  =   sprintf( "%-40s", $inList[$i][$j] );
-                ::userDisplay   "$ss" ;
-                $col ++ ;
-                if ( $col > 1 )
-                {
-                    ::userDisplay   "\n";
-                    $col = 0;
-
-                }
+                ::userDisplay   "$i.$j: $ss\n" ;
             }
         }   ## end for $j
 
-        if ( $col > 0 )
-        {
-            ::userDisplay "\n";
-            $col = 0;
-        }
         $hdrflag=1;
     }   ##  end for $i
 }
@@ -850,12 +837,52 @@ sub process_command( $ )
             }
         }
 
-
-        for( my $x=$istepM; $x<$istepN+1; $x++ )
+        for(my $x=$istepM; $x<=$istepN; $x++)
         {
-            for( my $y=$substepM; $y<$substepN+1; $y++ )
+            if ($istepM == $istepN)
+            {
+                # First and Last Steps are the same.
+                # Run all requested substeps between the same step
+                for(my $y=$substepM; $y<=$substepN; $y++)
+                {
+                    if (defined($inList[$x][$y]))
+                    {
+                        runIStep($x, $y);
+                    }
+                }
+            }
+            elsif ($x == $istepM)
             {
-                runIStep( $x, $y );
+                # First requested Step, run from requested substep
+                for(my $y=$substepM; $y<MAX_SUBSTEPS; $y++)
+                {
+                    if (defined($inList[$x][$y]))
+                    {
+                        runIStep($x, $y);
+                    } 
+                }
+            }
+            elsif ($x == $istepN)
+            {
+                # Last requested Step, run up to requested substep
+                for(my $y=0; $y<=$substepN; $y++)
+                {
+                    if (defined($inList[$x][$y]))
+                    {
+                        runIStep($x, $y);
+                    }
+                }
+            }
+            else
+            {
+                # Middle istep, run all substeps
+                for(my $y=0; $y<MAX_SUBSTEPS; $y++)
+                {
+                    if (defined($inList[$x][$y]))
+                    {
+                        runIStep($x, $y);
+                    }
+                }
             }
         }
 
diff --git a/src/build/simics/hb-simdebug.py b/src/build/simics/hb-simdebug.py
index f241757ae..f6d8d7225 100755
--- a/src/build/simics/hb-simdebug.py
+++ b/src/build/simics/hb-simdebug.py
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2011,2013
+# COPYRIGHT International Business Machines Corp. 2011,2014
 #
 # p1
 #
@@ -124,9 +124,9 @@ Examples: \n
     hb-istep    clear-trace \n
     hb-istep    resume \n
     hb-istep    s4 \n
-    hb-istep    s4..N
+    hb-istep    s4..N \n
     hb-istep    poweron \n
-    hb-istep    poweron..clock_frequency_set /n
+    hb-istep    poweron..clock_frequency_set \n
     """)
 
 #------------------------------------------------