ArmPlatformPkg/Scripts: Added '--verbose' support to DS-5 scripts

[mirror_edk2.git] / ArmPlatformPkg / Scripts / Ds5 / edk2_debugger.py

diff --git a/ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py b/ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py
index 87e82b68d6c28470c6dacca6a7f2b96b93ca9420..4867af1938d703a1dfc5ff1c2931b0be07642cd5 100644 (file)
--- a/ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py
+++ b/ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -53,7 +53,10 @@ def dump_system_table(ec, mem_base, mem_size):
     debug_info_table = system_table.DebugInfoTable(ec, debug_info_table_base)\r
     debug_info_table.dump()\r
 \r
-def load_symbol_from_file(ec, filename, address):\r
+def load_symbol_from_file(ec, filename, address, verbose = False):\r
+    if verbose:\r
+        print "Add symbols of %s at 0x%x" % (filename, address)\r
+        \r
     try:\r
         ec.getImageService().addSymbols(filename, address)\r
     except:\r
@@ -62,7 +65,7 @@ def load_symbol_from_file(ec, filename, address):
             ec.getImageService().unloadSymbols(filename)\r
             ec.getImageService().addSymbols(filename, address)\r
         except:\r
-            print "Warning: not possible to load symbols from %s" % filename\r
+            print "Warning: not possible to load symbols from %s at 0x%x" % (filename, address)\r
             pass\r
 \r
 class ArmPlatform:\r
@@ -79,8 +82,9 @@ class ArmPlatformDebugger:
     REGION_TYPE_ROM    = 2\r
     REGION_TYPE_FV     = 3\r
     \r
-    def __init__(self, ec, report_log, regions):\r
+    def __init__(self, ec, report_log, regions, verbose = False):\r
         self.ec = ec\r
+        self.verbose = verbose\r
         fvs = []\r
         sysmem_base = None\r
         sysmem_size = None\r
@@ -89,7 +93,7 @@ class ArmPlatformDebugger:
             try:\r
                 self.build = build_report.BuildReport(report_log)\r
             except IOError:\r
-                raise IOError(2, 'Report \'%s\' isnot valid' % report_log)\r
+                raise IOError(2, 'Report \'%s\' is not valid' % report_log)\r
             \r
             # Generate list of supported Firmware Volumes\r
             if self.build.PCDs['gArmTokenSpaceGuid'].has_key('PcdFvSize') and int(self.build.PCDs['gArmTokenSpaceGuid']['PcdFvSize'][0],16) != 0:\r
@@ -141,7 +145,7 @@ class ArmPlatformDebugger:
                 self.firmware_volumes[fv_base] = firmware_volume.FirmwareVolume(self.ec, fv_base, fv_size)\r
                 \r
             stack_frame = self.ec.getTopLevelStackFrame()\r
-            info = self.firmware_volumes[fv_base].load_symbols_at(int(stack_frame.getRegisterService().getValue('PC')) & 0xFFFFFFFF)\r
+            info = self.firmware_volumes[fv_base].load_symbols_at(int(stack_frame.getRegisterService().getValue('PC')) & 0xFFFFFFFF, self.verbose)\r
             debug_infos.append(info)\r
             while stack_frame.next() is not None:\r
                 stack_frame = stack_frame.next()\r
@@ -171,7 +175,7 @@ class ArmPlatformDebugger:
                 self.debug_info_table = system_table.DebugInfoTable(self.ec, debug_info_table_base)\r
                 \r
             stack_frame = self.ec.getTopLevelStackFrame()\r
-            info = self.debug_info_table.load_symbols_at(int(stack_frame.getRegisterService().getValue('PC')) & 0xFFFFFFFF)\r
+            info = self.debug_info_table.load_symbols_at(int(stack_frame.getRegisterService().getValue('PC')) & 0xFFFFFFFF, self.verbose)\r
             debug_infos.append(info)\r
             while stack_frame.next() is not None:\r
                 stack_frame = stack_frame.next()\r
@@ -197,7 +201,7 @@ class ArmPlatformDebugger:
         for (fv_base, fv_size) in self.platform.fvs:\r
             if self.firmware_volumes.has_key(fv_base) == False:\r
                 self.firmware_volumes[fv_base] = firmware_volume.FirmwareVolume(self.ec, fv_base, fv_size)    \r
-            self.firmware_volumes[fv_base].load_all_symbols()\r
+            self.firmware_volumes[fv_base].load_all_symbols(self.verbose)\r
 \r
         try:\r
             # Load all symbols of module loaded into System Memory\r
@@ -210,7 +214,7 @@ class ArmPlatformDebugger:
                 debug_info_table_base = self.system_table.get_configuration_table(system_table.DebugInfoTable.CONST_DEBUG_INFO_TABLE_GUID)\r
                 self.debug_info_table = system_table.DebugInfoTable(self.ec, debug_info_table_base)\r
             \r
-            self.debug_info_table.load_all_symbols()\r
+            self.debug_info_table.load_all_symbols(self.verbose)\r
         except:\r
             # Debugger exception could be excepted if DRAM has not been initialized or if we have not started to run from DRAM yet\r
             print "Note: no symbols have been found in System Memory (possible cause: the UEFI permanent memory has been installed yet)"\r