From e28415eefd39c7af75086458a229fd770f0cd8e7 Mon Sep 17 00:00:00 2001 From: angie Date: Thu, 19 Sep 2024 23:36:23 -0300 Subject: [PATCH] Fix not generating branch labels under some circuntances --- CHANGELOG.md | 7 +++++++ README.md | 2 +- pyproject.toml | 2 +- spimdisasm/__init__.py | 2 +- spimdisasm/mips/symbols/MipsSymbolFunction.py | 6 ------ 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d48dbfc..0f30b96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.30.2] - 2024-09-19 + +### Fixed + +- Fix not generating branch labels under some circuntances. + ## [1.30.1] - 2024-09-19 ### Added @@ -1682,6 +1688,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.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 [1.29.0]: https://github.com/Decompollaborate/spimdisasm/compare/1.28.1...1.29.0 diff --git a/README.md b/README.md index d1069d3..89a6e09 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.1,<2.0.0 +spimdisasm>=1.30.2,<2.0.0 ``` ### Development version diff --git a/pyproject.toml b/pyproject.toml index ff44d74..753fd4f 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.1" +version = "1.30.2" description = "MIPS disassembler" readme = "README.md" license = {file = "LICENSE"} diff --git a/spimdisasm/__init__.py b/spimdisasm/__init__.py index bc8b8bd..6840096 100644 --- a/spimdisasm/__init__.py +++ b/spimdisasm/__init__.py @@ -5,7 +5,7 @@ from __future__ import annotations -__version_info__: tuple[int, int, int] = (1, 30, 1) +__version_info__: tuple[int, int, int] = (1, 30, 2) __version__ = ".".join(map(str, __version_info__))# + "-dev0" __author__ = "Decompollaborate" diff --git a/spimdisasm/mips/symbols/MipsSymbolFunction.py b/spimdisasm/mips/symbols/MipsSymbolFunction.py index 11544b4..77734c4 100644 --- a/spimdisasm/mips/symbols/MipsSymbolFunction.py +++ b/spimdisasm/mips/symbols/MipsSymbolFunction.py @@ -428,9 +428,6 @@ def analyze(self) -> None: # Branches for instrOffset, targetBranchVram in self.instrAnalyzer.branchInstrOffsets.items(): - if self.context.isAddressBanned(targetBranchVram): - continue - if common.GlobalConfig.INPUT_FILE_TYPE == common.InputFileType.ELF: if self.getVromOffset(instrOffset) in self.context.globalRelocationOverrides: # Avoid creating wrong symbols on elf files @@ -527,9 +524,6 @@ def analyze(self) -> None: # Jump tables for targetVram in self.instrAnalyzer.referencedJumpTableOffsets.values(): - if self.context.isAddressBanned(targetVram): - continue - jumpTable = self.addJumpTable(targetVram, isAutogenerated=True) jumpTable.parentFunction = self.contextSym self.contextSym.jumpTables.add(jumpTable.vram, jumpTable)