Skip to content
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
76 changes: 72 additions & 4 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 @@ -190,6 +190,7 @@ cmd-vpd = { path = "./cmd/vpd", package = "humility-cmd-vpd" }
cmd-writeword = { path = "./cmd/writeword", package = "humility-cmd-writeword" }

# crates.io deps
addr2line = "0.25"
anyhow = { version = "1.0.44", features = ["backtrace"] }
atty = "0.2"
bitfield = "0.13.2"
Expand Down
2 changes: 1 addition & 1 deletion humility-bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[package]
name = "humility-bin"
version = "0.12.7"
version = "0.12.8"
edition = "2021"
license = "MPL-2.0"

Expand Down
4 changes: 2 additions & 2 deletions humility-bin/tests/cmd/chip.trycmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ For more information try --help

```
$ humility --chip this-can-be-anything -V
humility 0.12.7
humility 0.12.8

```

Expand All @@ -28,7 +28,7 @@ For more information try --help

```
$ humility -c apx432 -V
humility 0.12.7
humility 0.12.8

```

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
SP = 0x24000288 <- kernel: 0x24000000+0x288
|
+---> 0x240002c0 0x080019ac kern::fail::die_impl
0x240002d0 0x080019d0 kern::fail::die
0x240002d0 0x080019d4 kern::fail::die
0x240002d0 0x080019d4 rust_begin_unwind
0x240002f0 0x080006da core::panicking::panic_fmt
0x24000318 0x0800105a core::panicking::panic
Expand Down
10 changes: 5 additions & 5 deletions humility-bin/tests/cmd/registers-s/registers-s.kiowa.4.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
SP = 0x20002b70 <- i2c_driver: 0x20002800+0x370
|
+---> 0x20002b80 0x08015ac8 userlib::sys_irq_control_stub
0x20002c00 0x080148e2 drv_stm32h7_i2c::I2cController::write_read
0x20002c00 0x08014658 drv_stm32h7_i2c_server::main::{{closure}}
0x20002c00 0x08014658 userlib::hl::recv_without_notification::{{closure}}
0x20002c00 0x080142d4 userlib::hl::recv
0x20002c00 0x080142d4 userlib::hl::recv_without_notification
0x20002c00 0x08014920 drv_stm32h7_i2c::I2cController::write_read
0x20002c00 0x08014920 drv_stm32h7_i2c_server::main::{{closure}}
0x20002c00 0x08014920 userlib::hl::recv_without_notification::{{closure}}
0x20002c00 0x08014920 userlib::hl::recv
0x20002c00 0x08014920 userlib::hl::recv_without_notification
0x20002c00 0x08014920 main
0x20002c00 0x0801404e _start

Expand Down
18 changes: 9 additions & 9 deletions humility-bin/tests/cmd/registers-s/registers-s.kiowa.49.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
SP = 0x20002ae0 <- i2c_driver: 0x20002800+0x2e0
|
+---> 0x20002af0 0x08016408 userlib::sys_irq_control_stub
0x20002b20 0x08015b9c drv_stm32h7_i2c::I2cController::write_read
0x20002b20 0x08015b9c drv_stm32h7_i2c::ltc4306::write_reg_u8
0x20002b20 0x08015bc0 drv_stm32h7_i2c::I2cController::write_read
0x20002b20 0x08015bc0 drv_stm32h7_i2c::ltc4306::write_reg_u8
0x20002b20 0x08015bc0 <drv_stm32h7_i2c::ltc4306::Ltc4306 as drv_stm32h7_i2c::I2cMuxDriver>::enable_segment
0x20002c00 0x08014852 drv_stm32h7_i2c_server::configure_mux::{{closure}}
0x20002c00 0x08014830 drv_stm32h7_i2c_server::find_mux
0x20002c00 0x08014830 drv_stm32h7_i2c_server::configure_mux
0x20002c00 0x0801476e drv_stm32h7_i2c_server::main::{{closure}}
0x20002c00 0x0801476e userlib::hl::recv_without_notification::{{closure}}
0x20002c00 0x0801447a userlib::hl::recv
0x20002c00 0x0801447a userlib::hl::recv_without_notification
0x20002c00 0x080148a8 drv_stm32h7_i2c_server::configure_mux::{{closure}}
0x20002c00 0x080148a8 drv_stm32h7_i2c_server::find_mux
0x20002c00 0x080148a8 drv_stm32h7_i2c_server::configure_mux
0x20002c00 0x080148a8 drv_stm32h7_i2c_server::main::{{closure}}
0x20002c00 0x080148a8 userlib::hl::recv_without_notification::{{closure}}
0x20002c00 0x080148a8 userlib::hl::recv
0x20002c00 0x080148a8 userlib::hl::recv_without_notification
0x20002c00 0x080148a8 main
0x20002c00 0x0801404e _start

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
R12 = 0x20002a48 <- i2c_driver: 0x20002800+0x248
SP = 0x20000eb0 <- kernel: 0x20000000+0xeb0
|
+---> 0x20000f58 0x08002090 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x08002074 kern::arch::arm_m::with_task_table
+---> 0x20000f58 0x08002094 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x08002094 kern::arch::arm_m::with_task_table
0x20000f58 0x08002094 syscall_entry
0x20000f58 0x0800375a SVCall

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
|
+---> 0x20000f58 0x080022ee <kern::arch::arm_m::SavedState as kern::task::ArchState>::arg1
0x20000f58 0x080022ee kern::task::AsIrqArgs<&T>::control
0x20000f58 0x080022dc kern::syscalls::irq_control
0x20000f58 0x080020a0 kern::syscalls::safe_syscall_entry
0x20000f58 0x080020a0 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x08002074 kern::arch::arm_m::with_task_table
0x20000f58 0x080022ee kern::syscalls::irq_control
0x20000f58 0x080022ee kern::syscalls::safe_syscall_entry
0x20000f58 0x080022ee kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x080022ee kern::arch::arm_m::with_task_table
0x20000f58 0x080022ee syscall_entry
0x20000f58 0x0800375a SVCall

Expand Down
10 changes: 5 additions & 5 deletions humility-bin/tests/cmd/registers-s/registers-s.kiowa.52.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
SP = 0x20000e80 <- kernel: 0x20000000+0xe80
|
+---> 0x20000e80 0x0800153c kern::umem::USlice<T>::last_byte_addr
0x20000eb0 0x080033b2 kern::umem::USlice<T>::aliases
0x20000eb0 0x080033bc kern::umem::USlice<T>::aliases
0x20000eb0 0x080033bc kern::umem::safe_copy
0x20000f58 0x080021c0 kern::syscalls::borrow_read
0x20000f58 0x080020a0 kern::syscalls::safe_syscall_entry
0x20000f58 0x080020a0 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x08002074 kern::arch::arm_m::with_task_table
0x20000f58 0x08002244 kern::syscalls::borrow_read
0x20000f58 0x08002244 kern::syscalls::safe_syscall_entry
0x20000f58 0x08002244 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x08002244 kern::arch::arm_m::with_task_table
0x20000f58 0x08002244 syscall_entry
0x20000f58 0x0800375a SVCall

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
R12 = 0x20002a78 <- i2c_driver: 0x20002800+0x278
SP = 0x20000f18 <- kernel: 0x20000000+0xf18
|
+---> 0x20000f58 0x08003936 kern::arch::arm_m::DefaultHandler::{{closure}}::{{closure}}
0x20000f58 0x08003928 kern::arch::arm_m::with_irq_table
0x20000f58 0x08003928 kern::arch::arm_m::DefaultHandler::{{closure}}
0x20000f58 0x0800391c kern::arch::arm_m::with_task_table
+---> 0x20000f58 0x08003942 kern::arch::arm_m::DefaultHandler::{{closure}}::{{closure}}
0x20000f58 0x08003942 kern::arch::arm_m::with_irq_table
0x20000f58 0x08003942 kern::arch::arm_m::DefaultHandler::{{closure}}
0x20000f58 0x08003942 kern::arch::arm_m::with_task_table
0x20000f58 0x08003942 DefaultHandler

LR = 0x08003933 <- kernel: DefaultHandler+0x47
Expand Down
8 changes: 4 additions & 4 deletions humility-bin/tests/cmd/registers-s/registers-s.kiowa.6.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
SP = 0x20000f10 <- kernel: 0x20000000+0xf10
|
+---> 0x20000f18 0x0800383e kern::arch::arm_m::disable_irq
0x20000f58 0x08003b56 kern::arch::arm_m::DefaultHandler::{{closure}}::{{closure}}
0x20000f58 0x08003b48 kern::arch::arm_m::with_irq_table
0x20000f58 0x08003b48 kern::arch::arm_m::DefaultHandler::{{closure}}
0x20000f58 0x08003b3c kern::arch::arm_m::with_task_table
0x20000f58 0x08003b6e kern::arch::arm_m::DefaultHandler::{{closure}}::{{closure}}
0x20000f58 0x08003b6e kern::arch::arm_m::with_irq_table
0x20000f58 0x08003b6e kern::arch::arm_m::DefaultHandler::{{closure}}
0x20000f58 0x08003b6e kern::arch::arm_m::with_task_table
0x20000f58 0x08003b6e DefaultHandler

LR = 0x08003b6f <- kernel: DefaultHandler+0x63
Expand Down
6 changes: 3 additions & 3 deletions humility-bin/tests/cmd/registers-s/registers-s.kiowa.8.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
+---> 0x20000f58 0x08002914 <kern::arch::arm_m::SavedState as kern::task::ArchState>::arg2
0x20000f58 0x08002914 kern::task::AsReplyArgs<&T>::message
0x20000f58 0x08002914 kern::syscalls::reply
0x20000f58 0x080022c0 kern::syscalls::safe_syscall_entry
0x20000f58 0x080022c0 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x08002294 kern::arch::arm_m::with_task_table
0x20000f58 0x08002914 kern::syscalls::safe_syscall_entry
0x20000f58 0x08002914 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x08002914 kern::arch::arm_m::with_task_table
0x20000f58 0x08002914 syscall_entry
0x20000f58 0x0800397a SVCall

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
SP = 0x20001508 <- jefe: 0x20001000+0x508
|
+---> 0x200015c0 0x080081fa <core::result::Result<T,E> as core::ops::try::Try>::into_result
0x200015c0 0x080081f2 <&mut ssmarshal::Deserializer as serde::de::EnumAccess>::variant_seed
0x200015c0 0x080081f2 serde::de::EnumAccess::variant
0x200015c0 0x080081f2 <abi::_::<impl serde::de::Deserialize for abi::TaskState>::deserialize::__Visitor as serde::de::Visitor>::visit_enum
0x200015c0 0x080081f2 <&mut ssmarshal::Deserializer as serde::de::Deserializer>::deserialize_enum
0x200015c0 0x080081f2 abi::_::<impl serde::de::Deserialize for abi::TaskState>::deserialize
0x200015c0 0x080081ee ssmarshal::deserialize
0x200015c0 0x080081e6 userlib::kipc::read_task_status
0x200015c0 0x080081fa <&mut ssmarshal::Deserializer as serde::de::EnumAccess>::variant_seed
0x200015c0 0x080081fa serde::de::EnumAccess::variant
0x200015c0 0x080081fa <abi::_::<impl serde::de::Deserialize for abi::TaskState>::deserialize::__Visitor as serde::de::Visitor>::visit_enum
0x200015c0 0x080081fa <&mut ssmarshal::Deserializer as serde::de::Deserializer>::deserialize_enum
0x200015c0 0x080081fa abi::_::<impl serde::de::Deserialize for abi::TaskState>::deserialize
0x200015c0 0x080081fa ssmarshal::deserialize
0x200015c0 0x080081fa userlib::kipc::read_task_status
0x200015c0 0x080081fa task_jefe::check_tasks
0x20001600 0x0800890a task_jefe::main::{{closure}}
0x20001600 0x0800889c userlib::hl::recv
0x20001600 0x08008916 task_jefe::main::{{closure}}
0x20001600 0x08008916 userlib::hl::recv
0x20001600 0x08008916 main
0x20001600 0x0800804e _start

Expand Down
20 changes: 10 additions & 10 deletions humility-bin/tests/cmd/registers-s/registers-s.ouray.35.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
|
+---> 0x20000e70 0x0000159e kern::umem::USlice<T>::last_byte_addr
0x20000e98 0x0000199e core::num::<impl u32>::wrapping_add
0x20000e98 0x00001992 <abi::RegionDesc as kern::app::RegionDescExt>::covers
0x20000e98 0x0000198e kern::task::Task::can_access::{{closure}}
0x20000e98 0x0000198a <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::any
0x20000e98 0x0000199e <abi::RegionDesc as kern::app::RegionDescExt>::covers
0x20000e98 0x0000199e kern::task::Task::can_access::{{closure}}
0x20000e98 0x0000199e <core::slice::iter::Iter<T> as core::iter::traits::iterator::Iterator>::any
0x20000e98 0x0000199e kern::task::Task::can_access
0x20000eb0 0x000017a2 kern::task::Task::can_write
0x20000f58 0x00002ac8 kern::kipc::serialize_response
0x20000f58 0x00002ac2 kern::kipc::read_task_status
0x20000f58 0x00002ac2 kern::kipc::handle_kernel_message
0x20000f58 0x00002ac2 kern::syscalls::send
0x20000f58 0x00002a2c kern::syscalls::safe_syscall_entry
0x20000f58 0x00002074 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x00002048 kern::arch::arm_m::with_task_table
0x20000f58 0x00002ad6 kern::kipc::serialize_response
0x20000f58 0x00002ad6 kern::kipc::read_task_status
0x20000f58 0x00002ad6 kern::kipc::handle_kernel_message
0x20000f58 0x00002ad6 kern::syscalls::send
0x20000f58 0x00002ad6 kern::syscalls::safe_syscall_entry
0x20000f58 0x00002ad6 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x00002ad6 kern::arch::arm_m::with_task_table
0x20000f58 0x00002ad6 syscall_entry
0x20000f58 0x00003636 SVCall

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
|
+---> 0x20000eb0 0x00001e72 core::option::Option<T>::expect
0x20000eb0 0x00001e72 kern::task::select
0x20000f58 0x00002074 kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x00002048 kern::arch::arm_m::with_task_table
0x20000f58 0x00002dce kern::syscalls::syscall_entry::{{closure}}
0x20000f58 0x00002dce kern::arch::arm_m::with_task_table
0x20000f58 0x00002dce syscall_entry
0x20000f58 0x00003636 SVCall

Expand Down
Loading
Loading