Cleanup

Author: vshymanskyy

buildall.py

@@ -5,7 +5,7 @@
 from tabulate import tabulate
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
-targets = ["x86", "x64", "armv7m", "armv7emsp", "armv7emdp", "xtensa", "xtensawin"]  # "armv6m", "rv32imc"
+targets = ["x86", "x64", "armv6m", "armv7m", "armv7emsp", "armv7emdp", "xtensa", "xtensawin"]  # "rv32imc"
 apps = ["assemblyscript", "cpp", "rust", "tinygo", "zig", "virgil", "wat", "coremark"]
 
 

runtime/libc.c

@@ -3,8 +3,10 @@
  * Created:   24.08.2024
  **/
 
+#if !defined(__riscv)
 // define errno before any includes so it gets into BSS
 int errno;
+#endif
 
 #include "py/dynruntime.h"
 
@@ -58,18 +60,21 @@ int strncmp(const char *_l, const char *_r, size_t n) {
     return *l - *r;
 }
 
+#if !defined(__riscv)
 int *__errno(void) {
     return &errno;
 }
 
 int *__errno_location(void) {
     return &errno;
 }
+#endif
 
 __attribute__ ((noreturn))
 void abort(void) {
-    mp_printf(&mp_plat_print, "Aborting\n");
-    __builtin_trap();
+    //mp_printf(&mp_plat_print, "WASM: Aborting\n");
+    //__builtin_trap();
+    mp_raise_msg(&mp_type_RuntimeError, "WASM: Aborted");
     for(;;) {}  // Should not reach here
 }
 

runtime/runtime.c

@@ -6,6 +6,8 @@
 #include "py/dynruntime.h"
 #include "wasm.h"
 
+#define mp_type_AttributeError (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_AttributeError)))
+
 // Instance of the WASM module
 w2c_wasm module;
 
@@ -35,13 +37,13 @@ static mp_obj_t getattr(mp_obj_t attr) {
     size_t attr_len;
     char* attr_str = mp_obj_str_get_data(attr, &attr_len);
     if (!attr_str) {
-        mp_raise_msg(&mp_type_RuntimeError, "Invalid attr");
+        mp_raise_msg(&mp_type_AttributeError, "Invalid attr");
         return mp_const_none;
     }
     if (!strncmp(attr_str, "_memory", attr_len + 1)) {
         return mp_obj_new_bytearray_by_ref(module.w2c_memory.size, (void*)(module.w2c_memory.data));
     } else {
-        mp_raise_msg(&mp_type_RuntimeError, "Unknown attr");
+        mp_raise_msg(&mp_type_AttributeError, "Unknown attr");
         return mp_const_none;
     }
 }
@@ -73,7 +75,10 @@ void w2c_wiring_digitalWrite(struct w2c_wiring* wiring, u32 pin, u32 value) {
 }
 
 void w2c_wiring_print(struct w2c_wiring* wiring, u32 offset, u32 len) {
-    // TODO: verify bounds
+    if (len > module.w2c_memory.size || offset > (module.w2c_memory.size - len)) {
+        mp_raise_msg(&mp_type_RuntimeError, "OOB in external func");
+        abort();
+    }
     mp_printf(&mp_plat_print, "%.*s", len, (const uint8_t*)module.w2c_memory.data + offset);
 }