From cc3f47c209a4dff44c7ab8a439a2319933442151 Mon Sep 17 00:00:00 2001 From: Jerome Forissier Date: Wed, 30 Aug 2017 13:38:40 +0200 Subject: [PATCH] [Review] scripts/symbolize.py: try to resolve abort address to symbol/section[+offset] - Replace tab by spaces - Initialize ret to '' rather than None Signed-off-by: Jerome Forissier --- scripts/symbolize.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/symbolize.py b/scripts/symbolize.py index 4fc614fe011..696562929c6 100755 --- a/scripts/symbolize.py +++ b/scripts/symbolize.py @@ -138,7 +138,7 @@ def resolve(self, addr): return ret def symbol_plus_offset(self, addr): - ret = None + ret = '' prevsize = 0 reladdr = self.subtract_load_addr(addr) elf = self.get_elf(self._bin) @@ -171,13 +171,11 @@ def symbol_plus_offset(self, addr): break prevsize = size prevname = name - if ret is None: - ret = '' nm.terminate() return ret def section_plus_offset(self, addr): - ret = None + ret = '' reladdr = self.subtract_load_addr(addr) elf = self.get_elf(self._bin) cmd = self.arch_prefix('objdump') @@ -192,7 +190,7 @@ def section_plus_offset(self, addr): idx, name, size, vma, lma, offs, algn = line.split() except: continue; - ivma = int(vma, 16) + ivma = int(vma, 16) isize = int(size, 16) if ivma == iaddr: ret = name @@ -201,8 +199,6 @@ def section_plus_offset(self, addr): offs = iaddr - ivma ret = name + '+' + str(offs) break - if ret is None: - ret = '' objdump.terminate() return ret