Update WAVM binding to match new API

Author: axic

src/wavm.cpp

@@ -45,6 +45,7 @@
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
 using namespace std;
+using namespace WAVM;
 
 namespace hera {
 
@@ -60,7 +61,7 @@ class WavmEthereumInterface : public EthereumInterface {
     EthereumInterface(_context, _code, _msg, _result, _meterGas)
   {}
 
-  void setWasmMemory(Runtime::MemoryInstance* _wasmMemory) {
+  void setWasmMemory(Runtime::Memory* _wasmMemory) {
     m_wasmMemory = _wasmMemory;
   }
 
@@ -70,7 +71,7 @@ class WavmEthereumInterface : public EthereumInterface {
   void memorySet(size_t offset, uint8_t value) override { (Runtime::memoryArrayPtr<U8>(m_wasmMemory, offset, 1))[0] = value; }
   uint8_t memoryGet(size_t offset) override { return (Runtime::memoryArrayPtr<U8>(m_wasmMemory, offset, 1))[0]; }
 
-  Runtime::MemoryInstance* m_wasmMemory;
+  Runtime::Memory* m_wasmMemory;
 };
 
 unique_ptr<WasmEngine> WavmEngine::create()
@@ -258,7 +259,7 @@ namespace wavm_host_module {
     bool resolve(
       const string& moduleName,
       const string& exportName,
-      IR::ObjectType type,
+      IR::ExternType type,
       Runtime::Object*& outObject
     ) override
     {
@@ -293,11 +294,13 @@ ExecutionResult WavmEngine::execute(
   try {
     ExecutionResult result = internalExecute(context, code, state_code, msg, meterInterfaceGas);
     // And clean up mess left by this run.
-    Runtime::collectGarbage();
+    // TODO: enable this.
+    // Runtime::collectCompartmentGarbage(compartment);
     return result;
   } catch (exception const&) {
     // And clean up mess left by this run.
-    Runtime::collectGarbage();
+    // TODO: enable this.
+    // Runtime::collectCompartmentGarbage(compartment);
     // We only catch this exception here in order to clean up garbage..
     // TODO: hopefully WAVM is fixed so that this isn't needed
     throw;
@@ -353,8 +356,7 @@ ExecutionResult WavmEngine::internalExecute(
   heraAssert(linkResult.success, "Couldn't link contract against host module.");
 
   // compile the module from IR to LLVM bitcode
-  Runtime::GCPointer<Runtime::Module> module = Runtime::compileModule(moduleIR);
-  heraAssert(module, "Couldn't compile IR to bitcode.");
+  Runtime::ModuleRef module = Runtime::compileModule(moduleIR);
 
   // instantiate contract module
   Runtime::GCPointer<Runtime::ModuleInstance> moduleInstance = Runtime::instantiateModule(compartment, module, move(linkResult.resolvedImports), "<ewasmcontract>");
@@ -364,7 +366,7 @@ ExecutionResult WavmEngine::internalExecute(
   wavm_host_module::interface.top()->setWasmMemory(asMemory(Runtime::getInstanceExport(moduleInstance, "memory")));
 
   // invoke the main function
-  Runtime::GCPointer<Runtime::FunctionInstance> mainFunction = asFunctionNullable(Runtime::getInstanceExport(moduleInstance, "main"));
+  Runtime::GCPointer<Runtime::Function> mainFunction = asFunctionNullable(Runtime::getInstanceExport(moduleInstance, "main"));
   ensureCondition(mainFunction, ContractValidationFailure, "\"main\" not found");
 
   // this is how WAVM's try/catch for exceptions