Add test for native to wasm value conversions

include/proxy-wasm/wasm_vm.h

@@ -67,12 +67,21 @@ template <size_t N>
 using WasmCallVoid = std::function<WasmCallInFuncType<N, void, ContextBase *, Word>>;
 template <size_t N>
 using WasmCallWord = std::function<WasmCallInFuncType<N, Word, ContextBase *, Word>>;
+// Callback used to test arg passing from host to wasm.
+using WasmCall_WWlfd = std::function<Word(ContextBase *, Word, uint64_t, float, double)>;
+// Types used to test return values. Floats are passed as parameters as these
+// do not conflict with ProxyWasm ABI signatures.
+using WasmCall_lf = std::function<uint64_t(ContextBase *, float)>;
+using WasmCall_fff = std::function<float(ContextBase *, float, float)>;
+using WasmCall_dfff = std::function<double(ContextBase *, float, float, float)>;
 
 #define FOR_ALL_WASM_VM_EXPORTS(_f)                                                                \
   _f(proxy_wasm::WasmCallVoid<0>) _f(proxy_wasm::WasmCallVoid<1>) _f(proxy_wasm::WasmCallVoid<2>)  \
       _f(proxy_wasm::WasmCallVoid<3>) _f(proxy_wasm::WasmCallVoid<5>)                              \
           _f(proxy_wasm::WasmCallWord<0>) _f(proxy_wasm::WasmCallWord<1>)                          \
-              _f(proxy_wasm::WasmCallWord<2>) _f(proxy_wasm::WasmCallWord<3>)
+              _f(proxy_wasm::WasmCallWord<2>) _f(proxy_wasm::WasmCallWord<3>)                      \
+                  _f(proxy_wasm::WasmCall_WWlfd) _f(proxy_wasm::WasmCall_lf)                       \
+                      _f(proxy_wasm::WasmCall_fff) _f(proxy_wasm::WasmCall_dfff)
 
 // These are templates and its helper for constructing signatures of functions callbacks from Wasm
 // VMs.

include/proxy-wasm/word.h

@@ -24,8 +24,16 @@ namespace proxy_wasm {
 // Use byteswap functions only when compiling for big-endian platforms.
 #if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) &&                                    \
     __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define htowasm(x, vm_uses_wasm_byte_order) ((vm_uses_wasm_byte_order) ? __builtin_bswap32(x) : (x))
-#define wasmtoh(x, vm_uses_wasm_byte_order) ((vm_uses_wasm_byte_order) ? __builtin_bswap32(x) : (x))
+static inline float bswap(float x) {
+  return std::bit_cast<float>(__builtin_bswap32(std::bit_cast<int32_t>(x)));
+}
+static inline double bswap(double x) {
+  return std::bit_cast<double>(__builtin_bswap64(std::bit_cast<int64_t>(x)));
+}
+static inline uint32_t bswap(uint32_t x) { return __builtin_bswap32(x); }
+static inline auto bswap(auto x) { return __builtin_bswap64(x); }
+#define htowasm(x, vm_uses_wasm_byte_order) ((vm_uses_wasm_byte_order) ? bswap(x) : (x))
+#define wasmtoh(x, vm_uses_wasm_byte_order) ((vm_uses_wasm_byte_order) ? bswap(x) : (x))
 #else
 #define htowasm(x, vm_uses_wasm_byte_order) (x)
 #define wasmtoh(x, vm_uses_wasm_byte_order) (x)

src/v8/v8.cc

@@ -244,6 +244,7 @@ template <> constexpr auto convertArgToValKind<Word>() { return wasm::ValKind::I
 template <> constexpr auto convertArgToValKind<uint32_t>() { return wasm::ValKind::I32; };
 template <> constexpr auto convertArgToValKind<int64_t>() { return wasm::ValKind::I64; };
 template <> constexpr auto convertArgToValKind<uint64_t>() { return wasm::ValKind::I64; };
+template <> constexpr auto convertArgToValKind<float>() { return wasm::ValKind::F32; };
 template <> constexpr auto convertArgToValKind<double>() { return wasm::ValKind::F64; };
 
 template <typename T, std::size_t... I>

src/wamr/wamr.cc

@@ -462,6 +462,10 @@ template <> void assignVal(uint64_t t, wasm_val_t &val) {
   val.kind = WASM_I64;
   val.of.i64 = static_cast<int64_t>(t);
 }
+template <> void assignVal(float t, wasm_val_t &val) {
+  val.kind = WASM_F32;
+  val.of.f32 = static_cast<float>(t);
+}
 template <> void assignVal(double t, wasm_val_t &val) {
   val.kind = WASM_F64;
   val.of.f64 = t;
@@ -485,17 +489,21 @@ template <> auto convertArgToValTypePtr<Word>() { return wasm_valtype_new_i32();
 template <> auto convertArgToValTypePtr<uint32_t>() { return wasm_valtype_new_i32(); };
 template <> auto convertArgToValTypePtr<int64_t>() { return wasm_valtype_new_i64(); };
 template <> auto convertArgToValTypePtr<uint64_t>() { return wasm_valtype_new_i64(); };
+template <> auto convertArgToValTypePtr<float>() { return wasm_valtype_new_f32(); };
 template <> auto convertArgToValTypePtr<double>() { return wasm_valtype_new_f64(); };
 
 template <typename T> T convertValueTypeToArg(wasm_val_t val);
 template <> uint32_t convertValueTypeToArg<uint32_t>(wasm_val_t val) {
   return static_cast<uint32_t>(val.of.i32);
 }
-template <> Word convertValueTypeToArg<Word>(wasm_val_t val) { return val.of.i32; }
+template <> Word convertValueTypeToArg<Word>(wasm_val_t val) {
+  return static_cast<uint32_t>(val.of.i32);
+}
 template <> int64_t convertValueTypeToArg<int64_t>(wasm_val_t val) { return val.of.i64; }
 template <> uint64_t convertValueTypeToArg<uint64_t>(wasm_val_t val) {
   return static_cast<uint64_t>(val.of.i64);
 }
+template <> float convertValueTypeToArg<float>(wasm_val_t val) { return val.of.f32; }
 template <> double convertValueTypeToArg<double>(wasm_val_t val) { return val.of.f64; }
 
 template <typename T, typename U, std::size_t... I>

src/wasmedge/wasmedge.cc

@@ -48,6 +48,7 @@ template <> WasmEdge_Value makeVal(uint32_t t) {
 template <> WasmEdge_Value makeVal(uint64_t t) {
   return WasmEdge_ValueGenI64(static_cast<int64_t>(t));
 }
+template <> WasmEdge_Value makeVal(float t) { return WasmEdge_ValueGenF32(t); }
 template <> WasmEdge_Value makeVal(double t) { return WasmEdge_ValueGenF64(t); }
 
 // Helper function to print values.
@@ -143,20 +144,24 @@ template <> WasmEdge_ValType convArgToValType<Word>() { return WasmEdge_ValTypeG
 template <> WasmEdge_ValType convArgToValType<uint32_t>() { return WasmEdge_ValTypeGenI32(); }
 template <> WasmEdge_ValType convArgToValType<int64_t>() { return WasmEdge_ValTypeGenI64(); }
 template <> WasmEdge_ValType convArgToValType<uint64_t>() { return WasmEdge_ValTypeGenI64(); }
+template <> WasmEdge_ValType convArgToValType<float>() { return WasmEdge_ValTypeGenF32(); }
 template <> WasmEdge_ValType convArgToValType<double>() { return WasmEdge_ValTypeGenF64(); }
 
 // Helper templates to convert valtype to arg.
 template <typename T> T convValTypeToArg(WasmEdge_Value val);
 template <> uint32_t convValTypeToArg<uint32_t>(WasmEdge_Value val) {
   return static_cast<uint32_t>(WasmEdge_ValueGetI32(val));
 }
-template <> Word convValTypeToArg<Word>(WasmEdge_Value val) { return WasmEdge_ValueGetI32(val); }
+template <> Word convValTypeToArg<Word>(WasmEdge_Value val) {
+  return static_cast<uint32_t>(WasmEdge_ValueGetI32(val));
+}
 template <> int64_t convValTypeToArg<int64_t>(WasmEdge_Value val) {
   return WasmEdge_ValueGetI64(val);
 }
 template <> uint64_t convValTypeToArg<uint64_t>(WasmEdge_Value val) {
   return static_cast<uint64_t>(WasmEdge_ValueGetI64(val));
 }
+template <> float convValTypeToArg<float>(WasmEdge_Value val) { return WasmEdge_ValueGetF32(val); }
 template <> double convValTypeToArg<double>(WasmEdge_Value val) {
   return WasmEdge_ValueGetF64(val);
 }

src/wasmtime/wasmtime.cc

@@ -435,6 +435,10 @@ template <> void assignVal(uint64_t t, wasm_val_t &val) {
   val.kind = WASM_I64;
   val.of.i64 = static_cast<int64_t>(t);
 }
+template <> void assignVal(float t, wasm_val_t &val) {
+  val.kind = WASM_F32;
+  val.of.f32 = t;
+}
 template <> void assignVal(double t, wasm_val_t &val) {
   val.kind = WASM_F64;
   val.of.f64 = t;
@@ -458,17 +462,21 @@ template <> auto convertArgToValTypePtr<Word>() { return wasm_valtype_new_i32();
 template <> auto convertArgToValTypePtr<uint32_t>() { return wasm_valtype_new_i32(); };
 template <> auto convertArgToValTypePtr<int64_t>() { return wasm_valtype_new_i64(); };
 template <> auto convertArgToValTypePtr<uint64_t>() { return wasm_valtype_new_i64(); };
+template <> auto convertArgToValTypePtr<float>() { return wasm_valtype_new_f32(); };
 template <> auto convertArgToValTypePtr<double>() { return wasm_valtype_new_f64(); };
 
 template <typename T> T convertValueTypeToArg(wasm_val_t val);
 template <> uint32_t convertValueTypeToArg<uint32_t>(wasm_val_t val) {
   return static_cast<uint32_t>(val.of.i32);
 }
-template <> Word convertValueTypeToArg<Word>(wasm_val_t val) { return val.of.i32; }
+template <> Word convertValueTypeToArg<Word>(wasm_val_t val) {
+  return static_cast<uint32_t>(val.of.i32);
+}
 template <> int64_t convertValueTypeToArg<int64_t>(wasm_val_t val) { return val.of.i64; }
 template <> uint64_t convertValueTypeToArg<uint64_t>(wasm_val_t val) {
   return static_cast<uint64_t>(val.of.i64);
 }
+template <> float convertValueTypeToArg<float>(wasm_val_t val) { return val.of.f32; }
 template <> double convertValueTypeToArg<double>(wasm_val_t val) { return val.of.f64; }
 
 template <typename T, typename U, std::size_t... I>

test/BUILD

@@ -84,6 +84,22 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "endianness_test",
+    timeout = "long",
+    srcs = ["endianness_test.cc"],
+    data = [
+        "//test/test_data:endianness.wasm",
+    ],
+    linkstatic = 1,
+    deps = [
+        ":utility_lib",
+        "//:lib",
+        "@com_google_googletest//:gtest",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
 cc_test(
     name = "exports_test",
     srcs = ["exports_test.cc"],

test/endianness_test.cc

@@ -0,0 +1,155 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+
+#include <optional>
+
+#include "include/proxy-wasm/context.h"
+#include "include/proxy-wasm/wasm.h"
+
+#include "test/utility.h"
+
+namespace proxy_wasm {
+namespace {
+
+class EndiannessContext : public TestContext {
+public:
+  using TestContext::TestContext;
+  WasmResult getHeaderMapPairs(WasmHeaderMapType /* type */, Pairs * /* result */) override {
+    // GetHeaderMapPairs passes this value as the hostcall return value as
+    // opposed to output parameter.
+    return static_cast<WasmResult>(3333333333U);
+  }
+};
+
+class EndiannessWasm : public TestWasm {
+public:
+  using TestWasm::TestWasm;
+  ContextBase *createVmContext() override { return new EndiannessContext(this); };
+};
+
+class EndiannessTest : public TestVm {
+public:
+  void SetUp() {
+    auto source = readTestWasmFile("endianness.wasm");
+    ASSERT_FALSE(source.empty());
+    wasm_.emplace(std::move(vm_));
+    ASSERT_TRUE(wasm_->load(source, false));
+    ASSERT_TRUE(wasm_->initialize());
+    context_ = dynamic_cast<EndiannessContext *>(wasm_->vm_context());
+    ASSERT_NE(context_, nullptr);
+  }
+
+  std::optional<EndiannessWasm> wasm_;
+  EndiannessContext *context_;
+};
+
+INSTANTIATE_TEST_SUITE_P(WasmEngines, EndiannessTest, testing::ValuesIn(getWasmEngines()),
+                         [](const testing::TestParamInfo<std::string> &info) {
+                           return info.param;
+                         });
+
+TEST_P(EndiannessTest, WasmCallReturnsWordValue) {
+  WasmCallWord<0> test_return_u32;
+  wasm_->wasm_vm()->getFunction("test_return_u32", &test_return_u32);
+
+  EXPECT_EQ(test_return_u32(context_).u32(), 3333333333U) << context_->getLog();
+}
+
+TEST_P(EndiannessTest, WasmCallReturnsNegativeWordValue) {
+  WasmCallWord<0> test_return_i32;
+  wasm_->wasm_vm()->getFunction("test_return_i32", &test_return_i32);
+
+  EXPECT_EQ(test_return_i32(context_).u32(), -1111111111) << context_->getLog();
+}
+
+TEST_P(EndiannessTest, WasmCallReturnsUnsignedLongValue) {
+  WasmCall_lf test_return_u64;
+  wasm_->wasm_vm()->getFunction("test_return_u64", &test_return_u64);
+
+  EXPECT_EQ(test_return_u64(context_, 1.0), 11111111111111111111UL) << context_->getLog();
+}
+
+TEST_P(EndiannessTest, WasmCallReturnsNegativeLongValue) {
+  WasmCall_lf test_return_i64;
+  wasm_->wasm_vm()->getFunction("test_return_i64", &test_return_i64);
+
+  EXPECT_EQ(test_return_i64(context_, 1.0), -111111111111111111L) << context_->getLog();
+}
+
+TEST_P(EndiannessTest, WasmCallReturnsFloatValue) {
+  WasmCall_fff test_return_f32;
+  wasm_->wasm_vm()->getFunction("test_return_f32", &test_return_f32);
+
+  EXPECT_THAT(test_return_f32(context_, 1.0, 1.0),
+              testing::AllOf(testing::Lt(1112.0), testing::Gt(1110.0)))
+      << context_->getLog();
+}
+
+TEST_P(EndiannessTest, WasmCallReturnsDoubleValue) {
+  WasmCall_dfff test_return_f64;
+  wasm_->wasm_vm()->getFunction("test_return_f64", &test_return_f64);
+
+  EXPECT_THAT(test_return_f64(context_, 1.0, 1.0, 1.0),
+              testing::AllOf(testing::Lt(1111111112.0), testing::Gt(1111111110.0)))
+      << context_->getLog();
+}
+
+TEST_P(EndiannessTest, HostCallReturnsWordValue) {
+  WasmCallWord<0> test_host_return;
+  wasm_->wasm_vm()->getFunction("test_host_return", &test_host_return);
+
+  EXPECT_TRUE(test_host_return(context_)) << context_->getLog();
+}
+
+TEST_P(EndiannessTest, HostPassesPrimitiveValues) {
+  WasmCall_WWlfd test_primitives;
+  wasm_->wasm_vm()->getFunction("test_primitives", &test_primitives);
+
+  ASSERT_TRUE(test_primitives(context_, 3333333333U, 11111111111111111111UL, 1111, 1111111111))
+      << context_->getLog();
+}
+
+TEST_P(EndiannessTest, HostPassesNegativePrimitiveValues) {
+  WasmCall_WWlfd test_negative_primitives;
+  wasm_->wasm_vm()->getFunction("test_negative_primitives", &test_negative_primitives);
+
+  ASSERT_TRUE(
+      test_negative_primitives(context_, -1111111111, -1111111111111111111, -1111, -1111111111))
+      << context_->getLog();
+}
+
+TEST_P(EndiannessTest, HostReadsPointersToWasmMemory) {
+  WasmCallWord<0> test_buffer_from_wasm;
+  wasm_->wasm_vm()->getFunction("test_buffer_from_wasm", &test_buffer_from_wasm);
+
+  ASSERT_TRUE(test_buffer_from_wasm(context_)) << context_->getLog();
+
+  context_->isLogged("hello from wasm land!");
+}
+
+TEST_P(EndiannessTest, WasmCallReadsBufferPassedByHost) {
+  context_->setBuffer(0, "hello from host land!");
+  WasmCallWord<0> test_buffer_from_host;
+  wasm_->wasm_vm()->getFunction("test_buffer_from_host", &test_buffer_from_host);
+
+  ASSERT_TRUE(test_buffer_from_host(context_)) << context_->getLog();
+}
+
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EndiannessTest);
+
+} // namespace
+} // namespace proxy_wasm

test/test_data/BUILD

@@ -57,6 +57,11 @@ wasm_rust_binary(
     srcs = ["trap.rs"],
 )
 
+wasm_rust_binary(
+    name = "endianness.wasm",
+    srcs = ["endianness.rs"],
+)
+
 wasm_rust_binary(
     name = "resource_limits.wasm",
     srcs = ["resource_limits.rs"],