AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm][memory64] Prepare interpreter for memory64

Browse Source 
This CL prepares the interpreter for 64-bit addresses. The offset (in
the memory immediate) can now be 64-bit, and also the index (from the
stack) will be 64-bit if memory64 is enabled.
memory.size will return a 64-bit constant under memory64.
memory.grow is a bit more involved and requires more refactorings in the
called functions. I left a TODO in the interpreter for now.

R=manoskouk@chromium.org

Bug: v8:10949
Change-Id: I47ab7e38a7356239c827619325f4583069e46669
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2555000
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Manos Koukoutos <manoskouk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#71376}
This commit is contained in:
Clemens Backes 2020-11-23 19:42:18 +01:00 committed by Commit Bot
parent fa9ee22ec1
commit c229abea6d
1 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
test/common/wasm/wasm-interpreter.cc
View File

@ -1486,7 +1486,10 @@ class WasmInterpreterInternals {
ResetStack(dest + arity); ResetStack(dest + arity);
} }
Address EffectiveAddress(uint32_t index) { Address EffectiveAddress(uint64_t index) {
DCHECK_GE(std::numeric_limits<uintptr_t>::max(),
instance_object_->memory_size());
DCHECK_GE(instance_object_->memory_size(), index);
// Compute the effective address of the access, making sure to condition // Compute the effective address of the access, making sure to condition
// the index even in the in-bounds case. // the index even in the in-bounds case.
return reinterpret_cast<Address>(instance_object_->memory_start()) + return reinterpret_cast<Address>(instance_object_->memory_start()) +
@ -1494,8 +1497,8 @@ class WasmInterpreterInternals {
} }
template <typename mtype> template <typename mtype>
Address BoundsCheckMem(uint32_t offset, uint32_t index) { Address BoundsCheckMem(uint64_t offset, uint64_t index) {
uint32_t effective_index = offset + index; uint64_t effective_index = offset + index;
if (effective_index < index) { if (effective_index < index) {
return kNullAddress; // wraparound => oob return kNullAddress; // wraparound => oob
} }
@ -1506,12 +1509,20 @@ class WasmInterpreterInternals {
return EffectiveAddress(effective_index); return EffectiveAddress(effective_index);
} }
bool BoundsCheckMemRange(uint32_t index, uint32_t* size, bool BoundsCheckMemRange(uint64_t index, uint64_t* size,
Address* out_address) { Address* out_address) {
bool ok = base::ClampToBounds( DCHECK_GE(std::numeric_limits<uintptr_t>::max(),
index, size, static_cast<uint32_t>(instance_object_->memory_size())); instance_object_->memory_size());
if (!base::ClampToBounds<uint64_t>(index, size,
instance_object_->memory_size())) {
return false;
}
*out_address = EffectiveAddress(index); *out_address = EffectiveAddress(index);
return ok; return true;
}
uint64_t ToMemType(WasmValue value) {
return module()->is_memory64 ? value.to<uint64_t>() : value.to<uint32_t>();
} }
template <typename ctype, typename mtype> template <typename ctype, typename mtype>
@ -1524,7 +1535,7 @@ class WasmInterpreterInternals {
// those will report at the middle of an opcode. // those will report at the middle of an opcode.
MemoryAccessImmediate<Decoder::kNoValidation> imm( MemoryAccessImmediate<Decoder::kNoValidation> imm(
decoder, code->at(pc + prefix_len), sizeof(ctype)); decoder, code->at(pc + prefix_len), sizeof(ctype));
uint32_t index = Pop().to<uint32_t>(); uint64_t index = ToMemType(Pop());
Address addr = BoundsCheckMem<mtype>(imm.offset, index); Address addr = BoundsCheckMem<mtype>(imm.offset, index);
if (!addr) { if (!addr) {
DoTrap(kTrapMemOutOfBounds, pc); DoTrap(kTrapMemOutOfBounds, pc);
@ -1558,7 +1569,7 @@ class WasmInterpreterInternals {
decoder, code->at(pc + prefix_len), sizeof(ctype)); decoder, code->at(pc + prefix_len), sizeof(ctype));
ctype val = Pop().to<ctype>(); ctype val = Pop().to<ctype>();
uint32_t index = Pop().to<uint32_t>(); uint64_t index = ToMemType(Pop());
Address addr = BoundsCheckMem<mtype>(imm.offset, index); Address addr = BoundsCheckMem<mtype>(imm.offset, index);
if (!addr) { if (!addr) {
DoTrap(kTrapMemOutOfBounds, pc); DoTrap(kTrapMemOutOfBounds, pc);
@ -1585,7 +1596,7 @@ class WasmInterpreterInternals {
decoder, code->at(pc + *len), sizeof(type)); decoder, code->at(pc + *len), sizeof(type));
if (val2) *val2 = static_cast<type>(Pop().to<op_type>()); if (val2) *val2 = static_cast<type>(Pop().to<op_type>());
if (val) *val = static_cast<type>(Pop().to<op_type>()); if (val) *val = static_cast<type>(Pop().to<op_type>());
uint32_t index = Pop().to<uint32_t>(); uint64_t index = ToMemType(Pop());
*address = BoundsCheckMem<type>(imm.offset, index); *address = BoundsCheckMem<type>(imm.offset, index);
if (!*address) { if (!*address) {
DoTrap(kTrapMemOutOfBounds, pc); DoTrap(kTrapMemOutOfBounds, pc);
@ -1602,7 +1613,7 @@ class WasmInterpreterInternals {
template <typename type> template <typename type>
bool ExtractAtomicWaitNotifyParams(Decoder* decoder, InterpreterCode* code, bool ExtractAtomicWaitNotifyParams(Decoder* decoder, InterpreterCode* code,
pc_t pc, int* const len, pc_t pc, int* const len,
uint32_t* buffer_offset, type* val, uint64_t* buffer_offset, type* val,
int64_t* timeout = nullptr) { int64_t* timeout = nullptr) {
// TODO(manoskouk): Introduce test which exposes wrong pc offset below. // TODO(manoskouk): Introduce test which exposes wrong pc offset below.
MemoryAccessImmediate<Decoder::kFullValidation> imm( MemoryAccessImmediate<Decoder::kFullValidation> imm(
@ -1611,9 +1622,9 @@ class WasmInterpreterInternals {
*timeout = Pop().to<int64_t>(); *timeout = Pop().to<int64_t>();
} }
*val = Pop().to<type>(); *val = Pop().to<type>();
auto index = Pop().to<uint32_t>(); uint64_t index = ToMemType(Pop());
// Check bounds. // Check bounds.
Address address = BoundsCheckMem<uint32_t>(imm.offset, index); Address address = BoundsCheckMem<uint64_t>(imm.offset, index);
*buffer_offset = index + imm.offset; *buffer_offset = index + imm.offset;
if (!address) { if (!address) {
DoTrap(kTrapMemOutOfBounds, pc); DoTrap(kTrapMemOutOfBounds, pc);
@ -1663,11 +1674,11 @@ class WasmInterpreterInternals {
// validation. // validation.
DCHECK_LT(imm.data_segment_index, module()->num_declared_data_segments); DCHECK_LT(imm.data_segment_index, module()->num_declared_data_segments);
*len += imm.length; *len += imm.length;
auto size = Pop().to<uint32_t>(); uint64_t size = ToMemType(Pop());
auto src = Pop().to<uint32_t>(); uint64_t src = ToMemType(Pop());
auto dst = Pop().to<uint32_t>(); uint64_t dst = ToMemType(Pop());
Address dst_addr; Address dst_addr;
auto src_max = uint64_t src_max =
instance_object_->data_segment_sizes()[imm.data_segment_index]; instance_object_->data_segment_sizes()[imm.data_segment_index];
if (!BoundsCheckMemRange(dst, &size, &dst_addr) || if (!BoundsCheckMemRange(dst, &size, &dst_addr) ||
!base::IsInBounds(src, size, src_max)) { !base::IsInBounds(src, size, src_max)) {
@ -1695,9 +1706,9 @@ class WasmInterpreterInternals {
MemoryCopyImmediate<Decoder::kNoValidation> imm(decoder, MemoryCopyImmediate<Decoder::kNoValidation> imm(decoder,
code->at(pc + 2)); code->at(pc + 2));
*len += imm.length; *len += imm.length;
auto size = Pop().to<uint32_t>(); uint64_t size = ToMemType(Pop());
auto src = Pop().to<uint32_t>(); uint64_t src = ToMemType(Pop());
auto dst = Pop().to<uint32_t>(); uint64_t dst = ToMemType(Pop());
Address dst_addr; Address dst_addr;
Address src_addr; Address src_addr;
if (!BoundsCheckMemRange(dst, &size, &dst_addr) || if (!BoundsCheckMemRange(dst, &size, &dst_addr) ||
@ -1714,12 +1725,11 @@ class WasmInterpreterInternals {
MemoryIndexImmediate<Decoder::kNoValidation> imm(decoder, MemoryIndexImmediate<Decoder::kNoValidation> imm(decoder,
code->at(pc + 2)); code->at(pc + 2));
*len += imm.length; *len += imm.length;
auto size = Pop().to<uint32_t>(); uint64_t size = ToMemType(Pop());
auto value = Pop().to<uint32_t>(); uint32_t value = Pop().to<uint32_t>();
auto dst = Pop().to<uint32_t>(); uint64_t dst = ToMemType(Pop());
Address dst_addr; Address dst_addr;
bool ok = BoundsCheckMemRange(dst, &size, &dst_addr); if (!BoundsCheckMemRange(dst, &size, &dst_addr)) {
if (!ok) {
DoTrap(kTrapMemOutOfBounds, pc); DoTrap(kTrapMemOutOfBounds, pc);
return false; return false;
} }
@ -2031,7 +2041,7 @@ class WasmInterpreterInternals {
} }
int32_t val; int32_t val;
int64_t timeout; int64_t timeout;
uint32_t buffer_offset; uint64_t buffer_offset;
if (!ExtractAtomicWaitNotifyParams<int32_t>( if (!ExtractAtomicWaitNotifyParams<int32_t>(
decoder, code, pc, len, &buffer_offset, &val, &timeout)) { decoder, code, pc, len, &buffer_offset, &val, &timeout)) {
return false; return false;
@ -2051,7 +2061,7 @@ class WasmInterpreterInternals {
} }
int64_t val; int64_t val;
int64_t timeout; int64_t timeout;
uint32_t buffer_offset; uint64_t buffer_offset;
if (!ExtractAtomicWaitNotifyParams<int64_t>( if (!ExtractAtomicWaitNotifyParams<int64_t>(
decoder, code, pc, len, &buffer_offset, &val, &timeout)) { decoder, code, pc, len, &buffer_offset, &val, &timeout)) {
return false; return false;
@ -2066,7 +2076,7 @@ class WasmInterpreterInternals {
} }
case kExprAtomicNotify: { case kExprAtomicNotify: {
int32_t val; int32_t val;
uint32_t buffer_offset; uint64_t buffer_offset;
if (!ExtractAtomicWaitNotifyParams<int32_t>(decoder, code, pc, len, if (!ExtractAtomicWaitNotifyParams<int32_t>(decoder, code, pc, len,
&buffer_offset, &val)) { &buffer_offset, &val)) {
return false; return false;
@ -3702,6 +3712,7 @@ class WasmInterpreterInternals {
case kExprMemoryGrow: { case kExprMemoryGrow: {
MemoryIndexImmediate<Decoder::kNoValidation> imm(&decoder, MemoryIndexImmediate<Decoder::kNoValidation> imm(&decoder,
code->at(pc + 1)); code->at(pc + 1));
// TODO(clemensb): Fix this for memory64.
uint32_t delta_pages = Pop().to<uint32_t>(); uint32_t delta_pages = Pop().to<uint32_t>();
HandleScope handle_scope(isolate_); // Avoid leaking handles. HandleScope handle_scope(isolate_); // Avoid leaking handles.
Handle<WasmMemoryObject> memory(instance_object_->memory_object(), Handle<WasmMemoryObject> memory(instance_object_->memory_object(),
@ -3718,8 +3729,10 @@ class WasmInterpreterInternals {
case kExprMemorySize: { case kExprMemorySize: {
MemoryIndexImmediate<Decoder::kNoValidation> imm(&decoder, MemoryIndexImmediate<Decoder::kNoValidation> imm(&decoder,
code->at(pc + 1)); code->at(pc + 1));
Push(WasmValue(static_cast<uint32_t>(instance_object_->memory_size() / uint64_t num_pages = instance_object_->memory_size() / kWasmPageSize;
kWasmPageSize))); Push(module()->is_memory64
? WasmValue(num_pages)
: WasmValue(static_cast<uint32_t>(num_pages)));
len = 1 + imm.length; len = 1 + imm.length;
break; break;
} }