From 2ad8d47d3aed06de305e7dbfda0a120638b27fd6 Mon Sep 17 00:00:00 2001 From: JoYo <> Date: Mon, 24 Jan 2022 13:47:31 -0500 Subject: [PATCH] engine type stored in db --- subdisassem/schema.py | 9 +++++---- subdisassem/scripts.py | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/subdisassem/schema.py b/subdisassem/schema.py index ae75ef6..ecf371e 100644 --- a/subdisassem/schema.py +++ b/subdisassem/schema.py @@ -20,12 +20,13 @@ class Disassembly(Base): arch = Column(String, nullable=False) checksum = Column(String, nullable=False) count = Column(Integer, nullable=False) + engine = Column(String, nullable=False) mnemonic_rates = Column(String, nullable=False) - ret_rates = Column(String, nullable=False) - size = Column(Integer, nullable=False) offset = Column(Integer, nullable=False) opcodes = Column(String, nullable=False) path = Column(String, nullable=False) + ret_rates = Column(String, nullable=False) + size = Column(Integer, nullable=False) def __repr__(self): return f"" @@ -41,11 +42,11 @@ class Disassembly(Base): values_dict = { "id": self.id, "arch": self.arch, + "engine": self.engine, "count": self.count, + "size": self.size, "mnemonic_rates": self.mnemonic_rates, "ret_rates": self.ret_rates, - "size": self.size, - "offset": self.offset, } return values_dict diff --git a/subdisassem/scripts.py b/subdisassem/scripts.py index f08f782..f3aac5a 100644 --- a/subdisassem/scripts.py +++ b/subdisassem/scripts.py @@ -95,12 +95,13 @@ def subdisassem_script(): row.arch = disasembler.arch row.checksum = checksum row.count = len(disasembler) + row.engine = str(arch.__bases__) row.mnemonic_rates = str(disasembler.mnemonic_rates[:5]) - row.ret_rates = str(disasembler.ret_rates[:5]) - row.size = len(raw_bytes) - offset row.offset = offset row.opcodes = disasembler.objdump row.path = str(args.bin_path.absolute()) + row.ret_rates = str(disasembler.ret_rates[:5]) + row.size = len(raw_bytes) - offset session.add(row) session.commit()