Skip to content

Commit 220886a

Browse files
committed
don't leave core halted if PC check fails
1 parent 3d1e66b commit 220886a

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

humility-core/src/hubris.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2095,12 +2095,13 @@ impl HubrisArchive {
20952095
return Ok(());
20962096
} else {
20972097
core.halt()?;
2098-
if let Ok((false, pc)) = self.is_pc_within_archive(core) {
2098+
let result = self.is_pc_within_archive(core);
2099+
core.run()?;
2100+
if let Ok((false, pc)) = result {
20992101
bail!("image ID matches but PC at 0x{pc:x} is not part of any \
21002102
module. Maybe this is an incorrect A/B archive, or \
21012103
bootloader or ROM code is running?");
21022104
}
2103-
core.run()?;
21042105
}
21052106

21062107
if criteria == HubrisValidate::ArchiveMatch {

0 commit comments

Comments
 (0)