feat: tbf filtering

Signed-off-by: addrian-77 <lunguadrian30@gmail.com>

Author: addrian-77

tockloader-lib/Cargo.toml

@@ -9,9 +9,9 @@ edition = "2021"
 
 [dependencies]
 tokio = { version = "1.32.0", features = ["full"] }
-tokio-serial = {version = "5.4.4", features = ["libudev"]}
+tokio-serial = { version = "5.4.4", features = ["libudev"] }
 probe-rs = "0.24.0"
-tbf-parser = { path = "../tbf-parser"}
+tbf-parser = { path = "../tbf-parser" }
 utf8-decode = "1.0.1"
 byteorder = "1.5.0"
 tar = "0.4.41"

tockloader-lib/src/board_settings.rs

@@ -1,6 +1,7 @@
 pub struct BoardSettings {
     pub arch: Option<String>,
     pub start_address: u64,
+    pub ram_start_address: u64,
 }
 
 // TODO(george-cosma): Does a default implementation make sense for this? Is a
@@ -10,6 +11,7 @@ impl Default for BoardSettings {
         Self {
             arch: None,
             start_address: 0x30000,
+            ram_start_address: 0x20000000,
         }
     }
 }

tockloader-lib/src/command_impl/probers/install.rs

@@ -55,7 +55,7 @@ impl CommandInstall for ProbeRSConnection {
                 "architechture".to_owned(),
             ))?;
 
-        let mut binary = tab_file.extract_binary(arch)?;
+        let mut binary = tab_file.extract_binary(arch.to_string())?;
         let size = binary.len() as u64;
 
         // Make sure the app is aligned to a multiple of its size

tockloader-lib/src/known_boards.rs

@@ -25,6 +25,7 @@ impl KnownBoard for NucleoF4 {
         BoardSettings {
             arch: Some("cortex-m4".to_string()),
             start_address: 0x08040000,
+            ram_start_address: 0x20000000,
         }
     }
 }
@@ -47,6 +48,7 @@ impl KnownBoard for MicrobitV2 {
         BoardSettings {
             arch: Some("cortex-m4".to_string()),
             start_address: 0x00040000,
+            ram_start_address: 0x20000000,
         }
     }
 }

tockloader-lib/src/tabs/tab.rs

@@ -2,13 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 // Copyright OXIDOS AUTOMOTIVE 2024.
 
+use crate::board_settings::BoardSettings;
 use crate::errors::{TabError, TockloaderError};
 use crate::tabs::metadata::Metadata;
 use std::fs::File;
 use std::io::Read;
 use tar::Archive;
 
-struct TbfFile {
+pub struct TbfFile {
     pub filename: String,
     pub data: Vec<u8>,
 }
@@ -75,9 +76,64 @@ impl Tab {
         }
     }
 
-    pub fn extract_binary(&self, arch: &str) -> Result<Vec<u8>, TockloaderError> {
+    /// This function returns all the compatible binaries for a given tab
+    ///
+    /// Vector components:
+    ///     - binary (Vec<u8>)
+    ///     - start_address: u64
+    ///     - ram_start_address: u64
+    pub fn filter_tbfs(
+        &self,
+        settings: &BoardSettings,
+    ) -> Result<Vec<Option<(u64, u64)>>, TockloaderError> {
+        // save the file
+        // also save flash start and ram start for comparing easily later
+        let mut compatible_tbfs: Vec<Option<(u64, u64)>> = Vec::new();
         for file in &self.tbf_files {
-            if file.filename.starts_with(arch) {
+            let (arch, flash, ram) = Self::split_arch(file.filename.to_string());
+            // check if we have the same arch
+            // check if flash and ram fit
+            if flash != 0
+                && ram != 0
+                && arch.starts_with(settings.arch.as_ref().unwrap())
+                && flash >= settings.start_address
+            {
+                log::info!("rust, pushed arch {arch}, flash {flash:#x}, ram {ram:#x}");
+                compatible_tbfs.push(Some((flash, ram)));
+            }
+
+            // how about we don't do anything on else?
+            // } else if arch.starts_with(settings.arch.as_ref().unwrap()) {
+            //     // this happens for C apps, we'll have
+            //     // arch = "cortex-m4.tbf"
+            //     // without any flash and ram values
+            //     compatible_tbfs.push(None);
+            // }
+        }
+        Ok(compatible_tbfs)
+    }
+
+    fn split_arch(filename: String) -> (String, u64, u64) {
+        // filename is always formatted like this:
+        // "cortex-m0.0x10020000.0x20004000.tab"
+        // splitting by .0x will give us "arch", "flash start", "ram start.tab"
+        // 3 items
+        // log::info!("filename {filename}");
+        let data: Vec<&str> = filename.split(".0x").collect();
+        if data.len() == 3 {
+            let flashaddr: u64 = u64::from_str_radix(data[1], 16).unwrap();
+            // split the ram address again because it also contains .tab
+            // take the first item of the tuple
+            let ramaddr: u64 = u64::from_str_radix(data[2].split_once(".").unwrap().0, 16).unwrap();
+            (data[0].to_string(), flashaddr, ramaddr)
+        } else {
+            (data[0].to_string(), 0, 0)
+        }
+    }
+
+    pub fn extract_binary(&self, arch: String) -> Result<Vec<u8>, TockloaderError> {
+        for file in &self.tbf_files {
+            if file.filename.starts_with(&arch) {
                 return Ok(file.data.clone());
             }
         }