Merge pull request #132 from Decompollaborate/develop

1.16.3

Author: AngheloAlf

pyproject.toml

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

spimdisasm/__init__.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-__version_info__: tuple[int, int, int] = (1, 16, 2)
+__version_info__: tuple[int, int, int] = (1, 16, 3)
 __version__ = ".".join(map(str, __version_info__))
 __author__ = "Decompollaborate"
 

spimdisasm/common/Utils.py

@@ -124,22 +124,39 @@ def wordsToBytes(words_list: list[int]) -> bytes:
 beWordsToBytes = wordsToBytes
 
 def wordToFloat(word: int) -> float:
-    return struct.unpack('>f', struct.pack('>I', word))[0]
+    b = struct.pack('>I', word)
+    return struct.unpack('>f', b)[0]
 
 def qwordToDouble(qword: int) -> float:
-    return struct.unpack('>d', struct.pack('>Q', qword))[0]
+    b = struct.pack('>Q', qword)
+    return struct.unpack('>d', b)[0]
 
 def wordToCurrenEndian(word: int) -> int:
     if GlobalConfig.ENDIAN == InputEndian.BIG:
         return word
 
     if GlobalConfig.ENDIAN == InputEndian.LITTLE:
-        return struct.unpack('<I', struct.pack('>I', word))[0]
+        b = struct.pack('>I', word)
+        return struct.unpack('<I', b)[0]
 
     # MIDDLE
-    first, second = struct.unpack('>2H', struct.pack('<2H', word >> 16, word & 0xFFFF))
+    b = struct.pack('<2H', word >> 16, word & 0xFFFF)
+    first, second = struct.unpack('>2H', b)
     return (first << 16) | second
 
+def qwordToCurrenEndian(word: int) -> int:
+    if GlobalConfig.ENDIAN == InputEndian.BIG:
+        return word
+
+    if GlobalConfig.ENDIAN == InputEndian.LITTLE:
+        b = struct.pack('>Q', word)
+        return struct.unpack('<Q', b)[0]
+
+    # MIDDLE
+    b = struct.pack('<4H', (word >> 48) & 0xFFFF, (word >> 32) & 0xFFFF, (word >> 16) & 0xFFFF, word & 0xFFFF)
+    first, second, third, fourth = struct.unpack('>4H', b)
+    return (first << 48) | (second << 32) | (third << 16) | fourth
+
 def runCommandGetOutput(command: str, args: list[str]) -> list[str] | None:
     try:
         output = subprocess.check_output([command, *args]).decode("utf-8")

spimdisasm/mips/symbols/MipsSymbolBase.py

@@ -66,7 +66,7 @@ def canUseConstantsOnData(self) -> bool:
         return self.contextSym.allowedToReferenceConstants
 
 
-    def generateAsmLineComment(self, localOffset: int, wordValue: int|None = None) -> str:
+    def generateAsmLineComment(self, localOffset: int, wordValue: int|None=None, *, isDouble: bool=False) -> str:
         if not common.GlobalConfig.ASM_COMMENT:
             return ""
 
@@ -77,7 +77,10 @@ def generateAsmLineComment(self, localOffset: int, wordValue: int|None = None) -
 
         wordValueHex = ""
         if wordValue is not None:
-            wordValueHex = f"{common.Utils.wordToCurrenEndian(wordValue):08X} "
+            if isDouble:
+                wordValueHex = f"{common.Utils.qwordToCurrenEndian(wordValue):016X} "
+            else:
+                wordValueHex = f"{common.Utils.wordToCurrenEndian(wordValue):08X} "
 
         return f"/* {offsetHex} {vramHex} {wordValueHex}*/"
 
@@ -435,7 +438,7 @@ def getNthWordAsDouble(self, i: int) -> tuple[str, int]:
         doubleValue = common.Utils.qwordToDouble(doubleWord)
         value = f"{doubleValue:.18g}"
 
-        comment = self.generateAsmLineComment(localOffset, doubleWord)
+        comment = self.generateAsmLineComment(localOffset, doubleWord, isDouble=True)
         output += f"{label}{comment} {dotType} {value}"
         output += self.getEndOfLineComment(i)
         output += common.GlobalConfig.LINE_ENDS