Near point

CMakeLists.txt

@@ -16,7 +16,6 @@ cmake_minimum_required(VERSION 3.15)
 
 project(libhal-exceptions LANGUAGES CXX)
 
-
 if("${RUNTIME}" STREQUAL "ARM_CORTEX_GCC")
 set(SOURCE_LIST src/builtin/gcc/impl.cpp)
 elseif("${RUNTIME}" STREQUAL "ARM_CORTEX_ESTELL")

conanfile.py

@@ -81,7 +81,7 @@ def build_requirements(self):
         self.test_requires("boost-ext-ut/1.1.9")
 
     def requirements(self):
-        self.requires("libhal-util/[^5.0.0]")
+        self.requires("libhal-util/[^5.2.0]")
 
     def build(self):
         cmake = CMake(self)
@@ -120,6 +120,7 @@ def package_info(self):
                 "-Wl,--wrap=__cxa_end_catch",
                 "-Wl,--wrap=__cxa_begin_catch",
                 "-Wl,--wrap=__cxa_end_cleanup",
+                "-Wl,--wrap=__cxa_call_unexpected",
                 "-Wl,--wrap=__gnu_unwind_pr_common",
                 "-Wl,--wrap=__aeabi_unwind_cpp_pr0",
                 "-Wl,--wrap=_sig_func",

datasheets/near_point/block_seperation.json

@@ -0,0 +1,21 @@
+{
+  "reg": [
+    {
+      "bits": 10,
+      "name": "inter-block offset",
+      "type": 6
+    },
+    {
+      "bits": 22,
+      "name": "block index",
+      "type": 5
+    }
+  ],
+  "config": {
+    "fontsize": 14,
+    "bits": 32,
+    "hflip": true,
+    "lanes": 1,
+    "compact": true
+  }
+}

datasheets/near_point/linear_near_point_entry.json

@@ -0,0 +1,21 @@
+{
+  "reg": [
+    {
+      "bits": 24,
+      "name": "entry number offset",
+      "type": 5
+    },
+    {
+      "bits": 8,
+      "name": "average function size",
+      "type": 6
+    }
+  ],
+  "config": {
+    "fontsize": 14,
+    "bits": 32,
+    "hflip": true,
+    "lanes": 1,
+    "compact": true
+  }
+}

demos/CMakeLists.txt

@@ -27,9 +27,21 @@ libhal_build_demos(
   INCLUDES
   .
 
+  SOURCES
+  multi_levels.elf.nm.np.cpp
+
   PACKAGES
   libhal-exceptions
 
   LINK_LIBRARIES
   libhal::exceptions
+
+  # SOURCE_FLAGS
+  # -fno-ipa-sra
+
+  LINK_FLAGS
+  -L${CMAKE_SOURCE_DIR}/
+  -Tlinker-stm32f103.ld
+  -Wl,--wrap=_ZSt17__throw_bad_allocv
+  -Wl,--wrap=abort
 )

demos/applications/multi_levels.cpp

@@ -25,13 +25,13 @@ int funct_group3_0();
 int funct_group4_0();
 int funct_group5_0();
 int funct_group6_0();
-// int funct_group7_0();
-// int funct_group8_0();
-// int funct_group9_0();
-// int funct_group10_0();
-// int funct_group11_0();
-// int funct_group12_0();
-// int funct_group13_0();
+int funct_group7_0();
+int funct_group8_0();
+int funct_group9_0();
+int funct_group10_0();
+int funct_group11_0();
+int funct_group12_0();
+int funct_group13_0();
 // int funct_group14_0();
 // int funct_group15_0();
 // int funct_group16_0();
@@ -47,12 +47,11 @@ int funct_group6_0();
 using signature = int(void);
 
 std::array functions{
-  &funct_group0_0, &funct_group1_0, &funct_group2_0, &funct_group3_0,
-  &funct_group4_0, &funct_group5_0, &funct_group6_0,
+  &funct_group0_0,  &funct_group1_0,  &funct_group2_0,  &funct_group3_0,
+  &funct_group4_0,  &funct_group5_0,  &funct_group6_0,  &funct_group7_0,
+  &funct_group8_0,  &funct_group9_0,  &funct_group10_0, &funct_group11_0,
+  &funct_group12_0, &funct_group13_0,
 #if 0
-   &funct_group7_0, &funct_group8_0,
-  &funct_group9_0,
-  &funct_group10_0, &funct_group11_0, &funct_group12_0, &funct_group13_0,
   &funct_group14_0, &funct_group15_0, &funct_group16_0, &funct_group17_0,
   &funct_group18_0, &funct_group19_0, &funct_group20_0, &funct_group21_0,
   &funct_group22_0, &funct_group23_0, &funct_group24_0
@@ -2631,8 +2630,6 @@ int funct_group6_11()
   return side_effect;
 }
 
-#if 0
-
 int funct_group7_1();
 
 int funct_group7_0()
@@ -5750,6 +5747,7 @@ int funct_group13_47()
   return side_effect;
 }
 
+#if 0
 int funct_group14_1();
 
 int funct_group14_0()

demos/applications/single_level.cpp

@@ -24,7 +24,6 @@ struct error
 std::uint64_t start = 0;
 std::uint64_t end = 0;
 int volatile value = 5;
-
 void foo()
 {
   if (value) {

demos/conanfile.py

@@ -16,7 +16,7 @@
 
 
 class demos(ConanFile):
-    python_requires = "libhal-bootstrap/[^4.0.0]"
+    python_requires = "libhal-bootstrap/[^4.0.2]"
     python_requires_extend = "libhal-bootstrap.demo"
 
     def requirements(self):