Update WAMR implementation based on Common utils

INFO: Analyzed 9 targets (0 packages loaded, 0 targets configured).
INFO: Found 1 target and 8 test targets...
INFO: Elapsed time: 4.954s, Critical Path: 3.83s
INFO: 25 processes: 2 internal, 23 linux-sandbox.
INFO: Build completed successfully, 25 total actions
//test:context_test                                                      PASSED in 0.1s
//test:exports_test                                                      PASSED in 0.1s
//test:null_vm_test                                                      PASSED in 0.2s
//test:runtime_test                                                      PASSED in 0.1s
//test:shared_data                                                       PASSED in 0.1s
//test:shared_queue                                                      PASSED in 0.1s
//test:vm_id_handle                                                      PASSED in 0.1s
//test/common:bytecode_util_test                                         PASSED in 0.2s

Executed 8 out of 8 tests: 8 tests pass.
INFO: Build completed successfully, 25 total actions

Signed-off-by: Le Yao <[email protected]>

Author: Le Yao

src/wamr/types.h

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "src/common/types.h"
-#include "wamr/include/wasm_c_api.h"
+#include "wasm_c_api.h"
 
 namespace proxy_wasm {
 namespace wamr {

src/wamr/wamr.cc

@@ -31,6 +31,7 @@
 
 #include "src/wamr/types.h"
 #include "wasm_c_api.h"
+#include "src/common/bytecode_util.h"
 
 namespace proxy_wasm {
 namespace wamr {
@@ -62,7 +63,6 @@ class Wamr : public WasmVm {
   std::unique_ptr<WasmVm> clone() override;
 
   AbiVersion getAbiVersion() override;
-  std::string_view getCustomSection(std::string_view name) override;
 
   bool load(const std::string &code, bool allow_precompiled = false) override;
   bool link(std::string_view debug_name) override;
@@ -88,8 +88,6 @@ class Wamr : public WasmVm {
   FOR_ALL_WASM_VM_EXPORTS(_GET_MODULE_FUNCTION)
 #undef _GET_MODULE_FUNCTION
 private:
-  bool getStrippedSource(WasmByteVec *out);
-
   template <typename... Args>
   void registerHostFunctionImpl(std::string_view module_name, std::string_view function_name,
                                 void (*function)(void *, Args...));
@@ -106,7 +104,6 @@ class Wamr : public WasmVm {
   void getModuleFunctionImpl(std::string_view function_name,
                              std::function<R(ContextBase *, Args...)> *function);
 
-  WasmByteVec source_;
   WasmStorePtr store_;
   WasmModulePtr module_;
   WasmInstancePtr instance_;
@@ -116,39 +113,27 @@ class Wamr : public WasmVm {
 
   std::unordered_map<std::string, HostFuncDataPtr> host_functions_;
   std::unordered_map<std::string, WasmFuncPtr> module_functions_;
+  AbiVersion abi_version_;
 };
 
-// TODO(mathetake): move to proxy_wasm::common::*
-static uint32_t parseVarint(const byte_t *&pos, const byte_t *end) {
-  uint32_t n = 0;
-  uint32_t shift = 0;
-  byte_t b;
-  do {
-    if (pos + 1 > end) {
-      abort();
-    }
-    b = *pos++;
-    n += (b & 0x7f) << shift;
-    shift += 7;
-  } while ((b & 0x80) != 0);
-  return n;
-}
-
 bool Wamr::load(const std::string &code, bool allow_precompiled) {
   store_ = wasm_store_new(engine());
 
-  // Wasm file header is 8 bytes (magic number + version).
-  static const uint8_t magic_number[4] = {0x00, 0x61, 0x73, 0x6d};
-  if (code.size() < 8 || ::memcmp(code.data(), magic_number, 4) != 0) {
+  // Get ABI version from bytecode.
+  if (!common::BytecodeUtil::getAbiVersion(code, abi_version_)) {
+    fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
     return false;
   }
 
-  wasm_byte_vec_new_uninitialized(source_.get(), code.size());
-  ::memcpy(source_.get()->data, code.data(), code.size());
+  std::string stripped;
+  if (!common::BytecodeUtil::getStrippedSource(code, stripped)) {
+    fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
+    return false;
+  };
 
-  WasmByteVec stripped;
-  module_ =
-      wasm_module_new(store_.get(), getStrippedSource(&stripped) ? stripped.get() : source_.get());
+  WasmByteVec stripped_vec;
+  wasm_byte_vec_new(stripped_vec.get(), stripped.size(), stripped.data());
+  module_ = wasm_module_new(store_.get(), stripped_vec.get());
 
   return module_ != nullptr;
 }
@@ -162,60 +147,19 @@ std::unique_ptr<WasmVm> Wamr::clone() {
 
   clone->store_ = wasm_store_new(engine());
 
-  WasmByteVec stripped;
-  clone->module_ = wasm_module_new(clone->store_.get(),
-                                   getStrippedSource(&stripped) ? stripped.get() : source_.get());
-
-  return clone;
-}
+  std::string stripped;
+  if (!common::BytecodeUtil::getStrippedSource("", stripped)) {
+    fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
+    return nullptr;
+  };
 
-// TODO(mathetake): move to proxy_wasm::common::*
-bool Wamr::getStrippedSource(WasmByteVec *out) {
-  std::vector<byte_t> stripped;
+  WasmByteVec stripped_vec;
+  wasm_byte_vec_new(stripped_vec.get(), stripped.size(), stripped.data());
+  clone->module_ = wasm_module_new(store_.get(), stripped_vec.get());
 
-  const byte_t *pos = source_.get()->data + 8 /* Wasm header */;
-  const byte_t *end = source_.get()->data + source_.get()->size;
-  while (pos < end) {
-    const auto section_start = pos;
-    if (pos + 1 > end) {
-      return false;
-    }
-    const auto section_type = *pos++;
-    const auto section_len = parseVarint(pos, end);
-    if (section_len == static_cast<uint32_t>(-1) || pos + section_len > end) {
-      return false;
-    }
-    if (section_type == 0 /* custom section */) {
-      const auto section_data_start = pos;
-      const auto section_name_len = parseVarint(pos, end);
-      if (section_name_len == static_cast<uint32_t>(-1) || pos + section_name_len > end) {
-        return false;
-      }
-      auto section_name = std::string_view(pos, section_name_len);
-      if (section_name.find("precompiled_") != std::string::npos) {
-        // If this is the first "precompiled_" section, then save everything
-        // before it, otherwise skip it.
-        if (stripped.empty()) {
-          const byte_t *start = source_.get()->data;
-          stripped.insert(stripped.end(), start, section_start);
-        }
-      }
-      pos = section_data_start + section_len;
-    } else {
-      pos += section_len;
-      // Save this section if we already saw a custom "precompiled_" section.
-      if (!stripped.empty()) {
-        stripped.insert(stripped.end(), section_start, pos /* section end */);
-      }
-    }
-  }
+  clone->abi_version_ = abi_version_;
 
-  if (!stripped.empty()) {
-    wasm_byte_vec_new_uninitialized(out->get(), stripped.size());
-    ::memcpy(out->get()->data, stripped.data(), stripped.size());
-    return true;
-  }
-  return false;
+  return clone;
 }
 
 static bool equalValTypes(const wasm_valtype_vec_t *left, const wasm_valtype_vec_t *right) {
@@ -301,7 +245,6 @@ bool Wamr::link(std::string_view debug_name) {
   assert(module_ != nullptr);
 
   WasmImporttypeVec import_types;
-This conversation was marked as resolved by leyao-daily
   wasm_module_imports(module_.get(), import_types.get());
 
   std::vector<const wasm_extern_t *> imports;
@@ -406,41 +349,6 @@ This conversation was marked as resolved by leyao-daily
   return true;
 }
 
-std::string_view Wamr::getCustomSection(std::string_view name) {
-  const byte_t *pos = source_.get()->data + 8 /* Wasm header */;
-  const byte_t *end = source_.get()->data + source_.get()->size;
-  while (pos < end) {
-    if (pos + 1 > end) {
-      fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
-      return "";
-    }
-    const auto section_type = *pos++;
-    const auto section_len = parseVarint(pos, end);
-    if (section_len == static_cast<uint32_t>(-1) || pos + section_len > end) {
-      fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
-      return "";
-    }
-
-    if (section_type == 0 /* custom section */) {
-      const auto section_data_start = pos;
-      const auto section_name_len = parseVarint(pos, end);
-      if (section_name_len == static_cast<uint32_t>(-1) || pos + section_name_len > end) {
-        fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
-        return "";
-      }
-      if (section_name_len == name.size() && ::memcmp(pos, name.data(), section_name_len) == 0) {
-        pos += section_name_len;
-        return {pos, static_cast<size_t>(section_data_start + section_len - pos)};
-      }
-      pos = section_data_start + section_len;
-    } else {
-      pos += section_len;
-    }
-  }
-
-  return "";
-}
-
 uint64_t Wamr::getMemorySize() { return wasm_memory_data_size(memory_.get()); }
 
 std::optional<std::string_view> Wamr::getMemory(uint64_t pointer, uint64_t size) {
@@ -737,27 +645,7 @@ void Wamr::getModuleFunctionImpl(std::string_view function_name,
   };
 };
 
-AbiVersion Wamr::getAbiVersion() {
-  assert(module_ != nullptr);
-  WasmExportTypeVec export_types;
-  wasm_module_exports(module_.get(), export_types.get());
-
-  for (size_t i = 0; i < export_types.get()->size; i++) {
-    const wasm_externtype_t *exp_extern_type = wasm_exporttype_type(export_types.get()->data[i]);
-    if (wasm_externtype_kind(exp_extern_type) == WASM_EXTERN_FUNC) {
-      const wasm_name_t *name_ptr = wasm_exporttype_name(export_types.get()->data[i]);
-      std::string_view name(name_ptr->data, name_ptr->size);
-      if (name == "proxy_abi_version_0_1_0") {
-        return AbiVersion::ProxyWasm_0_1_0;
-      } else if (name == "proxy_abi_version_0_2_0") {
-        return AbiVersion::ProxyWasm_0_2_0;
-      } else if (name == "proxy_abi_version_0_2_1") {
-        return AbiVersion::ProxyWasm_0_2_1;
-      }
-    }
-  }
-  return AbiVersion::Unknown;
-}
+AbiVersion Wamr::getAbiVersion() { return abi_version_; }
 
 } // namespace wamr