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/call_arm.cc | |
| 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/call_arm.cc')
| -rw-r--r-- | compiler/dex/quick/arm/call_arm.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/dex/quick/arm/call_arm.cc b/compiler/dex/quick/arm/call_arm.cc index 822ea21..981ab2c 100644 --- a/compiler/dex/quick/arm/call_arm.cc +++ b/compiler/dex/quick/arm/call_arm.cc @@ -19,6 +19,7 @@ #include "codegen_arm.h" #include "arm_lir.h" +#include "art_method.h" #include "base/bit_utils.h" #include "base/logging.h" #include "dex/mir_graph.h" @@ -27,7 +28,6 @@ #include "driver/compiler_driver.h" #include "driver/compiler_options.h" #include "gc/accounting/card_table.h" -#include "mirror/art_method.h" #include "mirror/object_array-inl.h" #include "entrypoints/quick/quick_entrypoints.h" #include "utils/dex_cache_arrays_layout-inl.h" @@ -637,7 +637,7 @@ int ArmMir2Lir::ArmNextSDCallInsn(CompilationUnit* cu, CallInfo* info, if (direct_code == 0) { // kInvokeTgt := arg0_ref->entrypoint cg->LoadWordDisp(arg0_ref, - mirror::ArtMethod::EntryPointFromQuickCompiledCodeOffset( + ArtMethod::EntryPointFromQuickCompiledCodeOffset( kArmPointerSize).Int32Value(), cg->TargetPtrReg(kInvokeTgt)); } break; @@ -678,7 +678,7 @@ int ArmMir2Lir::ArmNextSDCallInsn(CompilationUnit* cu, CallInfo* info, case 1: // Get method->dex_cache_resolved_methods_ if (!use_pc_rel) { cg->LoadRefDisp(arg0_ref, - mirror::ArtMethod::DexCacheResolvedMethodsOffset().Int32Value(), + ArtMethod::DexCacheResolvedMethodsOffset().Int32Value(), arg0_ref, kNotVolatile); } @@ -708,14 +708,14 @@ int ArmMir2Lir::ArmNextSDCallInsn(CompilationUnit* cu, CallInfo* info, kNotVolatile); } else { size_t offset = cg->dex_cache_arrays_layout_.MethodOffset(target_method.dex_method_index); - cg->OpPcRelDexCacheArrayLoad(cu->dex_file, offset, arg0_ref); + cg->OpPcRelDexCacheArrayLoad(cu->dex_file, offset, arg0_ref, false); } break; case 3: // Grab the code from the method* if (direct_code == 0) { // kInvokeTgt := arg0_ref->entrypoint cg->LoadWordDisp(arg0_ref, - mirror::ArtMethod::EntryPointFromQuickCompiledCodeOffset( + ArtMethod::EntryPointFromQuickCompiledCodeOffset( kArmPointerSize).Int32Value(), cg->TargetPtrReg(kInvokeTgt)); } break; |