[SYSBIOS-310] GateHwi ROV view broken in TI-RTOS CC13xx/CC26xx examples
diff --git a/src/packages/xdc/rov/StateReader.xs b/src/packages/xdc/rov/StateReader.xs
index 8f9da87..7b69f38 100644
--- a/src/packages/xdc/rov/StateReader.xs
+++ b/src/packages/xdc/rov/StateReader.xs
@@ -1,13 +1,13 @@
 /* --COPYRIGHT--,EPL
- *  Copyright (c) 2008 Texas Instruments and others.
+ *  Copyright (c) 2008-2017 Texas Instruments Incorporated
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
  *  http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  *  Contributors:
  *      Texas Instruments - initial implementation
- * 
+ *
  * --/COPYRIGHT--*/
 
 /*
@@ -30,7 +30,7 @@
 
 /*
  *  ======== fetchModuleState ========
- *  Scans the given module's module state structure. If the structure has 
+ *  Scans the given module's module state structure. If the structure has
  *  already been scanned, this function returns immediately.
  */
 function fetchModuleState(mod)
@@ -125,10 +125,11 @@
 
         if (instArrAddr == -1) {
             // TODO - What should they do if they encounter this?
-            throw (new Error("The module " + mod.name + " has static " +
-                   "instances, but ROV could not find the required symbol '" +
-                   instArrSym + "' to locate them. Ensure the application " +
-                   "contains references to the instances."));
+            throw (new Error("There are " + mod.name + " static instances in"
+                + " the app configuration, but ROV could not find them in the"
+                + " app executable (required symbol '" + instArrSym
+                + "' is missing). The instances might have been removed by the"
+                + " linker because they weren't referenced."));
         }
 
         /* Determine number and size of the instance objects from the config */
@@ -190,7 +191,7 @@
                                              true);
 
             /*
-             * Create a temporary map of the addresses discovered to use for 
+             * Create a temporary map of the addresses discovered to use for
              * detecting loops in the linked list.
              */
             var addrs = {};
@@ -242,7 +243,7 @@
 
 /*
  *  ======== getKey ========
- *  Makes a key out of the instance's address for the module's 
+ *  Makes a key out of the instance's address for the module's
  *  instMap.
  */
 function getKey(addr)
@@ -274,7 +275,7 @@
 
     /*
      * If this module's instance state structure has a size field, fetch the
-     * instance state structure. 
+     * instance state structure.
      */
     var obj;
     if ('$sizeof' in mod.useMod.Instance_State) {
@@ -284,7 +285,8 @@
     /* Otherwise, this module has no real instance state (such as GateHwi). */
     else {
         /* TODO - Is this all right? Maybe call fetchStruct anyway? */
-        Program.debugPrint("xdc.rov.decoder: Module does not have instance state.");
+        Program.debugPrint("xdc.rov.decoder:"
+            + " Module does not have instance state.");
         var temp = new mod.useMod.Instance_State;
         obj = {};
 
@@ -362,7 +364,7 @@
             return (label);
         }
     }
-    /* Otherwise, if this is a dynamically created instance, 
+    /* Otherwise, if this is a dynamically created instance,
      * check if it has a name. */
     else if ('__name' in obj) {
         /* If the __name field is null, no name was given. */
@@ -377,7 +379,7 @@
                 }
                 /*
                  * Need a way to report error to user. Just display
-                 * error instead of name. 
+                 * error instead of name.
                  */
                 var givenName = "Error retrieving given name at 0x" +
                             Number(obj.__name).toString(16) + ": " +