Skip to content

Commit

Permalink
Start working on included/excluded files controlled by cli args
Browse files Browse the repository at this point in the history 
#33
  • Loading branch information
@AngheloAlf
AngheloAlf committed Jul 12, 2024
1 parent 45b723b commit cdd59f9
Show file tree
Hide file tree
Showing 5 changed files with 341 additions and 16 deletions.
51 changes: 51 additions & 0 deletions slinky/src/file_info.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,31 @@ pub struct FileInfo {
// Used for groups
pub files: Vec<FileInfo>,
pub dir: PathBuf,

pub include_if_any: Vec<(String, String)>,
pub include_if_all: Vec<(String, String)>,
pub exclude_if_any: Vec<(String, String)>,
pub exclude_if_all: Vec<(String, String)>,
}

impl FileInfo {
pub fn new_object(p: PathBuf) -> Self {
Self {
path: p,
kind: FileKind::Object,
subfile: "".into(),
pad_amount: 0,
section: "".into(),
linker_offset_name: "".into(),
section_order: HashMap::new(),
files: Vec::new(),
dir: PathBuf::new(),
include_if_any: Vec::new(),
include_if_all: Vec::new(),
exclude_if_any: Vec::new(),
exclude_if_all: Vec::new(),
}
}
}

#[derive(Deserialize, PartialEq, Debug)]
Expand Down Expand Up @@ -57,6 +82,15 @@ pub(crate) struct FileInfoSerial {
pub files: AbsentNullable<Vec<FileInfoSerial>>,
#[serde(default)]
pub dir: AbsentNullable<PathBuf>,

#[serde(default)]
pub include_if_any: AbsentNullable<Vec<(String, String)>>,
#[serde(default)]
pub include_if_all: AbsentNullable<Vec<(String, String)>>,
#[serde(default)]
pub exclude_if_any: AbsentNullable<Vec<(String, String)>>,
#[serde(default)]
pub exclude_if_all: AbsentNullable<Vec<(String, String)>>,
}

impl FileInfoSerial {
Expand Down Expand Up @@ -203,6 +237,19 @@ impl FileInfoSerial {
FileKind::Group => self.dir.get_non_null("dir", PathBuf::default)?,
};

let include_if_any = self
.include_if_any
.get_non_null("include_if_any", Vec::new)?;
let include_if_all = self
.include_if_all
.get_non_null("include_if_all", Vec::new)?;
let exclude_if_any = self
.exclude_if_any
.get_non_null("exclude_if_any", Vec::new)?;
let exclude_if_all = self
.exclude_if_all
.get_non_null("exclude_if_all", Vec::new)?;

Ok(FileInfo {
path,
kind,
Expand All @@ -213,6 +260,10 @@ impl FileInfoSerial {
section_order,
files,
dir,
include_if_any,
include_if_all,
exclude_if_any,
exclude_if_all,
})
}
}
37 changes: 37 additions & 0 deletions slinky/src/linker_writer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,43 @@ impl LinkerWriter<'_> {
section: &str,
base_path: &Path,
) -> Result<(), SlinkyError> {
if file
.exclude_if_any
.iter()
.any(|(key, value)| self.d.custom_options.get(key) == Some(value))
{
return Ok(());
}
if !file.exclude_if_all.is_empty()
&& file
.exclude_if_all
.iter()
.all(|(key, value)| self.d.custom_options.get(key) == Some(value))
{
return Ok(());
}

if !file.include_if_any.is_empty() || !file.include_if_all.is_empty() {
// If neither include fields match the options then we do not emit this entry

let mut exit = false;
if !file.include_if_any.is_empty() {
exit = !file
.include_if_any
.iter()
.any(|(key, value)| self.d.custom_options.get(key) == Some(value));
}
if (exit || file.include_if_any.is_empty()) && !file.include_if_all.is_empty() {
exit = !file
.include_if_all
.iter()
.all(|(key, value)| self.d.custom_options.get(key) == Some(value));
}
if exit {
return Ok(());
}
}

let style = &self.d.settings.linker_symbols_style;

let wildcard = if segment.wildcard_sections { "*" } else { "" };
Expand Down
19 changes: 3 additions & 16 deletions slinky/src/partial_linker_writer.rs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
/* SPDX-FileCopyrightText: © 2024 decompals */
/* SPDX-License-Identifier: MIT */

use std::{
collections::HashMap,
path::{Path, PathBuf},
};
use std::path::{Path, PathBuf};

use crate::{Document, FileInfo, FileKind, LinkerWriter, Segment, SlinkyError};
use crate::{Document, FileInfo, LinkerWriter, Segment, SlinkyError};

pub struct PartialLinkerWriter<'a> {
main_writer: LinkerWriter<'a>,
Expand Down Expand Up @@ -48,17 +45,7 @@ impl<'a> PartialLinkerWriter<'a> {
p.push(&format!("{}.o", segment.name));

let mut reference_segment = segment.clone();
reference_segment.files = vec![FileInfo {
path: p,
kind: FileKind::Object,
subfile: "".into(),
pad_amount: 0,
section: "".into(),
linker_offset_name: "".into(),
section_order: HashMap::new(),
files: Vec::new(),
dir: PathBuf::new(),
}];
reference_segment.files = vec![FileInfo::new_object(p)];
self.main_writer.add_segment(&reference_segment)?;
}

Expand Down
213 changes: 213 additions & 0 deletions tests/test_cases/conditional_includes.ld
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
SECTIONS
{
__romPos = 0x0;

boot_ROM_START = __romPos;
boot_VRAM = ADDR(.boot);
boot_alloc_VRAM = .;

.boot 0x80000460 : AT(boot_ROM_START) SUBALIGN(16)
{
FILL(0x00000000);
boot_TEXT_START = .;
build/us/src/boot/boot_main.o(.text*);
build/us/src/boot/file1.o(.text*);
build/us/src/boot/file3.o(.text*);
build/us/src/boot/file4.o(.text*);
build/us/src/boot/file8.o(.text*);
build/us/src/boot/file9.o(.text*);
build/us/src/boot/dmadata.o(.text*);
build/us/src/boot/file12.o(.text*);
build/us/src/boot/file15.o(.text*);
build/us/src/boot/file16.o(.text*);
build/us/src/boot/file17.o(.text*);
build/us/src/boot/util.o(.text*);
build/us/src/boot/file21.o(.text*);
build/us/src/boot/file24.o(.text*);
build/us/src/boot/file28.o(.text*);
build/us/src/boot/file29.o(.text*);
. = ALIGN(., 0x10);
boot_TEXT_END = .;
boot_TEXT_SIZE = ABSOLUTE(boot_TEXT_END - boot_TEXT_START);

boot_DATA_START = .;
build/us/src/boot/boot_main.o(.data*);
build/us/src/boot/file1.o(.data*);
build/us/src/boot/file3.o(.data*);
build/us/src/boot/file4.o(.data*);
build/us/src/boot/file8.o(.data*);
build/us/src/boot/file9.o(.data*);
build/us/src/boot/dmadata.o(.data*);
build/us/src/boot/file12.o(.data*);
build/us/src/boot/file15.o(.data*);
build/us/src/boot/file16.o(.data*);
build/us/src/boot/file17.o(.data*);
build/us/src/boot/util.o(.data*);
build/us/src/boot/file21.o(.data*);
build/us/src/boot/file24.o(.data*);
build/us/src/boot/file28.o(.data*);
build/us/src/boot/file29.o(.data*);
. = ALIGN(., 0x10);
boot_DATA_END = .;
boot_DATA_SIZE = ABSOLUTE(boot_DATA_END - boot_DATA_START);

boot_RODATA_START = .;
build/us/src/boot/boot_main.o(.rodata*);
build/us/src/boot/file1.o(.rodata*);
build/us/src/boot/file3.o(.rodata*);
build/us/src/boot/file4.o(.rodata*);
build/us/src/boot/file8.o(.rodata*);
build/us/src/boot/file9.o(.rodata*);
build/us/src/boot/dmadata.o(.rodata*);
build/us/src/boot/file12.o(.rodata*);
build/us/src/boot/file15.o(.rodata*);
build/us/src/boot/file16.o(.rodata*);
build/us/src/boot/file17.o(.rodata*);
build/us/src/boot/util.o(.rodata*);
build/us/src/boot/file21.o(.rodata*);
build/us/src/boot/file24.o(.rodata*);
build/us/src/boot/file28.o(.rodata*);
build/us/src/boot/file29.o(.rodata*);
. = ALIGN(., 0x10);
boot_RODATA_END = .;
boot_RODATA_SIZE = ABSOLUTE(boot_RODATA_END - boot_RODATA_START);

boot_SDATA_START = .;
build/us/src/boot/boot_main.o(.sdata*);
build/us/src/boot/file1.o(.sdata*);
build/us/src/boot/file3.o(.sdata*);
build/us/src/boot/file4.o(.sdata*);
build/us/src/boot/file8.o(.sdata*);
build/us/src/boot/file9.o(.sdata*);
build/us/src/boot/dmadata.o(.sdata*);
build/us/src/boot/file12.o(.sdata*);
build/us/src/boot/file15.o(.sdata*);
build/us/src/boot/file16.o(.sdata*);
build/us/src/boot/file17.o(.sdata*);
build/us/src/boot/util.o(.sdata*);
build/us/src/boot/file21.o(.sdata*);
build/us/src/boot/file24.o(.sdata*);
build/us/src/boot/file28.o(.sdata*);
build/us/src/boot/file29.o(.sdata*);
. = ALIGN(., 0x10);
boot_SDATA_END = .;
boot_SDATA_SIZE = ABSOLUTE(boot_SDATA_END - boot_SDATA_START);
}

boot_alloc_VRAM_END = .;
boot_alloc_VRAM_SIZE = ABSOLUTE(boot_alloc_VRAM_END - boot_alloc_VRAM);

boot_noload_VRAM = .;

.boot.noload (NOLOAD) : SUBALIGN(16)
{
FILL(0x00000000);
boot_SBSS_START = .;
build/us/src/boot/boot_main.o(.sbss*);
build/us/src/boot/file1.o(.sbss*);
build/us/src/boot/file3.o(.sbss*);
build/us/src/boot/file4.o(.sbss*);
build/us/src/boot/file8.o(.sbss*);
build/us/src/boot/file9.o(.sbss*);
build/us/src/boot/dmadata.o(.sbss*);
build/us/src/boot/file12.o(.sbss*);
build/us/src/boot/file15.o(.sbss*);
build/us/src/boot/file16.o(.sbss*);
build/us/src/boot/file17.o(.sbss*);
build/us/src/boot/util.o(.sbss*);
build/us/src/boot/file21.o(.sbss*);
build/us/src/boot/file24.o(.sbss*);
build/us/src/boot/file28.o(.sbss*);
build/us/src/boot/file29.o(.sbss*);
. = ALIGN(., 0x10);
boot_SBSS_END = .;
boot_SBSS_SIZE = ABSOLUTE(boot_SBSS_END - boot_SBSS_START);

boot_SCOMMON_START = .;
build/us/src/boot/boot_main.o(.scommon*);
build/us/src/boot/file1.o(.scommon*);
build/us/src/boot/file3.o(.scommon*);
build/us/src/boot/file4.o(.scommon*);
build/us/src/boot/file8.o(.scommon*);
build/us/src/boot/file9.o(.scommon*);
build/us/src/boot/dmadata.o(.scommon*);
build/us/src/boot/file12.o(.scommon*);
build/us/src/boot/file15.o(.scommon*);
build/us/src/boot/file16.o(.scommon*);
build/us/src/boot/file17.o(.scommon*);
build/us/src/boot/util.o(.scommon*);
build/us/src/boot/file21.o(.scommon*);
build/us/src/boot/file24.o(.scommon*);
build/us/src/boot/file28.o(.scommon*);
build/us/src/boot/file29.o(.scommon*);
. = ALIGN(., 0x10);
boot_SCOMMON_END = .;
boot_SCOMMON_SIZE = ABSOLUTE(boot_SCOMMON_END - boot_SCOMMON_START);

boot_BSS_START = .;
build/us/src/boot/boot_main.o(.bss*);
build/us/src/boot/file1.o(.bss*);
build/us/src/boot/file3.o(.bss*);
build/us/src/boot/file4.o(.bss*);
build/us/src/boot/file8.o(.bss*);
build/us/src/boot/file9.o(.bss*);
build/us/src/boot/dmadata.o(.bss*);
build/us/src/boot/file12.o(.bss*);
build/us/src/boot/file15.o(.bss*);
build/us/src/boot/file16.o(.bss*);
build/us/src/boot/file17.o(.bss*);
build/us/src/boot/util.o(.bss*);
build/us/src/boot/file21.o(.bss*);
build/us/src/boot/file24.o(.bss*);
build/us/src/boot/file28.o(.bss*);
build/us/src/boot/file29.o(.bss*);
. = ALIGN(., 0x10);
boot_BSS_END = .;
boot_BSS_SIZE = ABSOLUTE(boot_BSS_END - boot_BSS_START);

bootCOMMON_START = .;
build/us/src/boot/boot_main.o(COMMON*);
build/us/src/boot/file1.o(COMMON*);
build/us/src/boot/file3.o(COMMON*);
build/us/src/boot/file4.o(COMMON*);
build/us/src/boot/file8.o(COMMON*);
build/us/src/boot/file9.o(COMMON*);
build/us/src/boot/dmadata.o(COMMON*);
build/us/src/boot/file12.o(COMMON*);
build/us/src/boot/file15.o(COMMON*);
build/us/src/boot/file16.o(COMMON*);
build/us/src/boot/file17.o(COMMON*);
build/us/src/boot/util.o(COMMON*);
build/us/src/boot/file21.o(COMMON*);
build/us/src/boot/file24.o(COMMON*);
build/us/src/boot/file28.o(COMMON*);
build/us/src/boot/file29.o(COMMON*);
. = ALIGN(., 0x10);
bootCOMMON_END = .;
bootCOMMON_SIZE = ABSOLUTE(bootCOMMON_END - bootCOMMON_START);
}

boot_noload_VRAM_END = .;
boot_noload_VRAM_SIZE = ABSOLUTE(boot_noload_VRAM_END - boot_noload_VRAM);
boot_VRAM_END = .;
boot_VRAM_SIZE = ABSOLUTE(boot_VRAM_END - boot_VRAM);
__romPos += SIZEOF(.boot);
boot_ROM_END = __romPos;
boot_ROM_SIZE = ABSOLUTE(boot_ROM_END - boot_ROM_START);

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

/DISCARD/ :
{
*(.reginfo);
*(.MIPS.abiflags);
*(.MIPS.options);
*(.note.gnu.build-id);
*(.interp);
*(.eh_frame);
*(*);
}
}
Loading

0 comments on commit cdd59f9

Please sign in to comment.