commit 562a7a05d412734ec42336bd98ea1e7741e3fd78
author David Brown <david.brown@linaro.org> Mon Jan 23 11:19:03 2017 -0700
committer David Brown <david.brown@linaro.org> Mon Jan 23 16:01:01 2017 -0700
tree f612fba6a159c3e6abc884be61a529e6bb56a9f4
parent 90c1913c130193fa98ed2d8e554e2a614261f9c2

sim: Verify write alignment

When an alignment greater than one is specified, enforce this in the
simulated flash driver.

sim/src/flash.rs

diff --git a/sim/src/flash.rs b/sim/src/flash.rs
index 8cf267c..b85651c 100644
--- a/sim/src/flash.rs
+++ b/sim/src/flash.rs
@@ -34,15 +34,22 @@
 pub struct Flash {
     data: Vec<u8>,
     sectors: Vec<usize>,
+    // Alignment required for writes.
+    align: usize,
 }
 
 impl Flash {
     /// Given a sector size map, construct a flash device for that.
-    pub fn new(sectors: Vec<usize>) -> Flash {
+    pub fn new(sectors: Vec<usize>, align: usize) -> Flash {
+        // Verify that the alignment is a positive power of two.
+        assert!(align > 0);
+        assert!(align & (align - 1) == 0);
+
         let total = sectors.iter().sum();
         Flash {
             data: vec![0xffu8; total],
             sectors: sectors,
+            align: align,
         }
     }
 
@@ -74,6 +81,15 @@
             bail!(ebounds("Write outside of device"));
         }
 
+        // Verify the alignment (which must be a power of two).
+        if offset & (self.align - 1) != 0 {
+            bail!(ewrite("Misaligned write address"));
+        }
+
+        if payload.len() & (self.align - 1) != 0 {
+            bail!(ewrite("Write length not multiple of alignment"));
+        }
+
         let mut sub = &mut self.data[offset .. offset + payload.len()];
         if sub.iter().any(|x| *x != 0xFF) {
             bail!(ewrite("Write to non-FF location"));