Merge pull request #119 from Decompollaborate/develop

1.13.3

Author: AngheloAlf

pyproject.toml

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

spimdisasm/__init__.py

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

spimdisasm/frontendCommon/FrontendUtilities.py

@@ -58,7 +58,7 @@ def getSplittedSections(context: common.Context, splits: common.FileSplitFormat,
             outputFilePath = outputPath / fileName
 
         common.Utils.printVerbose(f"Reading '{row.fileName}'")
-        f = mips.FilesHandlers.createSectionFromSplitEntry(row, array_of_bytes, outputFilePath, context)
+        f = mips.FilesHandlers.createSectionFromSplitEntry(row, array_of_bytes, context)
         f.setCommentOffset(row.offset)
         processedFiles[row.section].append(f)
         processedFilesOutputPaths[row.section].append(outputFilePath)
@@ -145,6 +145,7 @@ def writeProcessedFiles(processedFiles: dict[common.FileSectionType, list[mips.s
             if progressCallback is not None:
                 progressCallback(i, str(filePath), processedFilesCount)
 
+            common.Utils.printVerbose(f"Writing {filePath}")
             mips.FilesHandlers.writeSection(filePath, f)
             i += 1
     return
@@ -167,7 +168,7 @@ def migrateFunctions(processedFiles: dict[common.FileSectionType, list[mips.sect
     rodataFileList = processedFiles.get(common.FileSectionType.Rodata, [])
     i = 0
     for textFile in processedFiles.get(common.FileSectionType.Text, []):
-        filePath = functionMigrationPath / textFile.name
+        filePath = functionMigrationPath / textFile.getName()
         filePath.mkdir(parents=True, exist_ok=True)
         for func in textFile.symbolList:
             if progressCallback is not None:
@@ -177,6 +178,7 @@ def migrateFunctions(processedFiles: dict[common.FileSectionType, list[mips.sect
             entry = mips.FunctionRodataEntry.getEntryForFuncFromPossibleRodataSections(func, rodataFileList)
 
             funcPath = filePath / (func.getName()+ ".s")
+            common.Utils.printVerbose(f"Writing function {funcPath}")
             with funcPath.open("w") as f:
                 entry.writeToFile(f, writeFunction=True)
 

spimdisasm/mips/FilesHandlers.py

@@ -17,7 +17,7 @@
 from . import FunctionRodataEntry
 
 
-def createSectionFromSplitEntry(splitEntry: common.FileSplitEntry, array_of_bytes: bytearray, outputPath: Path, context: common.Context) -> sections.SectionBase:
+def createSectionFromSplitEntry(splitEntry: common.FileSplitEntry, array_of_bytes: bytearray, context: common.Context) -> sections.SectionBase:
     offsetStart = splitEntry.offset
     offsetEnd = splitEntry.nextOffset
 
@@ -36,15 +36,16 @@ def createSectionFromSplitEntry(splitEntry: common.FileSplitEntry, array_of_byte
 
     f: sections.SectionBase
     if splitEntry.section == common.FileSectionType.Text:
-        f = sections.SectionText(context, offsetStart, offsetEnd, vram, outputPath.stem, array_of_bytes, 0, None)
+        f = sections.SectionText(context, offsetStart, offsetEnd, vram, splitEntry.fileName, array_of_bytes, 0, None)
         if splitEntry.isRsp:
             f.instrCat = rabbitizer.InstrCategory.RSP
     elif splitEntry.section == common.FileSectionType.Data:
-        f = sections.SectionData(context, offsetStart, offsetEnd, vram, outputPath.stem, array_of_bytes, 0, None)
+        f = sections.SectionData(context, offsetStart, offsetEnd, vram, splitEntry.fileName, array_of_bytes, 0, None)
     elif splitEntry.section == common.FileSectionType.Rodata:
-        f = sections.SectionRodata(context, offsetStart, offsetEnd, vram, outputPath.stem, array_of_bytes, 0, None)
+        f = sections.SectionRodata(context, offsetStart, offsetEnd, vram, splitEntry.fileName, array_of_bytes, 0, None)
     elif splitEntry.section == common.FileSectionType.Bss:
-        f = sections.SectionBss(context, offsetStart, offsetEnd, splitEntry.vram, splitEntry.vram + offsetEnd - offsetStart, outputPath.stem, 0, None)
+        bssVramEnd = splitEntry.vram + offsetEnd - offsetStart
+        f = sections.SectionBss(context, offsetStart, offsetEnd, splitEntry.vram, bssVramEnd, splitEntry.fileName, 0, None)
     else:
         common.Utils.eprint("Error! Section not set!")
         exit(-1)
@@ -105,6 +106,8 @@ def writeOtherRodata(path: Path, rodataFileList: list[sections.SectionBase]):
                 continue
 
             rodataSymbolPath = rodataPath / (rodataSym.getName() + ".s")
+            common.Utils.printVerbose(f"Writing unmigrated rodata {rodataSymbolPath}")
+
             with rodataSymbolPath.open("w") as f:
                 f.write(".section .rodata" + common.GlobalConfig.LINE_ENDS)
                 f.write(rodataSym.disassemble(migrate=True))

spimdisasm/mips/MipsFileSplits.py

@@ -74,7 +74,7 @@ def __init__(self, context: common.Context, vromStart: int, vromEnd: int, vram:
             # if self.vram is None:
             #     self.vram = splitEntry.vram
 
-            f = FilesHandlers.createSectionFromSplitEntry(splitEntry, array_of_bytes, Path(splitEntry.fileName), context)
+            f = FilesHandlers.createSectionFromSplitEntry(splitEntry, array_of_bytes, context)
             f.parent = self
             f.setCommentOffset(splitEntry.offset)