ArmPlatformPkg/Scripts/Ds5: Updated DS-5 scripts to be used by DS-5 v5.12

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13875 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py b/ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py
index f922a7283e920b17e63a5c489e8ba3df5ebd0cde..71e5a3ccd5d55cdf76afb8e9df4b844495a070a6 100644 (file)
--- a/ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py
+++ b/ArmPlatformPkg/Scripts/Ds5/edk2_debugger.py
@@ -55,10 +55,15 @@ def dump_system_table(ec, mem_base, mem_size):
 
 def load_symbol_from_file(ec, filename, address):
     try:
-        ec.executeDSCommand("discard-symbol-file \'%s\'" % filename)
+        ec.getImageService().addSymbols(filename, address)
     except:
-        pass
-    ec.executeDSCommand("add-symbol-file \'%s\' 0x%X" % (filename, address))
+        try:
+            # We could get an exception if the symbols are already loaded
+            ec.getImageService().unloadSymbols(filename)
+            ec.getImageService().addSymbols(filename, address)
+        except:
+            print "Warning: not possible to load symbols from %s" % filename
+            pass
 
 class ArmPlatform:
     def __init__(self, sysmembase=None, sysmemsize=None, fvs={}):