Merge pull request #48 from doronz88/bugfix/add-ida9-support

add ida 9.0 support

.github/workflows/python-app.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [3.9, "3.10", 3.11, 3.12]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/python-publish.yml

@@ -21,11 +21,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install setuptools wheel twine build
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         twine upload dist/*

.gitignore

@@ -108,3 +108,6 @@ venv.bak/
 
 # config
 config.ini
+
+# setuptools-scm
+fa/_version.py

README.md

@@ -24,7 +24,7 @@ Pull Requests are of course more than welcome :smirk:.
 
 ## Requirements
 
-Supported IDA 7.x.
+Supported IDA 8.0+.
 
 In your IDA's python directory, run:
 

elf_loader.py

@@ -1,5 +1,5 @@
-from elftools.elf import elffile
 import click
+from elftools.elf import elffile
 
 from fa import fainterp
 

fa/commands/add.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''add an hard-coded value into resultset

fa/commands/add_offset_range.py

@@ -1,6 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils
 
+from fa import utils
 
 DESCRIPTION = '''adds a python-range to resultset
 

fa/commands/align.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''align results to given base (round-up)

fa/commands/argument.py

@@ -1,5 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils, context
+
+from fa import context, utils
 
 try:
     import ida_typeinf

fa/commands/b.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''branch unconditionally to label

fa/commands/clear.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''clears the current result-set

fa/commands/find_bytes.py

@@ -1,5 +1,5 @@
-from argparse import RawTextHelpFormatter
 import binascii
+from argparse import RawTextHelpFormatter
 
 from fa import utils
 

fa/commands/find_bytes_ida.py

@@ -1,6 +1,6 @@
 from argparse import RawTextHelpFormatter
 
-from fa import utils, context
+from fa import context, utils
 
 DESCRIPTION = '''expands the result-set with the occurrences of the given bytes
 expression in "ida bytes syntax"

fa/commands/find_immediate.py

@@ -1,10 +1,10 @@
 from argparse import RawTextHelpFormatter
 
-from fa import utils, context
+from fa import context, utils
 
 try:
-    import idc
     import ida_search
+    import idc
 except ImportError:
     pass
 
@@ -34,11 +34,10 @@ def find_immediate(expression):
     if isinstance(expression, str):
         expression = eval(expression)
 
-    ea, imm = ida_search.find_imm(0, idc.SEARCH_DOWN, expression)
+    ea, imm = ida_search.find_imm(0, ida_search.SEARCH_DOWN, expression)
     while ea != idc.BADADDR:
         yield ea
-        ea, imm = idc.find_imm(ea + 1, idc.SEARCH_DOWN,
-                               expression)
+        ea, imm = idc.find_imm(ea + 1, ida_search.SEARCH_DOWN, expression)
 
 
 def run(segments, args, addresses, interpreter=None, **kwargs):

fa/commands/find_str.py

@@ -1,6 +1,7 @@
+import binascii
 import sys
 from argparse import RawTextHelpFormatter
-import binascii
+
 import six
 
 from fa.commands import find_bytes

fa/commands/function_end.py

@@ -1,6 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils
-from fa import context
+
+from fa import context, utils
 
 try:
     import idc

fa/commands/function_lines.py

@@ -1,5 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils, context
+
+from fa import context, utils
 
 try:
     import idautils

fa/commands/function_start.py

@@ -1,5 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils, context
+
+from fa import context, utils
 
 try:
     import idc

fa/commands/goto_ref.py

@@ -1,5 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils, context
+
+from fa import context, utils
 
 try:
     import idautils

fa/commands/if.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''perform an 'if' statement to create conditional branches

fa/commands/intersect.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''intersect two or more variables

fa/commands/keystone_find_opcodes.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 try:
     # flake8: noqa
     from keystone import *
@@ -7,8 +8,8 @@
 
 import binascii
 
-from fa.commands import find_bytes
 from fa import utils
+from fa.commands import find_bytes
 
 DESCRIPTION = '''use keystone to search for the supplied opcodes
 

fa/commands/keystone_verify_opcodes.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 try:
     # flake8: noqa
     from keystone import *
@@ -8,8 +9,8 @@
 
 import binascii
 
-from fa.commands import verify_bytes
 from fa import utils
+from fa.commands import verify_bytes
 
 DESCRIPTION = '''use keystone to verify the result-set matches the given
 opcodes

fa/commands/load.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''go back to previous result-set saved by 'store' command.

fa/commands/locate.py

@@ -1,5 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils, context
+
+from fa import context, utils
 
 try:
     import idc

fa/commands/make_code.py

@@ -1,4 +1,4 @@
-from fa import utils, context
+from fa import context, utils
 
 try:
     import idc

fa/commands/make_comment.py

@@ -5,7 +5,7 @@
 except ImportError:
     pass
 
-from fa import utils, context
+from fa import context, utils
 
 DESCRIPTION = '''add comment for given addresses
 

fa/commands/make_function.py

@@ -1,4 +1,4 @@
-from fa import utils, context
+from fa import context, utils
 
 try:
     import ida_funcs

fa/commands/make_literal.py

@@ -1,4 +1,4 @@
-from fa import utils, context
+from fa import context, utils
 
 try:
     import idc

fa/commands/make_unknown.py

@@ -1,4 +1,4 @@
-from fa import utils, context
+from fa import context, utils
 
 try:
     import ida_bytes

fa/commands/max_xrefs.py

@@ -1,4 +1,4 @@
-from fa import utils, context
+from fa import context, utils
 
 try:
     import idautils

fa/commands/min_xrefs.py

@@ -1,4 +1,4 @@
-from fa import utils, context
+from fa import context, utils
 
 try:
     import idautils

fa/commands/most_common.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''get the result appearing the most in the result-set

fa/commands/offset.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''advance the result-set by a given offset

fa/commands/operand.py

@@ -1,5 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils, context
+
+from fa import context, utils
 
 try:
     import idc

fa/commands/python_if.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''perform an 'if' statement to create conditional branches

fa/commands/set_enum.py

@@ -1,4 +1,4 @@
-from fa import utils, fa_types
+from fa import fa_types, utils
 
 
 def get_parser():

fa/commands/set_struct_member.py

@@ -1,4 +1,4 @@
-from fa import utils, fa_types
+from fa import fa_types, utils
 
 
 def get_parser():

fa/commands/set_type.py

@@ -1,8 +1,8 @@
-from fa import utils, fa_types, context
+from fa import context, fa_types, utils
 
 try:
-    import idc
     import ida_auto
+    import idc
 except ImportError:
     pass
 

fa/commands/single.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''peek a single result from the result-set (zero-based)

fa/commands/sort.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''performs a sort on the current result-set

fa/commands/stop_if_empty.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''exit if current resultset is empty

fa/commands/store.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''save current result-set in a variable.

fa/commands/symdiff.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''symmetric difference between two or more variables

fa/commands/unique.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''make the resultset unique

fa/commands/verify_aligned.py

@@ -1,4 +1,5 @@
 from argparse import RawTextHelpFormatter
+
 from fa import utils
 
 DESCRIPTION = '''leave only results fitting required alignment

fa/commands/verify_bytes.py

@@ -1,5 +1,5 @@
-from argparse import RawTextHelpFormatter
 import binascii
+from argparse import RawTextHelpFormatter
 
 from fa import utils
 

fa/commands/verify_name.py

@@ -1,4 +1,4 @@
-from fa import utils, context
+from fa import context, utils
 from fa.commands.locate import locate
 
 

fa/commands/verify_operand.py

@@ -1,5 +1,6 @@
 from argparse import RawTextHelpFormatter
-from fa import utils, context
+
+from fa import context, utils
 
 try:
     import idc

fa/commands/verify_ref.py

@@ -1,5 +1,5 @@
+from fa import context, utils
 from fa.commands.locate import locate
-from fa import utils, context
 
 try:
     import idautils