Make parameter the root directory in import script

Instead of specifying the file name, the user just points to the directory and the script will grab the necessary files.
dyninst · Dec 14, 2023 · 997bb0a · 997bb0a
1 parent 0bcdaf6
commit 997bb0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/instructionAPI/capstone/import.py b/instructionAPI/capstone/import.py
@@ -23,20 +23,20 @@
         "--capstone",
         type=str,
         required=True,
-        help="Capstone header (e.g., /capstone-engine/capstone/arch/X86/X86MappingInsnName.inc)"
+        help="Capstone directory (e.g., /capstone-engine/capstone/)"
     )
 
     parser.add_argument("--arch", type=str, choices=["x86"], default="x86")
     args = parser.parse_args()
 
     if args.arch == "x86":
-        translator = x86.x86()
+        translator = x86.x86(args.capstone)
 
     with open("mnemonics", "w") as f:
         for p in translator.pseudo:
             f.write("{0:s}_{1:s}, /* pseudo mnemonic */\n".format(translator.dyninst_prefix, p))
 
-        mnemonics = capstone.read_mnemonics(args.capstone)
+        mnemonics = capstone.read_mnemonics(translator.mnemonics_file)
         mnemonics.extend(translator.missing)
         mnemonics.sort()
 

diff --git a/instructionAPI/capstone/x86.py b/instructionAPI/capstone/x86.py
@@ -1,9 +1,11 @@
 class x86:
 
-    def __init__(self):
+    def __init__(self, cap_dir):
         self.capstone_prefix = "X86"
         self.dyninst_prefix = "e"
         self.dyninst_register_prefix = "x86_64"
+        self.mnemonics_file = cap_dir + "/arch/X86/X86MappingInsnName.inc"
+        self.registers_file = cap_dir + "/include/capstone/x86.h"
 
         # Mnemonics missing in Capstone
         self.missing = [ "faddp" ]