Fix align in code segments (#267)

* Don't ignore user declared align for code segments * version bump
ethteck · Aug 16, 2023 · 447aadd · 447aadd
1 parent bf2e406
commit 447aadd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # splat Release Notes
 
+### 0.16.8
+
+* Avoid ignoring the `align` defined in a segment for `code` segments
+
 ### 0.16.7
 
 * Use `pylibyaml` to speed-up yaml parsing

diff --git a/segtypes/common/code.py b/segtypes/common/code.py
@@ -7,7 +7,7 @@
 from util.symbols import Symbol
 
 from segtypes.common.group import CommonSegGroup
-from segtypes.segment import Segment
+from segtypes.segment import Segment, parse_segment_align
 
 CODE_TYPES = ["c", "asm", "hasm"]
 
@@ -44,7 +44,10 @@ def __init__(
         self.jtbl_glabels_to_add: Set[int] = set()
         self.jumptables: Dict[int, Tuple[int, int]] = {}
         self.rodata_syms: Dict[int, List[Symbol]] = {}
-        self.align = 0x10
+
+        self.align = parse_segment_align(yaml)
+        if self.align is None:
+            self.align = 0x10
 
     @property
     def needs_symbols(self) -> bool:

diff --git a/split.py b/split.py
@@ -24,7 +24,7 @@
 from segtypes.segment import Segment
 from util import log, options, palettes, symbols, relocs
 
-VERSION = "0.16.7"
+VERSION = "0.16.8"
 
 parser = argparse.ArgumentParser(
     description="Split a rom given a rom, a config, and output directory"