Merge branch 'master' of ssh://github.com/joxeankoret/diaphora

README.md

@@ -2,7 +2,7 @@
 
 Diaphora (διαφορά, Greek for 'difference') version 2.0 is the most advanced program diffing tool, working as an IDA plugin, available as of today (2019). It was released first during SyScan 2015 and is actively maintained.
 
-Diaphora supports IDA 6.9 to 7.5, but the main branch has support only for IDA >= 7.4 because the code only runs in Python 3.X.
+Diaphora supports IDA 6.9 to 7.6, but the main branch has support only for IDA >= 7.4 because the code only runs in Python 3.X. If you are looking for an IDA >= 7.4 port with support for Python 2.X, check [this issue](https://github.com/joxeankoret/diaphora/issues/197).
 
 Support for Ghidra is in development, but it will take very long. Support for Binary Ninja is also planned but will probably come after Ghidra's port. If you are looking for Radare2 support, you can [check this very old fork](https://github.com/radare/diaphora).
 

diaphora.py

@@ -53,7 +53,7 @@
 # better comparison ratios
 CMP_REPS = ["loc_", "j_nullsub_", "nullsub_", "j_sub_", "sub_",
   "qword_", "dword_", "byte_", "word_", "off_", "def_", "unk_", "asc_",
-  "stru_", "dbl_", "locret_"]
+  "stru_", "dbl_", "locret_", "flt_", "jpt_"]
 CMP_REMS = ["dword ptr ", "byte ptr ", "word ptr ", "qword ptr ", "short ptr"]
 
 

diaphora_ida.py

@@ -261,7 +261,7 @@ def OnGetSize(self):
     return len(self.items)
 
   def OnDeleteLine(self, items):
-    for n in items:
+    for n in sorted(items, reverse=True):
       if n >= 0:
         name1 = self.items[n][2]
         name2 = self.items[n][4]