Merge pull request #54 from maejima-fumika/execute-macro-benchmarks

Execute macro benchmarks

Author: maejima-fumika

microcontroller/core/include/main-thread.h

@@ -4,12 +4,16 @@
 #include <stdint.h>
 #include "c-runtime.h"
 
-void bs_main_thread_init();
+#define CORE_TEXT_SECTION __attribute__((section(".core_text")))
 
-void bs_main_thread_reset();
+void CORE_TEXT_SECTION bs_main_thread_init();
 
-void bs_main_thread_set_main(int32_t id, void* address);
+void CORE_TEXT_SECTION bs_main_thread_reset();
 
-void bs_main_thread_set_event(value_t fn);
+void CORE_TEXT_SECTION bs_main_thread_set_main(int32_t id, void* address);
+
+void CORE_TEXT_SECTION bs_main_thread_set_event(value_t fn);
+
+void CORE_TEXT_SECTION bs_main_thread_set_event_from_isr(void* fn);
 
 #endif /* __BS_MAIN_THREAD__ */

microcontroller/core/include/protocol.h

@@ -5,17 +5,18 @@
 #include "memory.h"
 #include "ble.h"
 
+#define CORE_TEXT_SECTION __attribute__((section(".core_text")))
 
-void bs_protocol_write_log(char* message);
+void CORE_TEXT_SECTION bs_protocol_write_log(char* message);
 
-void bs_protocol_write_error(char* message);
+void CORE_TEXT_SECTION bs_protocol_write_error(char* message);
 
-void bs_protocol_write_profile(uint8_t fid, char* profile);
+void CORE_TEXT_SECTION bs_protocol_write_profile(uint8_t fid, char* profile);
 
-void bs_protocol_write_execution_time(int32_t id, float time);
+void CORE_TEXT_SECTION bs_protocol_write_execution_time(int32_t id, float time);
 
-void bs_protocol_write_memory_layout(bs_memory_layout_t* layout);
+void CORE_TEXT_SECTION bs_protocol_write_memory_layout(bs_memory_layout_t* layout);
 
-void bs_protocol_read(uint8_t* buffer, uint32_t len);
+void CORE_TEXT_SECTION bs_protocol_read(uint8_t* buffer, uint32_t len);
 
 #endif /* __BS_PROTOCOL__ */

microcontroller/core/src/main-thread.c

@@ -35,16 +35,30 @@ typedef union {
 
 static QueueHandle_t task_item_queue;
 
-static void main_thread_init() {
+static bool is_code_installed(bs_memory_layout_t* memory_layout) {
+    uint8_t* dflash_address = (uint8_t*)memory_layout->dflash_address;
+    return dflash_address[0] == 1;
+}
+
+static void main_thread_init(bs_memory_layout_t* memory_layout) {
     BS_LOG_INFO("Initialize main thread")
-    bs_memory_init();
     gc_initialize();
+    bs_memory_init();
+    bs_memory_get_layout(memory_layout);
     task_item_queue = xQueueCreate(TASK_ITEM_QUEUE_LENGTH, sizeof(task_item_u));
+    if (is_code_installed(memory_layout)) {
+        BS_LOG_INFO("Execute installed code");
+        uint32_t dram_code_length = *(uint32_t*)(memory_layout->dflash_address + 1);
+        bs_protocol_read((uint8_t*)memory_layout->dflash_address + 5, dram_code_length);
+    } else {
+        BS_LOG_INFO("Reset memory")
+        bs_memory_reset();
+    }
 }
 
 static void main_thread_reset() {
     BS_LOG_INFO("Reset main thread")
-    bs_memory_reset();
+    bs_memory_ram_reset();
     gc_initialize();
     xQueueReset(task_item_queue);
 }
@@ -63,7 +77,8 @@ static void task_call_event(value_t fn) {
 }
 
 void main_thread(void *arg) {
-    main_thread_init();
+    bs_memory_layout_t memory_layout;
+    main_thread_init(&memory_layout);
 
     while (true) {
         task_item_u task_item;
@@ -79,8 +94,6 @@ void main_thread(void *arg) {
                 break;
             case TASK_RESET:
                 main_thread_reset();
-                bs_memory_layout_t memory_layout;
-                bs_memory_get_layout(&memory_layout);
                 bs_protocol_write_memory_layout(&memory_layout);
                 break;
             default:
@@ -91,7 +104,7 @@ void main_thread(void *arg) {
 }
 
 void bs_main_thread_init() {
-    xTaskCreatePinnedToCore(main_thread, "bs_main_thread", 4096 * 16, NULL, 5, NULL, 0);
+    xTaskCreatePinnedToCore(main_thread, "bs_main_thread", 4096 * 16, NULL, 1, NULL, 0);
 }
 
 void bs_main_thread_reset() {
@@ -113,4 +126,12 @@ void bs_main_thread_set_event(value_t fn) {
     task_item.call_event.task = TASK_CALL_EVENT;
     task_item.call_event.fn = fn;
     xQueueSend(task_item_queue, &task_item, portMAX_DELAY);
+}
+
+void bs_main_thread_set_event_from_isr(void* fn) {
+    portBASE_TYPE yield = pdFALSE;
+    task_item_u task_item;
+    task_item.call_event.task = TASK_CALL_EVENT;
+    task_item.call_event.fn = (value_t)fn;
+    xQueueSendFromISR(task_item_queue, &task_item, &yield);
 }

microcontroller/ports/esp32/CMakeLists.txt

@@ -7,10 +7,10 @@ cmake_minimum_required(VERSION 3.16)
 set(EXTRA_COMPONENT_DIRS  
         "../../core" 
         "../../../modules/std" 
-        # "../../../modules/gpio" 
-        # "../../../modules/timer" 
-        # "../../../modules/display"
-        # "../../../modules/button"
+        "../../../modules/gpio" 
+        "../../../modules/timer" 
+        "../../../modules/display"
+        "../../../modules/button"
     )
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)

microcontroller/ports/esp32/main/include/memory.h

@@ -16,6 +16,8 @@ typedef struct {
 
 void bs_memory_init();
 
+void bs_memory_ram_reset();
+
 void bs_memory_reset();
 
 void bs_memory_get_layout(bs_memory_layout_t* layout);

microcontroller/ports/esp32/main/memory.c

@@ -76,6 +76,12 @@ void bs_memory_init() {
 }
 
 
+void bs_memory_ram_reset() {
+    iram_reset();
+    dram_reset();
+}
+
+
 void bs_memory_reset() {
     iram_reset();
     dram_reset();

modules/button/button.c

@@ -1,6 +1,6 @@
 #include "driver/gpio.h"
 #include "c-runtime.h"
-#include "shell.h"
+#include "main-thread.h"
 #include "button.h"
 
 
@@ -28,7 +28,7 @@ void fbody_000001buttonOnPressed(value_t self, int32_t _buttonPin, value_t _call
         is_isr_installed = true;
     }
     set_global_variable(&global_rootset0_000001.values[_buttonPin], _callback);
-    gpio_isr_handler_add(_buttonPin, bs_event_push_from_isr, (void*)func_rootset.values[0]);
+    gpio_isr_handler_add(_buttonPin, bs_main_thread_set_event_from_isr, (void*)func_rootset.values[0]);
   }
   DELETE_ROOT_SET(func_rootset)
 }

modules/display/display-helper.c

@@ -3,6 +3,8 @@
 #include "esp_system.h"
 #include "driver/spi_master.h"
 #include "driver/gpio.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
 
 
 #define LCD_HOST    HSPI_HOST
@@ -508,3 +510,74 @@ uint8_t* get_font8x8_char(char chr) {
     return font8x8 + idx * 8;
 }
 
+void display_reset() {
+    gpio_set_level(PIN_NUM_BCKL, 0);
+    gpio_set_level(PIN_NUM_RST, 0);
+    vTaskDelay(50 / portTICK_PERIOD_MS);
+    gpio_set_level(PIN_NUM_RST, 1);
+    vTaskDelay(50 / portTICK_PERIOD_MS);
+}
+
+void display_init() {
+    spi_init();
+    gpio_init();
+    display_reset();
+    int cmd = 0;
+    //Send all the commands
+    while (init_cmds[cmd].databytes!=0xff) {
+        spi_write_cmd(init_cmds[cmd].cmd);
+        spi_write_data(init_cmds[cmd].data, init_cmds[cmd].databytes&0x1F);
+        if (init_cmds[cmd].databytes&0x80) {
+            vTaskDelay(100 / portTICK_PERIOD_MS);
+        }
+        cmd++;
+    }
+
+    spi_write_cmd(MADCTL);
+    uint8_t data[16] = {0x08};
+    spi_write_data(data, 1&0x1F);
+    spi_write_cmd(DISPLAY_INVERSION_ON);
+    spi_write_cmd(WAKE);
+    vTaskDelay(120 / portTICK_PERIOD_MS);
+    spi_write_cmd(DISPLAY_ON);
+    gpio_set_level(PIN_NUM_BCKL, 1);
+}
+
+uint16_t display_color(int32_t r, int32_t g, int32_t b) {
+    uint16_t color = 0;
+    color |= ((r >> 3) << 11);
+    color |= ((g >> 2) << 5);
+    color |= ((b >> 3) << 0);
+    color = (color >> 8) | (color << 8); // big-endian
+    return color;
+}
+
+void display_fill(uint16_t color) {
+    display_draw(fill, color, color);
+}
+
+void display_show_heart_icon(uint16_t color, uint16_t background) {
+    display_draw(heart, color, background);
+}
+
+void display_show_small_heart_icon(uint16_t color, uint16_t background) {
+    display_draw(small_heart, color, background);
+}
+
+void display_show_happy_face_icon(uint16_t color, uint16_t background) {
+    display_draw(happy_face, color, background);
+}
+
+void display_show_sad_face_icon(uint16_t color, uint16_t background) {
+    display_draw(sad_face, color, background);
+}
+
+void display_show_string(char* str, uint16_t color, uint16_t background) {
+    display_text(str, color, background);
+}
+
+void display_show_integer(int32_t integer, uint16_t color, uint16_t background) {
+    char buff[12]; // Max num length + blank
+    sprintf(buff, "%ld", integer);
+    display_text(&buff, color, background);
+}

modules/display/display-helper.h

@@ -0,0 +1,24 @@
+#ifndef __BS_Display_Helper__
+#define __BS_Display_Helper__
+
+#include <stdint.h>
+
+void display_init();
+
+uint16_t display_color(int32_t r, int32_t g, int32_t b);
+
+void display_fill(uint16_t color);
+
+void display_show_heart_icon(uint16_t color, uint16_t background);
+
+void display_show_small_heart_icon(uint16_t color, uint16_t background);
+
+void display_show_happy_face_icon(uint16_t color, uint16_t background);
+
+void display_show_sad_face_icon(uint16_t color, uint16_t background);
+
+void display_show_string(char* str, uint16_t color, uint16_t background);
+
+void display_show_integer(int32_t integer, uint16_t color, uint16_t background);
+
+#endif /* __BS_Display_Helper__ */

modules/display/display.bs

@@ -1,5 +1,6 @@
 import type {integer} from "../../bs-utils"
 
+code`#include "display-helper.h"`
 
 export class Display {
     ICON_HEART: integer;
@@ -12,30 +13,38 @@ export class Display {
         this.ICON_SMALL_HEART = 1;
         this.ICON_HAPPY_FACE = 2;
         this.ICON_SAD_FACE = 3;
-        this.reset();
-    }
-
-    public reset() {
-
+        code`display_init()`;
     }
 
     public fill(color: integer) {
-
+        code`display_fill(_color)`;
     }
 
     public showIcon(icon: integer, color: integer, background: integer) {
-
+        if (icon === this.ICON_HEART)
+            code`display_show_heart_icon(_color, _background)`;
+        else if (icon === this.ICON_SMALL_HEART)
+            code`display_show_small_heart_icon(_color, _background)`;
+        else if (icon === this.ICON_HAPPY_FACE)
+            code`display_show_happy_face_icon(_color, _background)`;
+        else if (icon === this.ICON_SAD_FACE)
+            code`display_show_sad_face_icon(_color, _background)`;
+        else
+            code`runtime_error("** display module error: unknown icon.")`
     }
 
     public showString(str: string, color: integer, background: integer) {
-
+        code`char* text = gc_string_to_cstr(_str)`;
+        code`display_show_string(text, _color, _background)`;
     }
 
     public showInt(int: integer, color: integer, background: integer) {
-
+        code`display_show_integer(_int, _color, _background)`;
     }
 
     public color(r: integer, g: integer, b: integer):integer {
-        return 2;
+        const color = 0;
+        code`_color = display_color(_r, _g, _b)`;
+        return color;
     }
 }