Skip to content

Commit

Permalink
fix #3
Browse files Browse the repository at this point in the history
  • Loading branch information
sgnes committed Jan 30, 2025
1 parent 55994f7 commit e7929e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
8 changes: 2 additions & 6 deletions elfwrapper/elf_wrapper.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import re
from elftools.elf.sections import NoteSection, SymbolTableSection
from elftools.common.py3compat import (
ifilter, byte2int, bytes2str, itervalues, str2bytes)
from elftools.elf.elffile import ELFFile
from elftools.dwarf.descriptions import (
describe_reg_name, describe_attr_value, set_global_machine_arch,
Expand Down Expand Up @@ -141,7 +139,7 @@ def _process_die(self, die, iter_dies):
pass
elif die.tag == "DW_TAG_const_type":
self.offset_dict[die.offset] = self._attr_to_dict(die)
elif die.tag == None:
elif die.tag is None:
pass
elif die.tag == "DW_TAG_volatile_type":
self.offset_dict[die.offset] = self._attr_to_dict(die)
Expand Down Expand Up @@ -268,9 +266,7 @@ def _process_array(self, die, iter_dies):
self._process_die(next_die, iter_dies)

def _attr_to_dict(self, die):
attrs_raw = {attr[0]: attr for attr in
[(attr.name, attr.offset, describe_attr_value(attr, die, self.section_offset).strip()) for attr in
itervalues(die.attributes)]}
attrs_raw = {attr[0]: attr for attr in [(die.attributes[key_attr].name, die.attributes[key_attr].offset, describe_attr_value(die.attributes[key_attr], die, self.section_offset).strip()) for key_attr in die.attributes]}

attrs = objdict()
attrs.tag = die.tag
Expand Down
6 changes: 3 additions & 3 deletions test.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ def setUp(self):

def test_1(self):
elf = ElfAddrObj(os.path.join(os.getcwd(), r"example/Test.elf"))
with open(r'example\test_var.txtdatafile.txt') as f:
with open(r'example\test_var.txtdatafile.txt', mode="r", encoding="utf-8") as f:
for line in f:
var, _, add = line.split(":")
if elf.get_var_addrs(var) == int(add.strip(),16):
print()
self.assertEqual(int(add.strip(),16), elf.get_var_addrs(""))
print(var, add)
self.assertEqual(int(add.strip(),16), elf.get_var_addrs(var))



Expand Down

0 comments on commit e7929e4

Please sign in to comment.