diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c1dd19..8017c2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.3.0] - 2023-11-05 + ### Added +- Support for parsing clang lld's map fles. - New functions: - `MapFile.parseMapContents`/`MapFile::parse_map_contents` - Parses the map contents passed as the argument, without requiring the map @@ -23,6 +26,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Parses the map contents passed as the argument, without requiring the map being on an actual file. - This function only parses the clang ld.lld map format. +- New members: + - `Symbol.align`/`Symbol::align`, `File.align`/`File::align` and + `Segment.align`/`Segment::align`: The alignment the given type. This member + will be filled by the parser only if the mapfile provides this information. ### Changed @@ -270,6 +277,7 @@ Full changes: "] description = "Map file parser library focusing decompilation projects" diff --git a/README.md b/README.md index 0b82f79..d33e307 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ If you use a `requirements.txt` file in your repository, then you can add this library with the following line: ```txt -mapfile_parser>=2.2.0,<3.0.0 +mapfile_parser>=2.3.0,<3.0.0 ``` #### Development version @@ -74,7 +74,7 @@ cargo add mapfile_parser Or add the following line manually to your `Cargo.toml` file: ```toml -mapfile_parser = "2.2.1" +mapfile_parser = "2.3.0" ``` #### System-wide dependencies diff --git a/pyproject.toml b/pyproject.toml index 21c2ee4..b428def 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ [project] name = "mapfile_parser" -version = "2.2.1" +version = "2.3.0" description = "Map file parser library focusing decompilation projects" readme = "README.md" requires-python = ">=3.7" diff --git a/src/mapfile_parser/__init__.py b/src/mapfile_parser/__init__.py index 57a42e0..98362e7 100644 --- a/src/mapfile_parser/__init__.py +++ b/src/mapfile_parser/__init__.py @@ -5,7 +5,7 @@ from __future__ import annotations -__version_info__ = (2, 2, 1) +__version_info__ = (2, 3, 0) __version__ = ".".join(map(str, __version_info__)) __author__ = "Decompollaborate" diff --git a/src/rs/mapfile.rs b/src/rs/mapfile.rs index 919718c..5bd3a82 100644 --- a/src/rs/mapfile.rs +++ b/src/rs/mapfile.rs @@ -312,10 +312,9 @@ impl MapFile { new_segment.align = Some(align); temp_segment_list.push(new_segment); - } else if let Some(fill_entry_match) = regex_fill.captures(subline) { + } else if regex_fill.is_match(subline) { // Make a dummy file to handle pads (. += XX) - //let expr = &fill_entry_match["expr"]; let mut filepath = std::path::PathBuf::new(); let mut section_type = "".to_owned();