Fail to build if tasks may overflow (#1890)

oxidecomputer · Oct 9, 2024 · 9144307 · 9144307
1 parent 4b74549
commit 9144307
Show file tree

Hide file tree

Showing 8 changed files with 377 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,6 +38,7 @@ bitflags = { version = "2.5.0", default-features = false }
 bstringify = { version = "0.1.2", default-features = false }
 byteorder = { version = "1.3.4", default-features = false }
 bzip2-rs = { version = "0.1.2", default-features = false }
+capstone = { version = "0.12.0", default-features = false, features = ["full"] }
 cargo_metadata = { version = "0.12.0", default-features = false }
 cfg-if = { version = "1", default-features = false }
 chrono = { version = "0.4", default-features = false }
@@ -70,6 +71,7 @@ hubpack = { version = "0.1.2", default-features = false }
 indexmap = { version = "1.4.0", default-features = false, features = ["serde-1"] }
 indoc = { version = "2.0.3", default-features = false }
 itertools = { version = "0.10.5", default-features = false }
+leb128 = { version = "0.2.5", default-features = false }
 lpc55-pac = { version = "0.4", default-features = false }
 memchr = { version = "2.4", default-features = false }
 memoffset = { version = "0.6.5", default-features = false }
@@ -90,6 +92,7 @@ rand_core = { version = "0.6", default-features = false }
 rangemap = { version = "1.3", default-features = false }
 regex = { version = "1", default-features = false, features = ["std", "perf", "unicode-perl"] }
 ron = { version = "0.8", default-features = false }
+rustc-demangle = { version = "0.1.24", default-features = false }
 scroll = { version = "0.10", default-features = false }
 serde = { version = "1.0.114", default-features = false, features = ["derive"] }
 serde-big-array = { version = "0.4", default-features = false }

diff --git a/app/demo-stm32g0-nucleo/app-g070.toml b/app/demo-stm32g0-nucleo/app-g070.toml
@@ -65,8 +65,8 @@ stacksize = 256
 name = "task-ping"
 features = ["uart", "no-ipc-counters"]
 priority = 4
-max-sizes = {flash = 8192, ram = 512}
-stacksize = 256
+max-sizes = {flash = 8192, ram = 1024}
+stacksize = 512
 start = true
 task-slots = [{peer = "pong"}, "usart_driver"]
 

diff --git a/app/gimletlet/app.toml b/app/gimletlet/app.toml
@@ -55,7 +55,7 @@ tasks = ["control_plane_agent", "caboose_reader"]
 name = "task-control-plane-agent"
 priority = 7
 max-sizes = {flash = 131072, ram = 32768}
-stacksize = 4096
+stacksize = 6000
 start = true
 uses = ["usart1"]
 task-slots = [

diff --git a/build/xtask/Cargo.toml b/build/xtask/Cargo.toml
@@ -17,6 +17,7 @@ toml_edit = { workspace = true }
 # for dist
 byteorder = { workspace = true }
 bzip2-rs = { workspace = true }
+capstone = { workspace = true }
 ctrlc = { workspace = true }
 dunce = { workspace = true }
 filetime = { workspace = true }
@@ -25,6 +26,7 @@ goblin = { workspace = true }
 hex = "0.4"
 hubtools = { workspace = true }
 indexmap = { workspace = true }
+leb128 = { workspace = true }
 multimap = { workspace = true }
 path-slash = { workspace = true }
 rangemap = { workspace = true }
@@ -34,6 +36,7 @@ scroll = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 sha3 = { workspace = true }
+rustc-demangle = { workspace = true }
 tlvc = { workspace = true }
 tlvc-text = { workspace = true }
 toml = { workspace = true }

diff --git a/build/xtask/src/config.rs b/build/xtask/src/config.rs
@@ -702,6 +702,7 @@ impl BuildConfig<'_> {
         // nightly features that we use:
         nightly_features.extend([
             "asm_const",
+            "emit_stack_sizes",
             "naked_functions",
             "used_with_arg",
         ]);