diff options
author | Mathieu Chartier <mathieuc@google.com> | 2015-06-02 16:44:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 16:44:44 +0000 |
commit | ace571fb8891d1dcb6b628724949e3a620be45b5 (patch) | |
tree | 77c695b661868452f2e03e7bd645139b739d5be3 /compiler/dex/quick/arm/codegen_arm.h | |
parent | bd7eef17de5f3d25f411702f9f260a96455b4cf7 (diff) | |
parent | 3d21bdf8894e780d349c481e5c9e29fe1556051c (diff) | |
download | art-ace571fb8891d1dcb6b628724949e3a620be45b5.zip art-ace571fb8891d1dcb6b628724949e3a620be45b5.tar.gz art-ace571fb8891d1dcb6b628724949e3a620be45b5.tar.bz2 |
Merge "Move mirror::ArtMethod to native" into mnc-dev
Diffstat (limited to 'compiler/dex/quick/arm/codegen_arm.h')
-rw-r--r-- | compiler/dex/quick/arm/codegen_arm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/dex/quick/arm/codegen_arm.h b/compiler/dex/quick/arm/codegen_arm.h index 83b27df..b94e707 100644 --- a/compiler/dex/quick/arm/codegen_arm.h +++ b/compiler/dex/quick/arm/codegen_arm.h @@ -83,7 +83,8 @@ class ArmMir2Lir FINAL : public Mir2Lir { void UnconditionallyMarkGCCard(RegStorage tgt_addr_reg) OVERRIDE; bool CanUseOpPcRelDexCacheArrayLoad() const OVERRIDE; - void OpPcRelDexCacheArrayLoad(const DexFile* dex_file, int offset, RegStorage r_dest) OVERRIDE; + void OpPcRelDexCacheArrayLoad(const DexFile* dex_file, int offset, RegStorage r_dest, + bool wide) OVERRIDE; // Required for target - register utilities. RegStorage TargetReg(SpecialTargetRegister reg) OVERRIDE; |