Fix hb-istep defects

SW146494 : P8 Hostboot:VPO:hb_istep host_attnlisten_proc gives usagea
SW146851 : P8 Hostboot:VPO:hb_istep sN fails to complete desired steps

Change-Id: I4e2c233307a5b6dca369bf93918fc4831074c0ee
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1213
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 15 insertions, 15 deletions

diff --git a/src/build/vpo/VBU_Cacheline.pm b/src/build/vpo/VBU_Cacheline.pm
index cef6e3e5b..55de20dad 100755
--- a/src/build/vpo/VBU_Cacheline.pm
+++ b/src/build/vpo/VBU_Cacheline.pm
@@ -109,7 +109,7 @@ my  $RUNCLKSCMD =   "simclock";
 #    Query command output strings:
 #       Single thread (-t0,1,..)   "Running" or "Quiesced"
 #       All threads   (-tall)      A formatted table
-# 
+#
 # TODO:
 # Needs to resolve the error when using "start -tall".  After running a while,
 # start -tall may lock up with this error:
@@ -117,7 +117,7 @@ my  $RUNCLKSCMD =   "simclock";
 # Temporary workaround is using only one thread as shown below.
 # Lance Karm is still investigating.
 my  $QUERYCMD   =   "$vbuToolsDir/proc_thread_control_wrap.x86 -query  $CORE -t0 -quiet";
-my  $STARTCMD   =   "$vbuToolsDir/proc_thread_control_wrap.x86 -start  $CORE -t0 -quiet";
+my  $STARTCMD   =   "$vbuToolsDir/proc_thread_control_wrap.x86 -start  $CORE -t0 -quiet -warncheck";
 my  $STOPCMD    =   "$vbuToolsDir/proc_thread_control_wrap.x86 -stop   $CORE -t0 -quiet";
 my  $RESETCMD   =   "$vbuToolsDir/proc_thread_control_wrap.x86 -sreset $CORE -quiet";
 
@@ -253,7 +253,7 @@ sub P8_Ins_Query()
 
 
 ##
-##  Stop the simulation.  Necessary to read and write L3 .
+##  Start the simulation.
 ##
 sub P8_Ins_Start()
 {
diff --git a/src/build/vpo/hb-istep b/src/build/vpo/hb-istep
index 01013b4ad..81b7a22ba 100755
--- a/src/build/vpo/hb-istep
+++ b/src/build/vpo/hb-istep
@@ -180,7 +180,7 @@ if ( ! -e "$hbSymsFile" )  { die "Can't find symbols file $hbSymsFile\n";   }
 if ( ! -e "$CSVfile" )  { die "Can't find isteplist file $hbSymsFile\n";   }
 
 
-print   STDOUT  "Welcome to hb-istep 3.0 .  \n";
+print   STDOUT  "Welcome to hb-istep 3.02 .\n";
 
 
 ## exit if no args
@@ -233,48 +233,48 @@ for ( my $i=0; $i <= $#Options; $i++ )
 {
     $_  =   $Options[$i];
 
-    if ( m/\-{0,2}help/  )
+    if ( m/^\-{0,2}help$/  )
     {
         $opt_help       =   1;
         $Options[$i]    =   "";
     }
-    if ( m/\-{0,2}debug/ )
+    if ( m/^\-{0,2}debug$/ )
     {
         $opt_debug      =   1;
         $Options[$i]    =   "";
     }
-    if ( m/\-{0,2}list/ )
+    if ( m/^\-{0,2}list$/ )
     {
         $opt_list       =   1;
         $Options[$i]    =   "";
     }
-    if ( m/\-{0,2}istepmode/ )
+    if ( m/^\-{0,2}istepmode$/ )
     {
         $opt_istepmode  =   1;
         $Options[$i]    =   "";
     }
-    if ( m/\-{0,2}splessmode/ )
+    if ( m/^\-{0,2}splessmode$/ )
     {
         $opt_splessmode  =   1;
         $Options[$i]    =   "";
     }
-    if ( m/\-{0,2}fspmode/ )
+    if ( m/^\-{0,2}fspmode$/ )
     {
         $opt_fspmode  =   1;
         $Options[$i]    =   "";
     }
-    if ( m/\-{0,2}command/ )
+    if ( m/^\-{0,2}command$/ )
     {
         ## does nothing except eat the "[--]command" option
         $opt_command    =   1;
         $Options[$i]    =   "";
     }
-    if ( m/\-{0,2}resume/ )
+    if ( m/^\-{0,2}resume$/ )
     {
         $opt_resume     =   1;
         $Options[$i]    =   "";
     }
-    if  ( m/\-{0,2}clear-trace/ )
+    if  ( m/^\-{0,2}clear-trace$/ )
     {
         $opt_clear_trace    =   1;
         $Options[$i]    =   "";
@@ -728,7 +728,7 @@ sub getSyncStatus( )
 
         # Progress bar
         print   STDOUT  ".";
-        
+
         # Feed simclocks
         runClocks();
 
@@ -743,7 +743,7 @@ sub getSyncStatus( )
            print   STDOUT  "T/F";
            system ("$hbToolsDir/hb-ContTrace --no-save-states --mute > /dev/null" );
            system ("cat hb-ContTrace.output >> tracMERG");
-           
+
            # Need to start instructions after trace has been dumped out.
            VBU_Cacheline::P8_Ins_Start();
         }