Merge branch 'master' into ffi

diff --cc Cargo.lock
Simple merge

diff --cc Cargo.toml
index 206b7150fd95b40ec4281753726bcda82dc980f1,b21d49211ecbde3ab2f02c282350753e8a77d6c3..9e2ca8839a0647c03009573dde6fc04e54acfb09
--- 1/Cargo.toml
--- 2/Cargo.toml
+++ b/Cargo.toml
@@@ -63,8 -63,7 +63,9 @@@ hyper = { version = "0.14", features = 
  hyper-tls = "0.5.0"
  tokio = { version = "1.24.2", features = ["full"] }
  futures = "0.3"
 +libffi = "3.1.0"
 +libloading = "0.7"
+ derive_deref = "1.1.1"
  
  [dev-dependencies]
  assert_cmd = "1.0.3"

diff --cc build/instructions_template.rs
Simple merge

diff --cc src/machine/dispatch.rs
Simple merge

diff --cc src/machine/mod.rs
Simple merge

diff --cc src/machine/system_calls.rs
Simple merge