Other misc not really important changes

Author: MaartenS11

platforms/CLI-Emulator/main.cpp

@@ -394,6 +394,8 @@ int main(int argc, const char *argv[]) {
 
             // Start supervising proxy device (new thread)
             wac->debugger->startProxySupervisor(connection);
+            std::this_thread::sleep_for (std::chrono::seconds(1));
+
         }
 
         // Start debugger (new thread)

src/Debug/debugger.cpp

@@ -181,7 +181,7 @@ bool Debugger::checkDebugMessages(Module *m, RunningState *program_state) {
     fflush(stdout);
 
     printf("Interrupt: %x\n", *interruptData);
-    this->channel->write("Interrupt: %x\n", *interruptData);
+    //this->channel->write("Interrupt: %x\n", *interruptData);
 
     long start = 0, size = 0;
     switch (*interruptData) {
@@ -317,6 +317,8 @@ bool Debugger::checkDebugMessages(Module *m, RunningState *program_state) {
             this->transfer(m, interruptData);
             free(interruptData);
             this->channel->write("Transferred!\n");
+            //this->snapshot(m);
+            //exit(0);
             break;
         case interruptProxyCall: {
             this->handleProxyCall(m, program_state, interruptData + 1);
@@ -785,7 +787,7 @@ void Debugger::inspect(Module *m, const uint16_t sizeStateArray,
                        const uint8_t *state) const {
     debug("asked for inspect\n");
     uint16_t idx = 0;
-    auto toVA = [m](uint8_t *addr) { return toVirtualAddress(addr, m); };
+    auto toVA = [m](uint8_t *addr) { return 0; };
     bool addComma = false;
 
     this->channel->write("{");
@@ -1130,7 +1132,7 @@ void Debugger::load(uint8_t *bytes, Module *m) {
     auto start = read_B8(&bytes);
     auto limit = read_B8(&bytes);
     auto total_bytes = limit - start + 1;
-    this->channel->write("loading into %u - %u \n", start, limit);
+    printf("loading into %u - %u \n", start, limit);
     memcpy(m->memory.bytes + start, bytes, total_bytes);
 }
 
@@ -1493,6 +1495,9 @@ void Debugger::sendProxyCallResult(Module *m) const {
 bool Debugger::isProxy() const { return this->proxy != nullptr; }
 
 bool Debugger::isProxied(Module *m, const uint32_t fidx) const {
+    if (this->supervisor == nullptr) {
+        printf("Has no supervisor!\n");
+    }
     return this->supervisor != nullptr && fidx < m->import_count;
 }
 
@@ -1695,7 +1700,7 @@ void Debugger::notifyCompleteStep(Module *m) const {
         m->warduino->debugger->checkpoint(m);
     }
     this->channel->write("STEP!\n");
-    printf("STEP!\n");
+    //printf("STEP!\n");
 }
 
 Debugger::~Debugger() {

src/Debug/debugger.h

@@ -125,7 +125,7 @@ class Debugger {
     std::queue<uint8_t *> parsedInterrupts{};
     long interruptSize{};
     bool receivingData = false;
-
+public:
     Proxy *proxy = nullptr;  // proxy module for debugger
 
     bool connected_to_proxy = false;

src/Oop/proxy_supervisor.cpp

@@ -85,15 +85,15 @@ void ProxySupervisor::listenToSocket() {
         }
         if (readAmount > 0) {
             std::string msg_str = std::string(reinterpret_cast<char *>(message));
-            printf("msg_str = \"%s\"\n", (char*) message);
+            //printf("msg_str = \"%s\"\n", (char*) message);
             while (!msg_str.empty()) {
                 auto first_msg = msg_str.substr(0, msg_str.find('\n'));
                 msg_str = msg_str.substr(msg_str.find('\n') + 1);
-                printf("first_msg = \"%s\"\n", first_msg.c_str());
+                //printf("first_msg = \"%s\"\n", first_msg.c_str());
 
                 try {
                     nlohmann::basic_json<> parsed = nlohmann::json::parse(first_msg);
-                    printf("parseJSON: %s\n", parsed.dump().c_str());
+                    //printf("parseJSON: %s\n", parsed.dump().c_str());
 
                     if (isEvent(parsed)) {
                         CallbackHandler::push_event(new Event(

src/Primitives/emulated.cpp

@@ -688,15 +688,16 @@ std::vector<IOStateElement *> get_io_state(Module *) {
     return ioState;
 }
 
-std::string get_backward(Module *m, uint32_t index) {
+std::string get_backward(Module *m, uint32_t fidx) {
     std::stringstream transfer;
     auto *buffer = new char[6];
     sprintf(buffer, "%02" PRIx8 "00%02" PRIx8, interruptTransfer, 1);
     delete[] buffer;
 
-    if (index < ALL_PRIMITIVES) {
-        auto &primitive = primitives[index];
-        printf("transfering for %s", primitive.name);
+    // TODO: map fidx into primitive index
+    if (fidx < ALL_PRIMITIVES) {
+        auto &primitive = primitives[fidx];
+        printf("transfering for %s\n", primitive.name);
         if (primitive.f_backward) {
             m->sp += primitive.t->param_count;
             auto data = primitive.f_backward(m);
@@ -713,16 +714,17 @@ std::string get_backward(Module *m, uint32_t index) {
 //      fix length at start of 52 message
 //      send nothing if length is 0
 
-bool do_forward(Module *m, uint32_t index) {
-    if (index < ALL_PRIMITIVES) {
-        auto &primitive = primitives[index];
-        printf("transfering for %s", primitive.name);
+bool do_forward(Module *m, uint32_t fidx) {
+    if (fidx < ALL_PRIMITIVES) {
+        auto &primitive = primitives[fidx];
         if (primitive.f_forward) {
+            printf("transfering for %s\n", primitive.name);
             auto data = primitive.f_forward(m);
             printf("transfer built\n");
             WARDuino::instance()->debugger->channel->write(
                 "%02" PRIx8 "00%02" PRIx8 "%s", interruptTransfer, 1, data);
             free(data);
+            //exit(0);
         }
     } else {
         return false;

src/Primitives/primitives.h

@@ -81,8 +81,8 @@ void invoke_primitive(Module *m, const std::string &function_name, Ts... args) {
     primitive(m);
 }
 
-bool do_forward(Module *m, uint32_t index);
+bool do_forward(Module *m, uint32_t fidx);
 
-std::string get_backward(Module *m, uint32_t index);
+std::string get_backward(Module *m, uint32_t fidx);
 
 #endif

src/Utils/sockets.cpp

@@ -14,6 +14,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <thread>
 
 #ifndef __ZEPHYR__
 // Socket Debugger Interface
@@ -35,8 +36,8 @@ int createSocketFileDescriptor() {
     return socket_fd;
 }
 
-void bindSocketToAddress(int socket_fd, struct sockaddr_in address) {
-    if (bind(socket_fd, (struct sockaddr *)&address, sizeof(address)) < 0) {
+void bindSocketToAddress(int socket_fd, sockaddr_in address) {
+    if (bind(socket_fd, (sockaddr*) &address, sizeof(address)) < 0) {
         perror("Binding socket to address failed");
         exit(EXIT_FAILURE);
     }
@@ -136,13 +137,19 @@ void WebSocket::open() {
 }
 
 void ClientSocket::open() {
+    //std::this_thread::sleep_for (std::chrono::seconds(1));
     // bind socket to address
     this->fileDescriptor = createSocketFileDescriptor();
-    struct sockaddr_in address = createAddress(this->port);  // server port
-    if (connect(this->fileDescriptor, (struct sockaddr *)&address,
+    sockaddr_in address = createAddress(this->port);  // server port
+    int i = 0;
+    while (connect(this->fileDescriptor, (sockaddr*) &address,
                 sizeof(address)) < 0) {
-        perror("Failed to connect to socket");
-        exit(EXIT_FAILURE);
+        perror("Failed to connect to socket, retrying...\n");
+        std::this_thread::sleep_for (std::chrono::seconds(1));
+        i++;
+        if (i >= 5) {
+            exit(EXIT_FAILURE);
+        }
     }
 
     this->socket = this->fileDescriptor;