Commit c5e3c9bf authored by mtrofin's avatar mtrofin Committed by Commit bot

[wasm] Support for memory size relocation for asm-wasm.

Only Intel needed changes, arm and mips work as expected.

BUG=

Review-Url: https://codereview.chromium.org/2061833003
Cr-Commit-Position: refs/heads/master@{#37011}
parent 5846acc2
This diff is collapsed.
...@@ -2679,7 +2679,7 @@ void MacroAssembler::Move(Register dst, Register src) { ...@@ -2679,7 +2679,7 @@ void MacroAssembler::Move(Register dst, Register src) {
void MacroAssembler::Move(Register dst, const Immediate& x) { void MacroAssembler::Move(Register dst, const Immediate& x) {
if (x.is_zero()) { if (x.is_zero() && RelocInfo::IsNone(x.rmode_)) {
xor_(dst, dst); // Shorter than mov of 32-bit immediate 0. xor_(dst, dst); // Shorter than mov of 32-bit immediate 0.
} else { } else {
mov(dst, x); mov(dst, x);
......
...@@ -228,6 +228,9 @@ WASM_EXEC_TEST(StoreMemI32_oob_asm) { ...@@ -228,6 +228,9 @@ WASM_EXEC_TEST(StoreMemI32_oob_asm) {
BUILD(r, WASM_UNOP(OP_TYPE, WASM_GET_LOCAL(0))); \ BUILD(r, WASM_UNOP(OP_TYPE, WASM_GET_LOCAL(0))); \
CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0], \ CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0], \
RelocInfo::WASM_MEMORY_REFERENCE)); \ RelocInfo::WASM_MEMORY_REFERENCE)); \
CHECK_NE( \
0, GetMatchingRelocInfoCount(module.instance->function_code[0], \
RelocInfo::WASM_MEMORY_SIZE_REFERENCE)); \
} }
FOREACH_INT_CHECKED_LOAD_OP(INT_LOAD_TEST) FOREACH_INT_CHECKED_LOAD_OP(INT_LOAD_TEST)
...@@ -240,6 +243,9 @@ FOREACH_INT_CHECKED_LOAD_OP(INT_LOAD_TEST) ...@@ -240,6 +243,9 @@ FOREACH_INT_CHECKED_LOAD_OP(INT_LOAD_TEST)
BUILD(r, WASM_BINOP(OP_TYPE, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))); \ BUILD(r, WASM_BINOP(OP_TYPE, WASM_GET_LOCAL(0), WASM_GET_LOCAL(1))); \
CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0], \ CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0], \
RelocInfo::WASM_MEMORY_REFERENCE)); \ RelocInfo::WASM_MEMORY_REFERENCE)); \
CHECK_NE( \
0, GetMatchingRelocInfoCount(module.instance->function_code[0], \
RelocInfo::WASM_MEMORY_SIZE_REFERENCE)); \
} }
FOREACH_INT_CHECKED_STORE_OP(INT_STORE_TEST) FOREACH_INT_CHECKED_STORE_OP(INT_STORE_TEST)
...@@ -251,6 +257,8 @@ TEST(RunWasm_AsmCheckedLoadFloat32RelocInfo) { ...@@ -251,6 +257,8 @@ TEST(RunWasm_AsmCheckedLoadFloat32RelocInfo) {
CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0], CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0],
RelocInfo::WASM_MEMORY_REFERENCE)); RelocInfo::WASM_MEMORY_REFERENCE));
CHECK_NE(0, GetMatchingRelocInfoCount(module.instance->function_code[0],
RelocInfo::WASM_MEMORY_SIZE_REFERENCE));
} }
TEST(RunWasm_AsmCheckedStoreFloat32RelocInfo) { TEST(RunWasm_AsmCheckedStoreFloat32RelocInfo) {
...@@ -261,6 +269,8 @@ TEST(RunWasm_AsmCheckedStoreFloat32RelocInfo) { ...@@ -261,6 +269,8 @@ TEST(RunWasm_AsmCheckedStoreFloat32RelocInfo) {
CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0], CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0],
RelocInfo::WASM_MEMORY_REFERENCE)); RelocInfo::WASM_MEMORY_REFERENCE));
CHECK_NE(0, GetMatchingRelocInfoCount(module.instance->function_code[0],
RelocInfo::WASM_MEMORY_SIZE_REFERENCE));
} }
TEST(RunWasm_AsmCheckedLoadFloat64RelocInfo) { TEST(RunWasm_AsmCheckedLoadFloat64RelocInfo) {
...@@ -270,6 +280,8 @@ TEST(RunWasm_AsmCheckedLoadFloat64RelocInfo) { ...@@ -270,6 +280,8 @@ TEST(RunWasm_AsmCheckedLoadFloat64RelocInfo) {
CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0], CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0],
RelocInfo::WASM_MEMORY_REFERENCE)); RelocInfo::WASM_MEMORY_REFERENCE));
CHECK_NE(0, GetMatchingRelocInfoCount(module.instance->function_code[0],
RelocInfo::WASM_MEMORY_SIZE_REFERENCE));
} }
TEST(RunWasm_AsmCheckedStoreFloat64RelocInfo) { TEST(RunWasm_AsmCheckedStoreFloat64RelocInfo) {
...@@ -280,4 +292,6 @@ TEST(RunWasm_AsmCheckedStoreFloat64RelocInfo) { ...@@ -280,4 +292,6 @@ TEST(RunWasm_AsmCheckedStoreFloat64RelocInfo) {
CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0], CHECK_EQ(1, GetMatchingRelocInfoCount(module.instance->function_code[0],
RelocInfo::WASM_MEMORY_REFERENCE)); RelocInfo::WASM_MEMORY_REFERENCE));
CHECK_NE(0, GetMatchingRelocInfoCount(module.instance->function_code[0],
RelocInfo::WASM_MEMORY_SIZE_REFERENCE));
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment