Linting and formatting

Sorry git history

Author: beardhatcode

WARDuino.cpp

@@ -2,6 +2,7 @@
 
 #ifndef WAC_H
 #define WAC_H
+
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -49,9 +50,13 @@ typedef struct Type {
 
 typedef union FuncPtr {
     void (*void_void)();
+
     void (*void_i32)(uint32_t);
+
     void (*void_i64)(uint64_t);
+
     void (*void_f32)(float);
+
     void (*void_f64)(double);
 
     double (*f64_f64)(double);
@@ -60,11 +65,11 @@ typedef union FuncPtr {
 // A block or function
 typedef struct Block {
     uint8_t block_type;    // 0x00: function, 0x01: init_exp
-                           // 0x02: block, 0x03: loop, 0x04: if
+    // 0x02: block, 0x03: loop, 0x04: if
     uint32_t fidx;         // function only (index)
     Type *type;            // params/results type
     uint32_t local_count;  // function only
-    uint32_t *local_value_type;      // types of locals (function only)
+    uint8_t *local_value_type;      // types of locals (function only)
     uint8_t *start_ptr;
     uint8_t *end_ptr;
     uint8_t *else_ptr;    // if block only
@@ -128,7 +133,7 @@ typedef struct Options {
 class WARDuino; // predeclare for it work in the module decl
 
 typedef struct Module {
-    WARDuino* warduino;
+    WARDuino *warduino;
     char *path;       // file path of the wasm module
     Options options;  // Config options
 
@@ -142,8 +147,8 @@ typedef struct Module {
     uint32_t function_count;  // number of function (including imports)
     Block *functions;         // imported and locally defined functions
     std::map<uint8_t *, Block *>
-        block_lookup;         // map of module byte position to Blocks
-                              // same length as byte_count
+            block_lookup;         // map of module byte position to Blocks
+    // same length as byte_count
     uint32_t start_function;  // function to run on module load
     Table table;
     Memory memory;
@@ -160,17 +165,20 @@ typedef struct Module {
 } Module;
 
 typedef void (*Primitive)(Module *);
+
 typedef struct PrimitiveEntry {
     const char *name;
     Primitive f;
     Type t;
 } PrimitiveEntry;
 
 
-enum RunningState { WARDUINOrun, WARDUINOpause, WARDUINOstep };
+enum RunningState {
+    WARDUINOrun, WARDUINOpause, WARDUINOstep
+};
 
 class WARDuino {
-   private:
+private:
     std::vector<Module *> modules = {};
     std::deque<uint8_t *> parsedInterrups = {};
 
@@ -184,26 +192,35 @@ class WARDuino {
     std::vector<uint8_t> interruptBuffer;
     long interruptSize;
 
-   public:
+public:
 
     // vector, we expect few breakpoints
     std::set<uint8_t *> breakpoints = {};
 
     WARDuino();
-    int run_module(Module* m);
+
+    int run_module(Module *m);
+
     Module *load_module(uint8_t *bytes, uint32_t byte_count, Options options);
-    void unload_module(Module* m);
+
+    void unload_module(Module *m);
+
     bool invoke(Module *m, uint32_t fidx);
+
     uint32_t get_export_fidx(Module *m, const char *name);
+
     void handleInterrupt(size_t len, uint8_t *buff);
 
     // breakpoints
-    void addBreakpoint(uint8_t* loc);
-    void delBreakpoint(uint8_t* loc);
-    bool isBreakpoint(uint8_t* loc);
-    
+    void addBreakpoint(uint8_t *loc);
+
+    void delBreakpoint(uint8_t *loc);
+
+    bool isBreakpoint(uint8_t *loc);
+
     // Get interrupt or NULL if none
-    uint8_t* getInterrupt();
+    uint8_t *getInterrupt();
 
 };
+
 #endif

WARDuino.h

@@ -9,17 +9,17 @@ trap "rm -rf '$tmpdir'" EXIT
 
 echo -e "tip:\ntail -f $tmpdir/*"
 
-echo "Not started yet" >  $tmpdir/espruino
-echo "Not started yet" >  $tmpdir/warduino
-echo "Not started yet" >  $tmpdir/native
+echo "Not started yet" >$tmpdir/espruino
+echo "Not started yet" >$tmpdir/warduino
+echo "Not started yet" >$tmpdir/native
 
-to_csv () {
+to_csv() {
   sed -i -n '0~2{N;s/\n/,/p}' $1
 }
 
 sleep 5
 ./espruino_bench.sh $tmpdir/espruino
-to_csv  $tmpdir/espruino
+to_csv $tmpdir/espruino
 
 sleep 5
 ./warduino_bench.sh $tmpdir/warduino
@@ -36,18 +36,18 @@ cat $tmpdir/warduino
 echo "# Native"
 cat $tmpdir/native
 
-sizes () {
+sizes() {
   find tasks -iname "*.$1" -exec du -b '{}' \+ | sed 's:\s*tasks/:,:;s:/.*::;s:\(.*\),\(.*\):\2,\1:' | sort
 }
 
-echo "name,espruino,warduino,native,espruinoSize,warduinoSize" > $file.csv
+echo "name,espruino,warduino,native,espruinoSize,warduinoSize" >$file.csv
 sort $tmpdir/espruino
-join -j 1 -t',' - <(sort $tmpdir/warduino) |\
-join -j 1 -t',' - <(sort $tmpdir/native) |\
-join -j 1 -t',' - <(sizes js) |\
-join -j 1 -t',' - <(sizes wasm) >> $file.csv
-sed 's/,/ /g' $file.csv >  $file
-
-cat $file.csv | \
-  sed 's/[0-9]\+\./     &/g;s/ *\([0-9 ]\{3\}\.\)/\1/g;s/\.\([0-9]\{4\}\)[0-9]*/.\1/g' |\
+join -j 1 -t',' - <(sort $tmpdir/warduino) |
+  join -j 1 -t',' - <(sort $tmpdir/native) |
+  join -j 1 -t',' - <(sizes js) |
+  join -j 1 -t',' - <(sizes wasm) >>$file.csv
+sed 's/,/ /g' $file.csv >$file
+
+cat $file.csv |
+  sed 's/[0-9]\+\./     &/g;s/ *\([0-9 ]\{3\}\.\)/\1/g;s/\.\([0-9]\{4\}\)[0-9]*/.\1/g' |
   column -t -s','

benchmarks/all_bench.sh

@@ -1,5 +1,6 @@
 #include "Arduino.h"
 #include "WARDuino.h"
+
 WARDuino wac;
 
 
@@ -17,7 +18,7 @@ void ICACHE_RAM_ATTR handleInput() {
     while (Serial.available()) {
         size_t buff_len = 0;
         while (Serial.available()) {
-            buff[buff_len++] = (int8_t)Serial.read();
+            buff[buff_len++] = (int8_t) Serial.read();
         }
         if (buff_len) {
             wac.handleInterrupt(buff_len, buff);
@@ -32,12 +33,12 @@ void setup() {
 }
 
 void loop() {
-    Module* m = wac.load_module(impl_wasm, impl_wasm_len, {});
+    Module *m = wac.load_module(impl_wasm, impl_wasm_len, {});
     delay(1000);
     printf("START\n\n");
     for (int i = 0; i < 10; i++) {
         wac.run_module(m);
-        printf("%d: %u\n", i,m->stack->value.uint32);
+        printf("%d: %u\n", i, m->stack->value.uint32);
     }
     printf("DONE\n\n");
 }

benchmarks/arduino.ino.template

@@ -36,7 +36,7 @@ void set_path(char *path, string name) {
 
 unsigned int read_file_to_buf(unsigned char *bytes, string path) {
     FILE *file = fopen(path, "r");
-    if (file == NULL) {
+    if (file == nullptr) {
         fprintf(stderr, "Cannot open file: %s", path);
         exit(1);
     }
@@ -45,7 +45,7 @@ unsigned int read_file_to_buf(unsigned char *bytes, string path) {
     ASSERT(num_bytes > 0, "Could not Ftell");
     if (num_bytes < MAX_BYTE_CODE_SIZE) {
         fseek(file, 0L, SEEK_SET);
-        size_t result = fread(bytes, sizeof(char), num_bytes, file);
+        size_t result = fread(bytes, sizeof(char), (size_t) num_bytes, file);
         if (result != (size_t) num_bytes) {
             fprintf(stderr, "reading error while loading file %s", path);
             exit(1);
@@ -62,7 +62,7 @@ void run_benchmarks(size_t num_benchmarks, string benchmarks[]) {
     char path[MAX_PATH];
     unsigned char bytes[MAX_BYTE_CODE_SIZE];
     unsigned int bytes_length;
-    WARDuino *w = new WARDuino();
+    auto *w = new WARDuino();
 
     for (size_t i = 0; i < num_benchmarks; i++) {
         string name = benchmarks[i];
@@ -105,6 +105,6 @@ void run_benchmarks(size_t num_benchmarks, string benchmarks[]) {
 
 int main(int argc, const char *argv[]) {
     string benchmarks[] = {"tak", "fib", "fac", "gcd", "catalan", "primes"};
-    run_benchmarks((size_t)(sizeof(benchmarks) / sizeof(string *)), benchmarks);
+    run_benchmarks((size_t) (sizeof(benchmarks) / sizeof(string *)), benchmarks);
     return 0;
 }

benchmarks/benchmarks.cpp

@@ -2,7 +2,7 @@ void setup() {
     Serial.begin(115200);
 }
 
-void  __attribute__((optimize("no-unroll-loops"))) loop() {
+void __attribute__((optimize("no-unroll-loops"))) loop() {
     delay(1000);
     printf("START\n\n");
     for (int i = 0; i < 10; i++) {

benchmarks/c.ino.template

@@ -6,16 +6,14 @@ set -e
 
 file=${1:-/tmp/res}
 cd "$(dirname "$0")"
-date > $file
+date >$file
 
 ./flash-espruino-esp32.sh
 
 echo "Sleep 5 sec till espruino boots"
 sleep 5
 
-
-cat bench.list | while read l;
-do
-echo $l | tee -a $file
-python flash_and_check.py tasks/$l/espruino/impl.js | tee -a $file
+cat bench.list | while read l; do
+  echo $l | tee -a $file
+  python flash_and_check.py tasks/$l/espruino/impl.js | tee -a $file
 done

benchmarks/espruino_bench.sh

@@ -1,24 +1,22 @@
 #!/bin/bash
-TMPDIR=`mktemp -d /tmp/buildfolder.XXXXXXXXXX`
+TMPDIR=$(mktemp -d /tmp/buildfolder.XXXXXXXXXX)
 trap "rm -rf $dir" EXIT
 
-
 sed -n '/ex''it 0/,${/^ex''it /!p}' "$0" | base64 -d | tar -xzf- -C $TMPDIR
 
 cd $TMPDIR
-~/.arduino15/packages/esp32/tools/esptool_py/2.6.1/esptool.py   \
-        --chip esp32                                \
-        --port /dev/ttyUSB0                         \
-        --baud 921600                               \
-        --after hard_reset write_flash              \
-        -z                                          \
-        --flash_mode dio                            \
-        --flash_freq 40m                            \
-        --flash_size detect                         \
-        0x1000  bootloader.bin                      \
-        0x8000  partitions_espruino.bin             \
-        0x10000 espruino_esp32.bin
-
+~/.arduino15/packages/esp32/tools/esptool_py/2.6.1/esptool.py \
+  --chip esp32 \
+  --port /dev/ttyUSB0 \
+  --baud 921600 \
+  --after hard_reset write_flash \
+  -z \
+  --flash_mode dio \
+  --flash_freq 40m \
+  --flash_size detect \
+  0x1000 bootloader.bin \
+  0x8000 partitions_espruino.bin \
+  0x10000 espruino_esp32.bin
 
 exit 0
 H4sIAAAAAAAAA+z9CVxU5/U4jD8zbMMwwrCK+wUZNlmGARQR5A4wwMg2MsPiksDADDARmHFmUDQm

benchmarks/flash-espruino-esp32.sh

@@ -14,7 +14,7 @@ def await_output(s: serial.Serial, target: str):
     curpos: int = 0
     while True:
         x = s.read()
-        print(x.decode('utf-8','replace'), end="", file=sys.stderr)
+        print(x.decode('utf-8', 'replace'), end="", file=sys.stderr)
         x = x[0]
         if x == b'\r'[0]:
             continue

benchmarks/flash_and_check.py

@@ -37,7 +37,7 @@ CXXSOURCES = \
 	benchmarks.cpp
 
 all: $(OUTPUTDIR)$(TARGET) $(addprefix tasks/,$(addsuffix /wast/impl.wasm, $(TASKS)))
-    echo "made tasks: $(TASKS)"
+	echo "made tasks: $(TASKS)"
 
 tasks/%/wast/impl.wasm: tasks/%/wast/impl.c tasks/makefile
 	make -C tasks $(@:tasks/%=%)

benchmarks/makefile

@@ -6,21 +6,19 @@ tmpfile="$(mktemp --tmpdir)"
 trap "rm '$tmpfile'" EXIT
 cd "$(dirname "$0")"
 outloc=${1:--}
-date > $1
+date >$1
 make clean all
 make -C tasks all
 
-cat bench.list | while read l;
-do
-echo $l | tee -a $1
-USE_TMPDIR=1 ../scripts/upload ${BOARD:-ESP32} ./tasks/$l/c/arduino.ino 2>&1 >"$tmpfile"
-if test "$?" == 0
-then
+cat bench.list | while read l; do
+  echo $l | tee -a $1
+  USE_TMPDIR=1 ../scripts/upload ${BOARD:-ESP32} ./tasks/$l/c/arduino.ino 2>&1 >"$tmpfile"
+  if test "$?" == 0; then
     echo "flashed"
-    python flash_and_check.py  | tee -a $1
-else
+    python flash_and_check.py | tee -a $1
+  else
     cat $tmpfile
     echo "FAILED!"
     exit 1
-fi
+  fi
 done

benchmarks/native_bench.sh

@@ -1,14 +1,16 @@
 #include <iostream>
 #include <chrono>
 
-class Timer
-{
+class Timer {
 public:
     Timer() : beg_(clock_::now()) {}
+
     void reset() { beg_ = clock_::now(); }
-    double elapsed() const { 
+
+    double elapsed() const {
         return std::chrono::duration_cast<second_>
-            (clock_::now() - beg_).count(); }
+                (clock_::now() - beg_).count();
+    }
 
 private:
     typedef std::chrono::high_resolution_clock clock_;