Merge pull request #129 from Decompollaborate/develop

1.15.4

Author: AngheloAlf

pyproject.toml

@@ -4,7 +4,7 @@
 [project]
 name = "spimdisasm"
 # Version should be synced with spimdisasm/__init__.py
-version = "1.15.3"
+version = "1.15.4"
 description = "MIPS disassembler"
 # license = "MIT"
 readme = "README.md"

spimdisasm/__init__.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-__version_info__ = (1, 15, 3)
+__version_info__ = (1, 15, 4)
 __version__ = ".".join(map(str, __version_info__))
 __author__ = "Decompollaborate"
 

spimdisasm/mips/sections/MipsSectionText.py

@@ -84,7 +84,7 @@ def _findFunctions(self, instrsList: list[rabbitizer.Instruction]):
 
         while index < nInstr:
             instr = instrsList[index]
-            if not instr.isImplemented():
+            if not instr.isImplemented() or not instr.isValid():
                 isInstrImplemented = False
 
             if functionEnded:
@@ -121,7 +121,7 @@ def _findFunctions(self, instrsList: list[rabbitizer.Instruction]):
                 if index >= len(instrsList):
                     break
                 instr = instrsList[index]
-                isInstrImplemented = instr.isImplemented()
+                isInstrImplemented = instr.isImplemented() and instr.isValid()
 
             currentVram = self.getVramOffset(instructionOffset)
             currentVrom = self.getVromOffset(instructionOffset)
@@ -140,7 +140,7 @@ def _findFunctions(self, instrsList: list[rabbitizer.Instruction]):
                         if not instr.isJump(): # Make an exception for `j`
                             break
                     # make sure to not branch outside of the current function
-                    if not isLikelyHandwritten:
+                    if not isLikelyHandwritten and isInstrImplemented:
                         j = len(funcsStartsList) - 1
                         while j >= 0:
                             if branchOffset + instructionOffset < 0:

spimdisasm/mips/symbols/MipsSymbolFunction.py

@@ -143,8 +143,12 @@ def _processElfRelocSymbols(self):
                                 symbolVram += addressOffset
                             else:
                                 symbolVram += instr.getProcessedImmediate()
-                        relocInfo.symbol = self.addSymbol(symbolVram, isAutogenerated=True)
+                        contextSym = self.getSymbol(symbolVram, tryPlusOffset=True)
+                        if contextSym is None:
+                            contextSym = self.addSymbol(symbolVram, isAutogenerated=True)
+                        relocInfo.symbol = contextSym
                         relocInfo.symbol._isStatic = True
+                        relocInfo.addend = symbolVram - contextSym.vram
                     elif offsetAddend is not None:
                         # Addends for global symbols
                         relocInfo.addend = offsetAddend