From 5334c6e7944ddb4b58b4d712168834f83188010c Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Fri, 9 Aug 2024 11:59:04 -0400
Subject: [PATCH] Avoid emitting a rom offset comment on bss symbols.

---
 CHANGELOG.md                              | 1 +
 pyproject.toml                            | 2 +-
 spimdisasm/__init__.py                    | 4 ++--
 spimdisasm/mips/symbols/MipsSymbolBase.py | 9 ++++++---
 spimdisasm/mips/symbols/MipsSymbolBss.py  | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5355571..7010909 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Avoid emitting "global" visibility on labels.
+- Avoid emitting a rom offset comment on bss symbols.
 
 ## [1.28.0] - 2024-08-09
 
diff --git a/pyproject.toml b/pyproject.toml
index bb27a2c..ac31f3d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@
 [project]
 name = "spimdisasm"
 # Version should be synced with spimdisasm/__init__.py
-version = "1.28.0"
+version = "1.28.1-dev0"
 description = "MIPS disassembler"
 readme = "README.md"
 license = {file = "LICENSE"}
diff --git a/spimdisasm/__init__.py b/spimdisasm/__init__.py
index bc6bed0..3b1e063 100644
--- a/spimdisasm/__init__.py
+++ b/spimdisasm/__init__.py
@@ -5,8 +5,8 @@
 
 from __future__ import annotations
 
-__version_info__: tuple[int, int, int] = (1, 28, 0)
-__version__ = ".".join(map(str, __version_info__))# + "-dev0"
+__version_info__: tuple[int, int, int] = (1, 28, 1)
+__version__ = ".".join(map(str, __version_info__)) + "-dev0"
 __author__ = "Decompollaborate"
 
 from . import common as common
diff --git a/spimdisasm/mips/symbols/MipsSymbolBase.py b/spimdisasm/mips/symbols/MipsSymbolBase.py
index 0cc5f56..f1458d8 100644
--- a/spimdisasm/mips/symbols/MipsSymbolBase.py
+++ b/spimdisasm/mips/symbols/MipsSymbolBase.py
@@ -64,11 +64,14 @@ def canUseConstantsOnData(self) -> bool:
         return self.contextSym.allowedToReferenceConstants
 
 
-    def generateAsmLineComment(self, localOffset: int, wordValue: int|None=None, *, isDouble: bool=False) -> str:
+    def generateAsmLineComment(self, localOffset: int, wordValue: int|None=None, *, isDouble: bool=False, emitRomOffset: bool=True) -> str:
         if not common.GlobalConfig.ASM_COMMENT:
             return ""
 
-        offsetHex = "{0:0{1}X}".format(localOffset + self.inFileOffset + self.commentOffset, common.GlobalConfig.ASM_COMMENT_OFFSET_WIDTH)
+        if emitRomOffset:
+            offsetHex = "{0:0{1}X} ".format(localOffset + self.inFileOffset + self.commentOffset, common.GlobalConfig.ASM_COMMENT_OFFSET_WIDTH)
+        else:
+            offsetHex = ""
 
         currentVram = self.getVramOffset(localOffset)
         vramHex = f"{currentVram:08X}"
@@ -80,7 +83,7 @@ def generateAsmLineComment(self, localOffset: int, wordValue: int|None=None, *,
             else:
                 wordValueHex = f"{common.Utils.wordToCurrenEndian(wordValue):08X} "
 
-        return f"/* {offsetHex} {vramHex} {wordValueHex}*/"
+        return f"/* {offsetHex}{vramHex} {wordValueHex}*/"
 
 
     def getSymbolAsmDeclaration(self, symName: str, useGlobalLabel: bool=True) -> str:
diff --git a/spimdisasm/mips/symbols/MipsSymbolBss.py b/spimdisasm/mips/symbols/MipsSymbolBss.py
index 04245d2..6457cb8 100644
--- a/spimdisasm/mips/symbols/MipsSymbolBss.py
+++ b/spimdisasm/mips/symbols/MipsSymbolBss.py
@@ -61,7 +61,7 @@ def disassembleAsBss(self, useGlobalLabel: bool = True) -> str:
         output += self.getPrevAlignDirective(0)
 
         output += self.getSymbolAsmDeclaration(self.getName(), useGlobalLabel)
-        output += self.generateAsmLineComment(0)
+        output += self.generateAsmLineComment(0, emitRomOffset=False)
         output += f" .space 0x{self.spaceSize:02X}{common.GlobalConfig.LINE_ENDS}"
 
         nameEnd = self.getNameEnd()