Skip to content

Commit b5f707f

Browse files
authored
Merge pull request #542 from ewasm/wavm-memory
Use memoryRef and not memoryArrayPtr for single elements in WAVM
2 parents 863f035 + b45c6f8 commit b5f707f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/wavm.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ class WavmEthereumInterface : public EthereumInterface {
6161
private:
6262
// These assume that m_wasmMemory was set prior to execution.
6363
size_t memorySize() const override { return Runtime::getMemoryNumPages(m_wasmMemory) * 65536; }
64-
void memorySet(size_t offset, uint8_t value) override { (Runtime::memoryArrayPtr<U8>(m_wasmMemory, offset, 1))[0] = value; }
65-
uint8_t memoryGet(size_t offset) override { return (Runtime::memoryArrayPtr<U8>(m_wasmMemory, offset, 1))[0]; }
64+
void memorySet(size_t offset, uint8_t value) override { Runtime::memoryRef<U8>(m_wasmMemory, offset) = value; }
65+
uint8_t memoryGet(size_t offset) override { return Runtime::memoryRef<U8>(m_wasmMemory, offset); }
6666
uint8_t* memoryPointer(size_t offset, size_t length) override {
6767
ensureCondition(memorySize() >= (offset + length), InvalidMemoryAccess, "Memory is shorter than requested segment");
6868
return Runtime::memoryArrayPtr<U8>(m_wasmMemory, offset, length);

0 commit comments

Comments
 (0)