From 21c8eaffc75455d19878251324737230c4da91dc Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Tue, 1 Oct 2024 10:41:27 -0300
Subject: [PATCH 1/9] Improve comment specifying the reason why an address
 could not be symbolized if it is `$gp` relative.

---
 CHANGELOG.md                                  | 7 ++++++-
 pyproject.toml                                | 2 +-
 spimdisasm/__init__.py                        | 4 ++--
 spimdisasm/mips/symbols/MipsSymbolFunction.py | 8 +++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f30b96..1990d43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.30.2] - 2024-09-19
 
+### Changed
+
+- Improve comment specifying the reason why an address could not be symbolized
+  if it is `$gp` relative.
+
 ### Fixed
 
-- Fix not generating branch labels under some circuntances.
+- Fix not generating branch labels under some circumstances.
 
 ## [1.30.1] - 2024-09-19
 
diff --git a/pyproject.toml b/pyproject.toml
index 753fd4f..bbdc085 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@
 [project]
 name = "spimdisasm"
 # Version should be synced with spimdisasm/__init__.py
-version = "1.30.2"
+version = "1.30.3-dev0"
 description = "MIPS disassembler"
 readme = "README.md"
 license = {file = "LICENSE"}
diff --git a/spimdisasm/__init__.py b/spimdisasm/__init__.py
index 6840096..2b89b79 100644
--- a/spimdisasm/__init__.py
+++ b/spimdisasm/__init__.py
@@ -5,8 +5,8 @@
 
 from __future__ import annotations
 
-__version_info__: tuple[int, int, int] = (1, 30, 2)
-__version__ = ".".join(map(str, __version_info__))# + "-dev0"
+__version_info__: tuple[int, int, int] = (1, 30, 3)
+__version__ = ".".join(map(str, __version_info__)) + "-dev0"
 __author__ = "Decompollaborate"
 
 from . import common as common
diff --git a/spimdisasm/mips/symbols/MipsSymbolFunction.py b/spimdisasm/mips/symbols/MipsSymbolFunction.py
index 77734c4..074d0bf 100644
--- a/spimdisasm/mips/symbols/MipsSymbolFunction.py
+++ b/spimdisasm/mips/symbols/MipsSymbolFunction.py
@@ -396,7 +396,13 @@ def _generateRelocsFromInstructionAnalyzer(self) -> None:
                     if generatedReloc is not None:
                         self.relocs[instrOffset] = generatedReloc
             else:
-                self.endOfLineComment[instrOffset//4] = f" /* Failed to symbolize address 0x{constant:08X} for {relocType.getPercentRel()}. Make sure this address is within the recognized valid address space */"
+                comment = f"Failed to symbolize address 0x{constant:08X} for {relocType.getPercentRel()}. Make sure this address is within the recognized valid address space."
+                if relocType in {common.RelocType.MIPS_GPREL16, common.RelocType.MIPS_GOT16}:
+                    if common.GlobalConfig.GP_VALUE is None:
+                        comment += f" Please specify a gp_value."
+                    elif not self.context.isInTotalVramRange(common.GlobalConfig.GP_VALUE):
+                        comment += f" The provided gp_value (0x{common.GlobalConfig.GP_VALUE:08X}) seems wrong."
+                self.endOfLineComment[instrOffset//4] = f" /* {comment} */"
 
         for instrOffset, targetVram in self.instrAnalyzer.funcCallInstrOffsets.items():
             funcSym = self.getSymbol(targetVram, tryPlusOffset=False)

From ba5fff7b3e52eb465676a5e7f6636c8322b70dd8 Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sat, 12 Oct 2024 09:39:32 -0300
Subject: [PATCH 2/9] Prevent .text split suggestions on compilers that do not
 follow the 0x10 boundary rule

---
 CHANGELOG.md                                |  4 +--
 spimdisasm/common/CompilerConfig.py         | 29 +++++++++++++++------
 spimdisasm/common/__init__.py               |  1 +
 spimdisasm/mips/sections/MipsSectionText.py | 15 +++++++----
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1990d43..81e4d50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,13 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.30.2] - 2024-09-19
-
 ### Changed
 
 - Improve comment specifying the reason why an address could not be symbolized
   if it is `$gp` relative.
 
+## [1.30.2] - 2024-09-19
+
 ### Fixed
 
 - Fix not generating branch labels under some circumstances.
diff --git a/spimdisasm/common/CompilerConfig.py b/spimdisasm/common/CompilerConfig.py
index 5088112..72b2aea 100644
--- a/spimdisasm/common/CompilerConfig.py
+++ b/spimdisasm/common/CompilerConfig.py
@@ -46,21 +46,34 @@ class CompilerProperties:
     based projects) then this flag needs to be turned on.
     """
 
+    sectionAlign_text: int|None = None
+    """
+    The value the compiler will use to align the `.text` section of the given
+    object.
+
+    Used for determining `.text` file splits when disassembling full ROM images.
+
+    The real aligment value will be computed like `1 << x`, where `x`
+    corresponds to the value given to this property.
+
+    If a compiler emits multiple `.text` sections per object (i.e. each function
+    is emitted on its own section) then it is better to keep this value as
+    `None`, since the split detector won't give any meaningful result.
+    """
+
 
 @enum.unique
 class Compiler(enum.Enum):
-    UNKNOWN = CompilerProperties("UNKNOWN")
-
     # General GCC
     GCC = CompilerProperties("GCC", prevAlign_jumptable=3)
 
     # N64
-    IDO = CompilerProperties("IDO", hasLateRodata=True, pairMultipleHiToSameLow=False, bigAddendWorkaroundForMigratedFunctions=False)
-    KMC = CompilerProperties("KMC", prevAlign_jumptable=3)
-    SN64 = CompilerProperties("SN64", prevAlign_double=3, prevAlign_jumptable=3, allowRdataMigration=True)
+    IDO = CompilerProperties("IDO", hasLateRodata=True, pairMultipleHiToSameLow=False, bigAddendWorkaroundForMigratedFunctions=False, sectionAlign_text=4)
+    KMC = CompilerProperties("KMC", prevAlign_jumptable=3, sectionAlign_text=4)
+    SN64 = CompilerProperties("SN64", prevAlign_double=3, prevAlign_jumptable=3, allowRdataMigration=True, sectionAlign_text=4)
 
     # iQue
-    EGCS = CompilerProperties("EGCS", prevAlign_jumptable=3)
+    EGCS = CompilerProperties("EGCS", prevAlign_jumptable=3, sectionAlign_text=4)
 
     # PS1
     PSYQ = CompilerProperties("PSYQ", prevAlign_double=3, prevAlign_jumptable=3, allowRdataMigration=True)
@@ -70,8 +83,8 @@ class Compiler(enum.Enum):
     EEGCC = CompilerProperties("EEGCC", prevAlign_jumptable=3, prevAlign_string=3, prevAlign_function=3)
 
     @staticmethod
-    def fromStr(value: str) -> Compiler:
-        return compilerOptions.get(value, Compiler.UNKNOWN)
+    def fromStr(value: str) -> Compiler|None:
+        return compilerOptions.get(value)
 
 
 compilerOptions: dict[str, Compiler] = {
diff --git a/spimdisasm/common/__init__.py b/spimdisasm/common/__init__.py
index dfcee47..4d7acdb 100644
--- a/spimdisasm/common/__init__.py
+++ b/spimdisasm/common/__init__.py
@@ -6,6 +6,7 @@
 from .SortedDict import SortedDict as SortedDict
 from .CompilerConfig import CompilerProperties as CompilerProperties
 from .CompilerConfig import Compiler as Compiler
+from .CompilerConfig import compilerOptions as compilerOptions
 from .GlobalConfig import GlobalConfig as GlobalConfig
 from .GlobalConfig import InputEndian as InputEndian
 from .GlobalConfig import Abi as Abi
diff --git a/spimdisasm/mips/sections/MipsSectionText.py b/spimdisasm/mips/sections/MipsSectionText.py
index 6ece10c..d289dbe 100644
--- a/spimdisasm/mips/sections/MipsSectionText.py
+++ b/spimdisasm/mips/sections/MipsSectionText.py
@@ -288,6 +288,8 @@ def analyze(self) -> None:
         funcsStartsList, unimplementedInstructionsFuncList = self._findFunctions(instrsList)
 
         previousSymbolExtraPadding = 0
+        sectionAlign_text = common.GlobalConfig.COMPILER.value.sectionAlign_text
+        textAlignment = 1 << sectionAlign_text if sectionAlign_text is not None else None
 
         i = 0
         startsCount = len(funcsStartsList)
@@ -325,14 +327,17 @@ def analyze(self) -> None:
             func.analyze()
             self.symbolList.append(func)
 
-            # File boundaries detection
-            if func.inFileOffset % 16 == 0:
-                # Files are always 0x10 aligned
+            if textAlignment is not None:
+                # File boundaries detection
 
-                if previousSymbolExtraPadding > 0:
+                if func.inFileOffset % textAlignment == 0 and previousSymbolExtraPadding > 0:
+                    # If the previous symbol had trailing padding and the
+                    # current symbol is aligned to the expected alignment then
+                    # add this offset as a section boundary.
                     self.fileBoundaries.append(func.inFileOffset)
 
-            previousSymbolExtraPadding = func.countExtraPadding()
+                previousSymbolExtraPadding = func.countExtraPadding()
+
             i += 1
 
         # Filter out repeated values and sort

From 75677b926704c285ade72273a099f5598499ba50 Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sat, 12 Oct 2024 09:48:20 -0300
Subject: [PATCH 3/9] Prevent .rodata split suggestions on compilers that do
 not follow the 0x10 boundary rule

---
 CHANGELOG.md                                  |  2 +
 spimdisasm/common/CompilerConfig.py           | 19 ++++++--
 spimdisasm/mips/sections/MipsSectionRodata.py | 43 ++++++++++---------
 spimdisasm/mips/sections/MipsSectionText.py   |  2 +-
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81e4d50..f3cd1db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improve comment specifying the reason why an address could not be symbolized
   if it is `$gp` relative.
+- Prevent section split suggestions if the selected compiler doesn't follow the
+  0x10 boundary rule.
 
 ## [1.30.2] - 2024-09-19
 
diff --git a/spimdisasm/common/CompilerConfig.py b/spimdisasm/common/CompilerConfig.py
index 72b2aea..70c6edd 100644
--- a/spimdisasm/common/CompilerConfig.py
+++ b/spimdisasm/common/CompilerConfig.py
@@ -61,6 +61,17 @@ class CompilerProperties:
     `None`, since the split detector won't give any meaningful result.
     """
 
+    sectionAlign_rodata: int|None = None
+    """
+    The value the compiler will use to align the `.rodata` section of the given
+    object.
+
+    Used for determining `.rodata` file splits when disassembling full ROM images.
+
+    The real aligment value will be computed like `1 << x`, where `x`
+    corresponds to the value given to this property.
+    """
+
 
 @enum.unique
 class Compiler(enum.Enum):
@@ -68,12 +79,12 @@ class Compiler(enum.Enum):
     GCC = CompilerProperties("GCC", prevAlign_jumptable=3)
 
     # N64
-    IDO = CompilerProperties("IDO", hasLateRodata=True, pairMultipleHiToSameLow=False, bigAddendWorkaroundForMigratedFunctions=False, sectionAlign_text=4)
-    KMC = CompilerProperties("KMC", prevAlign_jumptable=3, sectionAlign_text=4)
-    SN64 = CompilerProperties("SN64", prevAlign_double=3, prevAlign_jumptable=3, allowRdataMigration=True, sectionAlign_text=4)
+    IDO = CompilerProperties("IDO", hasLateRodata=True, pairMultipleHiToSameLow=False, bigAddendWorkaroundForMigratedFunctions=False, sectionAlign_text=4, sectionAlign_rodata=4)
+    KMC = CompilerProperties("KMC", prevAlign_jumptable=3, sectionAlign_text=4, sectionAlign_rodata=4)
+    SN64 = CompilerProperties("SN64", prevAlign_double=3, prevAlign_jumptable=3, allowRdataMigration=True, sectionAlign_text=4, sectionAlign_rodata=4)
 
     # iQue
-    EGCS = CompilerProperties("EGCS", prevAlign_jumptable=3, sectionAlign_text=4)
+    EGCS = CompilerProperties("EGCS", prevAlign_jumptable=3, sectionAlign_text=4, sectionAlign_rodata=4)
 
     # PS1
     PSYQ = CompilerProperties("PSYQ", prevAlign_double=3, prevAlign_jumptable=3, allowRdataMigration=True)
diff --git a/spimdisasm/mips/sections/MipsSectionRodata.py b/spimdisasm/mips/sections/MipsSectionRodata.py
index 1153bed..dcd1baa 100644
--- a/spimdisasm/mips/sections/MipsSectionRodata.py
+++ b/spimdisasm/mips/sections/MipsSectionRodata.py
@@ -139,6 +139,8 @@ def analyze(self) -> None:
 
         previousSymbolWasLateRodata = False
         previousSymbolExtraPadding = 0
+        sectionAlign_rodata = common.GlobalConfig.COMPILER.value.sectionAlign_rodata
+        rodataAlignment = 1 << sectionAlign_rodata if sectionAlign_rodata is not None else None
 
         for i, (offset, contextSym) in enumerate(symbolList):
             if i + 1 == len(symbolList):
@@ -157,29 +159,28 @@ def analyze(self) -> None:
             self.symbolList.append(sym)
             self.symbolsVRams.add(contextSym.vram)
 
-            # File boundaries detection
-            if sym.inFileOffset % 16 == 0:
-                # Files are always 0x10 aligned
-
-                if previousSymbolWasLateRodata and not sym.contextSym.isLateRodata():
-                    # late rodata followed by normal rodata implies a file split
-                    self.fileBoundaries.append(sym.inFileOffset)
-                elif previousSymbolExtraPadding > 0:
-                    if sym.isDouble(0):
-                        # doubles require a bit extra of alignment
-                        if previousSymbolExtraPadding >= 2:
-                            self.fileBoundaries.append(sym.inFileOffset)
-                    elif sym.isJumpTable() and common.GlobalConfig.COMPILER.value.prevAlign_jumptable is not None and common.GlobalConfig.COMPILER.value.prevAlign_jumptable >= 3:
-                        if previousSymbolExtraPadding >= 2:
-                            self.fileBoundaries.append(sym.inFileOffset)
-                    elif sym.isString() and common.GlobalConfig.COMPILER.value.prevAlign_string is not None and common.GlobalConfig.COMPILER.value.prevAlign_string >= 3:
-                        if previousSymbolExtraPadding >= 2:
-                            self.fileBoundaries.append(sym.inFileOffset)
-                    else:
+            if rodataAlignment is not None:
+            # Section boundaries detection
+                if sym.inFileOffset % rodataAlignment == 0:
+                    if previousSymbolWasLateRodata and not sym.contextSym.isLateRodata():
+                        # late rodata followed by normal rodata implies a file split
                         self.fileBoundaries.append(sym.inFileOffset)
+                    elif previousSymbolExtraPadding > 0:
+                        if sym.isDouble(0):
+                            # doubles require a bit extra of alignment
+                            if previousSymbolExtraPadding >= 2:
+                                self.fileBoundaries.append(sym.inFileOffset)
+                        elif sym.isJumpTable() and common.GlobalConfig.COMPILER.value.prevAlign_jumptable is not None and common.GlobalConfig.COMPILER.value.prevAlign_jumptable >= 3:
+                            if previousSymbolExtraPadding >= 2:
+                                self.fileBoundaries.append(sym.inFileOffset)
+                        elif sym.isString() and common.GlobalConfig.COMPILER.value.prevAlign_string is not None and common.GlobalConfig.COMPILER.value.prevAlign_string >= 3:
+                            if previousSymbolExtraPadding >= 2:
+                                self.fileBoundaries.append(sym.inFileOffset)
+                        else:
+                            self.fileBoundaries.append(sym.inFileOffset)
 
-            previousSymbolWasLateRodata = sym.contextSym.isLateRodata()
-            previousSymbolExtraPadding = sym.countExtraPadding()
+                previousSymbolWasLateRodata = sym.contextSym.isLateRodata()
+                previousSymbolExtraPadding = sym.countExtraPadding()
 
         self.processStaticRelocs()
 
diff --git a/spimdisasm/mips/sections/MipsSectionText.py b/spimdisasm/mips/sections/MipsSectionText.py
index d289dbe..4e5fa45 100644
--- a/spimdisasm/mips/sections/MipsSectionText.py
+++ b/spimdisasm/mips/sections/MipsSectionText.py
@@ -328,7 +328,7 @@ def analyze(self) -> None:
             self.symbolList.append(func)
 
             if textAlignment is not None:
-                # File boundaries detection
+                # Section boundaries detection
 
                 if func.inFileOffset % textAlignment == 0 and previousSymbolExtraPadding > 0:
                     # If the previous symbol had trailing padding and the

From 067b1ae01de2a51e0de2c6cf4104e01d8abb497d Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sat, 12 Oct 2024 09:52:18 -0300
Subject: [PATCH 4/9] Fix rodata split detection issue related to jumptables
 and strings

---
 spimdisasm/mips/sections/MipsSectionRodata.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/spimdisasm/mips/sections/MipsSectionRodata.py b/spimdisasm/mips/sections/MipsSectionRodata.py
index dcd1baa..76d2afb 100644
--- a/spimdisasm/mips/sections/MipsSectionRodata.py
+++ b/spimdisasm/mips/sections/MipsSectionRodata.py
@@ -170,12 +170,14 @@ def analyze(self) -> None:
                             # doubles require a bit extra of alignment
                             if previousSymbolExtraPadding >= 2:
                                 self.fileBoundaries.append(sym.inFileOffset)
-                        elif sym.isJumpTable() and common.GlobalConfig.COMPILER.value.prevAlign_jumptable is not None and common.GlobalConfig.COMPILER.value.prevAlign_jumptable >= 3:
-                            if previousSymbolExtraPadding >= 2:
-                                self.fileBoundaries.append(sym.inFileOffset)
-                        elif sym.isString() and common.GlobalConfig.COMPILER.value.prevAlign_string is not None and common.GlobalConfig.COMPILER.value.prevAlign_string >= 3:
-                            if previousSymbolExtraPadding >= 2:
-                                self.fileBoundaries.append(sym.inFileOffset)
+                        elif sym.isJumpTable():
+                            if common.GlobalConfig.COMPILER.value.prevAlign_jumptable is not None and common.GlobalConfig.COMPILER.value.prevAlign_jumptable >= 3:
+                                if previousSymbolExtraPadding >= 2:
+                                    self.fileBoundaries.append(sym.inFileOffset)
+                        elif sym.isString():
+                            if common.GlobalConfig.COMPILER.value.prevAlign_string is not None and common.GlobalConfig.COMPILER.value.prevAlign_string >= 3:
+                                if previousSymbolExtraPadding >= 2:
+                                    self.fileBoundaries.append(sym.inFileOffset)
                         else:
                             self.fileBoundaries.append(sym.inFileOffset)
 

From e98ef7415dbf453f11737d2e5e5f873470e2c6db Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sat, 12 Oct 2024 10:07:26 -0300
Subject: [PATCH 5/9] Bump required Python version to 3.9

---
 .github/workflows/ci.yml   |  7 ++++++-
 .github/workflows/mypy.yml | 29 +++++++++++++++++------------
 CHANGELOG.md               |  3 +++
 pyproject.toml             |  2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30c6ed0..22215a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,8 +12,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Setup venv
+        run: |
+          python3 -m venv .venv
+          . .venv/bin/activate
+
       - name: Install build module
-        run: pip install -U build
+        run: python3 -m pip install -U build
 
       - name: Build wheel and source
         run: python -m build --sdist --wheel --outdir dist/ .
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index f96865d..3de6290 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -8,18 +8,23 @@ jobs:
     runs-on: ubuntu-latest
     name: mypy
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.7
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
 
-    - name: Install Dependencies
-      run: |
-        pip install -r requirements.txt
-        pip install mypy -U
+      - name: Setup venv
+        run: |
+          python3 -m venv .venv
+          . .venv/bin/activate
 
-    - name: mypy
-      run: mypy --show-column-numbers --hide-error-context .
+      - name: Install Dependencies
+        run: |
+          python3 -m pip install -U -r requirements.txt
+          python3 -m pip install -U mypy
+
+      - name: mypy
+        run: mypy --show-column-numbers --hide-error-context .
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3cd1db..dde420c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   if it is `$gp` relative.
 - Prevent section split suggestions if the selected compiler doesn't follow the
   0x10 boundary rule.
+- Python 3.9 or later is now required.
+  - Nothing really changed. Just the CI tools I was using is refusing to use any
+    Python version older than this. Sorry if you were affected by this.
 
 ## [1.30.2] - 2024-09-19
 
diff --git a/pyproject.toml b/pyproject.toml
index bbdc085..7e286ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ version = "1.30.3-dev0"
 description = "MIPS disassembler"
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 authors = [
     { name="Anghelo Carvajal", email="angheloalf95@gmail.com" },
 ]

From ec2cd10fd228b3a202848c113c4854460401054c Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sat, 12 Oct 2024 10:12:00 -0300
Subject: [PATCH 6/9] fix CI?

---
 .github/workflows/ci.yml          | 9 ++++++---
 .github/workflows/mypy.yml        | 6 ++++--
 mypy.ini                          | 2 +-
 spimdisasm/common/GlobalConfig.py | 8 +++++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 22215a3..9fffcb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,13 +15,16 @@ jobs:
       - name: Setup venv
         run: |
           python3 -m venv .venv
-          . .venv/bin/activate
 
       - name: Install build module
-        run: python3 -m pip install -U build
+        run: |
+          . .venv/bin/activate
+          python3 -m pip install -U build
 
       - name: Build wheel and source
-        run: python -m build --sdist --wheel --outdir dist/ .
+        run: |
+          . .venv/bin/activate
+          python3 -m build --sdist --wheel --outdir dist/ .
 
       - uses: actions/upload-artifact@v4.3.1
         with:
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
index 3de6290..d4cffe9 100644
--- a/.github/workflows/mypy.yml
+++ b/.github/workflows/mypy.yml
@@ -19,12 +19,14 @@ jobs:
       - name: Setup venv
         run: |
           python3 -m venv .venv
-          . .venv/bin/activate
 
       - name: Install Dependencies
         run: |
+          . .venv/bin/activate
           python3 -m pip install -U -r requirements.txt
           python3 -m pip install -U mypy
 
       - name: mypy
-        run: mypy --show-column-numbers --hide-error-context .
+        run: |
+          . .venv/bin/activate
+          mypy --show-column-numbers --hide-error-context .
diff --git a/mypy.ini b/mypy.ini
index f7243b0..ef77f10 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.7
+python_version = 3.9
 check_untyped_defs = True
 disallow_untyped_defs = True
 disallow_any_unimported = True
diff --git a/spimdisasm/common/GlobalConfig.py b/spimdisasm/common/GlobalConfig.py
index 5c5aac0..d6cb326 100644
--- a/spimdisasm/common/GlobalConfig.py
+++ b/spimdisasm/common/GlobalConfig.py
@@ -468,8 +468,8 @@ def processEnvironmentVariables(self) -> None:
                     environmentValue = bool(environmentValue)
             elif isinstance(currentValue, Compiler):
                 newComp = Compiler.fromStr(environmentValue)
-                if newComp == Compiler.UNKNOWN:
-                    Utils.eprint(f"Unrecognized compiler setting from environment 'SPIMDISASM_{attr.upper()}={environmentValue}'. Choosing compiler UNKNOWN instead.")
+                if newComp is None:
+                    Utils.eprint(f"Unrecognized compiler setting from environment 'SPIMDISASM_{attr.upper()}={environmentValue}'.")
                     continue
                 environmentValue = newComp
             elif isinstance(currentValue, InputEndian):
@@ -530,7 +530,9 @@ def parseArgs(self, args: argparse.Namespace) -> None:
             self.CUSTOM_SUFFIX = args.custom_suffix
 
         if args.compiler is not None:
-            self.COMPILER = Compiler.fromStr(args.compiler)
+            compiler = Compiler.fromStr(args.compiler)
+            if compiler is not None:
+                self.COMPILER = compiler
 
         if args.symbol_alignment_requires_aligned_section is not None:
             self.SYMBOL_ALIGNMENT_REQUIRES_ALIGNED_SECTION = args.symbol_alignment_requires_aligned_section

From 40ca9707ece0d6d282d535af72b4c1424afd5f5d Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sat, 12 Oct 2024 10:34:50 -0300
Subject: [PATCH 7/9] Rename MWCC to MWCCPS2

---
 CHANGELOG.md                        | 1 +
 spimdisasm/common/CompilerConfig.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dde420c..f6eca5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   if it is `$gp` relative.
 - Prevent section split suggestions if the selected compiler doesn't follow the
   0x10 boundary rule.
+- Rename `MWCC` compiler option to `MWCCPS2`.
 - Python 3.9 or later is now required.
   - Nothing really changed. Just the CI tools I was using is refusing to use any
     Python version older than this. Sorry if you were affected by this.
diff --git a/spimdisasm/common/CompilerConfig.py b/spimdisasm/common/CompilerConfig.py
index 70c6edd..3a9a7ff 100644
--- a/spimdisasm/common/CompilerConfig.py
+++ b/spimdisasm/common/CompilerConfig.py
@@ -90,7 +90,7 @@ class Compiler(enum.Enum):
     PSYQ = CompilerProperties("PSYQ", prevAlign_double=3, prevAlign_jumptable=3, allowRdataMigration=True)
 
     # PS2
-    MWCC = CompilerProperties("MWCC", prevAlign_jumptable=4)
+    MWCCPS2 = CompilerProperties("MWCCPS2", prevAlign_jumptable=4)
     EEGCC = CompilerProperties("EEGCC", prevAlign_jumptable=3, prevAlign_string=3, prevAlign_function=3)
 
     @staticmethod
@@ -107,7 +107,7 @@ def fromStr(value: str) -> Compiler|None:
         Compiler.SN64,
         Compiler.EGCS,
         Compiler.PSYQ,
-        Compiler.MWCC,
+        Compiler.MWCCPS2,
         Compiler.EEGCC,
     ]
 }

From 91fb4140ff004e87f9852f7b2893f4e932ceaf54 Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Sat, 12 Oct 2024 10:51:52 -0300
Subject: [PATCH 8/9] remove redundant split checks

---
 spimdisasm/mips/sections/MipsSectionRodata.py |  2 +-
 spimdisasm/mips/sections/MipsSectionText.py   | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/spimdisasm/mips/sections/MipsSectionRodata.py b/spimdisasm/mips/sections/MipsSectionRodata.py
index 76d2afb..de4beb0 100644
--- a/spimdisasm/mips/sections/MipsSectionRodata.py
+++ b/spimdisasm/mips/sections/MipsSectionRodata.py
@@ -161,7 +161,7 @@ def analyze(self) -> None:
 
             if rodataAlignment is not None:
             # Section boundaries detection
-                if sym.inFileOffset % rodataAlignment == 0:
+                if (self.vromStart + sym.inFileOffset) % rodataAlignment == 0:
                     if previousSymbolWasLateRodata and not sym.contextSym.isLateRodata():
                         # late rodata followed by normal rodata implies a file split
                         self.fileBoundaries.append(sym.inFileOffset)
diff --git a/spimdisasm/mips/sections/MipsSectionText.py b/spimdisasm/mips/sections/MipsSectionText.py
index 4e5fa45..3c0e51a 100644
--- a/spimdisasm/mips/sections/MipsSectionText.py
+++ b/spimdisasm/mips/sections/MipsSectionText.py
@@ -191,7 +191,6 @@ def _findFunctions(self, instrsList: list[rabbitizer.Instruction]) -> tuple[list
         index = 0
 
         if instrsList[0].isNop():
-            isboundary = False
             # Loop over until we find a instruction that isn't a nop
             while index < nInstr:
                 if currentFunctionSym is not None:
@@ -199,12 +198,9 @@ def _findFunctions(self, instrsList: list[rabbitizer.Instruction]) -> tuple[list
 
                 instr = instrsList[index]
                 if not instr.isNop():
-                    if isboundary:
-                        self.fileBoundaries.append(self.inFileOffset + index*4)
                     break
                 index += 1
                 instructionOffset += 4
-                isboundary |= ((instructionOffset % 16) == 0)
 
                 currentInstructionStart = instructionOffset
                 currentFunctionSym = self.getSymbol(self.getVramOffset(instructionOffset), vromAddress=self.getVromOffset(instructionOffset), tryPlusOffset=False, checkGlobalSegment=False)
@@ -229,7 +225,6 @@ def _findFunctions(self, instrsList: list[rabbitizer.Instruction]) -> tuple[list
 
                 auxSym = self.getSymbol(self.getVramOffset(instructionOffset), vromAddress=self.getVromOffset(instructionOffset), tryPlusOffset=False, checkGlobalSegment=False)
 
-                isboundary = False
                 # Loop over until we find a instruction that isn't a nop
                 while index < nInstr:
                     if auxSym is not None:
@@ -237,12 +232,9 @@ def _findFunctions(self, instrsList: list[rabbitizer.Instruction]) -> tuple[list
 
                     instr = instrsList[index]
                     if not instr.isNop():
-                        if isboundary:
-                            self.fileBoundaries.append(self.inFileOffset + index*4)
                         break
                     index += 1
                     instructionOffset += 4
-                    isboundary |= ((instructionOffset % 16) == 0)
 
                     auxSym = self.getSymbol(self.getVramOffset(instructionOffset), vromAddress=self.getVromOffset(instructionOffset), tryPlusOffset=False, checkGlobalSegment=False)
 
@@ -330,7 +322,7 @@ def analyze(self) -> None:
             if textAlignment is not None:
                 # Section boundaries detection
 
-                if func.inFileOffset % textAlignment == 0 and previousSymbolExtraPadding > 0:
+                if (self.vromStart + func.inFileOffset) % textAlignment == 0 and previousSymbolExtraPadding > 0:
                     # If the previous symbol had trailing padding and the
                     # current symbol is aligned to the expected alignment then
                     # add this offset as a section boundary.

From 1dadbd389390219b5d599eb9f707cc2dfc80d1ec Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Wed, 20 Nov 2024 18:43:24 -0300
Subject: [PATCH 9/9] version bump

---
 CHANGELOG.md           | 3 +++
 README.md              | 2 +-
 pyproject.toml         | 2 +-
 spimdisasm/__init__.py | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6eca5f..f64bc6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.31.0] - 2024-11-20
+
 ### Changed
 
 - Improve comment specifying the reason why an address could not be symbolized
@@ -1699,6 +1701,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Version 1.0.0
 
 [unreleased]: https://github.com/Decompollaborate/spimdisasm/compare/master...develop
+[1.31.0]: https://github.com/Decompollaborate/spimdisasm/compare/1.30.2...1.31.0
 [1.30.2]: https://github.com/Decompollaborate/spimdisasm/compare/1.30.1...1.30.2
 [1.30.1]: https://github.com/Decompollaborate/spimdisasm/compare/1.30.0...1.30.1
 [1.30.0]: https://github.com/Decompollaborate/spimdisasm/compare/1.29.0...1.30.0
diff --git a/README.md b/README.md
index 89a6e09..37d2097 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ If you use a `requirements.txt` file in your repository, then you can add
 this library with the following line:
 
 ```txt
-spimdisasm>=1.30.2,<2.0.0
+spimdisasm>=1.31.0,<2.0.0
 ```
 
 ### Development version
diff --git a/pyproject.toml b/pyproject.toml
index 7e286ee..3ab0eea 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@
 [project]
 name = "spimdisasm"
 # Version should be synced with spimdisasm/__init__.py
-version = "1.30.3-dev0"
+version = "1.31.0"
 description = "MIPS disassembler"
 readme = "README.md"
 license = {file = "LICENSE"}
diff --git a/spimdisasm/__init__.py b/spimdisasm/__init__.py
index 2b89b79..d8a3f3f 100644
--- a/spimdisasm/__init__.py
+++ b/spimdisasm/__init__.py
@@ -5,8 +5,8 @@
 
 from __future__ import annotations
 
-__version_info__: tuple[int, int, int] = (1, 30, 3)
-__version__ = ".".join(map(str, __version_info__)) + "-dev0"
+__version_info__: tuple[int, int, int] = (1, 31, 0)
+__version__ = ".".join(map(str, __version_info__))# + "-dev0"
 __author__ = "Decompollaborate"
 
 from . import common as common