Initial work on splitting the concrete and concolic interpreters

TOPLLab · Nov 15, 2023 · f7ef7c9 · f7ef7c9
1 parent 9163e0b
commit f7ef7c9
Show file tree

Hide file tree

Showing 13 changed files with 1,177 additions and 308 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,10 @@ if (BUILD_EMULATOR)
             src/WARDuino/WARDuino.cpp
             src/WARDuino/CallbackHandler.cpp
             src/Primitives/emulated.cpp
-            src/Interpreter/instructions.cpp
+            src/Interpreter/interpreter.h
+            src/Interpreter/concolic_interpreter.cpp
+            src/Interpreter/concolic_interpreter.h
+            src/Interpreter/interpreter.cpp
             src/Memory/mem.cpp
             src/Utils/util.cpp
             src/Utils/util_arduino.cpp

diff --git a/examples/assemblyscript/main/CMakeLists.txt b/examples/assemblyscript/main/CMakeLists.txt
@@ -10,7 +10,8 @@ set(SOURCE_FILES
         ../../../src/Utils/macros.cpp
         ../../../src/WARDuino/WARDuino.cpp
         ../../../src/Primitives/emulated.cpp
-        ../../../src/Interpreter/instructions.cpp
+        ../../../src/Interpreter/interpreter.h
+        ../../../src/Interpreter/interpreter.cpp
         ../../../src/WARDuino/CallbackHandler.cpp
         )
 

diff --git a/examples/wat/main/CMakeLists.txt b/examples/wat/main/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(SOURCE_FILES
         ../../../src/Debug/debugger.cpp
-        ../../../src/Interpreter/instructions.cpp
+        ../../../src/Interpreter/interpreter.h
+        ../../../src/Interpreter/interpreter.cpp
         ../../../src/Memory/mem.cpp
         ../../../src/Primitives/idf.cpp
         ../../../src/Edward/proxy.cpp

diff --git a/platforms/ESP-IDF/CMakeLists.txt b/platforms/ESP-IDF/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(SOURCE_FILES
         ../../src/Debug/debugger.cpp
-        ../../src/Interpreter/instructions.cpp
+        ../../../src/Interpreter/interpreter.h
+        ../../../src/Interpreter/interpreter.cpp
         ../../src/Memory/mem.cpp
         ../../src/Primitives/idf.cpp
         ../../src/Edward/proxy.cpp

diff --git a/src/Edward/proxy.cpp b/src/Edward/proxy.cpp
@@ -6,7 +6,7 @@
 #include <cstring>
 #include <map>
 
-#include "../Interpreter/instructions.h"
+#include "../Interpreter/interpreter.h"
 #include "../Utils/macros.h"
 #include "../Utils/util.h"
 
@@ -39,7 +39,7 @@ void Proxy::pushRFC(Module *m, RFC *rfc) {
     }
 
     // push function to callstack
-    setup_call(m, rfc->fidx);
+    Interpreter().setup_call(m, rfc->fidx);
     // push proxy guard block to stack
     this->pushProxyGuard(m);
 
@@ -115,5 +115,5 @@ void Proxy::pushProxyGuard(Module *m) {
     }
     auto *guard = (Block *)malloc(sizeof(struct Block));
     guard->block_type = 0xfe;  // 0xfe proxy guard
-    push_block(m, guard, m->sp);
+    Interpreter().push_block(m, guard, m->sp);
 }