🐛 Check debug messages during blokcing RFC call

 Adds `module *m` to RFC

Author: tolauwae

src/Debug/debugger.cpp

@@ -1216,7 +1216,7 @@ void Debugger::handleProxyCall(Module *m, RunningState *program_state,
     StackValue *args = Proxy::readRFCArgs(func, data);
     dbg_trace("Enqueuing callee %" PRIu32 "\n", func->fidx);
 
-    auto *rfc = new RFC(fidx, func->type, args);
+    auto *rfc = new RFC(m, fidx, func->type, args);
     this->proxy->pushRFC(m, rfc);
 }
 

src/Edward/RFC.cpp

@@ -1,4 +1,4 @@
 #include "RFC.h"
 
-RFC::RFC(uint32_t id, Type *t_type, StackValue *t_args)
-    : fidx(id), args(t_args), type(t_type) {}
+RFC::RFC(Module *m, uint32_t id, Type *t_type, StackValue *t_args)
+    : m(m), fidx(id), args(t_args), type(t_type) {}

src/Edward/RFC.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <cstdint>
+
+#include "../WARDuino/internals.h"
 struct StackValue;
 struct Type;
 
@@ -11,6 +13,7 @@ struct SerializeData {
 
 class RFC {
    public:
+    Module *m;
     const uint32_t fidx;
     StackValue *args;
     const Type *type;
@@ -20,5 +23,5 @@ class RFC {
     char *exception;
     uint16_t exception_size;
 
-    RFC(uint32_t id, Type *t_type, StackValue *t_args = nullptr);
+    RFC(Module *m, uint32_t id, Type *t_type, StackValue *t_args = nullptr);
 };

src/Edward/proxy_supervisor.cpp

@@ -111,9 +111,10 @@ bool ProxySupervisor::send(
     return n == size;
 }
 
-nlohmann::basic_json<> ProxySupervisor::readReply() {
-    while (!this->hasReplied)
-        ;
+nlohmann::basic_json<> ProxySupervisor::readReply(RFC *rfc) {
+    while (!this->hasReplied) {
+        WARDuino::instance()->debugger->checkDebugMessages(rfc->m, &WARDuino::instance()->program_state);
+    }
     WARDuino::instance()->debugger->channel->write("read reply: succeeded\n");
     this->hasReplied = false;
     return this->proxyResult;
@@ -197,7 +198,7 @@ struct SerializeData *ProxySupervisor::serializeRFC(RFC *callee) {
 }
 
 void ProxySupervisor::deserializeRFCResult(RFC *rfc) {
-    nlohmann::basic_json<> call_result = this->readReply();  // blocking
+    nlohmann::basic_json<> call_result = this->readReply(rfc);  // blocking
     rfc->success = *call_result.find("success");
 
     if (rfc->type->result_count == 0) {

src/Edward/proxy_supervisor.h

@@ -35,7 +35,7 @@ class ProxySupervisor : public Debugger {
     void listenToSocket();
 
     bool send(void *t_buffer, int t_size);
-    nlohmann::basic_json<> readReply();
+    nlohmann::basic_json<> readReply(RFC *rfc);
 
     bool call(RFC *callee);
 

src/Interpreter/instructions.cpp

@@ -17,9 +17,9 @@ bool proxy_call(Module *m, uint32_t fidx) {
     if (type->param_count > 0) {
         m->sp -= type->param_count;
         StackValue *args = &m->stack[m->sp + 1];
-        rfc = new RFC(fidx, type, args);
+        rfc = new RFC(m, fidx, type, args);
     } else {
-        rfc = new RFC(fidx, type);
+        rfc = new RFC(m, fidx, type);
     }
 
     if (!supervisor->call(rfc)) {