FSI Fixes for multi-chip support

Changes include the following:
- Fix for modified slave break behavior
- Xscom chipid bug fix

RTC: 64149
Change-Id: Icd9c93ed265f0004ab4a726fcc01bde0cbe3eadf
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5097
Tested-by: Jenkins Server
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/usr/cxxtest/cxxtestexec.C b/src/usr/cxxtest/cxxtestexec.C
index bf55c5e69..38fa2f501 100644
--- a/src/usr/cxxtest/cxxtestexec.C
+++ b/src/usr/cxxtest/cxxtestexec.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,2012              */
+/* COPYRIGHT International Business Machines Corp. 2011,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -82,7 +82,7 @@ void    cxxinit( errlHndl_t    &io_taskRetErrl )
 
     //  start executing the CxxTest modules
 
-    TRACDCOMP( g_trac_cxxtest, ENTER_MRK "Execute CxxTestExec, totalmodules=%d.",
+    TRACFCOMP( g_trac_cxxtest, ENTER_MRK "Execute CxxTestExec, totalmodules=%d.",
             module_list.size());
     printkd( "\n Begin CxxTest...\n");
 
@@ -111,7 +111,7 @@ void    cxxinit( errlHndl_t    &io_taskRetErrl )
         }
 
         tidrc = task_exec( *i, NULL );
-        TRACDCOMP( g_trac_cxxtest, "Launched task: %s tidrc=%d",
+        TRACFCOMP( g_trac_cxxtest, "Launched task: %s tidrc=%d",
                    *i, tidrc );
         tasks.push_back(tidrc);
     }
@@ -131,6 +131,10 @@ void    cxxinit( errlHndl_t    &io_taskRetErrl )
             TRACFCOMP( g_trac_cxxtest, "Task %d crashed.", *t );
             __sync_add_and_fetch(&CxxTest::g_FailedTests, 1);
         }
+        else
+        {
+            TRACFCOMP( g_trac_cxxtest, "Task %d finished.", *t );
+        }
     }
 
     __sync_add_and_fetch(&CxxTest::g_ModulesCompleted, 1);