mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-21 09:14:34 +00:00
add swap tag to image creation
This commit is contained in:
parent
38f0002294
commit
fdbdea5ab0
3 changed files with 62 additions and 24 deletions
|
|
@ -14,6 +14,7 @@ use tools::tags::inif::IniF;
|
||||||
use tools::tags::inis::IniS;
|
use tools::tags::inis::IniS;
|
||||||
use tools::tags::memory::{MemoryRegion, MemoryRegions};
|
use tools::tags::memory::{MemoryRegion, MemoryRegions};
|
||||||
use tools::tags::pnam::ProcessNames;
|
use tools::tags::pnam::ProcessNames;
|
||||||
|
use tools::tags::swap::Swap;
|
||||||
use tools::tags::xkrn::XousKernel;
|
use tools::tags::xkrn::XousKernel;
|
||||||
use tools::utils::{parse_csr_csv, parse_u32};
|
use tools::utils::{parse_csr_csv, parse_u32};
|
||||||
use tools::xous_arguments::XousArguments;
|
use tools::xous_arguments::XousArguments;
|
||||||
|
|
@ -26,13 +27,6 @@ struct RamConfig {
|
||||||
memory_required: u32,
|
memory_required: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct SwapConfig {
|
|
||||||
offset: u32,
|
|
||||||
size: u32,
|
|
||||||
regions: MemoryRegions,
|
|
||||||
memory_required: u32,
|
|
||||||
}
|
|
||||||
|
|
||||||
fn csr_to_config(hv: tools::utils::CsrConfig, ram_config: &mut RamConfig) {
|
fn csr_to_config(hv: tools::utils::CsrConfig, ram_config: &mut RamConfig) {
|
||||||
let mut found_ram_name = None;
|
let mut found_ram_name = None;
|
||||||
fn round_mem(src: u32) -> u32 { (src + 4095) & !4095 }
|
fn round_mem(src: u32) -> u32 { (src + 4095) & !4095 }
|
||||||
|
|
@ -195,12 +189,7 @@ fn main() {
|
||||||
memory_required: 0,
|
memory_required: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut swap_config = SwapConfig {
|
let mut swap: Option<Swap> = None;
|
||||||
offset: Default::default(),
|
|
||||||
size: Default::default(),
|
|
||||||
regions: MemoryRegions::new(),
|
|
||||||
memory_required: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut process_names = ProcessNames::new();
|
let mut process_names = ProcessNames::new();
|
||||||
|
|
||||||
|
|
@ -333,7 +322,7 @@ fn main() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
swap_config.offset = match parse_u32(swap_parts[0]) {
|
let offset = match parse_u32(swap_parts[0]) {
|
||||||
Ok(o) => o,
|
Ok(o) => o,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("Error: Unable to parse {}: {:?}", swap_parts[0], e);
|
eprintln!("Error: Unable to parse {}: {:?}", swap_parts[0], e);
|
||||||
|
|
@ -341,7 +330,7 @@ fn main() {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
swap_config.size = match parse_u32(swap_parts[1]) {
|
let size = match parse_u32(swap_parts[1]) {
|
||||||
Ok(o) => o,
|
Ok(o) => o,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("Error: Unable to parse {}: {:?}", swap_parts[1], e);
|
eprintln!("Error: Unable to parse {}: {:?}", swap_parts[1], e);
|
||||||
|
|
@ -349,13 +338,13 @@ fn main() {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
swap_config.memory_required += swap_config.size / 4096;
|
swap = Some(Swap::new(offset, size));
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut args = XousArguments::new(ram_config.offset, ram_config.size, ram_config.name);
|
let mut args = XousArguments::new(ram_config.offset, ram_config.size, ram_config.name);
|
||||||
|
|
||||||
if !ram_config.regions.is_empty() {
|
if !ram_config.regions.is_empty() {
|
||||||
if !swap_config.regions.is_empty() {
|
if let Some(s) = swap {
|
||||||
// now process the swap region.
|
// now process the swap region.
|
||||||
#[cfg(any(feature = "precursor", feature = "renode"))]
|
#[cfg(any(feature = "precursor", feature = "renode"))]
|
||||||
{
|
{
|
||||||
|
|
@ -363,19 +352,16 @@ fn main() {
|
||||||
// so we can impose an artificial rule like "swap must be higher than RAM", instead
|
// so we can impose an artificial rule like "swap must be higher than RAM", instead
|
||||||
// of trying to handle the generic cases like "swap could be anywhere, maybe even
|
// of trying to handle the generic cases like "swap could be anywhere, maybe even
|
||||||
// a window inside RAM, or lower, or multiple fragments, or...".
|
// a window inside RAM, or lower, or multiple fragments, or...".
|
||||||
assert!(
|
assert!(s.offset > ram_config.offset, "swap is assumed to be at a higher address than RAM");
|
||||||
swap_config.offset > ram_config.offset,
|
|
||||||
"swap is assumed to be at a higher address than RAM"
|
|
||||||
);
|
|
||||||
// split the RAM space, if necessary, to accommodate swap
|
// split the RAM space, if necessary, to accommodate swap
|
||||||
if swap_config.offset < ram_config.offset + ram_config.size {
|
if s.offset < ram_config.offset + ram_config.size {
|
||||||
ram_config.size = swap_config.offset - ram_config.offset;
|
ram_config.size = s.offset - ram_config.offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Note that other configurations don't split RAM, since the swap is provisioned directly
|
// Note that other configurations don't split RAM, since the swap is provisioned directly
|
||||||
// in hardware, and thus, no post-processing is required.
|
// in hardware, and thus, no post-processing is required.
|
||||||
|
|
||||||
args.add(swap_config.regions);
|
args.add(s);
|
||||||
args.add(ram_config.regions);
|
args.add(ram_config.regions);
|
||||||
} else {
|
} else {
|
||||||
args.add(ram_config.regions);
|
args.add(ram_config.regions);
|
||||||
|
|
@ -467,5 +453,8 @@ fn main() {
|
||||||
println!("Arguments: {}", args);
|
println!("Arguments: {}", args);
|
||||||
|
|
||||||
println!("Runtime will require {} bytes to track memory allocations", ram_config.memory_required);
|
println!("Runtime will require {} bytes to track memory allocations", ram_config.memory_required);
|
||||||
|
if let Some(s) = swap {
|
||||||
|
println!("Runtime will also require {} bytes to track swap", s.size / 4096);
|
||||||
|
}
|
||||||
println!("Image created in file {}", output_filename);
|
println!("Image created in file {}", output_filename);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ pub mod inis;
|
||||||
pub mod memory;
|
pub mod memory;
|
||||||
pub mod pnam;
|
pub mod pnam;
|
||||||
pub mod xkrn;
|
pub mod xkrn;
|
||||||
|
pub mod swap;
|
||||||
|
|
||||||
pub(crate) const PAGE_SIZE: usize = 4096;
|
pub(crate) const PAGE_SIZE: usize = 4096;
|
||||||
|
|
||||||
|
|
|
||||||
48
tools/src/tags/swap.rs
Normal file
48
tools/src/tags/swap.rs
Normal file
|
|
@ -0,0 +1,48 @@
|
||||||
|
use std::fmt;
|
||||||
|
use std::io;
|
||||||
|
|
||||||
|
use crate::xous_arguments::{XousArgument, XousArgumentCode, XousSize};
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Clone, Copy)]
|
||||||
|
pub struct Swap {
|
||||||
|
/// Starting offset (in bytes)
|
||||||
|
pub offset: u32,
|
||||||
|
|
||||||
|
/// Length (in bytes)
|
||||||
|
pub size: u32,
|
||||||
|
|
||||||
|
/// Region name (as a type)
|
||||||
|
pub name: XousArgumentCode,
|
||||||
|
|
||||||
|
/// Unused
|
||||||
|
_padding: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for Swap {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
writeln!(f, " Swap: {:08x} - {:08x}", self.offset, self.offset + self.size)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Swap {
|
||||||
|
pub fn new(offset: XousSize, size: XousSize) -> Self {
|
||||||
|
Swap { offset, size, name: u32::from_le_bytes(*b"Swap") as XousArgumentCode, _padding: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl XousArgument for Swap {
|
||||||
|
fn code(&self) -> XousArgumentCode { self.name }
|
||||||
|
|
||||||
|
fn length(&self) -> XousSize { 16 as XousSize }
|
||||||
|
|
||||||
|
fn serialize(&self, output: &mut dyn io::Write) -> io::Result<usize> {
|
||||||
|
let mut written = 0;
|
||||||
|
output.write_all(&self.offset.to_le_bytes())?;
|
||||||
|
output.write_all(&self.size.to_le_bytes())?;
|
||||||
|
output.write_all(&self.name.to_le_bytes())?;
|
||||||
|
output.write_all(&0u32.to_le_bytes())?;
|
||||||
|
written += 4 * 4;
|
||||||
|
Ok(written)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue