stash to work on an aes api bug

This commit is contained in:
bunnie 2022-03-07 13:17:58 +08:00
parent 4cfd835c0c
commit 54e491840d
4 changed files with 43 additions and 2 deletions

23
Cargo.lock generated
View file

@ -840,6 +840,29 @@ dependencies = [
"backtrace", "backtrace",
] ]
[[package]]
name = "ffi-sys"
version = "0.1.0"
dependencies = [
"cc",
]
[[package]]
name = "ffi-test"
version = "0.1.0"
dependencies = [
"ffi-sys",
"log",
"log-server",
"num-derive",
"num-traits",
"susres",
"ticktimer-server",
"utralib",
"xous",
"xous-names",
]
[[package]] [[package]]
name = "filetime" name = "filetime"
version = "0.2.14" version = "0.2.14"

View file

@ -89,6 +89,7 @@ members = [
"apps/ball", "apps/ball",
"apps/repl", "apps/repl",
"services/libstd-test", "services/libstd-test",
"services/ffi-test",
"kernel", "kernel",
] ]
resolver = "2" resolver = "2"

View file

@ -3,7 +3,8 @@
# set RUSTFLAGS=--remap-path-prefix=F:\largework\rust-win\code\xous-core\=build # set RUSTFLAGS=--remap-path-prefix=F:\largework\rust-win\code\xous-core\=build
# $env:RUSTFLAGS="--remap-path-prefix=$(Get-Location)=build" # $env:RUSTFLAGS="--remap-path-prefix=$(Get-Location)=build"
cargo xtask app-image ball repl # cargo xtask app-image ball repl
cargo xtask ffi-test
# cargo xtask minimal precursors/soc.svd # cargo xtask minimal precursors/soc.svd
CertUtil -hashfile precursors/bbram-test1.nky MD5 CertUtil -hashfile precursors/bbram-test1.nky MD5

View file

@ -90,7 +90,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
"xous-names", "xous-names",
"trng", "trng",
"llio", "llio",
"test-stub",
"susres", "susres",
"com", "com",
]; ];
@ -157,6 +156,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
"com", "com",
"graphics-server", "graphics-server",
"keyboard", "keyboard",
"spinor",
]; ];
let aestest_pkgs = ["ticktimer-server", "log-server", "aes-test"]; let aestest_pkgs = ["ticktimer-server", "log-server", "aes-test"];
@ -210,6 +210,22 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
renode_image(false, &pkgs, extra_packages.as_slice(), renode_image(false, &pkgs, extra_packages.as_slice(),
None, Some(&["--features", "renode-bypass"]))?; None, Some(&["--features", "renode-bypass"]))?;
} }
Some("ffi-test") => {
let mut args = env::args();
args.nth(1);
let mut pkgs = hw_pkgs.to_vec();
pkgs.push("ffi-test");
let args: Vec<String> = args.collect();
let mut extra_packages = vec![];
for program in &args {
extra_packages.push(program.as_str());
}
build_hw_image(false, Some("./precursors/soc.svd".to_string()),
&pkgs, None, None, None, &[], Some(&["--features", "renode-bypass"]))?
//renode_image(false, &pkgs, extra_packages.as_slice(),
//None, Some(&["--features", "renode-bypass"]))?;
}
Some("libstd-net") => { Some("libstd-net") => {
let mut args = env::args(); let mut args = env::args();
args.nth(1); args.nth(1);