yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Fixed idaxml working in IDA 9.x

Browse source
This commit is contained in:
ZERO-A-ONE 2025-08-20 12:10:48 +08:00
parent 542c2aa617
commit f47258c2b2
4 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

21
GhidraBuild/IDAPro/Python/9xx/python/idaxml.py
View file

@ -90,7 +90,8 @@ def is_ida_version_supported():
def get_struc(sid: int) -> Optional[ida_typeinf.tinfo_t]:
try:
tif = ida_typeinf.tinfo_t(tid=sid)
tif = ida_typeinf.tinfo_t()
tif.get_type_by_tid(tid=sid)
return tif if tif.is_udt() else None
except ValueError:
return None
@ -139,7 +140,8 @@ def get_struc_qty():
def get_enum_member_tid(eid: int, i: int) -> int:
try:
tif = ida_typeinf.tinfo_t(tid=eid)
tif = ida_typeinf.tinfo_t()
tif.get_type_by_tid(tid=eid)
except ValueError:
return BADADDR
edm = ida_typeinf.edm_t()
@ -152,7 +154,8 @@ def find_enum_member_serial(enum_id: int, member_value: int, member_name: str):
Returns -1 on failure.
"""
try:
tif = ida_typeinf.tinfo_t(tid=enum_id)
tif = ida_typeinf.tinfo_t()
tif.get_type_by_tid(tid=enum_id)
except ValueError:
return -1
ei = ida_typeinf.enum_type_data_t()
@ -980,7 +983,9 @@ class XmlExporter(IdaXml):
#if bf:
# self.write_attribute(BIT_FIELD, "yes")
regcmt = idc.get_enum_cmt(eid)
rptcmt = ida_typeinf.tinfo_t(tid=eid).get_type_rptcmt()
tif = ida_typeinf.tinfo_t()
tif.get_type_by_tid(tid=eid)
rptcmt = tif.get_type_rptcmt()
has_children = ((idc.get_enum_size(eid) > 0) or
(regcmt is not None) or (rptcmt is not None) or
(ida_bytes.get_radix(eflags, 0) != 16) or
@ -2721,9 +2726,9 @@ class XmlImporter(IdaXml):
if ea == BADADDR:
idc.put_bookmark(addr, 0, 0, 0, slot, description)
break
except Exception:
except Exception as e:
msg = "** Exception occurred in import_bookmark **"
print("\n" + msg + "\n", sys.exc_type, sys.exc_value)
print(f"\n{msg}\n{type(e).__name__}: {e}")
def import_cmts(self, element, sid, typ):
@ -3055,9 +3060,9 @@ class XmlImporter(IdaXml):
register_vars = function.findall(REGISTER_VAR)
for register_var in register_vars:
self.import_register_var(register_var, func)
except Exception:
except Exception as e:
msg = "** Exception occurred in import_function **"
print("\n" + msg + "\n", sys.exc_type, sys.exc_value)
print(f"\n{msg}\n{type(e).__name__}: {e}")
def import_function_def(self, function_def):