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

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

Issue 1808823002: Revert of Assembler changes for enabling GrowHeap in Wasm (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « src/x64/assembler-x64.cc ('k') | src/x64/macro-assembler-x64.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 Memory::Address_at(pc_) += delta; 319 Memory::Address_at(pc_) += delta;
320 } 320 }
321 } 321 }
322 322
323 323
324 Address RelocInfo::target_address() { 324 Address RelocInfo::target_address() {
325 DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)); 325 DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
326 return Assembler::target_address_at(pc_, host_); 326 return Assembler::target_address_at(pc_, host_);
327 } 327 }
328 328
329 Address RelocInfo::wasm_memory_reference() {
330 DCHECK(IsWasmMemoryReference(rmode_));
331 return Memory::Address_at(pc_);
332 }
333 329
334 Address RelocInfo::target_address_address() { 330 Address RelocInfo::target_address_address() {
335 DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_) 331 DCHECK(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)
336 || rmode_ == EMBEDDED_OBJECT 332 || rmode_ == EMBEDDED_OBJECT
337 || rmode_ == EXTERNAL_REFERENCE); 333 || rmode_ == EXTERNAL_REFERENCE);
338 return reinterpret_cast<Address>(pc_); 334 return reinterpret_cast<Address>(pc_);
339 } 335 }
340 336
341 337
342 Address RelocInfo::constant_pool_entry_address() { 338 Address RelocInfo::constant_pool_entry_address() {
(...skipping 18 matching lines...) Expand all
361 Assembler::set_target_address_at(isolate_, pc_, host_, target, 357 Assembler::set_target_address_at(isolate_, pc_, host_, target,
362 icache_flush_mode); 358 icache_flush_mode);
363 if (write_barrier_mode == UPDATE_WRITE_BARRIER && host() != NULL && 359 if (write_barrier_mode == UPDATE_WRITE_BARRIER && host() != NULL &&
364 IsCodeTarget(rmode_)) { 360 IsCodeTarget(rmode_)) {
365 Object* target_code = Code::GetCodeFromTargetAddress(target); 361 Object* target_code = Code::GetCodeFromTargetAddress(target);
366 host()->GetHeap()->incremental_marking()->RecordWriteIntoCode( 362 host()->GetHeap()->incremental_marking()->RecordWriteIntoCode(
367 host(), this, HeapObject::cast(target_code)); 363 host(), this, HeapObject::cast(target_code));
368 } 364 }
369 } 365 }
370 366
371 void RelocInfo::update_wasm_memory_reference(
372 Address old_base, Address new_base, size_t old_size, size_t new_size,
373 ICacheFlushMode icache_flush_mode) {
374 DCHECK(IsWasmMemoryReference(rmode_));
375 DCHECK(old_base <= wasm_memory_reference() &&
376 wasm_memory_reference() < old_base + old_size);
377 Address updated_reference = new_base + (wasm_memory_reference() - old_base);
378 DCHECK(new_base <= updated_reference &&
379 updated_reference < new_base + new_size);
380 Memory::Address_at(pc_) = updated_reference;
381 if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
382 Assembler::FlushICache(isolate_, pc_, sizeof(int64_t));
383 }
384 }
385 367
386 Object* RelocInfo::target_object() { 368 Object* RelocInfo::target_object() {
387 DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 369 DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
388 return Memory::Object_at(pc_); 370 return Memory::Object_at(pc_);
389 } 371 }
390 372
391 373
392 Handle<Object> RelocInfo::target_object_handle(Assembler* origin) { 374 Handle<Object> RelocInfo::target_object_handle(Assembler* origin) {
393 DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 375 DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
394 if (rmode_ == EMBEDDED_OBJECT) { 376 if (rmode_ == EMBEDDED_OBJECT) {
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 void Operand::set_disp64(int64_t disp) { 610 void Operand::set_disp64(int64_t disp) {
629 DCHECK_EQ(1, len_); 611 DCHECK_EQ(1, len_);
630 int64_t* p = reinterpret_cast<int64_t*>(&buf_[len_]); 612 int64_t* p = reinterpret_cast<int64_t*>(&buf_[len_]);
631 *p = disp; 613 *p = disp;
632 len_ += sizeof(disp); 614 len_ += sizeof(disp);
633 } 615 }
634 } // namespace internal 616 } // namespace internal
635 } // namespace v8 617 } // namespace v8
636 618
637 #endif // V8_X64_ASSEMBLER_X64_INL_H_ 619 #endif // V8_X64_ASSEMBLER_X64_INL_H_
OLDNEW
« no previous file with comments | « src/x64/assembler-x64.cc ('k') | src/x64/macro-assembler-x64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698