Merge pull request #47 from Patater/feature_cmsis5

Update for feature_cmsis5

Author: AlessandroA

README.md

@@ -8,7 +8,7 @@ Supported devices:
 |--------|-----------|-----------|
 | `K64F` | `GCC_ARM` | 9600      |
 
-Latest release: [mbed-os-5.3.x](https://github.com/ARMmbed/mbed-os-example-uvisor/releases/latest). Tested with [mbed-cli v1.0.0](https://github.com/ARMmbed/mbed-cli/releases/tag/1.0.0).
+Latest release: [mbed-os-5.4.x](https://github.com/ARMmbed/mbed-os-example-uvisor/releases/latest). Tested with [mbed-cli v1.0.0](https://github.com/ARMmbed/mbed-cli/releases/tag/1.0.0).
 
 ## Quickstart
 

mbed-os.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#42be5c01a7f91292d5e27124ad9584236025f6ab
+https://github.com/ARMmbed/mbed-os/#799983c5d17ed649cc8385f3fb11e486864b9eac

source/fun_bag.cpp

@@ -58,12 +58,12 @@ static int prn_verify(const void * mem, uint16_t seed, size_t len)
 {
     size_t i;
     uint16_t state = seed;
-    uint8_t * m = (uint8_t *) mem;
+    const uint8_t * m = (const uint8_t *) mem;
     bool matches = true;
 
     /* Check all of the bytes, even if we find a match sooner. This tests that
      * we can read all of the memory (and that it hasn't been securely taken
-     * over by another box. */
+     * over by another box). */
     for (i = 0; i < len; ++i) {
         if (m[i] != (state & 0xFF)) {
             matches = false;

source/led1.cpp

@@ -12,7 +12,7 @@ struct box_context {
 static const UvisorBoxAclItem acl[] = {
 };
 
-static void led1_main(const void *);
+static void led1_main(void *);
 
 /* Box configuration
  * We do not need large stacks in either the main nor the interrupt thread, as
@@ -22,13 +22,9 @@ UVISOR_BOX_HEAPSIZE(3 * 1024);
 UVISOR_BOX_MAIN(led1_main, osPriorityNormal, 512);
 UVISOR_BOX_CONFIG(box_led1, acl, 512, box_context);
 
-/* FIXME: The guard is needed for backwards-compatibility reasons. Remove it
- *        when mbed OS is updated. */
-#ifdef __uvisor_ctx
 #define uvisor_ctx ((box_context *) __uvisor_ctx)
-#endif
 
-static void led1_main(const void *)
+static void led1_main(void *)
 {
     DigitalOut led1(LED1);
     led1 = LED_OFF;

source/led2.cpp

@@ -12,7 +12,7 @@ struct box_context {
 static const UvisorBoxAclItem acl[] = {
 };
 
-static void led2_main(const void *);
+static void led2_main(void *);
 
 /* Box configuration
  * We do not need large stacks in either the main nor the interrupt thread, as
@@ -22,13 +22,9 @@ UVISOR_BOX_HEAPSIZE(3 * 1024);
 UVISOR_BOX_MAIN(led2_main, osPriorityNormal, 512);
 UVISOR_BOX_CONFIG(box_led2, acl, 512, box_context);
 
-/* FIXME: The guard is needed for backwards-compatibility reasons. Remove it
- *        when mbed OS is updated. */
-#ifdef __uvisor_ctx
 #define uvisor_ctx ((box_context *) __uvisor_ctx)
-#endif
 
-static void led2_main(const void *)
+static void led2_main(void *)
 {
     DigitalOut led2(LED2);
     led2 = LED_OFF;

source/led3.cpp

@@ -12,7 +12,7 @@ struct box_context {
 static const UvisorBoxAclItem acl[] = {
 };
 
-static void led3_main(const void *);
+static void led3_main(void *);
 
 /* Box configuration
  * We need at least 1kB in the main thread as we use printf in it. The interrupt
@@ -22,11 +22,7 @@ UVISOR_BOX_HEAPSIZE(3 * 1024);
 UVISOR_BOX_MAIN(led3_main, osPriorityNormal, 1024);
 UVISOR_BOX_CONFIG(box_led3, acl, 512, box_context);
 
-/* FIXME: The guard is needed for backwards-compatibility reasons. Remove it
- *        when mbed OS is updated. */
-#ifdef __uvisor_ctx
 #define uvisor_ctx ((box_context *) __uvisor_ctx)
-#endif
 
 static void run_3(void)
 {
@@ -40,9 +36,17 @@ static void run_3(void)
     }
 }
 
-static void led3_main(const void *)
+/* A thin wrapper around run_3 that accepts and ignores a context. This avoid a
+ * cast, as mbed's Thread and RTX's osThreadContextNew operate on differently
+ * typed thread functions. */
+static void run_3_context(void *)
 {
-    osStatus status;
+    run_3();
+}
+
+static void led3_main(void *)
+{
+    osStatus_t status;
     DigitalOut led3(LED3);
     led3 = LED_OFF;
 
@@ -64,14 +68,16 @@ static void led3_main(const void *)
     const uint32_t kB = 1024;
     SecureAllocator alloc = secure_allocator_create_with_pages(4 * kB, 1 * kB);
     /* Prepare the thread definition structure. */
-    osThreadDef_t thread_def;
-    thread_def.stacksize = 512;
+    osThreadAttr_t thread_attr = {0};
+    os_thread_t thread_def = {0};
+    thread_def.stack_size = 512;
     /* Allocate the stack inside the page allocator! */
-    thread_def.stack_pointer = (uint32_t *) secure_malloc(alloc, DEFAULT_STACK_SIZE);
-    thread_def.tpriority = osPriorityNormal;
-    thread_def.pthread = (void (*)(const void *)) &run_3;
+    thread_attr.stack_mem = (uint32_t *) secure_malloc(alloc, 512);
+    thread_def.priority = osPriorityNormal;
+    thread_attr.cb_size = sizeof(thread_def);
+    thread_attr.cb_mem = &thread_def;
     /* Create a thread with the page allocator as heap. */
-    osThreadContextCreate(&thread_def, NULL, alloc);
+    osThreadContextNew(run_3_context, NULL, &thread_attr, alloc);
 
     while (1) {
         static const size_t size = 20;

source/main-hw.h

@@ -45,6 +45,26 @@
         {SPI0,   sizeof(*SPI0),   UVISOR_TACLDEF_PERIPH}, \
     }
 
+#elif defined (TARGET_EFM32GG_STK3700)
+
+#define MAIN_LED           LED1
+#define SECURE_LED         LED2
+#define LED_ON             true
+#define LED_OFF            false
+#define SECURE_SWITCH      SW2
+#define SECURE_SWITCH_PULL PullUp
+
+#define MAIN_ACL(acl_list_name) \
+    static const UvisorBoxAclItem acl_list_name[] = {     \
+        {CMU,                 sizeof(*CMU),    UVISOR_TACLDEF_PERIPH}, \
+        {MSC,                 sizeof(*MSC),    UVISOR_TACLDEF_PERIPH}, \
+        {GPIO,                sizeof(*GPIO),   UVISOR_TACLDEF_PERIPH}, \
+        {TIMER0,              sizeof(*TIMER0), UVISOR_TACLDEF_PERIPH}, \
+        {UART0,               sizeof(*UART0),  UVISOR_TACLDEF_PERIPH}, \
+        {(void *) 0x0FE08000, 0x1000,          UVISOR_TACLDEF_PERIPH}, \
+        {(void *) 0x42000000, 0x2000000,       UVISOR_TACLDEF_PERIPH}, \
+    }
+
 #else /* Target-specific settings */
 
 #error "Unsupported target. Checkout the README.md file for the list of supported targets for this app."

source/main.cpp

@@ -43,7 +43,7 @@ static void main_alloc(void)
 int main(void)
 {
     Thread thread(osPriorityNormal, 512, NULL);
-    osStatus status = thread.start(main_alloc);
+    osStatus_t status = thread.start(main_alloc);
     if (status != osOK) {
         printf("Could not start main thread.\r\n");
         uvisor_error(USER_NOT_ALLOWED);

test/filters.json

@@ -1,6 +1,6 @@
 {
     "blacklist" : [ {
-        "platforms" : ["EFM32GG_STK3700", "DISCO_F429ZI"]
+        "platforms" : ["DISCO_F429ZI"]
         }
     ]
 }