Fix style

* Correct spacing around operators.
* Spell out stack sizes explicitly.
* Minor fixes.

Author: AlessandroA

source/led1.cpp

@@ -14,18 +14,21 @@ static const UvisorBoxAclItem acl[] = {
 
 static void led1_main(const void *);
 
+/* Box configuration
+ * We do not need large stacks in either the main nor the interrupt thread, as
+ * we do not do anything special in them. */
 UVISOR_BOX_NAMESPACE(NULL);
-UVISOR_BOX_HEAPSIZE(8192);
-UVISOR_BOX_MAIN(led1_main, osPriorityNormal, UVISOR_BOX_STACK_SIZE);
-UVISOR_BOX_CONFIG(box_led1, acl, UVISOR_BOX_STACK_SIZE, box_context);
+UVISOR_BOX_HEAPSIZE(3 * 1024);
+UVISOR_BOX_MAIN(led1_main, osPriorityNormal, 512);
+UVISOR_BOX_CONFIG(box_led1, acl, 512, box_context);
 
 static void led1_main(const void *)
 {
     DigitalOut led1(LED1);
     led1 = LED_OFF;
     const uint32_t kB = 1024;
 
-    SecureAllocator alloc = secure_allocator_create_with_pages(4*kB, 1*kB);
+    SecureAllocator alloc = secure_allocator_create_with_pages(4 * kB, 1 * kB);
 
     while (1) {
         static const size_t size = 500;
@@ -34,6 +37,6 @@ static void led1_main(const void *)
         led1 = !led1;
         ++uvisor_ctx->heartbeat;
         alloc_fill_wait_verify_free(size, seed, 211);
-        specific_alloc_fill_wait_verify_free(alloc, 5*kB, seed, 107);
+        specific_alloc_fill_wait_verify_free(alloc, 5 * kB, seed, 107);
     }
 }

source/led2.cpp

@@ -14,10 +14,13 @@ static const UvisorBoxAclItem acl[] = {
 
 static void led2_main(const void *);
 
+/* Box configuration
+ * We do not need large stacks in either the main nor the interrupt thread, as
+ * we do not do anything special in them. */
 UVISOR_BOX_NAMESPACE(NULL);
-UVISOR_BOX_HEAPSIZE(8192);
-UVISOR_BOX_MAIN(led2_main, osPriorityNormal, UVISOR_BOX_STACK_SIZE);
-UVISOR_BOX_CONFIG(box_led2, acl, UVISOR_BOX_STACK_SIZE, box_context);
+UVISOR_BOX_HEAPSIZE(8 * 1024);
+UVISOR_BOX_MAIN(led2_main, osPriorityNormal, 512);
+UVISOR_BOX_CONFIG(box_led2, acl, 512, box_context);
 
 static void led2_main(const void *)
 {
@@ -33,13 +36,13 @@ static void led2_main(const void *)
      * page heap!
      */
     /* Allocate one page. */
-    alloc = secure_allocator_create_with_pages(4*kB, 1*kB);
+    alloc = secure_allocator_create_with_pages(4 * kB, 1 * kB);
     /* Allocate another page. */
-    SecureAllocator alloc2 = secure_allocator_create_with_pages(4*kB, 1*kB);
+    SecureAllocator alloc2 = secure_allocator_create_with_pages(4 * kB, 1 * kB);
     /* Deallocate alloc1 page, creating a hole. */
     secure_allocator_destroy(alloc);
     /* Allocate two pages. */
-    alloc = secure_allocator_create_with_pages(uvisor_get_page_size() + 3*kB, 6*kB);
+    alloc = secure_allocator_create_with_pages(uvisor_get_page_size() + 3 * kB, 6 * kB);
     /* Deallocate alloc2 page, creating another hole. */
     secure_allocator_destroy(alloc2);
 
@@ -52,9 +55,9 @@ static void led2_main(const void *)
         alloc_fill_wait_verify_free(size, seed, 311);
 
         /* Allocate in first page */
-        specific_alloc_fill_wait_verify_free(alloc, 6*kB, seed, 0);
+        specific_alloc_fill_wait_verify_free(alloc, 6 * kB, seed, 0);
 
         /* Allocate in second page */
-        specific_alloc_fill_wait_verify_free(alloc, 6*kB, seed, 101);
+        specific_alloc_fill_wait_verify_free(alloc, 6 * kB, seed, 101);
     }
 }

source/led3.cpp

@@ -14,10 +14,13 @@ static const UvisorBoxAclItem acl[] = {
 
 static void led3_main(const void *);
 
+/* Box configuration
+ * We need at least 1kB in the main thread as we use printf in it. The interrupt
+ * stack size can be smaller as we do not do anything special in them. */
 UVISOR_BOX_NAMESPACE(NULL);
-UVISOR_BOX_HEAPSIZE(8192);
-UVISOR_BOX_MAIN(led3_main, osPriorityNormal, UVISOR_BOX_STACK_SIZE);
-UVISOR_BOX_CONFIG(box_led3, acl, UVISOR_BOX_STACK_SIZE, box_context);
+UVISOR_BOX_HEAPSIZE(8 * 1024);
+UVISOR_BOX_MAIN(led3_main, osPriorityNormal, 1024);
+UVISOR_BOX_CONFIG(box_led3, acl, 512, box_context);
 
 static void run_3(void)
 {
@@ -37,23 +40,23 @@ static void led3_main(const void *)
     DigitalOut led3(LED3);
     led3 = LED_OFF;
 
-    Thread * thread1 = new Thread();
-    status = thread1->start(run_3);
+    Thread thread1(osPriorityNormal, 512, NULL);
+    status = thread1.start(run_3);
     if (status != osOK) {
         printf("Could not start box_led3 thread1.\r\n");
         uvisor_error(USER_NOT_ALLOWED);
     }
 
-    Thread * thread2 = new Thread();
-    status = thread2->start(run_3);
+    Thread thread2(osPriorityNormal, 512, NULL);
+    status = thread2.start(run_3);
     if (status != osOK) {
         printf("Could not start box_led3 thread2.\r\n");
         uvisor_error(USER_NOT_ALLOWED);
     }
 
     /* Create page-backed allocator. */
     const uint32_t kB = 1024;
-    SecureAllocator alloc = secure_allocator_create_with_pages(4*kB, 1*kB);
+    SecureAllocator alloc = secure_allocator_create_with_pages(4 * kB, 1 * kB);
     /* Prepare the thread definition structure. */
     osThreadDef_t thread_def;
     thread_def.stacksize = DEFAULT_STACK_SIZE;
@@ -64,7 +67,6 @@ static void led3_main(const void *)
     /* Create a thread with the page allocator as heap. */
     osThreadContextCreate(&thread_def, NULL, alloc);
 
-
     while (1) {
         static const size_t size = 20;
         uint16_t seed = (size << 8) | (uvisor_ctx->heartbeat & 0xFF);

source/main.cpp

@@ -22,28 +22,28 @@
 
 /* Create ACLs for main box. */
 MAIN_ACL(g_main_acl);
+
 /* Enable uVisor. */
 UVISOR_SET_MODE_ACL(UVISOR_ENABLED, g_main_acl);
-UVISOR_SET_PAGE_HEAP(8*1024, 5);
+UVISOR_SET_PAGE_HEAP(8 * 1024, 5);
 
 static void main_alloc(void)
 {
     const uint32_t kB = 1024;
     uint16_t seed = 0x10;
-    SecureAllocator alloc = secure_allocator_create_with_pages(4*kB, 1*kB);
+    SecureAllocator alloc = secure_allocator_create_with_pages(4 * kB, 1 * kB);
 
     while (1) {
         alloc_fill_wait_verify_free(500, seed, 577);
-        specific_alloc_fill_wait_verify_free(alloc, 5*kB, seed, 97);
+        specific_alloc_fill_wait_verify_free(alloc, 5 * kB, seed, 97);
         seed++;
     }
 }
 
 int main(void)
 {
-    osStatus status;
-    Thread * thread = new Thread();
-    status = thread->start(main_alloc);
+    Thread thread(osPriorityNormal, 512, NULL);
+    osStatus status = thread.start(main_alloc);
     if (status != osOK) {
         printf("Could not start main thread.\r\n");
         uvisor_error(USER_NOT_ALLOWED);
@@ -53,8 +53,7 @@ int main(void)
 
     size_t count = 0;
 
-    while (1)
-    {
+    while (1) {
         printf("Main loop count: %d\r\n", count++);
     }