Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: src/x64/assembler-x64-inl.h

Issue 1921203002: Add new relocation type WASM_MEMORY_SIZE_REFERENCE, use relocatable pointers to update wasm memory … (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef V8_X64_ASSEMBLER_X64_INL_H_ 5 #ifndef V8_X64_ASSEMBLER_X64_INL_H_
6 #define V8_X64_ASSEMBLER_X64_INL_H_ 6 #define V8_X64_ASSEMBLER_X64_INL_H_
7 7
8 #include "src/x64/assembler-x64.h" 8 #include "src/x64/assembler-x64.h"
9 9
10 #include "src/base/cpu.h" 10 #include "src/base/cpu.h"
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 Address RelocInfo::target_address() { 326 Address RelocInfo::target_address() {
327 DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)); 327 DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
328 return Assembler::target_address_at(pc_, host_); 328 return Assembler::target_address_at(pc_, host_);
329 } 329 }
330 330
331 Address RelocInfo::wasm_memory_reference() { 331 Address RelocInfo::wasm_memory_reference() {
332 DCHECK(IsWasmMemoryReference(rmode_)); 332 DCHECK(IsWasmMemoryReference(rmode_));
333 return Memory::Address_at(pc_); 333 return Memory::Address_at(pc_);
334 } 334 }
335 335
336 int32_t RelocInfo::wasm_memory_size_reference() {
337 DCHECK(IsWasmMemorySizeReference(rmode_));
338 return Memory::int32_at(pc_);
339 }
340
336 Address RelocInfo::target_address_address() { 341 Address RelocInfo::target_address_address() {
337 DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_) 342 DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)
338 || rmode_ == EMBEDDED_OBJECT 343 || rmode_ == EMBEDDED_OBJECT
339 || rmode_ == EXTERNAL_REFERENCE); 344 || rmode_ == EXTERNAL_REFERENCE);
340 return reinterpret_cast<Address>(pc_); 345 return reinterpret_cast<Address>(pc_);
341 } 346 }
342 347
343 348
344 Address RelocInfo::constant_pool_entry_address() { 349 Address RelocInfo::constant_pool_entry_address() {
345 UNREACHABLE(); 350 UNREACHABLE();
(...skipping 18 matching lines...) Expand all
364 icache_flush_mode); 369 icache_flush_mode);
365 if (write_barrier_mode == UPDATE_WRITE_BARRIER && host() != NULL && 370 if (write_barrier_mode == UPDATE_WRITE_BARRIER && host() != NULL &&
366 IsCodeTarget(rmode_)) { 371 IsCodeTarget(rmode_)) {
367 Object* target_code = Code::GetCodeFromTargetAddress(target); 372 Object* target_code = Code::GetCodeFromTargetAddress(target);
368 host()->GetHeap()->incremental_marking()->RecordWriteIntoCode( 373 host()->GetHeap()->incremental_marking()->RecordWriteIntoCode(
369 host(), this, HeapObject::cast(target_code)); 374 host(), this, HeapObject::cast(target_code));
370 } 375 }
371 } 376 }
372 377
373 void RelocInfo::update_wasm_memory_reference( 378 void RelocInfo::update_wasm_memory_reference(
374 Address old_base, Address new_base, size_t old_size, size_t new_size, 379 Address old_base, Address new_base, int32_t old_size, int32_t new_size,
375 ICacheFlushMode icache_flush_mode) { 380 ICacheFlushMode icache_flush_mode) {
376 DCHECK(IsWasmMemoryReference(rmode_)); 381 DCHECK(IsWasmMemoryReference(rmode_) || IsWasmMemorySizeReference(rmode_));
377 DCHECK(old_base <= wasm_memory_reference() && 382 if (IsWasmMemoryReference(rmode_)) {
378 wasm_memory_reference() < old_base + old_size); 383 Address updated_reference;
379 Address updated_reference = new_base + (wasm_memory_reference() - old_base); 384 DCHECK(old_base <= wasm_memory_reference() &&
380 DCHECK(new_base <= updated_reference && 385 wasm_memory_reference() < old_base + old_size);
381 updated_reference < new_base + new_size); 386 updated_reference = new_base + (wasm_memory_reference() - old_base);
382 Memory::Address_at(pc_) = updated_reference; 387 DCHECK(new_base <= updated_reference &&
388 updated_reference < new_base + new_size);
389 Memory::Address_at(pc_) = updated_reference;
390 } else if (IsWasmMemorySizeReference(rmode_)) {
391 int32_t updated_size_reference;
392 DCHECK(wasm_memory_size_reference() <= old_size);
393 updated_size_reference =
394 new_size + (wasm_memory_size_reference() - old_size);
395 DCHECK(updated_size_reference <= new_size);
396 Memory::int32_at(pc_) = updated_size_reference;
397 } else {
398 UNREACHABLE();
399 }
383 if (icache_flush_mode != SKIP_ICACHE_FLUSH) { 400 if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
384 Assembler::FlushICache(isolate_, pc_, sizeof(int64_t)); 401 Assembler::FlushICache(isolate_, pc_, sizeof(int64_t));
385 } 402 }
386 } 403 }
387 404
388 Object* RelocInfo::target_object() { 405 Object* RelocInfo::target_object() {
389 DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 406 DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
390 return Memory::Object_at(pc_); 407 return Memory::Object_at(pc_);
391 } 408 }
392 409
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 void Operand::set_disp64(int64_t disp) { 647 void Operand::set_disp64(int64_t disp) {
631 DCHECK_EQ(1, len_); 648 DCHECK_EQ(1, len_);
632 int64_t* p = reinterpret_cast<int64_t*>(&buf_[len_]); 649 int64_t* p = reinterpret_cast<int64_t*>(&buf_[len_]);
633 *p = disp; 650 *p = disp;
634 len_ += sizeof(disp); 651 len_ += sizeof(disp);
635 } 652 }
636 } // namespace internal 653 } // namespace internal
637 } // namespace v8 654 } // namespace v8
638 655
639 #endif // V8_X64_ASSEMBLER_X64_INL_H_ 656 #endif // V8_X64_ASSEMBLER_X64_INL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698