Index: test/cctest/wasm/test-run-wasm-64.cc |
diff --git a/test/cctest/wasm/test-run-wasm-64.cc b/test/cctest/wasm/test-run-wasm-64.cc |
index 1a5b341b744c8b3a3410b27158d84d1691cfe90e..9b312032f9d75aea7456c381dbb71c6a5c7a25e0 100644 |
--- a/test/cctest/wasm/test-run-wasm-64.cc |
+++ b/test/cctest/wasm/test-run-wasm-64.cc |
@@ -1238,7 +1238,7 @@ WASM_EXEC_TEST(I64ReinterpretF64) { |
FOR_INT32_INPUTS(i) { |
int64_t expected = static_cast<int64_t>(*i) * 0x300010001; |
- memory[0] = expected; |
+ module.WriteMemory(&memory[0], expected); |
CHECK_EQ(expected, r.Call()); |
} |
} |
@@ -1257,7 +1257,7 @@ WASM_EXEC_TEST(F64ReinterpretI64) { |
FOR_INT32_INPUTS(i) { |
int64_t expected = static_cast<int64_t>(*i) * 0x300010001; |
CHECK_EQ(expected, r.Call(expected)); |
- CHECK_EQ(expected, memory[0]); |
+ CHECK_EQ(expected, module.ReadMemory<int64_t>(&memory[0])); |
} |
} |
@@ -1270,13 +1270,13 @@ WASM_EXEC_TEST(LoadMemI64) { |
BUILD(r, WASM_LOAD_MEM(MachineType::Int64(), WASM_I8(0))); |
- memory[0] = 0xaabbccdd00112233LL; |
+ module.WriteMemory<int64_t>(&memory[0], 0xaabbccdd00112233LL); |
CHECK_EQ(0xaabbccdd00112233LL, r.Call()); |
- memory[0] = 0x33aabbccdd001122LL; |
+ module.WriteMemory<int64_t>(&memory[0], 0x33aabbccdd001122LL); |
CHECK_EQ(0x33aabbccdd001122LL, r.Call()); |
- memory[0] = 77777777; |
+ module.WriteMemory<int64_t>(&memory[0], 77777777); |
CHECK_EQ(77777777, r.Call()); |
} |
@@ -1291,13 +1291,13 @@ WASM_EXEC_TEST(LoadMemI64_alignment) { |
BUILD(r, |
WASM_LOAD_MEM_ALIGNMENT(MachineType::Int64(), WASM_I8(0), alignment)); |
- memory[0] = 0xaabbccdd00112233LL; |
+ module.WriteMemory<int64_t>(&memory[0], 0xaabbccdd00112233LL); |
CHECK_EQ(0xaabbccdd00112233LL, r.Call()); |
- memory[0] = 0x33aabbccdd001122LL; |
+ module.WriteMemory<int64_t>(&memory[0], 0x33aabbccdd001122LL); |
CHECK_EQ(0x33aabbccdd001122LL, r.Call()); |
- memory[0] = 77777777; |
+ module.WriteMemory<int64_t>(&memory[0], 77777777); |
CHECK_EQ(77777777, r.Call()); |
} |
} |
@@ -1331,7 +1331,7 @@ WASM_EXEC_TEST(MemI64_Sum) { |
module.RandomizeMemory(i * 33); |
uint64_t expected = 0; |
for (size_t j = kNumElems - 1; j > 0; j--) { |
- expected += memory[j]; |
+ expected += module.ReadMemory(&memory[j]); |
} |
uint64_t result = r.Call(8 * (kNumElems - 1)); |
CHECK_EQ(expected, result); |
@@ -1348,10 +1348,10 @@ WASM_EXEC_TEST(StoreMemI64_alignment) { |
BUILD(r, WASM_STORE_MEM_ALIGNMENT(MachineType::Int64(), WASM_ZERO, i, |
WASM_GET_LOCAL(0))); |
module.RandomizeMemory(1111); |
- memory[0] = 0; |
+ module.WriteMemory<int64_t>(&memory[0], 0); |
CHECK_EQ(kWritten, r.Call(kWritten)); |
- CHECK_EQ(kWritten, memory[0]); |
+ CHECK_EQ(kWritten, module.ReadMemory(&memory[0])); |
} |
} |
@@ -1369,7 +1369,7 @@ WASM_EXEC_TEST(I64Global) { |
WASM_I64_SCONVERT_I32(WASM_GET_LOCAL(0)))), |
WASM_ZERO)); |
- *global = 0xFFFFFFFFFFFFFFFFLL; |
+ module.WriteMemory<int64_t>(global, 0xFFFFFFFFFFFFFFFFLL); |
for (int i = 9; i < 444444; i += 111111) { |
int64_t expected = *global & i; |
r.Call(i); |