Fix debug prints in resolve_primitive

Author: MaartenS11

src/Interpreter/interpreter.h

@@ -4,8 +4,8 @@
 #include <cstring>
 #include <set>
 
+#include "../Utils/macros.h"
 #include "../WARDuino/internals.h"
-// #include "../Utils/macros.h"
 
 class Interpreter {
    public:
@@ -66,19 +66,18 @@ class Interpreter {
     //------------------------------------------------------
     // ReSharper disable once CppDFAConstantFunctionResult
     bool resolve_primitive(const char *symbol, Primitive *val) {
-        // debug("Resolve primitives (%d) for %s  \n", ALL_PRIMITIVES, symbol);
+        debug("Resolve primitives (%d) for %s  \n", ALL_PRIMITIVES, symbol);
 
         for (auto &primitive : primitives) {
             //        printf("Checking %s = %s  \n", symbol, primitive.name);
             if (!strcmp(symbol, primitive.name)) {
-                // debug("FOUND PRIMITIVE\n");
+                debug("FOUND PRIMITIVE\n");
                 *val = primitive.f;
                 return true;
             }
         }
-        // FATAL("Could not find primitive %s \n", symbol);
-        return false;
-        // return false; // unreachable
+        FATAL("Could not find primitive %s \n", symbol);
+        return false;  // unreachable
     }
 
     //------------------------------------------------------
@@ -94,7 +93,7 @@ class Interpreter {
         for (PrimitiveEntry &p : primitives) {
             if (prim_names.find(p.name) != prim_names.end()) {
                 if (p.f_reverse) {
-                    printf("Reversing state for primitive %s\n", p.name);
+                    dbg_info("Reversing state for primitive %s\n", p.name);
                     p.f_reverse(m, external_state);
                 }
             }

src/Utils/macros.h

@@ -2,7 +2,7 @@
 
 #include <cstdio>
 
-#include "../WARDuino.h"
+#include "../WARDuino/internals.h"
 
 #ifndef DEBUG
 #define DEBUG 0

src/WARDuino/CallbackHandler.cpp

@@ -5,6 +5,7 @@
 #include "../Debug/debugger.h"
 #include "../Interpreter/interpreter.h"
 #include "../Utils/macros.h"
+#include "../WARDuino.h"
 
 void push_guard(Module *m) {
     if (m == nullptr) {

src/WARDuino/WARDuino.cpp

@@ -622,9 +622,10 @@ void WARDuino::instantiate_module(Module *m, uint8_t *bytes,
                 // Allocate memory
                 // for (uint32_t c=0; c<memory_count; c++) {
                 parse_memory_type(m, &pos);
-                m->memory.bytes = (uint8_t *)acalloc(
-                    m->memory.pages * PAGE_SIZE, 1,  // sizeof(uint32_t),
-                    "Module->memory.bytes");
+                m->memory.bytes =
+                    (uint8_t *)acalloc(m->memory.pages * PAGE_SIZE,
+                                       1,  // sizeof(uint32_t),
+                                       "Module->memory.bytes");
                 //}
                 break;
             }