cleanup print debugs in sha2 for bootloader

This commit is contained in:
bunnie 2025-09-25 16:13:25 +08:00
parent a035bb669c
commit afba3040b3
4 changed files with 24 additions and 10 deletions

View file

@ -21,5 +21,6 @@ oid = []
precursor = ["utralib/precursor"] precursor = ["utralib/precursor"]
renode = ["utralib/renode"] renode = ["utralib/renode"]
std = [] std = []
debug = []
# This crate is specific to the bao1x. # This crate is specific to the bao1x.
default = ["bao1x"] default = ["bao1x"]

View file

@ -17,6 +17,7 @@ use digest::{
}; };
mod core_api; mod core_api;
#[cfg(feature = "debug")]
mod debug; mod debug;
mod sha256; mod sha256;
mod sha512; mod sha512;

View file

@ -29,11 +29,13 @@ fn compress(csr: &mut CSR<u32>, blocks: &[[u8; BLOCK_LEN]]) {
const BUF_BLOCKS: usize = utralib::HW_SEG_MSG_MEM_LEN / BLOCK_LEN; const BUF_BLOCKS: usize = utralib::HW_SEG_MSG_MEM_LEN / BLOCK_LEN;
// safety: this is the actual location of the message buffer and its length according to the hardware // safety: this is the actual location of the message buffer and its length according to the hardware
// spec. only safe because this is machine mode and no-std (no threads, no concurrency) // spec. only safe because this is machine mode and no-std (no threads, no concurrency)
#[cfg(feature = "debug")]
let msg_blocks: &mut [[u8; BLOCK_LEN]; BUF_BLOCKS] = let msg_blocks: &mut [[u8; BLOCK_LEN]; BUF_BLOCKS] =
unsafe { &mut *(utralib::HW_SEG_MSG_MEM as *mut [[u8; BLOCK_LEN]; BUF_BLOCKS]) }; unsafe { &mut *(utralib::HW_SEG_MSG_MEM as *mut [[u8; BLOCK_LEN]; BUF_BLOCKS]) };
for block_chunk in blocks.chunks(BUF_BLOCKS) { for block_chunk in blocks.chunks(BUF_BLOCKS) {
// block_chunk has a length equal to or less than msg_buf due to .chunks() iterator above // block_chunk has a length equal to or less than msg_buf due to .chunks() iterator above
#[cfg(feature = "debug")]
for (src, dst) in block_chunk.iter().zip(msg_blocks.iter_mut()) { for (src, dst) in block_chunk.iter().zip(msg_blocks.iter_mut()) {
crate::println!(" {:x?}", src); crate::println!(" {:x?}", src);
dst.copy_from_slice(src); dst.copy_from_slice(src);
@ -58,9 +60,9 @@ fn compress(csr: &mut CSR<u32>, blocks: &[[u8; BLOCK_LEN]]) {
.with_seg_result(true) .with_seg_result(true)
.raw_value(), .raw_value(),
); );
// csr.wo(utra::combohash::SFR_OPT3, 0);
// debug dump // debug dump
#[cfg(feature = "debug")]
for i in 0..utra::combohash::COMBOHASH_NUMREGS { for i in 0..utra::combohash::COMBOHASH_NUMREGS {
crate::println!("{:x}: {:x}", i * 4, unsafe { crate::println!("{:x}: {:x}", i * 4, unsafe {
(utra::combohash::HW_COMBOHASH_BASE as *const u32).add(i).read_volatile() (utra::combohash::HW_COMBOHASH_BASE as *const u32).add(i).read_volatile()
@ -78,10 +80,14 @@ fn compress(csr: &mut CSR<u32>, blocks: &[[u8; BLOCK_LEN]]) {
// clear the flag on exit // clear the flag on exit
csr.rmwf(utra::combohash::SFR_FR_MFSM_DONE, 1); csr.rmwf(utra::combohash::SFR_FR_MFSM_DONE, 1);
let state = unsafe { core::slice::from_raw_parts(utralib::HW_SEG_HOUT_MEM as *const u32, 16) }; #[cfg(feature = "debug")]
let state_byte = unsafe { core::slice::from_raw_parts(utralib::HW_SEG_HOUT_MEM as *const u8, 32) }; {
crate::println!("state: {:x?}", state); let state = unsafe { core::slice::from_raw_parts(utralib::HW_SEG_HOUT_MEM as *const u32, 16) };
crate::println!("state_byte: {:x?}", state_byte); let state_byte =
unsafe { core::slice::from_raw_parts(utralib::HW_SEG_HOUT_MEM as *const u8, 32) };
crate::println!("state: {:x?}", state);
crate::println!("state_byte: {:x?}", state_byte);
}
// clear the first block setting - this was set by the new() function // clear the first block setting - this was set by the new() function
// it does not hurt to clear it every successive block // it does not hurt to clear it every successive block

View file

@ -29,11 +29,13 @@ fn compress(csr: &mut CSR<u32>, blocks: &[[u8; BLOCK_LEN]]) {
const BUF_BLOCKS: usize = utralib::HW_SEG_MSG_MEM_LEN / BLOCK_LEN; const BUF_BLOCKS: usize = utralib::HW_SEG_MSG_MEM_LEN / BLOCK_LEN;
// safety: this is the actual location of the message buffer and its length according to the hardware // safety: this is the actual location of the message buffer and its length according to the hardware
// spec. only safe because this is machine mode and no-std (no threads, no concurrency) // spec. only safe because this is machine mode and no-std (no threads, no concurrency)
#[cfg(feature = "debug")]
let msg_blocks: &mut [[u8; BLOCK_LEN]; BUF_BLOCKS] = let msg_blocks: &mut [[u8; BLOCK_LEN]; BUF_BLOCKS] =
unsafe { &mut *(utralib::HW_SEG_MSG_MEM as *mut [[u8; BLOCK_LEN]; BUF_BLOCKS]) }; unsafe { &mut *(utralib::HW_SEG_MSG_MEM as *mut [[u8; BLOCK_LEN]; BUF_BLOCKS]) };
for block_chunk in blocks.chunks(BUF_BLOCKS) { for block_chunk in blocks.chunks(BUF_BLOCKS) {
// block_chunk has a length equal to or less than msg_buf due to .chunks() iterator above // block_chunk has a length equal to or less than msg_buf due to .chunks() iterator above
#[cfg(feature = "debug")]
for (src, dst) in block_chunk.iter().zip(msg_blocks.iter_mut()) { for (src, dst) in block_chunk.iter().zip(msg_blocks.iter_mut()) {
crate::println!(" {:x?}", src); crate::println!(" {:x?}", src);
dst.copy_from_slice(src); dst.copy_from_slice(src);
@ -58,9 +60,9 @@ fn compress(csr: &mut CSR<u32>, blocks: &[[u8; BLOCK_LEN]]) {
.with_seg_result(true) .with_seg_result(true)
.raw_value(), .raw_value(),
); );
// csr.wo(utra::combohash::SFR_OPT3, 0);
// debug dump // debug dump
#[cfg(feature = "debug")]
for i in 0..utra::combohash::COMBOHASH_NUMREGS { for i in 0..utra::combohash::COMBOHASH_NUMREGS {
crate::println!("{:x}: {:x}", i * 4, unsafe { crate::println!("{:x}: {:x}", i * 4, unsafe {
(utra::combohash::HW_COMBOHASH_BASE as *const u32).add(i).read_volatile() (utra::combohash::HW_COMBOHASH_BASE as *const u32).add(i).read_volatile()
@ -78,10 +80,14 @@ fn compress(csr: &mut CSR<u32>, blocks: &[[u8; BLOCK_LEN]]) {
// clear the flag on exit // clear the flag on exit
csr.rmwf(utra::combohash::SFR_FR_MFSM_DONE, 1); csr.rmwf(utra::combohash::SFR_FR_MFSM_DONE, 1);
let state = unsafe { core::slice::from_raw_parts(utralib::HW_SEG_HOUT_MEM as *const u32, 16) }; #[cfg(feature = "debug")]
let state_byte = unsafe { core::slice::from_raw_parts(utralib::HW_SEG_HOUT_MEM as *const u8, 32) }; {
crate::println!("state: {:x?}", state); let state = unsafe { core::slice::from_raw_parts(utralib::HW_SEG_HOUT_MEM as *const u32, 16) };
crate::println!("state_byte: {:x?}", state_byte); let state_byte =
unsafe { core::slice::from_raw_parts(utralib::HW_SEG_HOUT_MEM as *const u8, 32) };
crate::println!("state: {:x?}", state);
crate::println!("state_byte: {:x?}", state_byte);
}
// clear the first block setting - this was set by the new() function // clear the first block setting - this was set by the new() function
// it does not hurt to clear it every successive block // it does not hurt to clear it every successive block