diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/v8/src/arm64/instructions-arm64.cc | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/v8/src/arm64/instructions-arm64.cc')
-rw-r--r-- | chromium/v8/src/arm64/instructions-arm64.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/v8/src/arm64/instructions-arm64.cc b/chromium/v8/src/arm64/instructions-arm64.cc index 60243d8306d..d23533d8bc7 100644 --- a/chromium/v8/src/arm64/instructions-arm64.cc +++ b/chromium/v8/src/arm64/instructions-arm64.cc @@ -219,13 +219,13 @@ bool Instruction::IsTargetInImmPCOffsetRange(Instruction* target) { } -void Instruction::SetImmPCOffsetTarget(Instruction* target) { +void Instruction::SetImmPCOffsetTarget(Isolate* isolate, Instruction* target) { if (IsPCRelAddressing()) { - SetPCRelImmTarget(target); + SetPCRelImmTarget(isolate, target); } else if (BranchType() != UnknownBranchType) { SetBranchImmTarget(target); } else if (IsUnresolvedInternalReference()) { - SetUnresolvedInternalReferenceImmTarget(target); + SetUnresolvedInternalReferenceImmTarget(isolate, target); } else { // Load literal (offset from PC). SetImmLLiteral(target); @@ -233,7 +233,7 @@ void Instruction::SetImmPCOffsetTarget(Instruction* target) { } -void Instruction::SetPCRelImmTarget(Instruction* target) { +void Instruction::SetPCRelImmTarget(Isolate* isolate, Instruction* target) { // ADRP is not supported, so 'this' must point to an ADR instruction. DCHECK(IsAdr()); @@ -243,7 +243,7 @@ void Instruction::SetPCRelImmTarget(Instruction* target) { imm = Assembler::ImmPCRelAddress(static_cast<int>(target_offset)); SetInstructionBits(Mask(~ImmPCRel_mask) | imm); } else { - PatchingAssembler patcher(this, + PatchingAssembler patcher(isolate, this, PatchingAssembler::kAdrFarPatchableNInstrs); patcher.PatchAdrFar(target_offset); } @@ -284,7 +284,8 @@ void Instruction::SetBranchImmTarget(Instruction* target) { } -void Instruction::SetUnresolvedInternalReferenceImmTarget(Instruction* target) { +void Instruction::SetUnresolvedInternalReferenceImmTarget(Isolate* isolate, + Instruction* target) { DCHECK(IsUnresolvedInternalReference()); DCHECK(IsAligned(DistanceTo(target), kInstructionSize)); DCHECK(is_int32(DistanceTo(target) >> kInstructionSizeLog2)); @@ -293,7 +294,7 @@ void Instruction::SetUnresolvedInternalReferenceImmTarget(Instruction* target) { uint32_t high16 = unsigned_bitextract_32(31, 16, target_offset); uint32_t low16 = unsigned_bitextract_32(15, 0, target_offset); - PatchingAssembler patcher(this, 2); + PatchingAssembler patcher(isolate, this, 2); patcher.brk(high16); patcher.brk(low16); } |