Merge pull request #138 from Decompollaborate/develop

1.17.3
Decompollaborate · Sep 18, 2023 · 0c16243 · 0c16243
2 parents 2a975e8 + 719a689
commit 0c16243
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@
 [project]
 name = "spimdisasm"
 # Version should be synced with spimdisasm/__init__.py
-version = "1.17.1"
+version = "1.17.3"
 description = "MIPS disassembler"
 # license = "MIT"
 readme = "README.md"

diff --git a/spimdisasm/__init__.py b/spimdisasm/__init__.py
@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-__version_info__: tuple[int, int, int] = (1, 17, 1)
+__version_info__: tuple[int, int, int] = (1, 17, 3)
 __version__ = ".".join(map(str, __version_info__))
 __author__ = "Decompollaborate"
 

diff --git a/spimdisasm/elf32/Elf32File.py b/spimdisasm/elf32/Elf32File.py
@@ -204,7 +204,7 @@ def _processSection_PROGBITS(self, array_of_bytes: bytes, entry: Elf32SectionHea
 
         if sectionEntryName == ".got":
             self.got = Elf32GlobalOffsetTable(array_of_bytes, entry.offset, entry.size)
-        elif Elf32SectionHeaderFlag.EXECINSTR in flags:
+        elif Elf32SectionHeaderFlag.EXECINSTR in flags and sectionEntryName != ".vutext":
             self.progbitsExecute[sectionEntryName] = entry
         elif sectionEntryName in {".rodata", ".rdata"}:
             # Some compilers set the Write flag on .rodata sections, so we need to hardcode

diff --git a/spimdisasm/mips/symbols/MipsSymbolBase.py b/spimdisasm/mips/symbols/MipsSymbolBase.py
@@ -436,8 +436,12 @@ def getNthWordAsDouble(self, i: int) -> tuple[str, int]:
             label = self.getExtraLabelFromSymbol(self.getSymbol(currentVram, vromAddress=currentVrom, tryPlusOffset=False))
 
         dotType = ".double"
-        otherHalf = self.words[i+1]
-        doubleWord = (w << 32) | otherHalf
+        if common.GlobalConfig.ENDIAN == common.InputEndian.LITTLE:
+            otherHalf = self.words[i+1]
+            doubleWord = (otherHalf << 32) | w
+        else:
+            otherHalf = self.words[i+1]
+            doubleWord = (w << 32) | otherHalf
         doubleValue = common.Utils.qwordToDouble(doubleWord)
         value = f"{doubleValue:.18g}"