Bug fixes

Author: Mx-Iris

plugin/ida_mcp_server_plugin/ida_mcp_core.py

@@ -147,50 +147,27 @@ def get_function_assembly_by_address(self, address: int) -> Dict[str, Any]:
     def _get_function_assembly_by_address_internal(self, address: int) -> Dict[str, Any]:
         """Internal implementation for get_function_assembly_by_address without sync wrapper"""
         try:
-            # Get function from address
-            func = idaapi.get_func(address)
+            # Get function object
+            func = ida_funcs.get_func(address)
             if not func:
-                return {"error": f"No function found at address 0x{address:X}"}
-            
-            # Get function name
-            func_name = idaapi.get_func_name(func.start_ea)
-            
-            # Generate assembly
-            assembly = []
+                return {"error": f"Invalid function at {hex(address)}"}
 
-            # Create instruction iterator
-            instruction_iterator = idaapi.func_item_iterator_t(func)
+            # Collect all assembly instructions
+            assembly_lines = []
+            for instr_addr in idautils.FuncItems(address):
+                disasm = idc.GetDisasm(instr_addr)
+                assembly_lines.append(f"{hex(instr_addr)}: {disasm}")
 
-            # Get first instruction
-            address = instruction_iterator.first()
-            
-            # Iterate through all instructions
-            while address != idaapi.BADADDR:
-                # Get disassembly line
-                disasm_line = idaapi.generate_disasm_line(address, 0)
-                
-                # Get comment, if any
-                comment = idaapi.get_cmt(address, 0)  # 0 for non-repeatable comment
-                if not comment:
-                    comment = idaapi.get_cmt(address, 1)  # 1 for repeatable comment
-                
-                # Add line with comment
-                if comment:
-                    assembly.append(f"{disasm_line} ; {comment}")
-                else:
-                    assembly.append(disasm_line)
+            if not assembly_lines:
+                return {"error": "No assembly instructions found"}
 
-                # Move to next instruction
-                address = instruction_iterator.next()
-            
-            # Join the disassembly lines
-            assembly_str = "\n".join(assembly)
-            
-            return {"assembly": assembly_str, "function_name": func_name}
+            return {"assembly": "\n".join(assembly_lines)}
         except Exception as e:
+            print(f"Error getting function assembly: {str(e)}")
             traceback.print_exc()
             return {"error": str(e)}
 
+
     @idaread
     def get_function_decompiled_by_name(self, function_name: str) -> Dict[str, Any]:
         """Get decompiled code for a function by its name"""

test/IDA Debug.py

@@ -17,5 +17,7 @@
 core = IDAMCPCore()
 # print(core.execute_script("import idautils\nimport idc\n\ncurrent_ea = idc.here()\ncurrent_func = idc.get_func_name(current_ea)\n\nif current_func:\n    print(f'当前函数名: {current_func}')\n    func_addr = idc.get_name_ea_simple(current_func)\n    print(f'函数地址: {hex(func_addr)}')\n    \n    print('\\n引用此函数的位置：')\n    for xref in idautils.XrefsTo(func_addr):\n        print(f'从地址 {hex(xref.frm)} 引用')\n        \n    print('\\n此函数引用的位置：')\n    for addr in idautils.FuncItems(func_addr):\n        for xref in idautils.XrefsFrom(addr):\n            print(f'在地址 {hex(addr)} 引用了 {hex(xref.to)}')\nelse:\n    print('错误：未能获取当前函数')"))
 print(core.get_current_function_decompiled())
+print(core.get_current_function_assembly())
 print(core.get_function_decompiled_by_name("-[SPSpotlightPanel canBecomeMainWindow]"))
+print(core.get_function_assembly_by_name("-[SPSpotlightPanel canBecomeMainWindow]"))
 # idapro.close_database()