Merge pull request #101 from Decompollaborate/develop

1.11.4

pyproject.toml

@@ -1,10 +1,10 @@
-# SPDX-FileCopyrightText: © 2022 Decompollaborate
+# SPDX-FileCopyrightText: © 2022-2023 Decompollaborate
 # SPDX-License-Identifier: MIT
 
 [project]
 name = "spimdisasm"
 # Version should be synced with spimdisasm/__init__.py
-version = "1.11.3"
+version = "1.11.4"
 description = "MIPS disassembler"
 # license = "MIT"
 readme = "README.md"

spimdisasm/__init__.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-# SPDX-FileCopyrightText: © 2022 Decompollaborate
+# SPDX-FileCopyrightText: © 2022-2023 Decompollaborate
 # SPDX-License-Identifier: MIT
 
 from __future__ import annotations
 
-__version_info__ = (1, 11, 3)
+__version_info__ = (1, 11, 4)
 __version__ = ".".join(map(str, __version_info__))
 __author__ = "Decompollaborate"
 

spimdisasm/frontendCommon/FrontendUtilities.py

@@ -169,11 +169,11 @@ def writeFunctionInfoCsv(processedFiles: dict[common.FileSectionType, list[mips.
     csvPath.parent.mkdir(parents=True, exist_ok=True)
 
     with csvPath.open("w") as f:
-        f.write("address,name,file,length,hash of top bits of words,functions called by this function,non-jal function calls,referenced functions\n")
+        f.write("vrom,address,name,file,length,hash of top bits of words,functions called by this function,non-jal function calls,referenced functions\n")
         for textFile in processedFiles.get(common.FileSectionType.Text, []):
             for func in textFile.symbolList:
                 assert isinstance(func, mips.symbols.SymbolFunction)
-                f.write(f"0x{func.vram:08X},{func.getName()},{textFile.getName()},0x{func.sizew*4:X},")
+                f.write(f"0x{func.vromStart:06X},0x{func.vram:08X},{func.getName()},{textFile.getName()},0x{func.sizew*4:X},")
 
                 bitswordlist = []
                 for instr in func.instructions:
@@ -220,6 +220,9 @@ def writeFunctionInfoCsv(processedFiles: dict[common.FileSectionType, list[mips.
 
                 f.write("\n")
 
+            # For adding new lines at the end of each file
+            # f.write("\n")
+
 
 def cliMain():
     parser = argparse.ArgumentParser(description="Interface to call any of the spimdisasm's CLI utilities", prog="spimdisasm")

spimdisasm/singleFileDisasm/SingleFileDisasmInternals.py

@@ -143,8 +143,8 @@ def processArguments(args: argparse.Namespace) -> int:
     vromEnd = int(args.end, 16)
     if vromEnd == 0xFFFFFF:
         vromEnd = len(array_of_bytes)
-    vromDataStart = None if args.data_start is None else int(args.data_start)
-    vromDataEnd = None if args.data_end is None else int(args.data_end)
+    vromDataStart = None if args.data_start is None else int(args.data_start, 16)
+    vromDataEnd = None if args.data_end is None else int(args.data_end, 16)
     fileVram = int(args.vram, 16)
     splits = getSplits(fileSplitsPath, vromStart, vromEnd, fileVram, vromDataStart, vromDataEnd, args.disasm_rsp)