Skip to content

Add support for big-endian platforms. #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/proxy-wasm/exports.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ template <typename Pairs> size_t pairsSize(const Pairs &result) {

template <typename Pairs> void marshalPairs(const Pairs &result, char *buffer) {
char *b = buffer;
*reinterpret_cast<uint32_t *>(b) = result.size();
*reinterpret_cast<uint32_t *>(b) = htole32(result.size());
b += sizeof(uint32_t);
for (auto &p : result) {
*reinterpret_cast<uint32_t *>(b) = p.first.size();
*reinterpret_cast<uint32_t *>(b) = htole32(p.first.size());
b += sizeof(uint32_t);
*reinterpret_cast<uint32_t *>(b) = p.second.size();
*reinterpret_cast<uint32_t *>(b) = htole32(p.second.size());
b += sizeof(uint32_t);
}
for (auto &p : result) {
Expand Down
5 changes: 5 additions & 0 deletions include/proxy-wasm/word.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@

#include <iostream>

#ifdef __APPLE__
#define htole32(x) (x)
#define le32toh(x) (x)
#endif

namespace proxy_wasm {

#include "proxy_wasm_common.h"
Expand Down
9 changes: 5 additions & 4 deletions src/exports.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ Pairs toPairs(std::string_view buffer) {
if (buffer.size() < sizeof(uint32_t)) {
return {};
}
auto size = *reinterpret_cast<const uint32_t *>(b);
auto size = le32toh(*reinterpret_cast<const uint32_t *>(b));
b += sizeof(uint32_t);
if (sizeof(uint32_t) + size * 2 * sizeof(uint32_t) > buffer.size()) {
return {};
}
result.resize(size);
for (uint32_t i = 0; i < size; i++) {
result[i].first = std::string_view(nullptr, *reinterpret_cast<const uint32_t *>(b));
result[i].first = std::string_view(nullptr, le32toh(*reinterpret_cast<const uint32_t *>(b)));
b += sizeof(uint32_t);
result[i].second = std::string_view(nullptr, *reinterpret_cast<const uint32_t *>(b));
result[i].second = std::string_view(nullptr, le32toh(*reinterpret_cast<const uint32_t *>(b)));
b += sizeof(uint32_t);
}
for (auto &p : result) {
Expand Down Expand Up @@ -712,7 +712,8 @@ Word writevImpl(Word fd, Word iovs, Word iovs_len, Word *nwritten_ptr) {
}
const uint32_t *iovec = reinterpret_cast<const uint32_t *>(memslice.value().data());
if (iovec[1] /* buf_len */) {
memslice = context->wasmVm()->getMemory(iovec[0] /* buf */, iovec[1] /* buf_len */);
memslice = context->wasmVm()->getMemory(le32toh(iovec[0]) /* buf */,
le32toh(iovec[1]) /* buf_len */);
if (!memslice) {
return 21; // __WASI_EFAULT
}
Expand Down
4 changes: 2 additions & 2 deletions src/v8/v8.cc
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ bool V8::getWord(uint64_t pointer, Word *word) {
}
uint32_t word32;
::memcpy(&word32, memory_->data() + pointer, size);
word->u64_ = word32;
word->u64_ = le32toh(word32);
return true;
}

Expand All @@ -441,7 +441,7 @@ bool V8::setWord(uint64_t pointer, Word word) {
if (pointer + size > memory_->data_size()) {
return false;
}
uint32_t word32 = word.u32();
uint32_t word32 = htole32(word.u32());
::memcpy(memory_->data() + pointer, &word32, size);
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/wamr/wamr.cc
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ bool Wamr::getWord(uint64_t pointer, Word *word) {

uint32_t word32;
::memcpy(&word32, wasm_memory_data(memory_.get()) + pointer, size);
word->u64_ = word32;
word->u64_ = le32toh(word32);
return true;
}

Expand All @@ -349,7 +349,7 @@ bool Wamr::setWord(uint64_t pointer, Word word) {
if (pointer + size > wasm_memory_data_size(memory_.get())) {
return false;
}
uint32_t word32 = word.u32();
uint32_t word32 = htole32(word.u32());
::memcpy(wasm_memory_data(memory_.get()) + pointer, &word32, size);
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/wasmtime/wasmtime.cc
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ bool Wasmtime::getWord(uint64_t pointer, Word *word) {

uint32_t word32;
::memcpy(&word32, wasm_memory_data(memory_.get()) + pointer, size);
word->u64_ = word32;
word->u64_ = le32toh(word32);
return true;
}

Expand All @@ -363,7 +363,7 @@ bool Wasmtime::setWord(uint64_t pointer, Word word) {
if (pointer + size > wasm_memory_data_size(memory_.get())) {
return false;
}
uint32_t word32 = word.u32();
uint32_t word32 = htole32(word.u32());
::memcpy(wasm_memory_data(memory_.get()) + pointer, &word32, size);
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/wavm/wavm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,12 @@ bool Wavm::getWord(uint64_t pointer, Word *data) {
auto p = reinterpret_cast<char *>(memory_base_ + pointer);
uint32_t data32;
memcpy(&data32, p, sizeof(uint32_t));
data->u64_ = data32;
data->u64_ = le32toh(data32);
return true;
}

bool Wavm::setWord(uint64_t pointer, Word data) {
uint32_t data32 = data.u32();
uint32_t data32 = htole32(data.u32());
return setMemory(pointer, sizeof(uint32_t), &data32);
}

Expand Down
2 changes: 1 addition & 1 deletion test/runtime_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ TEST_P(TestVM, Memory) {
ASSERT_TRUE(vm_->getWord(0x2000, &word));
ASSERT_EQ(100, word.u64_);

int32_t data[2] = {-1, 200};
uint32_t data[2] = {htole32(static_cast<uint32_t>(-1)), htole32(200)};
ASSERT_TRUE(vm_->setMemory(0x200, sizeof(int32_t) * 2, static_cast<void *>(data)));
ASSERT_TRUE(vm_->getWord(0x200, &word));
ASSERT_EQ(-1, static_cast<int32_t>(word.u64_));
Expand Down