diff options
| author | Alexandre Rames <alexandre.rames@arm.com> | 2014-10-08 18:41:21 +0100 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-09 09:21:33 -0700 |
| commit | cee7524afa53216fcd13df8122ece495548a829c (patch) | |
| tree | 425ed45eec6823467734e8219b6320f8965e4189 /compiler/utils/arm64/assembler_arm64.cc | |
| parent | 9e878d50567f624094f3c4940ac3aedbc5eff3b9 (diff) | |
| download | android_art-cee7524afa53216fcd13df8122ece495548a829c.tar.gz android_art-cee7524afa53216fcd13df8122ece495548a829c.tar.bz2 android_art-cee7524afa53216fcd13df8122ece495548a829c.zip | |
ARM64: Update code after the VIXL 1.6 release.
We now leave the assembler buffer management to VIXL.
Change-Id: Ieefe83cf5cf5e1ab8c924b0e7dc03af6a55053ae
Diffstat (limited to 'compiler/utils/arm64/assembler_arm64.cc')
| -rw-r--r-- | compiler/utils/arm64/assembler_arm64.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/arm64/assembler_arm64.cc b/compiler/utils/arm64/assembler_arm64.cc index c82b4f0f50..25e02c35da 100644 --- a/compiler/utils/arm64/assembler_arm64.cc +++ b/compiler/utils/arm64/assembler_arm64.cc @@ -42,12 +42,12 @@ void Arm64Assembler::EmitSlowPaths() { } size_t Arm64Assembler::CodeSize() const { - return ___ SizeOfCodeGenerated(); + return vixl_masm_->BufferCapacity() - vixl_masm_->RemainingBufferSpace(); } void Arm64Assembler::FinalizeInstructions(const MemoryRegion& region) { // Copy the instructions from the buffer. - MemoryRegion from(reinterpret_cast<void*>(vixl_buf_), CodeSize()); + MemoryRegion from(vixl_masm_->GetStartAddress<void*>(), CodeSize()); region.CopyFrom(0, from); } |