Part of theheraldproject#98. Related to theheraldproject#105. Removed…

… throw clauses on Zephyr.

Removed throw clauses via ifdef if compiled on zephyr
- Uses std::terminate instead
- Did not save any SRAM on its own (See stdlib terminate definition)
Signed-off-by: Adam Fowler <[email protected]>

herald-wearable/prj.conf

@@ -4,8 +4,8 @@
 # Wearable specific settings (see config/zephyr/base.conf et al for mixed-in settings)
 CONFIG_BT_DEVICE_NAME="Herald Wearable"
 
-# Analysis engine uses variant, and so can have (an extremely hard to create) invalid variant exception
-CONFIG_EXCEPTIONS=y
+# Analysis engine uses variant, and so can have (an extremely hard to create) invalid variant exception -> Note: Switched now to std::terminate instead if zephyr detected
+CONFIG_EXCEPTIONS=n
 # CONFIG_HW_STACK_PROTECTION=y
 
 # REQUIRED if using DEBUG mode in wearable sample only

herald/include/herald/analysis/runner.h

@@ -71,7 +71,11 @@ struct VariantSet {
         return *pval;
       }
     }
+#ifdef __ZEPHYR__
+    std::terminate();
+#else
     throw std::bad_variant_access();
+#endif
   }
 
   const std::size_t size() const {
@@ -128,7 +132,11 @@ struct AnalysisDelegateManager {
         return *pval;
       }
     }
+#ifdef __ZEPHYR__
+    std::terminate();
+#else
     throw std::bad_variant_access();
+#endif
   }
 
 private:
@@ -181,7 +189,11 @@ struct AnalysisProviderManager {
         return *pval;
       }
     }
+#ifdef __ZEPHYR__
+    std::terminate();
+#else
     throw std::bad_variant_access();
+#endif
   }
 
   template <typename InputT,typename OutputT>

herald/include/herald/datatype/memory_arena.h

@@ -51,9 +51,9 @@ class MemoryArena {
     ;
   }
 
-  ~MemoryArena() = default;
+  ~MemoryArena() noexcept = default;
 
-  void reserve(MemoryArenaEntry& entry,std::size_t newSize) {
+  void reserve(MemoryArenaEntry& entry,std::size_t newSize) noexcept {
     if (newSize <= entry.byteLength) {
       return;
     }
@@ -92,10 +92,14 @@ class MemoryArena {
       }
     }
     // ran out of memory! Throw! (Causes catastrophic crash)
+#ifdef __ZEPHYR__
+    std::terminate();
+#else
     throw std::runtime_error("Unable to allocate memory in arena");
+#endif
   }
 
-  void deallocate(MemoryArenaEntry& entry) {
+  void deallocate(MemoryArenaEntry& entry) noexcept {
     if (!entry.isInitialised()) {
       return; // guard
     }
@@ -108,29 +112,29 @@ class MemoryArena {
     entry.startPageIndex = 0;
   }
 
-  void set(const MemoryArenaEntry& entry, unsigned short bytePosition, unsigned char value) {
+  void set(const MemoryArenaEntry& entry, unsigned short bytePosition, unsigned char value) noexcept {
     if (!entry.isInitialised()) {
       return;
     }
     arena[(entry.startPageIndex * PageSize) + bytePosition] = value;
   }
 
-  char get(const MemoryArenaEntry& entry, unsigned short bytePosition) {
+  char get(const MemoryArenaEntry& entry, unsigned short bytePosition) noexcept {
     if (!entry.isInitialised()) {
       return '\0';
     }
     return arena[(entry.startPageIndex * PageSize) + bytePosition];
   }
 
-  unsigned char* rawStartAddress(const MemoryArenaEntry& entry) {
+  unsigned char* rawStartAddress(const MemoryArenaEntry& entry) noexcept {
     if (!entry.isInitialised()) {
       return 0;
     }
     // The following is guaranteed by the STL 23.3.2.1
     return &arena[(entry.startPageIndex * PageSize)];
   }
 
-  std::size_t pagesFree() const {
+  std::size_t pagesFree() const noexcept {
     return pagesRequired(Size,PageSize) - pagesInUse.count();
   }