Skip to content

Commit

Permalink
black
Browse files Browse the repository at this point in the history
  • Loading branch information
AngheloAlf committed May 30, 2024
1 parent fe759f6 commit f8f5ebc
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
12 changes: 9 additions & 3 deletions src/splat/segtypes/linker_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,9 @@ def add(self, segment: Segment, max_vram_syms: List[Tuple[str, List[Segment]]]):
prev_entry = entry.section_order_type

if segment.ld_align_segment_start:
self._write_symbol("__romPos", f"ALIGN(__romPos, 0x{segment.ld_align_segment_start:X})")
self._write_symbol(
"__romPos", f"ALIGN(__romPos, 0x{segment.ld_align_segment_start:X})"
)
self._write_symbol(".", f"ALIGN(., 0x{segment.ld_align_segment_start:X})")

seg_rom_start = get_segment_rom_start(seg_name)
Expand Down Expand Up @@ -310,7 +312,9 @@ def add_legacy(self, segment: Segment, entries: List[LinkerEntry]):
last_seen_sections[entry] = entry.section_order_type

if segment.ld_align_segment_start:
self._write_symbol("__romPos", f"ALIGN(__romPos, 0x{segment.ld_align_segment_start:X})")
self._write_symbol(
"__romPos", f"ALIGN(__romPos, 0x{segment.ld_align_segment_start:X})"
)
self._write_symbol(".", f"ALIGN(., 0x{segment.ld_align_segment_start:X})")

seg_rom_start = get_segment_rom_start(seg_name)
Expand Down Expand Up @@ -368,7 +372,9 @@ def add_referenced_partial_segment(
self.write_max_vram_end_sym(sym, segs)

if segment.ld_align_segment_start:
self._write_symbol("__romPos", f"ALIGN(__romPos, 0x{segment.ld_align_segment_start:X})")
self._write_symbol(
"__romPos", f"ALIGN(__romPos, 0x{segment.ld_align_segment_start:X})"
)
self._write_symbol(".", f"ALIGN(., 0x{segment.ld_align_segment_start:X})")

seg_rom_start = get_segment_rom_start(seg_name)
Expand Down
4 changes: 3 additions & 1 deletion src/splat/segtypes/segment.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,9 @@ def __init__(
yaml, options.opts.ld_fill_value
)

self.ld_align_segment_start: Optional[int] = self.parse_ld_align_segment_start(yaml)
self.ld_align_segment_start: Optional[int] = self.parse_ld_align_segment_start(
yaml
)

# True if this segment was generated based on auto_all_sections
self.is_auto_all: bool = False
Expand Down
4 changes: 3 additions & 1 deletion src/splat/util/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,9 @@ def parse_endianness() -> Literal["big", "little"]:
ld_bss_is_noload=p.parse_opt(
"ld_bss_is_noload", bool, default_ld_bss_is_noload
),
ld_align_segment_start=p.parse_optional_opt_with_default("ld_align_segment_start", int, None),
ld_align_segment_start=p.parse_optional_opt_with_default(
"ld_align_segment_start", int, None
),
ld_align_segment_vram_end=p.parse_opt("ld_align_segment_vram_end", bool, True),
ld_align_section_vram_end=p.parse_opt("ld_align_section_vram_end", bool, True),
ld_generate_symbol_per_data_segment=p.parse_opt(
Expand Down

0 comments on commit f8f5ebc

Please sign in to comment.