fw: fix building with JS support

Signed-off-by: Liam McLoughlin <hexxeh@hexxeh.net>

Author: Hexxeh

.github/workflows/build.yml

@@ -8,6 +8,8 @@ on:
 
 env:
   ARM_GNU_TOOLCHAIN_VERSION: 14.2.rel1
+  EM_VERSION: 4.0.1
+  EM_CACHE_FOLDER: 'emsdk-cache'
 
 jobs:
   build:
@@ -22,6 +24,13 @@ jobs:
           fetch-depth: 0
           submodules: true
 
+      - name: Setup emsdk cache
+        id: cache-emsdk
+        uses: actions/cache@v2
+        with:
+          path: ${{env.EM_CACHE_FOLDER}}
+          key: emsdk-${{env.EM_VERSION}}-${{ runner.os }}
+
       - uses: actions/setup-python@v5
         with:
           python-version: "3.13"
@@ -40,8 +49,13 @@ jobs:
           sudo tar xf arm-gnu-toolchain-${ARM_GNU_TOOLCHAIN_VERSION}-x86_64-arm-none-eabi.tar.xz -C /opt
           echo "/opt/arm-gnu-toolchain-${ARM_GNU_TOOLCHAIN_VERSION}-x86_64-arm-none-eabi/bin" >> $GITHUB_PATH
 
+      - uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: ${{env.EM_VERSION}}
+          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
+
       - name: Configure
-        run: ./waf configure --board ${{ matrix.board }} --nojs
+        run: ./waf configure --board ${{ matrix.board }}
 
       - name: Build FW
         run: ./waf build
@@ -63,7 +77,7 @@ jobs:
 
       - name: Configure (QEMU)
         if: ${{ matrix.board != 'asterix_vla_dvb1' }}
-        run: ./waf clean configure --board ${{ matrix.board }} --nojs --qemu
+        run: ./waf clean configure --board ${{ matrix.board }} --qemu
 
       - name: Build FW (QEMU)
         if: ${{ matrix.board != 'asterix_vla_dvb1' }}

README.md

@@ -63,13 +63,17 @@ may work right now.
     python_libs/pulse2 \
     python_libs/pebble-loghash
   ```
+- Install emscripten
+  - If you're on Mac and using [Homebrew](https://brew.sh), you can run `brew install emscripten`.
+  - If you're on Linux, follow the instructions [here](https://github.com/emscripten-core/emsdk) and install version 4.0.1.
+  - You can skip this if you wish by configuring with `--nojs` but beware the built-in clock for several devices requires JS and will render a blank screen when disabled.
 
 ## Building
 
 First, configure the project like this:
 
 ```shell
-./waf configure --board <board> --nojs
+./waf configure --board <board>
 ```
 
 Note: If you wish to debug, you're likely to want `--nowatchdog --nostop --nosleep` also.
@@ -140,7 +144,7 @@ If you're using an Apple Silicon Mac, you might find it easier to build QEMU fro
 The steps here are similar that of real hardware:
 
 ```shell
-./waf configure --board=snowy_bb2 --nojs --qemu
+./waf configure --board=snowy_bb2 --qemu
 ./waf build
 ./waf qemu_image_spi
 ./waf qemu

src/fw/applib/rockyjs/api/rocky_api_graphics_color.c

@@ -314,6 +314,7 @@ static bool prv_parse_hex(const char *color_value, GColor8 *parsed_color) {
         return true;
       }
     }
+    /* FALLTHROUGH */
     case 5: { // #RGBA
       if (prv_parse_hex_comps(color_value + 1, 1, &r, &g, &b, &a)) {
         *parsed_color = GColorFromRGBA(r * (255/15), g * (255/15), b * (255/15), a * (255/15));
@@ -323,12 +324,14 @@ static bool prv_parse_hex(const char *color_value, GColor8 *parsed_color) {
         return true;
       }
     }
+    /* FALLTHROUGH */
     case 7: { // #RRGGBB
       if (prv_parse_hex_comps(color_value + 1, 2, &r, &g, &b, NULL)) {
         *parsed_color = GColorFromRGB(r, g, b);
         return true;
       }
     }
+    /* FALLTHROUGH */
     case 9: { // #RRGGBBAA
       if (prv_parse_hex_comps(color_value + 1, 2, &r, &g, &b, &a)) {
         *parsed_color = GColorFromRGBA(r, g, b, a);

src/fw/vendor/jerryscript/js_tooling/_js_tooling.js

@@ -144,13 +144,13 @@ function createSnapshot(js, options) {
     logDuration(timeJerryInit);
 
     var collectedErrors = [];
-    var errorHandlerPtr = jerry['Runtime'].addFunction(function(msgPtr) {
+    var errorHandlerPtr = addFunction(function(msgPtr) {
         var msg = jerry['Pointer_stringify'](msgPtr).trim();
         if (msg !== 'Error:') {
             collectedErrors.push(msg);
         }
         return true;
-    });
+    }, "ip");
     jerry_port_set_errormsg_handler(errorHandlerPtr);
 
     var timeJerry = captureDuration('jerry_parse_and_save_snapshot');
@@ -165,7 +165,7 @@ function createSnapshot(js, options) {
         return error(collectedErrors.join('. '));
     }
     logDuration(timeJerry);
-    jerry['Runtime'].removeFunction(errorHandlerPtr);
+    removeFunction(errorHandlerPtr);
 
     var timeJerryCleanup = captureDuration('jerry_cleanup');
     jerry['_jerry_cleanup']();

src/fw/vendor/jerryscript/js_tooling/js_tooling_port.c

@@ -7,9 +7,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-jerry_context_t jerry_global_context;
-jmem_heap_t jerry_global_heap __attribute__((__aligned__(JMEM_ALIGNMENT)));
-jerry_hash_table_t jerry_global_hash_table;
+extern jerry_context_t jerry_global_context;
+extern jmem_heap_t jerry_global_heap __attribute__((__aligned__(JMEM_ALIGNMENT)));
+extern jerry_hash_table_t jerry_global_hash_table;
 
 size_t jerry_parse_and_save_snapshot_from_zt_utf8_string(
   const jerry_char_t *zt_utf8_source_p,
@@ -68,3 +68,7 @@ void jerry_port_console(const char *format, ...) {
   prv_log(format, args);
   va_end(args);
 }
+
+void jerry_port_fatal (jerry_fatal_code_t code, void *lr) {
+  exit(code);
+}

src/fw/vendor/jerryscript/js_tooling/transform_js.py

@@ -18,8 +18,8 @@ def replace_ensured(s, old, new):
 
 # source = replace_ensured(source, "func = eval('_' + ident); // explicit lookup",
 #                                  "// func = eval('_' + ident); // explicit lookup")
-source = replace_ensured(source, "process['on']('uncaughtException',",
-                                 "process['on']('uncaughtException-ignore',")
+# source = replace_ensured(source, "process.on('uncaughtException',",
+#                                  "process.on('uncaughtException-ignore',")
 
 source = "(function(){\n%s\n})(this);" % source
 

src/fw/vendor/jerryscript/wscript

@@ -85,9 +85,6 @@ def jerry_build_js_compiler(bld):
     transform_js_file = bld.path.make_node('js_tooling/transform_js.py').abspath()
     env.append_value('CFLAGS', ['--js-transform', transform_js_file])
 
-    # tell Emscripten to create a single file
-    env.append_value('CFLAGS', ['--memory-init-file', '0'])
-
     # Uncomment this line to get verbose output for emscripten
     # env.append_value('CFLAGS', ['-v'])
 
@@ -97,15 +94,28 @@ def jerry_build_js_compiler(bld):
                           "_jerry_parse_and_save_snapshot_from_zt_utf8_string",
                           "_legacy_defective_checksum_memory",
                           "_rocky_fill_header",
-                          "_jerry_port_set_errormsg_handler")
+                          "_jerry_port_set_errormsg_handler",
+                          "_malloc",
+                          "_memset")
     env.append_value('CFLAGS', ['-s', 'EXPORTED_FUNCTIONS=[{}]'.format(
         ', '.join(('"' + f + '"' for f in exported_functions)))])
 
+    exported_runtime_methods = ( "getValue",
+                                 "setValue",
+                                 "ccall",
+                                 "addFunction",
+                                 "removeFunction")
+    env.append_value('CFLAGS', ['-s', 'EXPORTED_RUNTIME_METHODS=[{}]'.format(
+        ', '.join(('"' + f + '"' for f in exported_runtime_methods)))])
+
     # so we can call jerry_port_set_errormsg_handler() with a JS function pointer
     env.append_value('CFLAGS', ['-s', 'RESERVED_FUNCTION_POINTERS=1'])
 
     env.append_value('CFLAGS', ['-s', 'ERROR_ON_UNDEFINED_SYMBOLS=0'])
 
+    env.append_value('CFLAGS', ['-s', 'ALLOW_TABLE_GROWTH'])
+    env.append_value('CFLAGS', ['-s', 'WASM_ASYNC_COMPILATION=0'])
+
     sources = bld.path.ant_glob('jerry-core/**/*.c')
     sources += bld.path.ant_glob('js_tooling/*.c')
     sources += fw_path.ant_glob('util/legacy_checksum.c')
@@ -211,6 +221,7 @@ def build(bld):
                      '-Wno-error=unused-parameter',
                      '-Wno-error=unused-variable',
                      '-Wno-error=unused-function',
+                     '-Wno-error=implicit-fallthrough',
                      '-Wno-pedantic']
 
     if bld.variant == 'test':

tools/resources/resource_map/resource_generator_js.py

@@ -48,7 +48,7 @@ def generate_object(task, definition):
                bytecode.abspath(),
                memory_usage_output.abspath()]
 
-        proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
+        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, encoding='utf-8')
         out, err = proc.communicate()
 
         if proc.returncode != 0:

waftools/c_inject_include_files.py

@@ -32,7 +32,7 @@ def process_include_files(self):
     for include_file in to_list(self.inject_include_files):
         if isinstance(include_file, Nod3):
             node = include_file
-        elif isinstance(include_file, basestring):
+        elif isinstance(include_file, str):
             node = self.path.find_node(include_file)
             if not node:
                 self.bld.fatal('%s does not exist.' % include_file)