Update restore_external_state to match the zephyr definition and register reverse prim for digital write (#312)

Author: MaartenS11

src/Primitives/emulated.cpp

@@ -432,7 +432,7 @@ def_prim_serialize(chip_digital_write) {
     for (int pin = 0; pin < NUM_DIGITAL_PINS; pin++) {
         auto *state = new IOStateElement();
         state->key = "p" + std::to_string(pin);
-        state->output = MODES[pin] == 0x01;
+        state->output = MODES[pin] == 0x02;
         state->value = PINS[pin];
         external_state.push_back(state);
     }
@@ -573,6 +573,7 @@ void install_primitives() {
 
     install_primitive(chip_pin_mode);
     install_primitive(chip_digital_write);
+    install_primitive_reverse(chip_digital_write);
     install_primitive(chip_delay);
     install_primitive(chip_digital_read);
     install_primitive(chip_analog_read);
@@ -641,24 +642,16 @@ bool resolve_external_memory(char *symbol, Memory **val) {
 //------------------------------------------------------
 void restore_external_state(Module *m,
                             const std::vector<IOStateElement> &external_state) {
-    uint8_t opcode = *m->pc_ptr;
-    // TODO: Maybe primitives can also be called using the other call
-    // instructions such as call_indirect
-    //  maybe there should just be a function that checks if a certain function
-    //  is being called that handles all these cases?
-    if (opcode == 0x10) {  // call opcode
-        uint8_t *pc_copy = m->pc_ptr + 1;
-        uint32_t fidx = read_LEB_32(&pc_copy);
-        if (fidx < m->import_count) {
-            for (auto &primitive : primitives) {
-                if (!strcmp(primitive.name, m->functions[fidx].import_field)) {
-                    if (primitive.f_reverse) {
-                        debug("Reversing action for primitive %s\n",
-                              primitive.name);
-                        primitive.f_reverse(m, external_state);
-                    }
-                    return;
-                }
+    std::set<std::string> prim_names;
+    for (uint32_t i = 0; i < m->import_count; i++) {
+        prim_names.emplace(m->functions[i].import_field);
+    }
+
+    for (PrimitiveEntry &p : primitives) {
+        if (prim_names.find(p.name) != prim_names.end()) {
+            if (p.f_reverse) {
+                printf("EMU: Reversing state for primitive %s\n", p.name);
+                p.f_reverse(m, external_state);
             }
         }
     }

src/Primitives/zephyr.cpp

@@ -553,7 +553,7 @@ void restore_external_state(Module *m,
     }
 }
 
-std::vector<IOStateElement *> get_io_state(Module *m) {
+std::vector<IOStateElement *> get_io_state(Module *) {
     std::vector<IOStateElement *> ioState;
     for (auto &primitive : primitives) {
         if (primitive.f_serialize_state) {