Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default to panic = "abort" #228

Merged
merged 18 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ members = [
"crates/private/support/sel4-simple-task/threading",
"crates/private/tests/capdl/threads/components/test",
"crates/private/tests/capdl/utcover/components/test",
"crates/private/tests/microkit/minimal",
"crates/private/tests/microkit/passive-server-with-deferred-action/pds/client",
"crates/private/tests/microkit/passive-server-with-deferred-action/pds/server",
"crates/private/tests/microkit/reset",
Expand Down
2 changes: 1 addition & 1 deletion crates/examples/microkit/banscii/pds/artist/Cargo.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mk {
sel4-microkit-message
banscii-artist-interface-types
;
sel4-microkit = localCrates.sel4-microkit // { default-features = false; features = [ "alloc" ]; };
sel4-microkit = localCrates.sel4-microkit // { features = [ "alloc" ]; };
sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
};
build-dependencies = {
Expand Down
6 changes: 1 addition & 5 deletions crates/examples/microkit/banscii/pds/artist/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,8 @@ license = "BSD-2-Clause"
banscii-artist-interface-types = { path = "interface-types" }
rsa = { version = "0.9.6", default-features = false, features = ["pem", "sha2"] }
sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
sel4-microkit = { path = "../../../../../sel4-microkit", features = ["alloc"] }
sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }

[dependencies.sel4-microkit]
path = "../../../../../sel4-microkit"
default-features = false
features = ["alloc"]

[build-dependencies]
rsa = "0.9.6"
2 changes: 1 addition & 1 deletion crates/examples/microkit/banscii/pds/assistant/Cargo.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ mk {
banscii-artist-interface-types
;
sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
sel4-microkit = localCrates.sel4-microkit // { default-features = false; features = [ "alloc" ]; };
sel4-microkit = localCrates.sel4-microkit // { features = [ "alloc" ]; };
};
}
6 changes: 1 addition & 5 deletions crates/examples/microkit/banscii/pds/assistant/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ banscii-assistant-core = { path = "core" }
embedded-hal-nb = "1.0"
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
sel4-microkit = { path = "../../../../../sel4-microkit", features = ["alloc"] }
sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }

[dependencies.sel4-microkit]
path = "../../../../../sel4-microkit"
default-features = false
features = ["alloc"]
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ mk {
package.name = "banscii-serial-driver";
dependencies = {
inherit (localCrates)
sel4-microkit
sel4-microkit-message
sel4-microkit-driver-adapters
;
sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
sel4-pl011-driver = localCrates.sel4-pl011-driver // { optional = true; };
};
features = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ license = "BSD-2-Clause"
board-qemu_virt_aarch64 = ["sel4-pl011-driver"]

[dependencies]
sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
sel4-microkit = { path = "../../../../../sel4-microkit" }
sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
sel4-pl011-driver = { path = "../../../../../drivers/pl011", optional = true }
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ mk {
dependencies = {
inherit (localCrates)
sel4-pl031-driver
sel4-microkit
sel4-microkit-driver-adapters
;
sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ edition = "2021"
license = "BSD-2-Clause"

[dependencies]
sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
sel4-microkit = { path = "../../../../../sel4-microkit" }
sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
sel4-pl031-driver = { path = "../../../../../drivers/pl031" }
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ mk {
];
};

sel4-microkit = localCrates.sel4-microkit // { default-features = false; features = [ "alloc" ]; };
sel4-microkit = localCrates.sel4-microkit // { features = [ "alloc" ]; };
sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };

microkit-http-server-example-server-core = localCrates.microkit-http-server-example-server-core // {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ sel4-driver-interfaces = { path = "../../../../../sel4-driver-interfaces" }
sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
sel4-immediate-sync-once-cell = { path = "../../../../../sel4-immediate-sync-once-cell" }
sel4-logging = { path = "../../../../../sel4-logging" }
sel4-microkit = { path = "../../../../../sel4-microkit", features = ["alloc"] }
sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
sel4-newlib = { path = "../../../../../sel4-newlib", features = ["nosys", "all-symbols"] }
Expand All @@ -44,11 +45,6 @@ sel4-sync = { path = "../../../../../sel4-sync" }
[dependencies.sel4-async-single-threaded-executor]
path = "../../../../../sel4-async/single-threaded-executor"

[dependencies.sel4-microkit]
path = "../../../../../sel4-microkit"
default-features = false
features = ["alloc"]

[dependencies.sel4-shared-ring-buffer-block-io-types]
path = "../../../../../sel4-shared-ring-buffer/block-io/types"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ mk {
package.name = "microkit-http-server-example-sp804-driver";
dependencies = {
inherit (localCrates)
sel4-microkit
sel4-microkit-message
sel4-microkit-driver-adapters
sel4-driver-interfaces
sel4-sp804-driver
;
sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ license = "BSD-2-Clause"

[dependencies]
sel4-driver-interfaces = { path = "../../../../../sel4-driver-interfaces" }
sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
sel4-microkit = { path = "../../../../../sel4-microkit" }
sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
sel4-sp804-driver = { path = "../../../../../drivers/sp804" }
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ mk {
virtio-drivers = virtioDriversWith [];

inherit (localCrates)
sel4-microkit
sel4-microkit-message
sel4
sel4-logging
Expand All @@ -28,6 +29,5 @@ mk {
;

sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ sel4-driver-interfaces = { path = "../../../../../sel4-driver-interfaces" }
sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
sel4-immediate-sync-once-cell = { path = "../../../../../sel4-immediate-sync-once-cell" }
sel4-logging = { path = "../../../../../sel4-logging" }
sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
sel4-microkit = { path = "../../../../../sel4-microkit" }
sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
sel4-shared-ring-buffer = { path = "../../../../../sel4-shared-ring-buffer" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ mk {
virtio-drivers = virtioDriversWith [ "alloc" ];

inherit (localCrates)
sel4-microkit
sel4-microkit-message
sel4-microkit-driver-adapters
sel4
Expand All @@ -26,6 +27,5 @@ mk {
;

sel4-externally-shared = localCrates.sel4-externally-shared // { features = [ "unstable" ]; };
sel4-microkit = localCrates.sel4-microkit // { default-features = false; };
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sel4-bounce-buffer-allocator = { path = "../../../../../sel4-bounce-buffer-alloc
sel4-externally-shared = { path = "../../../../../sel4-externally-shared", features = ["unstable"] }
sel4-immediate-sync-once-cell = { path = "../../../../../sel4-immediate-sync-once-cell" }
sel4-logging = { path = "../../../../../sel4-logging" }
sel4-microkit = { path = "../../../../../sel4-microkit", default-features = false }
sel4-microkit = { path = "../../../../../sel4-microkit" }
sel4-microkit-driver-adapters = { path = "../../../../../sel4-microkit/driver-adapters" }
sel4-microkit-message = { path = "../../../../../sel4-microkit/message" }
sel4-shared-ring-buffer = { path = "../../../../../sel4-shared-ring-buffer" }
Expand Down
2 changes: 1 addition & 1 deletion crates/examples/root-task/spawn-task/child/Cargo.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mk {
sel4-ctors-dtors
;
sel4-panicking = localCrates.sel4-panicking // {
features = [ "unwinding" "alloc" ];
features = [ "alloc" ];
};
sel4-runtime-common = localCrates.sel4-runtime-common // {
features = [ "start" "tls" "unwinding" ];
Expand Down
2 changes: 1 addition & 1 deletion crates/examples/root-task/spawn-task/child/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ cfg-if = "1.0.0"
sel4 = { path = "../../../../sel4" }
sel4-ctors-dtors = { path = "../../../../sel4-ctors-dtors" }
sel4-dlmalloc = { path = "../../../../sel4-dlmalloc" }
sel4-panicking = { path = "../../../../sel4-panicking", features = ["unwinding", "alloc"] }
sel4-panicking = { path = "../../../../sel4-panicking", features = ["alloc"] }
sel4-panicking-env = { path = "../../../../sel4-panicking/env" }
sel4-sync = { path = "../../../../sel4-sync" }

Expand Down
16 changes: 16 additions & 0 deletions crates/private/tests/microkit/minimal/Cargo.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#
# Copyright 2024, Colias Group, LLC
#
# SPDX-License-Identifier: BSD-2-Clause
#

{ mk, localCrates }:

mk {
package.name = "tests-microkit-minimal";
dependencies = {
inherit (localCrates)
sel4-microkit
;
};
}
20 changes: 20 additions & 0 deletions crates/private/tests/microkit/minimal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# Copyright 2023, Colias Group, LLC
#
# SPDX-License-Identifier: BSD-2-Clause
#
#
# This file is generated from './Cargo.nix'. You can edit this file directly
# if you are not using this project's Cargo manifest management tools.
# See 'hacking/cargo-manifest-management/README.md' for more information.
#

[package]
name = "tests-microkit-minimal"
version = "0.1.0"
authors = ["Nick Spinale <nick.spinale@coliasgroup.com>"]
edition = "2021"
license = "BSD-2-Clause"

[dependencies]
sel4-microkit = { path = "../../../../sel4-microkit" }
16 changes: 16 additions & 0 deletions crates/private/tests/microkit/minimal/src/bin/test.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// Copyright 2024, Colias Group, LLC
//
// SPDX-License-Identifier: BSD-2-Clause
//

#![no_std]
#![no_main]

use sel4_microkit::{debug_println, protection_domain, NullHandler};

#[protection_domain]
fn init() -> NullHandler {
debug_println!("TEST_PASS");
NullHandler::new()
}
11 changes: 11 additions & 0 deletions crates/private/tests/microkit/minimal/x.system
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2024, Colias Group, LLC

SPDX-License-Identifier: BSD-2-Clause
-->
<system>
<protection_domain name="test" priority="128">
<program_image path="test.elf" />
</protection_domain>
</system>
2 changes: 1 addition & 1 deletion crates/private/tests/root-task/backtrace/Cargo.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ mk {
sel4
sel4-backtrace-embedded-debug-info
;
sel4-root-task = localCrates.sel4-root-task // { features = [ "alloc" "single-threaded" ]; };
sel4-root-task = localCrates.sel4-root-task // { features = [ "alloc" ]; };
sel4-backtrace-simple = localCrates.sel4-backtrace-simple // { features = [ "alloc" ]; };
sel4-backtrace = localCrates.sel4-backtrace // { features = [ "full" ]; };
sel4-backtrace-types = localCrates.sel4-backtrace-types // { features = [ "full" ]; };
Expand Down
2 changes: 1 addition & 1 deletion crates/private/tests/root-task/backtrace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ sel4-backtrace = { path = "../../../../sel4-backtrace", features = ["full"] }
sel4-backtrace-embedded-debug-info = { path = "../../../../sel4-backtrace/embedded-debug-info" }
sel4-backtrace-simple = { path = "../../../../sel4-backtrace/simple", features = ["alloc"] }
sel4-backtrace-types = { path = "../../../../sel4-backtrace/types", features = ["full"] }
sel4-root-task = { path = "../../../../sel4-root-task", features = ["alloc", "single-threaded"] }
sel4-root-task = { path = "../../../../sel4-root-task", features = ["alloc"] }
2 changes: 1 addition & 1 deletion crates/sel4-capdl-initializer/Cargo.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mk {
sel4-logging
sel4-sync
;
sel4-root-task = localCrates.sel4-root-task // { default-features = false; features = [ "single-threaded" ]; };
sel4-root-task = localCrates.sel4-root-task // { features = [ "single-threaded" ]; };
sel4-capdl-initializer-types = localCrates.sel4-capdl-initializer-types // { features = [ "alloc" "serde" "deflate" ]; };
};
# features = {
Expand Down
6 changes: 1 addition & 5 deletions crates/sel4-capdl-initializer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,5 @@ sel4-capdl-initializer-core = { path = "core" }
sel4-capdl-initializer-types = { path = "types", features = ["alloc", "serde", "deflate"] }
sel4-dlmalloc = { path = "../sel4-dlmalloc" }
sel4-logging = { path = "../sel4-logging" }
sel4-root-task = { path = "../sel4-root-task", features = ["single-threaded"] }
sel4-sync = { path = "../sel4-sync" }

[dependencies.sel4-root-task]
path = "../sel4-root-task"
default-features = false
features = ["single-threaded"]
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mk {
sel4
sel4-logging
;
sel4-root-task = localCrates.sel4-root-task // { default-features = false; features = [ "single-threaded" ]; };
sel4-root-task = localCrates.sel4-root-task // { features = [ "single-threaded" ]; };
};
build-dependencies = {
inherit (localCrates)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ sel4-capdl-initializer-core = { path = "../core" }
sel4-capdl-initializer-types = { path = "../types" }
sel4-capdl-initializer-with-embedded-spec-embedded-spec = { path = "embedded-spec" }
sel4-logging = { path = "../../sel4-logging" }

[dependencies.sel4-root-task]
path = "../../sel4-root-task"
default-features = false
features = ["single-threaded"]
sel4-root-task = { path = "../../sel4-root-task", features = ["single-threaded"] }

[build-dependencies.sel4-capdl-initializer-with-embedded-spec-embedded-spec-validate]
path = "embedded-spec/validate"
Loading
Loading