try again

prep_decompiled.py

@@ -1,10 +1,13 @@
 import argparse
 import os
-from utils import *
+#from utils import *
 from typing import Dict, List
 from tqdm import tqdm
 import re
-from error import ParseError
+
+class ParseError(Exception):
+    def __init__(self, msg):
+        self.msg = msg
 
 HEADER = '#include "/home/ReSym/clang-parser/defs.hh"\n'
 
@@ -18,8 +21,6 @@ def process_funname(raw_addr:str) -> str:
     else:
         return None
 
-
-
         
 def hex_to_decimal(hex_str : str) -> int:
     # Check if the input hex string is valid
@@ -141,67 +142,3 @@ def parse_signature(file_content:List[str], funname:str=None) -> List[Dict]:
             
     return arg_info
 
-
-
-def prep_decompiled(src_dir_or_file, file_save_dir, parsed_save_dir):
-    if os.path.isdir(src_dir_or_file):
-        files = [os.path.join(src_dir_or_file, f) for f in get_file_list(src_dir_or_file)]
-    else:
-        files = [src_dir_or_file]
-
-
-
-    for f in tqdm(files, disable=len(files)==1):
-        if not f.endswith(".decompiled"):
-            continue
-        fname = os.path.basename(f)
-
-        decompiled = read_json(f)
-
-        for fun in decompiled:
-            dex_addr, funname, code = fun['addr'], fun['funname'], fun['code']
-            if funname.startswith('sub_'):
-                addr = process_funname(funname).upper()
-            else:
-                addr = str(hex(dex_addr))[2:].upper()
-                
-
-            code_with_header = HEADER + code
-
-            new_fname = fname.replace('.decompiled', '-' + str(addr))+'.c'
-            write_file(os.path.join(file_save_dir,new_fname), code_with_header)
-
-            # parse decompiled
-            code_lines = code.split('\n')
-            try:
-                if funname.startswith('sub_'):
-                    arg_info: List[Dict] = parse_signature(code_lines)
-                else:
-                    if funname.startswith('.'):
-                        funname = funname[1:]
-
-                    arg_info: List[Dict] = parse_signature(code_lines, funname=funname)
-                var_info: List[Dict] = extract_comments(code_lines)
-            except ParseError as e:
-                print(f'{fname} - {funname}: {e.msg}')
-                continue
-            except Exception as e:
-                print(f'[ERROR] (parse_decomplied) Other error {fname} - {funname}: {e}')
-                continue
-            save_data = {'argument': arg_info, 'variable': var_info}
-
-            var_fname = fname.replace('.decompiled', '-' + str(addr) + '_var.json')
-            dump_json(os.path.join(parsed_save_dir, var_fname), save_data)
-
-
-
-
-if __name__=='__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('src_dir_or_file')
-    parser.add_argument('file_save_dir')
-    parser.add_argument('parsed_save_dir')
-    args = parser.parse_args()
-    prep_decompiled(args.src_dir_or_file, args.file_save_dir, args.parsed_save_dir)
-
-