Merge pull request #81 from tock/riscv-align-4

riscv: ensure total length is multiple of 4
tock · Sep 9, 2023 · 1972a93 · 1972a93
2 parents fc14c93 + 4dc3417
commit 1972a93
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/convert.rs b/src/convert.rs
@@ -191,11 +191,12 @@ pub fn elf_to_tbf(
     //
     // - ARM: make sure the entire TBF is a power of 2 to make configuring the
     //   MPU easy.
+    // - RISC_V: make sure the entire TBF is a multiple of 4 to meet TBF
+    //   alignment requirements.
     // - x86: use 4k padding to match page size.
-    //
-    // RISC-V apps do not need any additional padding.
     let trailing_padding = match elf_file.ehdr.e_machine {
         elf::abi::EM_ARM => Some(TrailingPadding::TotalSizePowerOfTwo),
+        elf::abi::EM_RISCV => Some(TrailingPadding::TotalSizeMultiple(4)),
         elf::abi::EM_386 => Some(TrailingPadding::TotalSizeMultiple(4096)),
         _ => None,
     };