Rename wasm_util -> bytecode_util

Signed-off-by: Takeshi Yoneda <[email protected]>

Author: mathetake

57bb777a7f12734ef0bd58448b3b3e7f7f7c3604.tar.gz.1

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/common/wasm_util.h"
+#include "src/common/bytecode_util.h"
 #include <cstring>
 
 namespace proxy_wasm {

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

@@ -45,7 +45,7 @@ class BytecodeUtil {
    * the function name subsection in "name" custom section.
    * See https://webassembly.github.io/spec/core/appendix/custom.html#binary-funcnamesec for detail.
    * @param bytecode is the target bytecode.
-   * @param ret the reference to store map from function indexes to function names.
+   * @param ret is the reference to store map from function indexes to function names.
    * @return indicates whether parsing succeeded or not.
    */
   static bool getFunctionNameIndex(std::string_view bytecode,
@@ -54,7 +54,7 @@ class BytecodeUtil {
   /**
    * getStrippedSource gets Wasm module without Custom Sections to save some memory in workers.
    * @param bytecode is the original bytecode.
-   * @param ret the reference to the stripped bytecode.
+   * @param ret is the reference to the stripped bytecode.
    * @return indicates whether parsing succeeded or not.
    */
   static bool getStrippedSource(std::string_view bytecode, std::string &ret);

src/common/wasm_util.h src/common/bytecode_util.hsrc/common/wasm_util.h renamed to src/common/bytecode_util.h

@@ -25,7 +25,7 @@
 #include <utility>
 #include <vector>
 
-#include "src/common/wasm_util.h"
+#include "src/common/bytecode_util.h"
 
 #include "v8.h"
 #include "v8-version.h"
@@ -290,7 +290,7 @@ bool V8::load(const std::string &code, bool allow_precompiled) {
     wasm::vec<byte_t> code_vec = wasm::vec<byte_t>::invalid();
     if (stripped.empty()) {
       // Use the original bytecode.
-      code_vec = wasm::vec<byte_t>::make(code.size(), (char *)(code.data()));
+      code_vec = wasm::vec<byte_t>::make(code.size(), code.data());
     } else {
       // Othewise use the stripped bytecode.
       code_vec = wasm::vec<byte_t>::make(stripped.size(), stripped.data());

src/v8/v8.cc

@@ -25,7 +25,7 @@
 #include <vector>
 
 #include "include/proxy-wasm/wasm_vm.h"
-#include "src/common/wasm_util.h"
+#include "src/common/bytecode_util.h"
 #include "src/wasmtime/types.h"
 
 #include "wasmtime/include/wasm.h"

src/wasmtime/wasmtime.cc

@@ -27,7 +27,7 @@
 #include <utility>
 #include <vector>
 
-#include "src/common/wasm_util.h"
+#include "src/common/bytecode_util.h"
 
 #include "WAVM/IR/Module.h"
 #include "WAVM/IR/Operators.h"

src/wavm/wavm.cc

@@ -2,8 +2,8 @@ load("@rules_cc//cc:defs.bzl", "cc_test")
 load("@proxy_wasm_cpp_host//bazel:variables.bzl", "COPTS")
 
 cc_test(
-    name = "wasm_util_test",
-    srcs = ["wasm_util_test.cc"],
+    name = "bytecode_util_test",
+    srcs = ["bytecode_util_test.cc"],
     copts = COPTS,
     data = [
         "//test/test_data:abi_export.wasm",

test/common/BUILD

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/common/wasm_util.h"
+#include "src/common/bytecode_util.h"
 
 #include <fstream>
 #include <iostream>