Fix common header multiple implementation for Arduino

Fix ESP-IDF compilation error in debugger.cpp

Author: tolauwae

CMakeLists.txt

@@ -34,7 +34,7 @@ if (BUILD_EMULATOR)
             src/Utils/macros.cpp
             src/WARDuino/WARDuino.cpp
             src/WARDuino/CallbackHandler.cpp
-            src/Primitives/primitives.h
+            src/Primitives/emulated.cpp
             src/Interpreter/instructions.cpp
             )
     set(TEST_FRAMEWORK

examples/assemblyscript/main/CMakeLists.txt

@@ -5,7 +5,7 @@ set(SOURCE_FILES
         ../../../src/Debug/debugger.cpp
         ../../../src/Utils/macros.cpp
         ../../../src/WARDuino/WARDuino.cpp
-        ../../../src/Primitives/primitives.h
+        ../../../src/Primitives/emulated.cpp
         ../../../src/Interpreter/instructions.cpp
         ../../../src/WARDuino/CallbackHandler.cpp
         )

examples/blink/main/CMakeLists.txt

@@ -5,7 +5,7 @@ set(SOURCE_FILES
         ../../../src/Debug/debugger.cpp
         ../../../src/Utils/macros.cpp
         ../../../src/WARDuino/WARDuino.cpp
-        ../../../src/Primitives/primitives.h
+        ../../../src/Primitives/emulated.cpp
         ../../../src/Interpreter/instructions.cpp
         ../../../src/WARDuino/CallbackHandler.cpp
         )

platforms/ESP-IDF/CMakeLists.txt

@@ -5,7 +5,7 @@ set(SOURCE_FILES
         ../../src/Debug/debugger.cpp
         ../../src/Utils/macros.cpp
         ../../src/WARDuino/WARDuino.cpp
-        ../../src/Primitives/primitives.h
+        ../../src/Primitives/emulated.cpp
         ../../src/Interpreter/instructions.cpp
         ../../src/WARDuino/CallbackHandler.cpp
         )

src/Debug/debugger.cpp

@@ -357,7 +357,7 @@ void Debugger::dumpLocals(Module *m) const {
     dprintf(this->socket, R"({"count":%u,"locals":[)", 0);
     //    fflush(stdout);  // FIXME: this is needed for ESP to propery print
     char _value_str[256];
-    for (size_t i = 0; i < f->block->local_count; i++) {
+    for (uint32_t i = 0; i < f->block->local_count; i++) {
         auto v = &m->stack[m->fp + i];
         switch (v->value_type) {
             case I32:
@@ -382,7 +382,7 @@ void Debugger::dumpLocals(Module *m) const {
                          v->value_type, v->value.uint64);
         }
 
-        dprintf(this->socket, "{%s, \"index\":%lu}%s", _value_str,
+        dprintf(this->socket, "{%s, \"index\":%u}%s", _value_str,
                 i + f->block->type->param_count,
                 (i + 1 < f->block->local_count) ? "," : "");
     }

src/Primitives/emulated.cpp

@@ -1,3 +1,5 @@
+#ifndef ARDUINO
+
 /**
  * This file lists the primitives of the language and stores them in the
  * primitives
@@ -20,6 +22,7 @@
 #include "../Memory/mem.h"
 #include "../Utils/macros.h"
 #include "../Utils/util.h"
+#include "primitives.h"
 
 #define NUM_PRIMITIVES 0
 #define NUM_PRIMITIVES_ARDUINO 23
@@ -485,3 +488,5 @@ bool resolve_external_memory(char *symbol, Memory **val) {
     FATAL("Could not find memory %s \n", symbol);
     return false;
 }
+
+#endif // ARDUINO

src/Primitives/arduino.cpp renamed to src/Primitives/hardware.cpp

@@ -9,8 +9,6 @@
  *  4) Extend the install_primitives function
  *
  */
-#include "Arduino.h"
-
 #include <HTTPClient.h>
 #include <WiFi.h>
 #include <sys/time.h>
@@ -22,6 +20,8 @@
 #include "../Memory/mem.h"
 #include "../Utils/macros.h"
 #include "../Utils/util.h"
+#include "Arduino.h"
+#include "primitives.h"
 
 // NEOPIXEL
 #include <Adafruit_NeoPixel.h>
@@ -890,4 +890,4 @@ bool resolve_external_memory(char *symbol, Memory **val) {
 
     FATAL("Could not find memory %s \n", symbol);
     return false;
-}
+}

src/Primitives/primitives.h

@@ -26,10 +26,4 @@ bool resolve_external_memory(char *symbol, Memory **val);
 
 void install_primitives();
 
-#ifdef Arduino
-#include "arduino.cpp"
-#else
-#include "emulated.cpp"
-#endif
-
 #endif