Fix data references to symbols with adends being symbolized instead o…

…f just using an addend to the symbol.
Decompollaborate · Aug 26, 2024 · 2aa4feb · 2aa4feb
1 parent 49b8cce
commit 2aa4feb
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix data references to symbols with adends (that have user declared sizes)
+  being symbolized instead of just using an addend to the symbol.
+  - This bug seems like was only happening if the referenced symbol was in the
+    same section as the one who was referencing it.
+
 ## [1.28.1] - 2024-08-19
 
 ### Changed

diff --git a/spimdisasm/mips/sections/MipsSectionBase.py b/spimdisasm/mips/sections/MipsSectionBase.py
@@ -115,11 +115,13 @@ def _getOwnedSymbol(self, localOffset: int) -> common.ContextSymbol|None:
 
         return contextSym
 
-    def _addOwnedSymbol(self, localOffset: int) -> common.ContextSymbol:
+    def _addOwnedSymbol(self, localOffset: int) -> common.ContextSymbol|None:
         currentVram = self.getVramOffset(localOffset)
         currentVrom = self.getVromOffsetNone(localOffset)
 
-        contextSym = self.addSymbol(currentVram, sectionType=self.sectionType, isAutogenerated=True, symbolVrom=currentVrom)
+        contextSym = self.addSymbol(currentVram, sectionType=self.sectionType, isAutogenerated=True, symbolVrom=currentVrom, allowAddendInstead=True)
+        if contextSym.vram != currentVram:
+            return None
 
         if self.typeForOwnedSymbols is not None:
             contextSym.autodetectedType = self.typeForOwnedSymbols

diff --git a/spimdisasm/mips/sections/MipsSectionData.py b/spimdisasm/mips/sections/MipsSectionData.py
@@ -40,8 +40,9 @@ def analyze(self) -> None:
 
             elif self.popPointerInDataReference(currentVram) is not None:
                 contextSym = self._addOwnedSymbol(localOffset)
-                symbolList.append((localOffset, contextSym))
-                localOffsetsWithSymbols.add(localOffset)
+                if contextSym is not None:
+                    symbolList.append((localOffset, contextSym))
+                    localOffsetsWithSymbols.add(localOffset)
 
             if self.checkWordIsASymbolReference(w):
                 if w < currentVram and self.containsVram(w):
@@ -57,8 +58,9 @@ def analyze(self) -> None:
 
                 if self.popPointerInDataReference(currentVram) is not None and localOffset not in localOffsetsWithSymbols:
                     contextSym = self._addOwnedSymbol(localOffset)
-                    symbolList.append((localOffset, contextSym))
-                    localOffsetsWithSymbols.add(localOffset)
+                    if contextSym is not None:
+                        symbolList.append((localOffset, contextSym))
+                        localOffsetsWithSymbols.add(localOffset)
 
                 localOffset += 4
 

diff --git a/spimdisasm/mips/sections/MipsSectionGccExceptTable.py b/spimdisasm/mips/sections/MipsSectionGccExceptTable.py
@@ -109,8 +109,9 @@ def analyze(self) -> None:
             if negativeOneCounter >= 2 and w != 0:
                 # The except table ended
                 contextSym = self._addOwnedSymbol(localOffset)
-                lastVramSymbol = contextSym
-                self.addGccExceptTable(currentVram, isAutogenerated=True, symbolVrom=currentVrom)
+                if contextSym is not None:
+                    lastVramSymbol = contextSym
+                    self.addGccExceptTable(currentVram, isAutogenerated=True, symbolVrom=currentVrom)
 
                 negativeOneCounter = 0
 
@@ -126,7 +127,8 @@ def analyze(self) -> None:
                 if contextSym is not None or self.popPointerInDataReference(currentVram) is not None or (lastVramSymbol.isGccExceptTable() and w != 0):
                     # Somehow this isn't an except table? TODO: check if this can happen
                     contextSym = self._addOwnedSymbol(localOffset)
-                    lastVramSymbol = contextSym
+                    if contextSym is not None:
+                        lastVramSymbol = contextSym
 
                 self.checkWordIsASymbolReference(w)
 

diff --git a/spimdisasm/mips/sections/MipsSectionRodata.py b/spimdisasm/mips/sections/MipsSectionRodata.py
@@ -96,7 +96,8 @@ def analyze(self) -> None:
             if jumpTableSym is None:
                 if contextSym is not None or self.popPointerInDataReference(currentVram) is not None or (lastVramSymbol.isJumpTable() and w != 0):
                     contextSym = self._addOwnedSymbol(localOffset)
-                    lastVramSymbol = contextSym
+                    if contextSym is not None:
+                        lastVramSymbol = contextSym
 
                 self.checkWordIsASymbolReference(w)
 
@@ -108,8 +109,9 @@ def analyze(self) -> None:
 
             elif jumpTableSym is None and self.popPointerInDataReference(currentVram) is not None:
                 contextSym = self._addOwnedSymbol(localOffset)
-                symbolList.append((localOffset, contextSym))
-                localOffsetsWithSymbols.add(localOffset)
+                if contextSym is not None:
+                    symbolList.append((localOffset, contextSym))
+                    localOffsetsWithSymbols.add(localOffset)
 
             if not lastVramSymbol.notPointerByType():
                 if self.checkWordIsASymbolReference(w):
@@ -126,8 +128,9 @@ def analyze(self) -> None:
 
                 if self.popPointerInDataReference(currentVram) is not None and localOffset not in localOffsetsWithSymbols:
                     contextSym = self._addOwnedSymbol(localOffset)
-                    symbolList.append((localOffset, contextSym))
-                    localOffsetsWithSymbols.add(localOffset)
+                    if contextSym is not None:
+                        symbolList.append((localOffset, contextSym))
+                        localOffsetsWithSymbols.add(localOffset)
 
                 localOffset += 4