diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 564b4b2b3..769e14446 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -36,6 +36,7 @@ print-panics = [] report-memory = ["stats_alloc"] wrap-print = [] # default = ["print-panics", "debug-print", "wrap-print"] +ditherpunk = [] default = ["print-panics", "gdbserver"] [target.'cfg(any(windows, unix))'.dependencies] diff --git a/kernel/src/arch/riscv/process.rs b/kernel/src/arch/riscv/process.rs index 9298cd66c..fcaec55db 100644 --- a/kernel/src/arch/riscv/process.rs +++ b/kernel/src/arch/riscv/process.rs @@ -13,7 +13,10 @@ use crate::services::ProcessInner; use xous_kernel::{ProcessInit, ProcessStartup, ThreadInit, PID, TID}; // use crate::args::KernelArguments; -pub const DEFAULT_STACK_SIZE: usize = 131072; +#[cfg(not(feature="ditherpunk"))] +pub const DEFAULT_STACK_SIZE: usize = 128 * 1024; +#[cfg(feature="ditherpunk")] // image processing needs a lot more stack space to run... +pub const DEFAULT_STACK_SIZE: usize = 1024 * 1024; pub const MAX_PROCESS_COUNT: usize = 64; // pub use crate::arch::mem::DEFAULT_STACK_TOP; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 6f307b195..699397ea5 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -194,7 +194,7 @@ fn main() -> Result<(), Box> { pkgs.push(app); } generate_app_menus(&apps); - renode_image(false, &pkgs, &[], None, None)? + renode_image(false, &pkgs, &[], None, None, None)? } Some("renode-test") => { let mut args = env::args(); @@ -211,7 +211,7 @@ fn main() -> Result<(), Box> { pkgs.push(app); } generate_app_menus(&apps); - renode_image(false, &cbtest_pkgs, &[], None, None)? + renode_image(false, &cbtest_pkgs, &[], None, None, None)? } Some("tts") => { let tmp_dir = tempfile::Builder::new().prefix("bins").tempdir()?; @@ -280,6 +280,7 @@ fn main() -> Result<(), Box> { Some(&["--features", "tts", "--features", "braille"]), &[&tts_exec_string], None, + None, )?; let mut locale_revert = OpenOptions::new() .read(true) @@ -307,13 +308,14 @@ fn main() -> Result<(), Box> { extra_packages.as_slice(), None, Some(&["--no-default-features", "--features", "renode-bypass", "--features", "debug-print"]), + None, )?; } else { build_hw_image(false, Some("./precursors/soc.svd".to_string()), &pkgs, None, None, None, - extra_packages.as_slice(), None)?; + extra_packages.as_slice(), None, None)?; } } Some("libstd-test") => { @@ -331,6 +333,7 @@ fn main() -> Result<(), Box> { extra_packages.as_slice(), None, Some(&["--features", "renode-bypass"]), + None, )?; } Some("ffi-test") => { @@ -353,6 +356,7 @@ fn main() -> Result<(), Box> { None, &[], Some(&["--features", "renode-bypass"]), + None, )? //renode_image(false, &pkgs, extra_packages.as_slice(), //None, Some(&["--features", "renode-bypass"]))?; @@ -376,15 +380,16 @@ fn main() -> Result<(), Box> { extra_packages.as_slice(), Some(&["--features", "renode-minimal"]), Some(&["--features", "renode-bypass"]), + None, )?; } Some("renode-aes-test") => { generate_app_menus(&Vec::::new()); - renode_image(false, &aestest_pkgs, &[], None, None)? + renode_image(false, &aestest_pkgs, &[], None, None, None)? } Some("renode-image-debug") => { generate_app_menus(&vec!["ball".to_string()]); - renode_image(true, &hw_pkgs, &[], None, None)? + renode_image(true, &hw_pkgs, &[], None, None, None)? } Some("pddb-ci") => { generate_app_menus(&Vec::::new()); @@ -465,6 +470,9 @@ fn main() -> Result<(), Box> { ]), &[], None, + Some(&[ + "--features", "ditherpunk", + ]), )? } Some("hw-image") => { @@ -489,6 +497,7 @@ fn main() -> Result<(), Box> { None, &[], None, + None, )? } Some("gfx-dev") => run( @@ -506,6 +515,7 @@ fn main() -> Result<(), Box> { None, &[], None, + None, )?, Some("pddb-hosted") => run(false, &pddb_dev_pkgs, None, false)?, Some("benchmark") => build_hw_image( @@ -517,6 +527,7 @@ fn main() -> Result<(), Box> { None, &[], None, + None, )?, Some("minimal") => build_hw_image( false, @@ -527,6 +538,7 @@ fn main() -> Result<(), Box> { None, &[], None, + None, )?, Some("cbtest") => build_hw_image( false, @@ -537,6 +549,7 @@ fn main() -> Result<(), Box> { None, &[], None, + None, )?, Some("trng-test") => { generate_app_menus(&Vec::::new()); @@ -549,6 +562,7 @@ fn main() -> Result<(), Box> { Some(&["--features", "urandomtest"]), &[], None, + None, )? } Some("ro-test") => { @@ -562,6 +576,7 @@ fn main() -> Result<(), Box> { Some(&["--features", "ringosctest"]), &[], None, + None, )? } Some("av-test") => { @@ -575,6 +590,7 @@ fn main() -> Result<(), Box> { Some(&["--features", "avalanchetest"]), &[], None, + None, )? } Some("sr-test") => build_hw_image( @@ -586,6 +602,7 @@ fn main() -> Result<(), Box> { None, &[], None, + None, )?, Some("burn-kernel") => update_usb(true, false, false, false)?, Some("burn-loader") => update_usb(false, true, false, false)?, @@ -796,6 +813,7 @@ fn build_hw_image( extra_args: Option<&[&str]>, extra_packages: &[&str], loader_features: Option<&[&str]>, + kernel_features: Option<&[&str]>, ) -> Result<(), DynError> { let svd_file = match svd { Some(s) => s, @@ -816,7 +834,7 @@ fn build_hw_image( let loaderkey_file = lkey.unwrap_or_else(|| "devkey/dev.key".into()); let kernelkey_file = kkey.unwrap_or_else(|| "devkey/dev.key".into()); - let kernel = build_kernel(debug)?; + let kernel = build_kernel(debug, kernel_features)?; let mut init = vec![]; let base_path = build( packages, @@ -965,6 +983,7 @@ fn renode_image( extra_packages: &[&str], xous_features: Option<&[&str]>, loader_features: Option<&[&str]>, + kernel_features: Option<&[&str]>, ) -> Result<(), DynError> { // Regenerate the Platform file let status = Command::new(cargo()) @@ -992,6 +1011,7 @@ fn renode_image( xous_features, extra_packages, loader_features, + kernel_features, ) } @@ -1056,8 +1076,8 @@ fn run( Ok(()) } -fn build_kernel(debug: bool) -> Result { - let mut path = build(&["kernel"], debug, Some(KERNEL_TARGET), None, None, None)?; +fn build_kernel(debug: bool, features: Option<&[&str]>) -> Result { + let mut path = build(&["kernel"], debug, Some(KERNEL_TARGET), None, None, features)?; path.push("kernel"); Ok(path) }