Export utils::BytecodeUtil.

Signed-off-by: Piotr Sikora <[email protected]>

Author: PiotrSikora

src/common/bytecode_util.h include/proxy-wasm/bytecode_util.hsrc/common/bytecode_util.h renamed to include/proxy-wasm/bytecode_util.h

@@ -20,7 +20,7 @@
 #include "include/proxy-wasm/wasm_vm.h"
 
 namespace proxy_wasm {
-namespace common {
+namespace utils {
 
 // Utilitiy functions which directly operate on Wasm bytecodes.
 class BytecodeUtil {
@@ -73,5 +73,5 @@ class BytecodeUtil {
   static bool parseVarint(const char *&begin, const char *end, uint32_t &ret);
 };
 
-} // namespace common
+} // namespace utils
 } // namespace proxy_wasm

src/common/bytecode_util.cc src/utils/bytecode_util.ccsrc/common/bytecode_util.cc renamed to src/utils/bytecode_util.cc

@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/common/bytecode_util.h"
+#include "include/proxy-wasm/bytecode_util.h"
+
 #include <cstring>
 
 namespace proxy_wasm {
-namespace common {
+namespace utils {
 
 bool BytecodeUtil::checkWasmHeader(std::string_view bytecode) {
   // Wasm file header is 8 bytes (magic number + version).
@@ -240,5 +241,5 @@ bool BytecodeUtil::parseVarint(const char *&pos, const char *end, uint32_t &ret)
   return ret != static_cast<uint32_t>(-1);
 }
 
-} // namespace common
+} // namespace utils
 } // namespace proxy_wasm

src/wamr/wamr.cc

@@ -29,9 +29,10 @@
 #include <utility>
 #include <vector>
 
+#include "include/proxy-wasm/bytecode_util.h"
+
 #include "src/wamr/types.h"
 #include "wasm_c_api.h"
-#include "src/common/bytecode_util.h"
 
 namespace proxy_wasm {
 namespace wamr {

src/wasm.cc

@@ -26,10 +26,11 @@
 #include <string>
 #include <unordered_map>
 
-#include "src/common/bytecode_util.h"
+#include "include/proxy-wasm/bytecode_util.h"
+#include "include/proxy-wasm/vm_id_handle.h"
+
 #include "src/third_party/base64.h"
 #include "src/third_party/picosha2.h"
-#include "include/proxy-wasm/vm_id_handle.h"
 
 namespace proxy_wasm {
 
@@ -250,7 +251,7 @@ bool WasmBase::load(const std::string &code, bool allow_precompiled) {
   }
 
   // Get ABI version from the module.
-  if (!common::BytecodeUtil::getAbiVersion(code, abi_version_)) {
+  if (!utils::BytecodeUtil::getAbiVersion(code, abi_version_)) {
     fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
     return false;
   }
@@ -260,7 +261,7 @@ bool WasmBase::load(const std::string &code, bool allow_precompiled) {
   }
 
   // Get function names from the module.
-  if (!common::BytecodeUtil::getFunctionNameIndex(code, function_names_)) {
+  if (!utils::BytecodeUtil::getFunctionNameIndex(code, function_names_)) {
     fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
     return false;
   }
@@ -270,7 +271,7 @@ bool WasmBase::load(const std::string &code, bool allow_precompiled) {
     std::string_view precompiled = {};
     const auto section_name = wasm_vm_->getPrecompiledSectionName();
     if (!section_name.empty()) {
-      if (!common::BytecodeUtil::getCustomSection(code, section_name, precompiled)) {
+      if (!utils::BytecodeUtil::getCustomSection(code, section_name, precompiled)) {
         fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
         return false;
       }
@@ -293,7 +294,7 @@ bool WasmBase::load(const std::string &code, bool allow_precompiled) {
 
   // Use original bytecode (possibly stripped).
   std::string stripped;
-  if (!common::BytecodeUtil::getStrippedSource(code, stripped)) {
+  if (!utils::BytecodeUtil::getStrippedSource(code, stripped)) {
     fail(FailState::UnableToInitializeCode, "Failed to parse corrupted Wasm module");
     return false;
   }

test/common/BUILD test/utils/BUILDtest/common/BUILD renamed to test/utils/BUILD

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/common/bytecode_util.h"
+#include "include/proxy-wasm/bytecode_util.h"
 
 #include <fstream>
 #include <iostream>
@@ -23,9 +23,9 @@
 #include "gtest/gtest.h"
 
 namespace proxy_wasm {
-namespace common {
+namespace utils {
 
-TEST(TestWasmCommonUtil, getCustomSection) {
+TEST(TestBytecodeUtil, getCustomSection) {
   std::string custom_section = {
       0x00, 0x61, 0x73, 0x6d,       // Wasm magic
       0x01, 0x00, 0x00, 0x00,       // Wasm version
@@ -54,7 +54,7 @@ TEST(TestWasmCommonUtil, getCustomSection) {
   EXPECT_FALSE(BytecodeUtil::getCustomSection(corrupted, "hey", section));
 }
 
-TEST(TestWasmCommonUtil, getFunctionNameIndex) {
+TEST(TestBytecodeUtil, getFunctionNameIndex) {
   const auto source = readTestWasmFile("abi_export.wasm");
   std::unordered_map<uint32_t, std::string> actual;
   // OK.
@@ -73,7 +73,7 @@ TEST(TestWasmCommonUtil, getFunctionNameIndex) {
   EXPECT_TRUE(actual.empty());
 }
 
-TEST(TestWasmCommonUtil, getStrippedSource) {
+TEST(TestBytecodeUtil, getStrippedSource) {
   // Unmodified case.
   auto source = readTestWasmFile("abi_export.wasm");
   std::string actual;
@@ -110,12 +110,12 @@ TEST(TestWasmCommonUtil, getStrippedSource) {
   EXPECT_EQ(actual.size(), source.size() - custom_section.size());
 }
 
-TEST(TestWasmCommonUtil, getAbiVersion) {
+TEST(TestBytecodeUtil, getAbiVersion) {
   const auto source = readTestWasmFile("abi_export.wasm");
   proxy_wasm::AbiVersion actual;
   EXPECT_TRUE(BytecodeUtil::getAbiVersion(source, actual));
   EXPECT_EQ(actual, proxy_wasm::AbiVersion::ProxyWasm_0_2_0);
 }
 
-} // namespace common
+} // namespace utils
 } // namespace proxy_wasm