commit 6d47d42eb6bc5bc0f8fb3d1683cd4460634cc037
author David Brown <david.brown@linaro.org> Fri Jun 04 14:41:33 2021 -0600
committer David Brown <davidb@davidb.org> Mon Jul 19 11:22:13 2021 -0600
tree 9b69e44a9e4cb71ec310678a16566c79a9b5c248
parent c423ac4517667c63c8403e247176a29bda1efb78

sim: Make BootGoResult into an enum

Now that this result is abstracted, take the special case for a sim stop
and make it its own field.  This hides the magic number we use to
indicate this to be entirely within mcuboot-sys.

Signed-off-by: David Brown <david.brown@linaro.org>

sim/mcuboot-sys/src/c.rs

diff --git a/sim/mcuboot-sys/src/c.rs b/sim/mcuboot-sys/src/c.rs
index 8729301..f8211d1 100644
--- a/sim/mcuboot-sys/src/c.rs
+++ b/sim/mcuboot-sys/src/c.rs
@@ -13,30 +13,41 @@
 /// The result of an invocation of `boot_go`.  This is intentionally opaque so that we can provide
 /// accessors for everything we need from this.
 #[derive(Debug)]
-pub struct BootGoResult {
-    result: i32,
-    asserts: u8,
+pub enum BootGoResult {
+    /// This run was stopped by the flash simulation mechanism.
+    Stopped,
+    /// The bootloader ran to completion with the following data.
+    Normal {
+        result: i32,
+        asserts: u8,
+    },
 }
 
 impl BootGoResult {
     /// Was this run interrupted.
     pub fn interrupted(&self) -> bool {
-        self.result == -0x13579
+        matches!(self, BootGoResult::Stopped)
     }
 
     /// Was this boot run successful (returned 0)
     pub fn success(&self) -> bool {
-        self.result == 0
+        matches!(self, BootGoResult::Normal { result: 0, .. })
     }
 
     /// Success, but also no asserts.
     pub fn success_no_asserts(&self) -> bool {
-        self.result == 0 && self.asserts == 0
+        matches!(self, BootGoResult::Normal {
+            result: 0,
+            asserts: 0,
+        })
     }
 
-    /// Get the asserts count.
+    /// Get the asserts count.  An interrupted run will be considered to have no asserts.
     pub fn asserts(&self) -> u8 {
-        self.asserts
+        match self {
+            BootGoResult::Normal { asserts, .. } => *asserts,
+            _ => 0,
+        }
     }
 }
 
@@ -72,7 +83,11 @@
     for &dev_id in multiflash.keys() {
         api::clear_flash(dev_id);
     }
-    BootGoResult { result, asserts }
+    if result == -0x13579 {
+        BootGoResult::Stopped
+    } else {
+        BootGoResult::Normal { result, asserts }
+    }
 }
 
 pub fn boot_trailer_sz(align: u32) -> u32 {