Skip to content
Snippets Groups Projects
Commit 69f63ad0 authored by Per's avatar Per
Browse files

Local paths to cortex-m/rt

parent 37acafe3
No related branches found
No related tags found
No related merge requests found
......@@ -32,7 +32,6 @@ dependencies = [
[[package]]
name = "cortex-m"
version = "0.6.1"
source = "git+https://github.com/perlindgren/cortex-m.git?branch=trustit#d8f28518c429febf488baf0dd8d3488779edaa0e"
dependencies = [
"aligned",
"bare-metal",
......@@ -43,7 +42,6 @@ dependencies = [
[[package]]
name = "cortex-m-rt"
version = "0.6.11"
source = "git+https://github.com/perlindgren/cortex-m-rt.git?branch=trustit#8d2686097e168e8b82d51ae1ea17d9ebe6d567e0"
dependencies = [
"cortex-m",
"cortex-m-rt-macros",
......@@ -54,7 +52,6 @@ dependencies = [
[[package]]
name = "cortex-m-rt-macros"
version = "0.1.7"
source = "git+https://github.com/perlindgren/cortex-m-rt.git?branch=trustit#8d2686097e168e8b82d51ae1ea17d9ebe6d567e0"
dependencies = [
"proc-macro2",
"quote",
......@@ -123,7 +120,7 @@ dependencies = [
[[package]]
name = "klee-sys"
version = "0.1.0"
source = "git+https://gitlab.henriktjader.com/pln/klee-sys.git#3e49ed21f5514e7a3244a21c3cbebfcc4042929c"
source = "git+https://gitlab.henriktjader.com/pln/klee-sys.git#3d0ccd8099e39ce0ce7885c4cfdd80fbc88ef99f"
dependencies = [
"cstr_core",
]
......@@ -157,9 +154,9 @@ source = "git+https://gitlab.henriktjader.com/pln/panic-klee.git#3b0c897f49d7fff
[[package]]
name = "proc-macro2"
version = "1.0.7"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
checksum = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
dependencies = [
"unicode-xid",
]
......@@ -223,9 +220,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.13"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
checksum = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
dependencies = [
"proc-macro2",
"quote",
......@@ -247,7 +244,7 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
[[package]]
name = "vcell"
version = "0.1.2"
source = "git+https://github.com/perlindgren/vcell.git?branch=trustit#4eb44a012d65860c596556d6a63af9e0fa31853a"
source = "git+https://github.com/perlindgren/vcell.git?branch=trustit#f1733793a842753fe47fbb5a3a77facbfdc195e4"
dependencies = [
"klee-sys",
]
......
......@@ -33,6 +33,7 @@ version = "0.1.0"
[dependencies.klee-sys]
git = "https://gitlab.henriktjader.com/pln/klee-sys.git"
# link = true ?
# path = "../klee-sys"
version = "0.1.0"
#features = ["inline-asm"]
......@@ -49,11 +50,11 @@ optional = true
vcell = { git = "https://github.com/perlindgren/vcell.git", branch = "trustit" }
#vcell = { path = "../vcell" }
cortex-m = { git = "https://github.com/perlindgren/cortex-m.git", branch = "trustit" }
#cortex-m = { path = "../cortex-m" }
# cortex-m = { git = "https://github.com/perlindgren/cortex-m.git", branch = "trustit" }
cortex-m = { path = "../cortex-m" }
cortex-m-rt = { git = "https://github.com/perlindgren/cortex-m-rt.git", branch = "trustit" }
# cortex-m-rt = { path = "../cortex-m-rt" }
# cortex-m-rt = { git = "https://github.com/perlindgren/cortex-m-rt.git", branch = "trustit" }
cortex-m-rt = { path = "../cortex-m-rt" }
[features]
# default = ["f4"] # uncomment to enable as default feature
......
......@@ -107,7 +107,7 @@ fn run() -> Result<i32, failure::Error> {
.wait()?;
if !status.success() {
panic!("command failed!");
panic!("cargo trust command failed!");
// handle_failed_command(status)
}
......
......@@ -6,12 +6,12 @@
extern crate panic_halt;
use stm32f4::stm32f401 as stm32;
// use stm32f4::stm32f401 as stm32;
use cortex_m::{asm, bkpt};
use cortex_m_rt::entry;
use klee_sys::*;
use klee_sys::{klee_abort, klee_make_symbolic};
#[entry]
#[inline(never)]
......@@ -25,6 +25,9 @@ fn main() -> ! {
bkpt!();
}
#[cfg(feature = "klee-analysis")]
klee_abort!();
loop {
asm::nop();
}
......
......@@ -406,7 +406,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "probe-rs"
version = "0.3.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitfield 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
"capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -425,7 +426,7 @@ dependencies = [
"maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"object 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
"probe-rs-t2rust 0.1.0",
"probe-rs-t2rust 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rental 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rusb 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -436,7 +437,8 @@ dependencies = [
[[package]]
name = "probe-rs-t2rust"
version = "0.1.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -517,7 +519,7 @@ version = "0.1.0"
dependencies = [
"failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"ktest 0.1.0",
"probe-rs 0.3.0",
"probe-rs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
......@@ -771,6 +773,8 @@ dependencies = [
"checksum parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865"
"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
"checksum probe-rs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f0be14dd28460296d2e073645ff15e9b9c007839da7bf0f364d70880d1805c3e"
"checksum probe-rs-t2rust 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "21d3ab5ee228149aecca578aa884d991968f6906a045ba0e2d838a6a77224a90"
"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment