Rename elf/stack to build-elf/build-stack for consistency

Author: jamesmunns

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "elf"
+name = "build-elf"
 version = "0.1.0"
 edition = "2024"
 

build/elf/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "stack"
+name = "build-stack"
 version = "0.1.0"
 edition = "2024"
 
@@ -10,7 +10,7 @@ capstone = { workspace = true }
 rustc-demangle = { workspace = true }
 leb128 = { workspace = true }
 
-elf = { path = "../elf" }
+build-elf = { path = "../elf" }
 
 [lints]
 workspace = true

build/stack/Cargo.toml

@@ -26,7 +26,7 @@ pub fn get_max_stack(
 
     // Read the .stack_sizes section, which is an array of
     // `(address: u32, stack size: unsigned leb128)` tuples
-    let sizes = elf::get_section_by_name(&elf, ".stack_sizes")
+    let sizes = build_elf::get_section_by_name(&elf, ".stack_sizes")
         .context("could not get .stack_sizes")?;
     let mut sizes = &data[sizes.sh_offset as usize..][..sizes.sh_size as usize];
     let mut addr_to_frame_size = BTreeMap::new();
@@ -75,7 +75,7 @@ pub fn get_max_stack(
         calls: BTreeSet<u32>,
     }
 
-    let text = elf::get_section_by_name(&elf, ".text")
+    let text = build_elf::get_section_by_name(&elf, ".text")
         .context("could not get .text")?;
 
     use capstone::{

build/stack/src/lib.rs

@@ -21,7 +21,7 @@ ctrlc = { workspace = true }
 directories = { workspace = true }
 digest-io = { workspace = true }
 dunce = { workspace = true }
-elf = { path = "../elf" }
+build-elf = { path = "../elf" }
 filetime = { workspace = true }
 fnv = { workspace = true }
 glob = { workspace = true }
@@ -40,7 +40,7 @@ scroll = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 sha3 = { workspace = true }
-stack = { path = "../stack" }
+build-stack = { path = "../stack" }
 tlvc = { workspace = true }
 tlvc-text = { workspace = true }
 toml = { workspace = true }

build/xtask/Cargo.toml

@@ -22,7 +22,7 @@ impl scroll::ctx::TryFromCtx<'_, &goblin::elf::Elf<'_>>
         src: &[u8],
         elf: &goblin::elf::Elf<'_>,
     ) -> Result<(Self, usize), Self::Error> {
-        let endianness = elf::get_endianness(elf);
+        let endianness = build_elf::get_endianness(elf);
         let src_offset = &mut 0;
 
         let caboose_pos_address = if elf.is_64 {
@@ -32,7 +32,7 @@ impl scroll::ctx::TryFromCtx<'_, &goblin::elf::Elf<'_>>
         };
 
         let caboose_pos_file_offset =
-            elf::get_file_offset_by_vma(elf, caboose_pos_address)
+            build_elf::get_file_offset_by_vma(elf, caboose_pos_address)
                 .context("could not get caboose pos file offset")?;
 
         Ok((
@@ -52,7 +52,7 @@ pub fn get_caboose_pos_table_entry(
     // If the section isn't present, then we're not reading the caboose position
     // from this task.
     let Some(caboose_pos_table_section) =
-        elf::get_section_by_name(elf, CABOOSE_POS_TABLE_SECTION)
+        build_elf::get_section_by_name(elf, CABOOSE_POS_TABLE_SECTION)
     else {
         return Ok(None);
     };

build/xtask/src/caboose_pos.rs

@@ -13,10 +13,10 @@ use std::process::{Command, Stdio};
 
 use anyhow::{Context, Result, anyhow, bail};
 use atty::Stream;
+use build_stack::get_max_stack;
 use indexmap::IndexMap;
 use multimap::MultiMap;
 use path_slash::{PathBufExt, PathExt};
-use stack::get_max_stack;
 use zerocopy::IntoBytes;
 
 use crate::{
@@ -3193,7 +3193,7 @@ fn resolve_task_slots(
     for entry in task_slot::get_task_slot_table_entries(&in_task_bin, &elf)? {
         let in_task_idx = in_task_bin.pread_with::<u16>(
             entry.taskidx_file_offset as usize,
-            elf::get_endianness(&elf),
+            build_elf::get_endianness(&elf),
         )?;
 
         let target_task_name = match task_toml.task_slots.get(entry.slot_name) {
@@ -3222,7 +3222,7 @@ fn resolve_task_slots(
         out_task_bin.pwrite_with::<u16>(
             target_task_idx as u16,
             entry.taskidx_file_offset as usize,
-            elf::get_endianness(&elf),
+            build_elf::get_endianness(&elf),
         )?;
 
         if cfg.verbose {
@@ -3257,12 +3257,12 @@ fn resolve_caboose_pos(
         out_task_bin.pwrite_with::<u32>(
             start,
             entry.caboose_pos_file_offset as usize,
-            elf::get_endianness(&elf),
+            build_elf::get_endianness(&elf),
         )?;
         out_task_bin.pwrite_with::<u32>(
             end,
             entry.caboose_pos_file_offset as usize + 4,
-            elf::get_endianness(&elf),
+            build_elf::get_endianness(&elf),
         )?;
 
         if cfg.verbose {

build/xtask/src/dist.rs

@@ -18,7 +18,7 @@ use crate::{
     Config,
     dist::{Allocations, ContiguousRanges, DEFAULT_KERNEL_STACK},
 };
-use stack::get_max_stack;
+use build_stack::get_max_stack;
 
 #[derive(Debug)]
 struct TaskSizes<'a> {

build/xtask/src/sizes.rs

@@ -24,7 +24,7 @@ impl<'a> scroll::ctx::TryFromCtx<'a, &goblin::elf::Elf<'a>>
         src: &'a [u8],
         elf: &goblin::elf::Elf<'a>,
     ) -> Result<(Self, usize), Self::Error> {
-        let endianness = elf::get_endianness(elf);
+        let endianness = build_elf::get_endianness(elf);
         let src_offset = &mut 0;
 
         let taskidx_address = if elf.is_64 {
@@ -45,7 +45,7 @@ impl<'a> scroll::ctx::TryFromCtx<'a, &goblin::elf::Elf<'a>>
         )?;
 
         let taskidx_file_offset =
-            elf::get_file_offset_by_vma(elf, taskidx_address).context(
+            build_elf::get_file_offset_by_vma(elf, taskidx_address).context(
                 format!("slot '{slot_name}' points to non-existent address"),
             )?;
 
@@ -65,7 +65,7 @@ pub fn get_task_slot_table_entries<'a>(
     elf: &goblin::elf::Elf<'a>,
 ) -> Result<Vec<TaskSlotTableEntry<'a>>> {
     let task_slot_table_section =
-        match elf::get_section_by_name(elf, TASK_SLOT_TABLE_SECTION) {
+        match build_elf::get_section_by_name(elf, TASK_SLOT_TABLE_SECTION) {
             Some(task_slot_table_section) => task_slot_table_section,
             _ => bail!("No {TASK_SLOT_TABLE_SECTION} section"),
         };
@@ -96,7 +96,7 @@ pub fn dump_task_slot_table(task_path: &Path) -> Result<()> {
     for entry in get_task_slot_table_entries(&task_bin, &elf)? {
         let task_idx = task_bin.pread_with::<u16>(
             entry.taskidx_file_offset as usize,
-            elf::get_endianness(&elf),
+            build_elf::get_endianness(&elf),
         )?;
 
         println!(