Merge branch 'master' into 'model_fix'

# Conflicts:
#   models/cpu/iss/include/isa_lib/int.h

CMakeLists.txt

@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.10)
+project(gvsoc-core)
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+set(JSON_TOOLS_SRCS "../../utils/json-tools/src/jsmn.cpp"
+                    "../../utils/json-tools/src/json.cpp")
+set(JSON_TOOLS_INC_DIRS "../../utils/json-tools/include/")
+
+add_library(json-tools OBJECT ${JSON_TOOLS_SRCS})
+target_include_directories(json-tools PUBLIC ${JSON_TOOLS_INC_DIRS})
+
+install(DIRECTORY bin/ DESTINATION bin USE_SOURCE_PERMISSIONS)
+
+add_subdirectory(dpi-wrapper)
+add_subdirectory(engine)
+add_subdirectory(launcher)
+add_subdirectory(models)

Makefile

@@ -9,6 +9,7 @@ TARGETS += $(INSTALL_DIR)/$(1)
 
 endef
 
+INSTALL_FILES += bin/gvcontrol
 INSTALL_FILES += bin/pulp-pc-info
 INSTALL_FILES += bin/pulp-trace-extend
 $(foreach file, $(INSTALL_FILES), $(eval $(call declareInstallFile,$(file))))

bin/gvcontrol

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import argparse
+import gv.gvsoc_control as gvsoc
+
+parser = argparse.ArgumentParser(description='Control GVSOC')
+
+parser.add_argument("--host", dest="host", default="localhost", help="Specify host name")
+parser.add_argument("--port", dest="port", default=42951, type=int, help="Specify host port")
+parser.add_argument("--trace-add", dest="trace_add", default=[], action="append", help="Enable trace")
+parser.add_argument("--trace-remove", dest="trace_remove", default=[], action="append", help="Disable trace")
+parser.add_argument("--step", dest="step", default=None, type=int, help="Step execution with a duration in picoseconds")
+parser.add_argument("--run", dest="run", action="store_true", help="Run until the end")
+
+args = parser.parse_args()
+
+
+gv = gvsoc.Telnet_proxy(args.host, args.port)
+
+for trace in args.trace_add:
+    gv.trace_add(trace)
+
+for trace in args.trace_remove:
+    gv.trace_remove(trace)
+
+if args.step is not None:
+    gv.run(args.step)
+
+if args.run:
+    gv.run()