Skip to content

Commit

Permalink
Preserve alloc_sections/noload_sections order when reordering based o…
Browse files Browse the repository at this point in the history 
…n section_order
  • Loading branch information
@AngheloAlf
AngheloAlf committed May 4, 2024
1 parent a53445e commit 34bd192
Show file tree
Hide file tree
Showing 3 changed files with 159 additions and 6 deletions.
23 changes: 17 additions & 6 deletions slinky/src/linker_writer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ impl LinkerWriter<'_> {
}
}

fn emit_section(&mut self, segment: &Segment, section: &str) {
fn emit_section(&mut self, segment: &Segment, section: &str, sections: &[String]) {
let mut base_path = PathBuf::new();

base_path.extend(&self.d.settings.base_path);
Expand All @@ -674,15 +674,26 @@ impl LinkerWriter<'_> {
continue;
}

let mut sections_to_emit_here = vec![section];

// Check if any other section should be placed be placed here
for (k, v) in &file.section_order {
if v == section {
self.emit_file(file, segment, k, &base_path);
sections_to_emit_here.push(k);
}
}
}

self.emit_file(file, segment, section, &base_path);
// We need to preserve the order given by alloc_sections or noload_sections
sections_to_emit_here
.sort_unstable_by_key(|&k| sections.iter().position(|s| s == k));

for k in sections_to_emit_here {
self.emit_file(file, segment, k, &base_path);
}
} else {
// No need to mess with section ordering, just emit the file
self.emit_file(file, segment, section, &base_path);
}
}
}

Expand All @@ -696,7 +707,7 @@ impl LinkerWriter<'_> {
for (i, section) in sections.iter().enumerate() {
self.write_section_symbol_start(segment, section);

self.emit_section(segment, section);
self.emit_section(segment, section, sections);

self.write_section_symbol_end(segment, section);

Expand Down Expand Up @@ -729,7 +740,7 @@ impl LinkerWriter<'_> {
self.buffer.writeln(&format!("FILL(0x{:08X});", fill_value));
}

self.emit_section(segment, section);
self.emit_section(segment, section, sections);

self.buffer.end_block();
self.write_section_symbol_end(segment, section);
Expand Down
129 changes: 129 additions & 0 deletions tests/test_cases/section_order_reorder.ld
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
SECTIONS
{
__romPos = 0x0;

code_ROM_START = __romPos;
code_VRAM = ADDR(.code);
code_alloc_VRAM = .;

.code 0x80024C00 : AT(code_ROM_START) SUBALIGN(16)
{
FILL(0x00000000);
code_TEXT_START = .;
build/src/code/main.o(.text*);
build/src/code/entities.o(.text*);
build/src/code/background.o(.text*);
build/src/code/music.o(.text*);
build/src/code/music.o(.data*);
build/src/code/music.o(.rodata*);
build/src/code/music.o(.sdata*);
. = ALIGN(., 0x10);
code_TEXT_END = .;
code_TEXT_SIZE = ABSOLUTE(code_TEXT_END - code_TEXT_START);

code_DATA_START = .;
build/src/code/main.o(.data*);
build/src/code/background.o(.data*);
build/src/code/background.o(.rodata*);
. = ALIGN(., 0x10);
code_DATA_END = .;
code_DATA_SIZE = ABSOLUTE(code_DATA_END - code_DATA_START);

code_RODATA_START = .;
build/src/code/main.o(.rodata*);
build/src/code/entities.o(.data*);
build/src/code/entities.o(.rodata*);
build/src/code/sfx.o(.text*);
build/src/code/sfx.o(.data*);
build/src/code/sfx.o(.rodata*);
build/src/code/sfx.o(.sdata*);
. = ALIGN(., 0x10);
code_RODATA_END = .;
code_RODATA_SIZE = ABSOLUTE(code_RODATA_END - code_RODATA_START);

code_SDATA_START = .;
build/src/code/main.o(.sdata*);
build/src/code/entities.o(.sdata*);
build/src/code/background.o(.sdata*);
. = ALIGN(., 0x10);
code_SDATA_END = .;
code_SDATA_SIZE = ABSOLUTE(code_SDATA_END - code_SDATA_START);
}

code_alloc_VRAM_END = .;
code_alloc_VRAM_SIZE = ABSOLUTE(code_alloc_VRAM_END - code_alloc_VRAM);

code_noload_VRAM = .;

.code.noload (NOLOAD) : SUBALIGN(16)
{
FILL(0x00000000);
code_SBSS_START = .;
build/src/code/main.o(.sbss*);
build/src/code/engine.o(.sbss*);
build/src/code/entities.o(.sbss*);
build/src/code/background.o(.sbss*);
build/src/code/music.o(.sbss*);
build/src/code/sfx.o(.sbss*);
. = ALIGN(., 0x10);
code_SBSS_END = .;
code_SBSS_SIZE = ABSOLUTE(code_SBSS_END - code_SBSS_START);

code_SCOMMON_START = .;
build/src/code/main.o(.scommon*);
build/src/code/engine.o(.scommon*);
build/src/code/entities.o(.scommon*);
build/src/code/background.o(.scommon*);
build/src/code/music.o(.scommon*);
build/src/code/sfx.o(.scommon*);
. = ALIGN(., 0x10);
code_SCOMMON_END = .;
code_SCOMMON_SIZE = ABSOLUTE(code_SCOMMON_END - code_SCOMMON_START);

code_BSS_START = .;
build/src/code/main.o(.bss*);
build/src/code/engine.o(.bss*);
build/src/code/entities.o(.bss*);
build/src/code/background.o(.bss*);
build/src/code/music.o(.bss*);
build/src/code/sfx.o(.bss*);
. = ALIGN(., 0x10);
code_BSS_END = .;
code_BSS_SIZE = ABSOLUTE(code_BSS_END - code_BSS_START);

codeCOMMON_START = .;
build/src/code/main.o(COMMON*);
build/src/code/engine.o(COMMON*);
build/src/code/entities.o(COMMON*);
build/src/code/background.o(COMMON*);
build/src/code/music.o(COMMON*);
build/src/code/sfx.o(COMMON*);
. = ALIGN(., 0x10);
codeCOMMON_END = .;
codeCOMMON_SIZE = ABSOLUTE(codeCOMMON_END - codeCOMMON_START);
}

code_noload_VRAM_END = .;
code_noload_VRAM_SIZE = ABSOLUTE(code_noload_VRAM_END - code_noload_VRAM);
code_VRAM_END = .;
code_VRAM_SIZE = ABSOLUTE(code_VRAM_END - code_VRAM);
__romPos += SIZEOF(.code);
code_ROM_END = __romPos;
code_ROM_SIZE = ABSOLUTE(code_ROM_END - code_ROM_START);

.shstrtab 0 :
{
*(.shstrtab);
}

/DISCARD/ :
{
*(.reginfo);
*(.MIPS.abiflags);
*(.MIPS.options);
*(.note.gnu.build-id);
*(.interp);
*(.eh_frame);
*(*);
}
}
13 changes: 13 additions & 0 deletions tests/test_cases/section_order_reorder.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
settings:
base_path: build

segments:
- name: code
fixed_vram: 0x80024C00
files:
- { path: src/code/main.o }
- { path: src/code/engine.o, section_order: { .text: .data, .data: .rodata, .rodata: .sdata, .sdata: .text } }
- { path: src/code/entities.o, section_order: { .data: .rodata } }
- { path: src/code/background.o, section_order: { .rodata: .data } }
- { path: src/code/music.o, section_order: { .rodata: .text, .sdata: .text, .data: .text } }
- { path: src/code/sfx.o, section_order: { .text: .rodata, .sdata: .rodata, .data: .rodata } }

0 comments on commit 34bd192

Please sign in to comment.