commit c8802490b36edaa4055a80bca3f5ca9089de99e2
author Balint Dobszay <balint.dobszay@arm.com> Wed Jan 15 18:11:39 2025 +0100
committer Balint Dobszay <balint.dobszay@arm.com> Wed Jan 15 18:16:35 2025 +0100
tree cd55c47618d1fdda153b610739bff53ceb6d06b3
parent 1e1aef1a475eea572fafb677d42f3017971e5161

Don't use String for console log

Signed-off-by: Balint Dobszay <balint.dobszay@arm.com>
Change-Id: Ib5b7ce7c574b3c00bdff763498c2e9566e2afbf4

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 04f44eb..f9699aa 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,6 @@
 
 extern crate alloc;
 
-use alloc::string::String;
 use core::fmt::{self, Debug, Display, Formatter};
 use num_enum::{IntoPrimitive, TryFromPrimitive};
 use thiserror::Error;
@@ -935,21 +934,22 @@
     }
 }
 
+pub const CONSOLE_LOG_32_MAX_MSG_LEN: usize = 24;
+pub const CONSOLE_LOG_64_MAX_MSG_LEN: usize = 48;
+
 pub fn parse_console_log(
     char_cnt: u32,
     char_lists: &[u64; 6],
     is_32bit: bool,
-) -> Result<String, Error> {
+    log_bytes: &mut [u8],
+) -> Result<(), Error> {
     const CHAR_COUNT_MASK: u32 = 0xff;
-    const LOG_32_MAX_MSG_LEN: usize = 24;
-    const LOG_64_MAX_MSG_LEN: usize = 48;
 
-    let mut msg_bytes = [0u8; LOG_64_MAX_MSG_LEN + 1];
     let char_count = (char_cnt & CHAR_COUNT_MASK) as usize;
     let (max_length, reg_size) = if is_32bit {
-        (LOG_32_MAX_MSG_LEN, 4)
+        (CONSOLE_LOG_32_MAX_MSG_LEN, 4)
     } else {
-        (LOG_64_MAX_MSG_LEN, 8)
+        (CONSOLE_LOG_64_MAX_MSG_LEN, 8)
     };
 
     if char_count < 1 || char_count > max_length {
@@ -957,9 +957,9 @@
     }
 
     for i in 0..=5 {
-        msg_bytes[reg_size * i..reg_size * (i + 1)]
+        log_bytes[reg_size * i..reg_size * (i + 1)]
             .copy_from_slice(&char_lists[i].to_le_bytes()[0..reg_size]);
     }
 
-    String::from_utf8(msg_bytes.to_vec()).map_err(|_| Error::InvalidParameters)
+    Ok(())
 }