diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-22 13:56:20 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-06-02 09:21:27 -0700 |
| commit | 3d21bdf8894e780d349c481e5c9e29fe1556051c (patch) | |
| tree | 61a5231f36c0dabd73457fec81df103462a05aff /runtime/arch | |
| parent | 71f0a8a123fa27bdc857a98afebbaf0ed09dac15 (diff) | |
| download | art-3d21bdf8894e780d349c481e5c9e29fe1556051c.tar.gz art-3d21bdf8894e780d349c481e5c9e29fe1556051c.tar.bz2 art-3d21bdf8894e780d349c481e5c9e29fe1556051c.zip | |
Move mirror::ArtMethod to native
Optimizing + quick tests are passing, devices boot.
TODO: Test and fix bugs in mips64.
Saves 16 bytes per most ArtMethod, 7.5MB reduction in system PSS.
Some of the savings are from removal of virtual methods and direct
methods object arrays.
Bug: 19264997
(cherry picked from commit e401d146407d61eeb99f8d6176b2ac13c4df1e33)
Change-Id: I622469a0cfa0e7082a2119f3d6a9491eb61e3f3d
Fix some ArtMethod related bugs
Added root visiting for runtime methods, not currently required
since the GcRoots in these methods are null.
Added missing GetInterfaceMethodIfProxy in GetMethodLine, fixes
--trace run-tests 005, 044.
Fixed optimizing compiler bug where we used a normal stack location
instead of double on ARM64, this fixes the debuggable tests.
TODO: Fix JDWP tests.
Bug: 19264997
Change-Id: I7c55f69c61d1b45351fd0dc7185ffe5efad82bd3
ART: Fix casts for 64-bit pointers on 32-bit compiler.
Bug: 19264997
Change-Id: Ief45cdd4bae5a43fc8bfdfa7cf744e2c57529457
Fix JDWP tests after ArtMethod change
Fixes Throwable::GetStackDepth for exception event detection after
internal stack trace representation change.
Adds missing ArtMethod::GetInterfaceMethodIfProxy call in case of
proxy method.
Bug: 19264997
Change-Id: I363e293796848c3ec491c963813f62d868da44d2
Fix accidental IMT and root marking regression
Was always using the conflict trampoline. Also included fix for
regression in GC time caused by extra roots. Most of the regression
was IMT.
Fixed bug in DumpGcPerformanceInfo where we would get SIGABRT due to
detached thread.
EvaluateAndApplyChanges:
From ~2500 -> ~1980
GC time: 8.2s -> 7.2s due to 1s less of MarkConcurrentRoots
Bug: 19264997
Change-Id: I4333e80a8268c2ed1284f87f25b9f113d4f2c7e0
Fix bogus image test assert
Previously we were comparing the size of the non moving space to
size of the image file.
Now we properly compare the size of the image space against the size
of the image file.
Bug: 19264997
Change-Id: I7359f1f73ae3df60c5147245935a24431c04808a
[MIPS64] Fix art_quick_invoke_stub argument offsets.
ArtMethod reference's size got bigger, so we need to move other args
and leave enough space for ArtMethod* and 'this' pointer.
This fixes mips64 boot.
Bug: 19264997
Change-Id: I47198d5f39a4caab30b3b77479d5eedaad5006ab
Diffstat (limited to 'runtime/arch')
20 files changed, 204 insertions, 205 deletions
diff --git a/runtime/arch/arch_test.cc b/runtime/arch/arch_test.cc index 5733ab6361..40e2cd340f 100644 --- a/runtime/arch/arch_test.cc +++ b/runtime/arch/arch_test.cc @@ -16,8 +16,8 @@ #include <stdint.h> +#include "art_method-inl.h" #include "common_runtime_test.h" -#include "mirror/art_method-inl.h" #include "quick/quick_method_frame_info.h" namespace art { @@ -38,7 +38,7 @@ class ArchTest : public CommonRuntimeTest { t->TransitionFromSuspendedToRunnable(); // So we can create callee-save methods. r->SetInstructionSet(isa); - mirror::ArtMethod* save_method = r->CreateCalleeSaveMethod(); + ArtMethod* save_method = r->CreateCalleeSaveMethod(); r->SetCalleeSaveMethod(save_method, type); QuickMethodFrameInfo frame_info = save_method->GetQuickFrameInfo(); EXPECT_EQ(frame_info.FrameSizeInBytes(), save_size) << "Expected and real size differs for " diff --git a/runtime/arch/arm/context_arm.cc b/runtime/arch/arm/context_arm.cc index c0e658ca47..403d348752 100644 --- a/runtime/arch/arm/context_arm.cc +++ b/runtime/arch/arm/context_arm.cc @@ -16,8 +16,8 @@ #include "context_arm.h" +#include "art_method-inl.h" #include "base/bit_utils.h" -#include "mirror/art_method-inl.h" #include "quick/quick_method_frame_info.h" namespace art { @@ -36,7 +36,7 @@ void ArmContext::Reset() { } void ArmContext::FillCalleeSaves(const StackVisitor& fr) { - mirror::ArtMethod* method = fr.GetMethod(); + ArtMethod* method = fr.GetMethod(); const QuickMethodFrameInfo frame_info = method->GetQuickFrameInfo(); int spill_pos = 0; diff --git a/runtime/arch/arm/fault_handler_arm.cc b/runtime/arch/arm/fault_handler_arm.cc index d84cb5369b..90b0d5374c 100644 --- a/runtime/arch/arm/fault_handler_arm.cc +++ b/runtime/arch/arm/fault_handler_arm.cc @@ -18,13 +18,13 @@ #include "fault_handler.h" #include <sys/ucontext.h> + +#include "art_method-inl.h" #include "base/macros.h" #include "base/hex_dump.h" #include "globals.h" #include "base/logging.h" #include "base/hex_dump.h" -#include "mirror/art_method.h" -#include "mirror/art_method-inl.h" #include "thread.h" #include "thread-inl.h" @@ -65,7 +65,7 @@ void FaultManager::HandleNestedSignal(int sig ATTRIBUTE_UNUSED, siginfo_t* info } void FaultManager::GetMethodAndReturnPcAndSp(siginfo_t* siginfo ATTRIBUTE_UNUSED, void* context, - mirror::ArtMethod** out_method, + ArtMethod** out_method, uintptr_t* out_return_pc, uintptr_t* out_sp) { struct ucontext* uc = reinterpret_cast<struct ucontext*>(context); struct sigcontext *sc = reinterpret_cast<struct sigcontext*>(&uc->uc_mcontext); @@ -81,10 +81,10 @@ void FaultManager::GetMethodAndReturnPcAndSp(siginfo_t* siginfo ATTRIBUTE_UNUSED uintptr_t* overflow_addr = reinterpret_cast<uintptr_t*>( reinterpret_cast<uint8_t*>(*out_sp) - GetStackOverflowReservedBytes(kArm)); if (overflow_addr == fault_addr) { - *out_method = reinterpret_cast<mirror::ArtMethod*>(sc->arm_r0); + *out_method = reinterpret_cast<ArtMethod*>(sc->arm_r0); } else { // The method is at the top of the stack. - *out_method = reinterpret_cast<mirror::ArtMethod*>(reinterpret_cast<uintptr_t*>(*out_sp)[0]); + *out_method = reinterpret_cast<ArtMethod*>(reinterpret_cast<uintptr_t*>(*out_sp)[0]); } // Work out the return PC. This will be the address of the instruction diff --git a/runtime/arch/arm/quick_entrypoints_arm.S b/runtime/arch/arm/quick_entrypoints_arm.S index 748857870d..5ae291a44b 100644 --- a/runtime/arch/arm/quick_entrypoints_arm.S +++ b/runtime/arch/arm/quick_entrypoints_arm.S @@ -423,7 +423,7 @@ ENTRY art_quick_invoke_stub_internal mov r4, #SUSPEND_CHECK_INTERVAL @ reset r4 to suspend check interval #endif - ldr ip, [r0, #MIRROR_ART_METHOD_QUICK_CODE_OFFSET_32] @ get pointer to the code + ldr ip, [r0, #ART_METHOD_QUICK_CODE_OFFSET_32] @ get pointer to the code blx ip @ call the method mov sp, r11 @ restore the stack pointer @@ -895,7 +895,7 @@ END art_quick_proxy_invoke_handler */ ENTRY art_quick_imt_conflict_trampoline ldr r0, [sp, #0] @ load caller Method* - ldr r0, [r0, #MIRROR_ART_METHOD_DEX_CACHE_METHODS_OFFSET] @ load dex_cache_resolved_methods + ldr r0, [r0, #ART_METHOD_DEX_CACHE_METHODS_OFFSET] @ load dex_cache_resolved_methods add r0, #MIRROR_OBJECT_ARRAY_DATA_OFFSET @ get starting address of data ldr r0, [r0, r12, lsl 2] @ load the target method b art_quick_invoke_interface_trampoline diff --git a/runtime/arch/arm/quick_entrypoints_cc_arm.cc b/runtime/arch/arm/quick_entrypoints_cc_arm.cc index a3acd7e10a..ce531f0709 100644 --- a/runtime/arch/arm/quick_entrypoints_cc_arm.cc +++ b/runtime/arch/arm/quick_entrypoints_cc_arm.cc @@ -14,23 +14,23 @@ * limitations under the License. */ -#include "mirror/art_method.h" +#include "art_method.h" #include "utils.h" // For RoundUp(). namespace art { // Assembly stub that does the final part of the up-call into Java. -extern "C" void art_quick_invoke_stub_internal(mirror::ArtMethod*, uint32_t*, uint32_t, +extern "C" void art_quick_invoke_stub_internal(ArtMethod*, uint32_t*, uint32_t, Thread* self, JValue* result, uint32_t, uint32_t*, uint32_t*); template <bool kIsStatic> -static void quick_invoke_reg_setup(mirror::ArtMethod* method, uint32_t* args, uint32_t args_size, +static void quick_invoke_reg_setup(ArtMethod* method, uint32_t* args, uint32_t args_size, Thread* self, JValue* result, const char* shorty) { // Note: We do not follow aapcs ABI in quick code for both softfp and hardfp. uint32_t core_reg_args[4]; // r0 ~ r3 uint32_t fp_reg_args[16]; // s0 ~ s15 (d0 ~ d7) - uint32_t gpr_index = 1; // Index into core registers. Reserve r0 for mirror::ArtMethod*. + uint32_t gpr_index = 1; // Index into core registers. Reserve r0 for ArtMethod*. uint32_t fpr_index = 0; // Index into float registers. uint32_t fpr_double_index = 0; // Index into float registers for doubles. uint32_t arg_index = 0; // Index into argument array. @@ -99,16 +99,16 @@ static void quick_invoke_reg_setup(mirror::ArtMethod* method, uint32_t* args, ui core_reg_args, fp_reg_args); } -// Called by art::mirror::ArtMethod::Invoke to do entry into a non-static method. +// Called by art::ArtMethod::Invoke to do entry into a non-static method. // TODO: migrate into an assembly implementation as with ARM64. -extern "C" void art_quick_invoke_stub(mirror::ArtMethod* method, uint32_t* args, uint32_t args_size, +extern "C" void art_quick_invoke_stub(ArtMethod* method, uint32_t* args, uint32_t args_size, Thread* self, JValue* result, const char* shorty) { quick_invoke_reg_setup<false>(method, args, args_size, self, result, shorty); } -// Called by art::mirror::ArtMethod::Invoke to do entry into a static method. +// Called by art::ArtMethod::Invoke to do entry into a static method. // TODO: migrate into an assembly implementation as with ARM64. -extern "C" void art_quick_invoke_static_stub(mirror::ArtMethod* method, uint32_t* args, +extern "C" void art_quick_invoke_static_stub(ArtMethod* method, uint32_t* args, uint32_t args_size, Thread* self, JValue* result, const char* shorty) { quick_invoke_reg_setup<true>(method, args, args_size, self, result, shorty); diff --git a/runtime/arch/arm64/context_arm64.cc b/runtime/arch/arm64/context_arm64.cc index cb5b9e1fa9..91c0fc9551 100644 --- a/runtime/arch/arm64/context_arm64.cc +++ b/runtime/arch/arm64/context_arm64.cc @@ -18,8 +18,8 @@ #include "context_arm64.h" +#include "art_method-inl.h" #include "base/bit_utils.h" -#include "mirror/art_method-inl.h" #include "quick/quick_method_frame_info.h" namespace art { @@ -38,7 +38,7 @@ void Arm64Context::Reset() { } void Arm64Context::FillCalleeSaves(const StackVisitor& fr) { - mirror::ArtMethod* method = fr.GetMethod(); + ArtMethod* method = fr.GetMethod(); const QuickMethodFrameInfo frame_info = method->GetQuickFrameInfo(); int spill_pos = 0; diff --git a/runtime/arch/arm64/fault_handler_arm64.cc b/runtime/arch/arm64/fault_handler_arm64.cc index 0448c760ee..3e9ad0da62 100644 --- a/runtime/arch/arm64/fault_handler_arm64.cc +++ b/runtime/arch/arm64/fault_handler_arm64.cc @@ -16,14 +16,15 @@ #include "fault_handler.h" + #include <sys/ucontext.h> + +#include "art_method-inl.h" #include "base/macros.h" #include "globals.h" #include "base/logging.h" #include "base/hex_dump.h" #include "registers_arm64.h" -#include "mirror/art_method.h" -#include "mirror/art_method-inl.h" #include "thread.h" #include "thread-inl.h" @@ -53,7 +54,7 @@ void FaultManager::HandleNestedSignal(int sig ATTRIBUTE_UNUSED, siginfo_t* info } void FaultManager::GetMethodAndReturnPcAndSp(siginfo_t* siginfo ATTRIBUTE_UNUSED, void* context, - mirror::ArtMethod** out_method, + ArtMethod** out_method, uintptr_t* out_return_pc, uintptr_t* out_sp) { struct ucontext *uc = reinterpret_cast<struct ucontext *>(context); struct sigcontext *sc = reinterpret_cast<struct sigcontext*>(&uc->uc_mcontext); @@ -69,10 +70,10 @@ void FaultManager::GetMethodAndReturnPcAndSp(siginfo_t* siginfo ATTRIBUTE_UNUSED uintptr_t* overflow_addr = reinterpret_cast<uintptr_t*>( reinterpret_cast<uint8_t*>(*out_sp) - GetStackOverflowReservedBytes(kArm64)); if (overflow_addr == fault_addr) { - *out_method = reinterpret_cast<mirror::ArtMethod*>(sc->regs[0]); + *out_method = reinterpret_cast<ArtMethod*>(sc->regs[0]); } else { // The method is at the top of the stack. - *out_method = (reinterpret_cast<StackReference<mirror::ArtMethod>* >(*out_sp)[0]).AsMirrorPtr(); + *out_method = *reinterpret_cast<ArtMethod**>(*out_sp); } // Work out the return PC. This will be the address of the instruction diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S index f8b0734428..f90a6b0367 100644 --- a/runtime/arch/arm64/quick_entrypoints_arm64.S +++ b/runtime/arch/arm64/quick_entrypoints_arm64.S @@ -32,7 +32,8 @@ // xIP0 = (ArtMethod*) Runtime.instance_.callee_save_methods[kRefAndArgs] . THIS_LOAD_REQUIRES_READ_BARRIER - ldr wIP0, [xIP0, RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET ] + // Loads appropriate callee-save-method. + ldr xIP0, [xIP0, RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET ] sub sp, sp, #176 .cfi_adjust_cfa_offset 176 @@ -97,7 +98,8 @@ // xIP0 = (ArtMethod*) Runtime.instance_.callee_save_methods[kRefAndArgs] . THIS_LOAD_REQUIRES_READ_BARRIER - ldr wIP0, [xIP0, RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET ] + // Loads appropriate callee-save-method. + ldr xIP0, [xIP0, RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET ] sub sp, sp, #112 .cfi_adjust_cfa_offset 112 @@ -271,7 +273,7 @@ // xIP0 = (ArtMethod*) Runtime.instance_.callee_save_methods[kRefAndArgs] . THIS_LOAD_REQUIRES_READ_BARRIER - ldr wIP0, [xIP0, RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET ] + ldr xIP0, [xIP0, RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET ] SETUP_REFS_AND_ARGS_CALLEE_SAVE_FRAME_INTERNAL @@ -483,7 +485,7 @@ ENTRY \c_name // Helper signature is always // (method_idx, *this_object, *caller_method, *self, sp) - ldr w2, [sp, #FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE] // pass caller Method* + ldr x2, [sp, #FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE] // pass caller Method* mov x3, xSELF // pass Thread::Current mov x4, sp bl \cxx_name // (method_idx, this, caller, Thread*, SP) @@ -508,14 +510,14 @@ INVOKE_TRAMPOLINE art_quick_invoke_virtual_trampoline_with_access_check, artInvo .macro INVOKE_STUB_CREATE_FRAME SAVE_SIZE=15*8 // x4, x5, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, SP, LR, FP saved. -SAVE_SIZE_AND_METHOD=SAVE_SIZE+STACK_REFERENCE_SIZE +SAVE_SIZE_AND_METHOD=SAVE_SIZE+8 mov x9, sp // Save stack pointer. .cfi_register sp,x9 add x10, x2, # SAVE_SIZE_AND_METHOD // calculate size of frame. - sub x10, sp, x10 // Calculate SP position - saves + ArtMethod* + args + sub x10, sp, x10 // Calculate SP position - saves + ArtMethod* + args and x10, x10, # ~0xf // Enforce 16 byte stack alignment. mov sp, x10 // Set new SP. @@ -565,7 +567,7 @@ SAVE_SIZE_AND_METHOD=SAVE_SIZE+STACK_REFERENCE_SIZE // W2 - args length // X9 - destination address. // W10 - temporary - add x9, sp, #4 // Destination address is bottom of stack + null. + add x9, sp, #8 // Destination address is bottom of stack + null. // Use \@ to differentiate between macro invocations. .LcopyParams\@: @@ -579,18 +581,14 @@ SAVE_SIZE_AND_METHOD=SAVE_SIZE+STACK_REFERENCE_SIZE .LendCopyParams\@: - // Store null into StackReference<Method>* at bottom of frame. - str wzr, [sp] - -#if (STACK_REFERENCE_SIZE != 4) -#error "STACK_REFERENCE_SIZE(ARM64) size not as expected." -#endif + // Store null into ArtMethod* at bottom of frame. + str xzr, [sp] .endm .macro INVOKE_STUB_CALL_AND_RETURN // load method-> METHOD_QUICK_CODE_OFFSET - ldr x9, [x0 , #MIRROR_ART_METHOD_QUICK_CODE_OFFSET_64] + ldr x9, [x0, #ART_METHOD_QUICK_CODE_OFFSET_64] // Branch to method. blr x9 @@ -681,7 +679,7 @@ SAVE_SIZE_AND_METHOD=SAVE_SIZE+STACK_REFERENCE_SIZE * | uint32_t out[n-1] | * | : : | Outs * | uint32_t out[0] | - * | StackRef<ArtMethod> | <- SP value=null + * | ArtMethod* | <- SP value=null * +----------------------+ * * Outgoing registers: @@ -1314,7 +1312,7 @@ END \name .extern \entrypoint ENTRY \name SETUP_REFS_ONLY_CALLEE_SAVE_FRAME // save callee saves in case of GC - ldr w1, [sp, #FRAME_SIZE_REFS_ONLY_CALLEE_SAVE] // Load referrer + ldr x1, [sp, #FRAME_SIZE_REFS_ONLY_CALLEE_SAVE] // Load referrer mov x2, xSELF // pass Thread::Current bl \entrypoint // (uint32_t type_idx, Method* method, Thread*, SP) RESTORE_REFS_ONLY_CALLEE_SAVE_FRAME @@ -1326,7 +1324,7 @@ END \name .extern \entrypoint ENTRY \name SETUP_REFS_ONLY_CALLEE_SAVE_FRAME // save callee saves in case of GC - ldr w2, [sp, #FRAME_SIZE_REFS_ONLY_CALLEE_SAVE] // Load referrer + ldr x2, [sp, #FRAME_SIZE_REFS_ONLY_CALLEE_SAVE] // Load referrer mov x3, xSELF // pass Thread::Current bl \entrypoint RESTORE_REFS_ONLY_CALLEE_SAVE_FRAME @@ -1338,7 +1336,7 @@ END \name .extern \entrypoint ENTRY \name SETUP_REFS_ONLY_CALLEE_SAVE_FRAME // save callee saves in case of GC - ldr w3, [sp, #FRAME_SIZE_REFS_ONLY_CALLEE_SAVE] // Load referrer + ldr x3, [sp, #FRAME_SIZE_REFS_ONLY_CALLEE_SAVE] // Load referrer mov x4, xSELF // pass Thread::Current bl \entrypoint RESTORE_REFS_ONLY_CALLEE_SAVE_FRAME @@ -1401,7 +1399,7 @@ THREE_ARG_REF_DOWNCALL art_quick_set_obj_instance, artSetObjInstanceFromCode, RE ENTRY art_quick_set64_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME // save callee saves in case of GC mov x3, x1 // Store value - ldr w1, [sp, #FRAME_SIZE_REFS_ONLY_CALLEE_SAVE] // Load referrer + ldr x1, [sp, #FRAME_SIZE_REFS_ONLY_CALLEE_SAVE] // Load referrer mov x2, x3 // Put value param mov x3, xSELF // pass Thread::Current bl artSet64StaticFromCode @@ -1468,10 +1466,10 @@ END art_quick_proxy_invoke_handler * dex method index. */ ENTRY art_quick_imt_conflict_trampoline - ldr w0, [sp, #0] // load caller Method* - ldr w0, [x0, #MIRROR_ART_METHOD_DEX_CACHE_METHODS_OFFSET] // load dex_cache_resolved_methods - add x0, x0, #MIRROR_OBJECT_ARRAY_DATA_OFFSET // get starting address of data - ldr w0, [x0, xIP1, lsl 2] // load the target method + ldr x0, [sp, #0] // load caller Method* + ldr w0, [x0, #ART_METHOD_DEX_CACHE_METHODS_OFFSET] // load dex_cache_resolved_methods + add x0, x0, #MIRROR_LONG_ARRAY_DATA_OFFSET // get starting address of data + ldr x0, [x0, xIP1, lsl 3] // load the target method b art_quick_invoke_interface_trampoline END art_quick_imt_conflict_trampoline @@ -1482,7 +1480,7 @@ ENTRY art_quick_resolution_trampoline bl artQuickResolutionTrampoline // (called, receiver, Thread*, SP) cbz x0, 1f mov xIP0, x0 // Remember returned code pointer in xIP0. - ldr w0, [sp, #0] // artQuickResolutionTrampoline puts called method in *SP. + ldr x0, [sp, #0] // artQuickResolutionTrampoline puts called method in *SP. RESTORE_REFS_AND_ARGS_CALLEE_SAVE_FRAME br xIP0 1: diff --git a/runtime/arch/mips/context_mips.cc b/runtime/arch/mips/context_mips.cc index 24892e95bb..53f2b65eec 100644 --- a/runtime/arch/mips/context_mips.cc +++ b/runtime/arch/mips/context_mips.cc @@ -16,8 +16,8 @@ #include "context_mips.h" +#include "art_method-inl.h" #include "base/bit_utils.h" -#include "mirror/art_method-inl.h" #include "quick/quick_method_frame_info.h" namespace art { @@ -36,7 +36,7 @@ void MipsContext::Reset() { } void MipsContext::FillCalleeSaves(const StackVisitor& fr) { - mirror::ArtMethod* method = fr.GetMethod(); + ArtMethod* method = fr.GetMethod(); const QuickMethodFrameInfo frame_info = method->GetQuickFrameInfo(); int spill_pos = 0; diff --git a/runtime/arch/mips/fault_handler_mips.cc b/runtime/arch/mips/fault_handler_mips.cc index c9949d4295..abe495b46d 100644 --- a/runtime/arch/mips/fault_handler_mips.cc +++ b/runtime/arch/mips/fault_handler_mips.cc @@ -35,7 +35,7 @@ void FaultManager::HandleNestedSignal(int sig ATTRIBUTE_UNUSED, siginfo_t* info void FaultManager::GetMethodAndReturnPcAndSp(siginfo_t* siginfo ATTRIBUTE_UNUSED, void* context ATTRIBUTE_UNUSED, - mirror::ArtMethod** out_method ATTRIBUTE_UNUSED, + ArtMethod** out_method ATTRIBUTE_UNUSED, uintptr_t* out_return_pc ATTRIBUTE_UNUSED, uintptr_t* out_sp ATTRIBUTE_UNUSED) { } diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S index f3d2274552..f1e6edb0ff 100644 --- a/runtime/arch/mips/quick_entrypoints_mips.S +++ b/runtime/arch/mips/quick_entrypoints_mips.S @@ -526,7 +526,7 @@ ENTRY art_quick_invoke_stub lw $a1, 4($sp) # copy arg value for a1 lw $a2, 8($sp) # copy arg value for a2 lw $a3, 12($sp) # copy arg value for a3 - lw $t9, MIRROR_ART_METHOD_QUICK_CODE_OFFSET_32($a0) # get pointer to the code + lw $t9, ART_METHOD_QUICK_CODE_OFFSET_32($a0) # get pointer to the code jalr $t9 # call the method sw $zero, 0($sp) # store null for method* at bottom of frame move $sp, $fp # restore the stack @@ -1103,7 +1103,7 @@ END art_quick_proxy_invoke_handler */ ENTRY art_quick_imt_conflict_trampoline lw $a0, 0($sp) # load caller Method* - lw $a0, MIRROR_ART_METHOD_DEX_CACHE_METHODS_OFFSET($a0) # load dex_cache_resolved_methods + lw $a0, ART_METHOD_DEX_CACHE_METHODS_OFFSET($a0) # load dex_cache_resolved_methods sll $t0, 2 # convert target method offset to bytes add $a0, $t0 # get address of target method lw $a0, MIRROR_OBJECT_ARRAY_DATA_OFFSET($a0) # load the target method diff --git a/runtime/arch/mips64/context_mips64.cc b/runtime/arch/mips64/context_mips64.cc index 8ce6cf0993..6637c371d2 100644 --- a/runtime/arch/mips64/context_mips64.cc +++ b/runtime/arch/mips64/context_mips64.cc @@ -16,8 +16,8 @@ #include "context_mips64.h" +#include "art_method-inl.h" #include "base/bit_utils.h" -#include "mirror/art_method-inl.h" #include "quick/quick_method_frame_info.h" namespace art { @@ -36,7 +36,7 @@ void Mips64Context::Reset() { } void Mips64Context::FillCalleeSaves(const StackVisitor& fr) { - mirror::ArtMethod* method = fr.GetMethod(); + ArtMethod* method = fr.GetMethod(); const QuickMethodFrameInfo frame_info = method->GetQuickFrameInfo(); int spill_pos = 0; diff --git a/runtime/arch/mips64/fault_handler_mips64.cc b/runtime/arch/mips64/fault_handler_mips64.cc index 7b5cd4913c..277c2b2394 100644 --- a/runtime/arch/mips64/fault_handler_mips64.cc +++ b/runtime/arch/mips64/fault_handler_mips64.cc @@ -35,7 +35,7 @@ void FaultManager::HandleNestedSignal(int sig ATTRIBUTE_UNUSED, siginfo_t* info void FaultManager::GetMethodAndReturnPcAndSp(siginfo_t* siginfo ATTRIBUTE_UNUSED, void* context ATTRIBUTE_UNUSED, - mirror::ArtMethod** out_method ATTRIBUTE_UNUSED, + ArtMethod** out_method ATTRIBUTE_UNUSED, uintptr_t* out_return_pc ATTRIBUTE_UNUSED, uintptr_t* out_sp ATTRIBUTE_UNUSED) { } diff --git a/runtime/arch/mips64/quick_entrypoints_mips64.S b/runtime/arch/mips64/quick_entrypoints_mips64.S index ff79b5d77c..227fe7e7f2 100644 --- a/runtime/arch/mips64/quick_entrypoints_mips64.S +++ b/runtime/arch/mips64/quick_entrypoints_mips64.S @@ -90,8 +90,8 @@ ld $v0, %got(_ZN3art7Runtime9instance_E)($gp) ld $v0, 0($v0) THIS_LOAD_REQUIRES_READ_BARRIER - lwu $v0, RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET($v0) - sw $v0, 0($sp) # Place Method* at bottom of stack. + ld $v0, RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET($v0) + sd $v0, 0($sp) # Place ArtMethod* at bottom of stack. sd $sp, THREAD_TOP_QUICK_FRAME_OFFSET(rSELF) # Place sp in Thread::Current()->top_quick_frame. .endm @@ -133,8 +133,8 @@ ld $v0, %got(_ZN3art7Runtime9instance_E)($gp) ld $v0, 0($v0) THIS_LOAD_REQUIRES_READ_BARRIER - lwu $v0, RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET($v0) - sw $v0, 0($sp) # Place Method* at bottom of stack. + ld $v0, RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET($v0) + sd $v0, 0($sp) # Place Method* at bottom of stack. sd $sp, THREAD_TOP_QUICK_FRAME_OFFSET(rSELF) # Place sp in Thread::Current()->top_quick_frame. .endm @@ -256,14 +256,14 @@ ld $v0, %got(_ZN3art7Runtime9instance_E)($gp) ld $v0, 0($v0) THIS_LOAD_REQUIRES_READ_BARRIER - lwu $v0, RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET($v0) - sw $v0, 0($sp) # Place Method* at bottom of stack. + ld $v0, RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET($v0) + sd $v0, 0($sp) # Place Method* at bottom of stack. sd $sp, THREAD_TOP_QUICK_FRAME_OFFSET(rSELF) # Place sp in Thread::Current()->top_quick_frame. .endm .macro SETUP_REFS_AND_ARGS_CALLEE_SAVE_FRAME_WITH_METHOD_IN_A0 SETUP_REFS_AND_ARGS_CALLEE_SAVE_FRAME_INTERNAL - sw $a0, 0($sp) # Place Method* at bottom of stack. + sd $a0, 0($sp) # Place Method* at bottom of stack. sd $sp, THREAD_TOP_QUICK_FRAME_OFFSET(rSELF) # Place sp in Thread::Current()->top_quick_frame. .endm @@ -642,7 +642,7 @@ ENTRY_NO_GP art_quick_invoke_stub move $s1, $a3 # move managed thread pointer into s1 (rSELF) move $s8, $sp # save sp in s8 (fp) - daddiu $t3, $a2, 20 # add 4 for method* and 16 for stack alignment + daddiu $t3, $a2, 24 # add 8 for ArtMethod* and 16 for stack alignment dsrl $t3, $t3, 4 # shift the frame size right 4 dsll $t3, $t3, 4 # shift the frame size left 4 to align to 16 bytes dsubu $sp, $sp, $t3 # reserve stack space for argument array @@ -650,7 +650,7 @@ ENTRY_NO_GP art_quick_invoke_stub daddiu $t0, $a5, 1 # t0 = shorty[1] (skip 1 for return type) daddiu $t1, $a1, 4 # t1 = ptr to arg_array[4] (skip this ptr) daddiu $t2, $a2, -4 # t2 = number of argument bytes remain (skip this ptr) - daddiu $v0, $sp, 8 # v0 points to where to copy arg_array + daddiu $v0, $sp, 12 # v0 points to where to copy arg_array LOOP_OVER_SHORTY_LOADING_REG a2, f14, call_fn LOOP_OVER_SHORTY_LOADING_REG a3, f15, call_fn LOOP_OVER_SHORTY_LOADING_REG a4, f16, call_fn @@ -671,9 +671,9 @@ ENTRY_NO_GP art_quick_invoke_stub call_fn: # call method (a0 and a1 have been untouched) lwu $a1, 0($a1) # make a1 = this ptr - sw $a1, 4($sp) # copy this ptr (skip 4 bytes for method*) - sw $zero, 0($sp) # store null for method* at bottom of frame - ld $t9, MIRROR_ART_METHOD_QUICK_CODE_OFFSET_64($a0) # get pointer to the code + sw $a1, 8($sp) # copy this ptr (skip 8 bytes for ArtMethod*) + sd $zero, 0($sp) # store null for ArtMethod* at bottom of frame + ld $t9, ART_METHOD_QUICK_CODE_OFFSET_64($a0) # get pointer to the code jalr $t9 # call the method nop move $sp, $s8 # restore sp @@ -745,7 +745,7 @@ ENTRY_NO_GP art_quick_invoke_static_stub move $s1, $a3 # move managed thread pointer into s1 (rSELF) move $s8, $sp # save sp in s8 (fp) - daddiu $t3, $a2, 20 # add 4 for method* and 16 for stack alignment + daddiu $t3, $a2, 24 # add 8 for ArtMethod* and 16 for stack alignment dsrl $t3, $t3, 4 # shift the frame size right 4 dsll $t3, $t3, 4 # shift the frame size left 4 to align to 16 bytes dsubu $sp, $sp, $t3 # reserve stack space for argument array @@ -753,7 +753,7 @@ ENTRY_NO_GP art_quick_invoke_static_stub daddiu $t0, $a5, 1 # t0 = shorty[1] (skip 1 for return type) move $t1, $a1 # t1 = arg_array move $t2, $a2 # t2 = number of argument bytes remain - daddiu $v0, $sp, 4 # v0 points to where to copy arg_array + daddiu $v0, $sp, 8 # v0 points to where to copy arg_array LOOP_OVER_SHORTY_LOADING_REG a1, f13, call_sfn LOOP_OVER_SHORTY_LOADING_REG a2, f14, call_sfn LOOP_OVER_SHORTY_LOADING_REG a3, f15, call_sfn @@ -774,8 +774,8 @@ ENTRY_NO_GP art_quick_invoke_static_stub call_sfn: # call method (a0 has been untouched) - sw $zero, 0($sp) # store null for method* at bottom of frame - ld $t9, MIRROR_ART_METHOD_QUICK_CODE_OFFSET_64($a0) # get pointer to the code + sd $zero, 0($sp) # store null for ArtMethod* at bottom of frame + ld $t9, ART_METHOD_QUICK_CODE_OFFSET_64($a0) # get pointer to the code jalr $t9 # call the method nop move $sp, $s8 # restore sp @@ -822,7 +822,7 @@ END art_quick_invoke_static_stub .extern artHandleFillArrayDataFromCode ENTRY art_quick_handle_fill_data SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case exception allocation triggers GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artHandleFillArrayDataFromCode # (payload offset, Array*, method, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -970,7 +970,7 @@ END art_quick_aput_obj .extern artGetBooleanStaticFromCode ENTRY art_quick_get_boolean_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetBooleanStaticFromCode # (uint32_t field_idx, const Method* referrer, Thread*) move $a2, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -982,7 +982,7 @@ END art_quick_get_boolean_static .extern artGetByteStaticFromCode ENTRY art_quick_get_byte_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetByteStaticFromCode # (uint32_t field_idx, const Method* referrer, Thread*) move $a2, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -994,7 +994,7 @@ END art_quick_get_byte_static .extern artGetCharStaticFromCode ENTRY art_quick_get_char_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetCharStaticFromCode # (uint32_t field_idx, const Method* referrer, Thread*) move $a2, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1006,7 +1006,7 @@ END art_quick_get_char_static .extern artGetShortStaticFromCode ENTRY art_quick_get_short_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetShortStaticFromCode # (uint32_t field_idx, const Method* referrer, Thread*) move $a2, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1018,7 +1018,7 @@ END art_quick_get_short_static .extern artGet32StaticFromCode ENTRY art_quick_get32_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGet32StaticFromCode # (uint32_t field_idx, const Method* referrer, Thread*) move $a2, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1030,7 +1030,7 @@ END art_quick_get32_static .extern artGet64StaticFromCode ENTRY art_quick_get64_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGet64StaticFromCode # (uint32_t field_idx, const Method* referrer, Thread*) move $a2, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1042,7 +1042,7 @@ END art_quick_get64_static .extern artGetObjStaticFromCode ENTRY art_quick_get_obj_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetObjStaticFromCode # (uint32_t field_idx, const Method* referrer, Thread*) move $a2, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1054,7 +1054,7 @@ END art_quick_get_obj_static .extern artGetBooleanInstanceFromCode ENTRY art_quick_get_boolean_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetBooleanInstanceFromCode # (field_idx, Object*, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1066,7 +1066,7 @@ END art_quick_get_boolean_instance .extern artGetByteInstanceFromCode ENTRY art_quick_get_byte_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetByteInstanceFromCode # (field_idx, Object*, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1078,7 +1078,7 @@ END art_quick_get_byte_instance .extern artGetCharInstanceFromCode ENTRY art_quick_get_char_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetCharInstanceFromCode # (field_idx, Object*, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1090,7 +1090,7 @@ END art_quick_get_char_instance .extern artGetShortInstanceFromCode ENTRY art_quick_get_short_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetShortInstanceFromCode # (field_idx, Object*, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1102,7 +1102,7 @@ END art_quick_get_short_instance .extern artGet32InstanceFromCode ENTRY art_quick_get32_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGet32InstanceFromCode # (field_idx, Object*, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1114,7 +1114,7 @@ END art_quick_get32_instance .extern artGet64InstanceFromCode ENTRY art_quick_get64_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGet64InstanceFromCode # (field_idx, Object*, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1126,7 +1126,7 @@ END art_quick_get64_instance .extern artGetObjInstanceFromCode ENTRY art_quick_get_obj_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artGetObjInstanceFromCode # (field_idx, Object*, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_NO_EXCEPTION @@ -1138,7 +1138,7 @@ END art_quick_get_obj_instance .extern artSet8StaticFromCode ENTRY art_quick_set8_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSet8StaticFromCode # (field_idx, new_val, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1150,7 +1150,7 @@ END art_quick_set8_static .extern artSet16StaticFromCode ENTRY art_quick_set16_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSet16StaticFromCode # (field_idx, new_val, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1162,7 +1162,7 @@ END art_quick_set16_static .extern artSet32StaticFromCode ENTRY art_quick_set32_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSet32StaticFromCode # (field_idx, new_val, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1175,7 +1175,7 @@ END art_quick_set32_static ENTRY art_quick_set64_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC move $a2, $a1 # pass new_val - lwu $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a1, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSet64StaticFromCode # (field_idx, referrer, new_val, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1187,7 +1187,7 @@ END art_quick_set64_static .extern artSetObjStaticFromCode ENTRY art_quick_set_obj_static SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a2, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSetObjStaticFromCode # (field_idx, new_val, referrer, Thread*) move $a3, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1199,7 +1199,7 @@ END art_quick_set_obj_static .extern artSet8InstanceFromCode ENTRY art_quick_set8_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSet8InstanceFromCode # (field_idx, Object*, new_val, referrer, Thread*) move $a4, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1211,7 +1211,7 @@ END art_quick_set8_instance .extern artSet16InstanceFromCode ENTRY art_quick_set16_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSet16InstanceFromCode # (field_idx, Object*, new_val, referrer, Thread*) move $a4, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1223,7 +1223,7 @@ END art_quick_set16_instance .extern artSet32InstanceFromCode ENTRY art_quick_set32_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSet32InstanceFromCode # (field_idx, Object*, new_val, referrer, Thread*) move $a4, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1235,7 +1235,7 @@ END art_quick_set32_instance .extern artSet64InstanceFromCode ENTRY art_quick_set64_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSet64InstanceFromCode # (field_idx, Object*, new_val, referrer, Thread*) move $a4, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1247,7 +1247,7 @@ END art_quick_set64_instance .extern artSetObjInstanceFromCode ENTRY art_quick_set_obj_instance SETUP_REFS_ONLY_CALLEE_SAVE_FRAME # save callee saves in case of GC - lwu $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* + ld $a3, FRAME_SIZE_REFS_ONLY_CALLEE_SAVE($sp) # pass referrer's Method* jal artSetObjInstanceFromCode # (field_idx, Object*, new_val, referrer, Thread*) move $a4, rSELF # pass Thread::Current RETURN_IF_ZERO @@ -1366,14 +1366,14 @@ END art_quick_proxy_invoke_handler * dex method index. */ ENTRY art_quick_imt_conflict_trampoline - lwu $a0, 0($sp) # load caller Method* - lwu $a0, MIRROR_ART_METHOD_DEX_CACHE_METHODS_OFFSET($a0) # load dex_cache_resolved_methods - dsll $t0, 2 # convert target method offset to bytes + ld $a0, 0($sp) # load caller Method* + lwu $a0, ART_METHOD_DEX_CACHE_METHODS_OFFSET($a0) # load dex_cache_resolved_methods + dsll $t0, 3 # convert target method offset to bytes daddu $a0, $t0 # get address of target method dla $t9, art_quick_invoke_interface_trampoline .cpreturn jalr $zero, $t9 - lwu $a0, MIRROR_OBJECT_ARRAY_DATA_OFFSET($a0) # load the target method + lwu $a0, MIRROR_LONG_ARRAY_DATA_OFFSET($a0) # load the target method END art_quick_imt_conflict_trampoline .extern artQuickResolutionTrampoline @@ -1383,7 +1383,7 @@ ENTRY art_quick_resolution_trampoline jal artQuickResolutionTrampoline # (Method* called, receiver, Thread*, SP) move $a3, $sp # pass $sp beq $v0, $zero, 1f - lwu $a0, 0($sp) # load resolved method in $a0 + ld $a0, 0($sp) # load resolved method in $a0 # artQuickResolutionTrampoline puts resolved method in *SP RESTORE_REFS_AND_ARGS_CALLEE_SAVE_FRAME move $t9, $v0 # code pointer must be in $t9 to generate the global pointer diff --git a/runtime/arch/stub_test.cc b/runtime/arch/stub_test.cc index a7d24b8e93..13acaa7512 100644 --- a/runtime/arch/stub_test.cc +++ b/runtime/arch/stub_test.cc @@ -17,10 +17,10 @@ #include <cstdio> #include "art_field-inl.h" +#include "art_method-inl.h" #include "class_linker-inl.h" #include "common_runtime_test.h" #include "entrypoints/quick/quick_entrypoints_enum.h" -#include "mirror/art_method-inl.h" #include "mirror/class-inl.h" #include "mirror/string-inl.h" #include "scoped_thread_state_change.h" @@ -70,7 +70,7 @@ class StubTest : public CommonRuntimeTest { // TODO: Set up a frame according to referrer's specs. size_t Invoke3WithReferrer(size_t arg0, size_t arg1, size_t arg2, uintptr_t code, Thread* self, - mirror::ArtMethod* referrer) { + ArtMethod* referrer) { // Push a transition back into managed code onto the linked list in thread. ManagedStack fragment; self->PushManagedStackFragment(&fragment); @@ -420,7 +420,7 @@ class StubTest : public CommonRuntimeTest { // TODO: Set up a frame according to referrer's specs. size_t Invoke3WithReferrerAndHidden(size_t arg0, size_t arg1, size_t arg2, uintptr_t code, - Thread* self, mirror::ArtMethod* referrer, size_t hidden) { + Thread* self, ArtMethod* referrer, size_t hidden) { // Push a transition back into managed code onto the linked list in thread. ManagedStack fragment; self->PushManagedStackFragment(&fragment); @@ -776,7 +776,7 @@ class StubTest : public CommonRuntimeTest { // Method with 32b arg0, 64b arg1 size_t Invoke3UWithReferrer(size_t arg0, uint64_t arg1, uintptr_t code, Thread* self, - mirror::ArtMethod* referrer) { + ArtMethod* referrer) { #if (defined(__x86_64__) && !defined(__APPLE__)) || (defined(__mips__) && defined(__LP64__)) || \ defined(__aarch64__) // Just pass through. @@ -1282,7 +1282,8 @@ TEST_F(StubTest, AllocObject) { { // Use an arbitrary method from c to use as referrer size_t result = Invoke3(static_cast<size_t>(c->GetDexTypeIndex()), // type_idx - reinterpret_cast<size_t>(c->GetVirtualMethod(0)), // arbitrary + // arbitrary + reinterpret_cast<size_t>(c->GetVirtualMethod(0, sizeof(void*))), 0U, StubTest::GetEntrypoint(self, kQuickAllocObject), self); @@ -1297,7 +1298,7 @@ TEST_F(StubTest, AllocObject) { { // We can use null in the second argument as we do not need a method here (not used in // resolved/initialized cases) - size_t result = Invoke3(reinterpret_cast<size_t>(c.Get()), reinterpret_cast<size_t>(nullptr), 0U, + size_t result = Invoke3(reinterpret_cast<size_t>(c.Get()), 0u, 0U, StubTest::GetEntrypoint(self, kQuickAllocObjectResolved), self); @@ -1311,7 +1312,7 @@ TEST_F(StubTest, AllocObject) { { // We can use null in the second argument as we do not need a method here (not used in // resolved/initialized cases) - size_t result = Invoke3(reinterpret_cast<size_t>(c.Get()), reinterpret_cast<size_t>(nullptr), 0U, + size_t result = Invoke3(reinterpret_cast<size_t>(c.Get()), 0u, 0U, StubTest::GetEntrypoint(self, kQuickAllocObjectInitialized), self); @@ -1367,7 +1368,7 @@ TEST_F(StubTest, AllocObject) { } self->ClearException(); - size_t result = Invoke3(reinterpret_cast<size_t>(c.Get()), reinterpret_cast<size_t>(nullptr), 0U, + size_t result = Invoke3(reinterpret_cast<size_t>(c.Get()), 0u, 0U, StubTest::GetEntrypoint(self, kQuickAllocObjectInitialized), self); EXPECT_TRUE(self->IsExceptionPending()); @@ -1417,7 +1418,8 @@ TEST_F(StubTest, AllocObjectArray) { // Use an arbitrary method from c to use as referrer size_t result = Invoke3(static_cast<size_t>(c->GetDexTypeIndex()), // type_idx 10U, - reinterpret_cast<size_t>(c_obj->GetVirtualMethod(0)), // arbitrary + // arbitrary + reinterpret_cast<size_t>(c_obj->GetVirtualMethod(0, sizeof(void*))), StubTest::GetEntrypoint(self, kQuickAllocArray), self); @@ -1554,7 +1556,7 @@ TEST_F(StubTest, StringCompareTo) { static void GetSetBooleanStatic(ArtField* f, Thread* self, - mirror::ArtMethod* referrer, StubTest* test) + ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) @@ -1584,7 +1586,7 @@ static void GetSetBooleanStatic(ArtField* f, Thread* self, std::cout << "Skipping set_boolean_static as I don't know how to do that on " << kRuntimeISA << std::endl; #endif } -static void GetSetByteStatic(ArtField* f, Thread* self, mirror::ArtMethod* referrer, +static void GetSetByteStatic(ArtField* f, Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ @@ -1616,7 +1618,7 @@ static void GetSetByteStatic(ArtField* f, Thread* self, mirror::ArtMethod* refer static void GetSetBooleanInstance(Handle<mirror::Object>* obj, ArtField* f, Thread* self, - mirror::ArtMethod* referrer, StubTest* test) + ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) @@ -1651,7 +1653,7 @@ static void GetSetBooleanInstance(Handle<mirror::Object>* obj, ArtField* f, Thre #endif } static void GetSetByteInstance(Handle<mirror::Object>* obj, ArtField* f, - Thread* self, mirror::ArtMethod* referrer, StubTest* test) + Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) @@ -1685,7 +1687,7 @@ static void GetSetByteInstance(Handle<mirror::Object>* obj, ArtField* f, #endif } -static void GetSetCharStatic(ArtField* f, Thread* self, mirror::ArtMethod* referrer, +static void GetSetCharStatic(ArtField* f, Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ @@ -1716,7 +1718,7 @@ static void GetSetCharStatic(ArtField* f, Thread* self, mirror::ArtMethod* refer #endif } static void GetSetShortStatic(ArtField* f, Thread* self, - mirror::ArtMethod* referrer, StubTest* test) + ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) @@ -1747,7 +1749,7 @@ static void GetSetShortStatic(ArtField* f, Thread* self, } static void GetSetCharInstance(Handle<mirror::Object>* obj, ArtField* f, - Thread* self, mirror::ArtMethod* referrer, StubTest* test) + Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) @@ -1781,7 +1783,7 @@ static void GetSetCharInstance(Handle<mirror::Object>* obj, ArtField* f, #endif } static void GetSetShortInstance(Handle<mirror::Object>* obj, ArtField* f, - Thread* self, mirror::ArtMethod* referrer, StubTest* test) + Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) @@ -1815,7 +1817,7 @@ static void GetSetShortInstance(Handle<mirror::Object>* obj, ArtField* f, #endif } -static void GetSet32Static(ArtField* f, Thread* self, mirror::ArtMethod* referrer, +static void GetSet32Static(ArtField* f, Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ @@ -1852,7 +1854,7 @@ static void GetSet32Static(ArtField* f, Thread* self, mirror::ArtMethod* referre static void GetSet32Instance(Handle<mirror::Object>* obj, ArtField* f, - Thread* self, mirror::ArtMethod* referrer, StubTest* test) + Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) @@ -1893,7 +1895,7 @@ static void GetSet32Instance(Handle<mirror::Object>* obj, ArtField* f, (defined(__x86_64__) && !defined(__APPLE__)) static void set_and_check_static(uint32_t f_idx, mirror::Object* val, Thread* self, - mirror::ArtMethod* referrer, StubTest* test) + ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { test->Invoke3WithReferrer(static_cast<size_t>(f_idx), reinterpret_cast<size_t>(val), @@ -1912,7 +1914,7 @@ static void set_and_check_static(uint32_t f_idx, mirror::Object* val, Thread* se } #endif -static void GetSetObjStatic(ArtField* f, Thread* self, mirror::ArtMethod* referrer, +static void GetSetObjStatic(ArtField* f, Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ @@ -1936,7 +1938,7 @@ static void GetSetObjStatic(ArtField* f, Thread* self, mirror::ArtMethod* referr #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) static void set_and_check_instance(ArtField* f, mirror::Object* trg, - mirror::Object* val, Thread* self, mirror::ArtMethod* referrer, + mirror::Object* val, Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { test->Invoke3WithReferrer(static_cast<size_t>(f->GetDexFieldIndex()), @@ -1960,7 +1962,7 @@ static void set_and_check_instance(ArtField* f, mirror::Object* trg, #endif static void GetSetObjInstance(Handle<mirror::Object>* obj, ArtField* f, - Thread* self, mirror::ArtMethod* referrer, StubTest* test) + Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ (defined(__x86_64__) && !defined(__APPLE__)) @@ -1982,7 +1984,7 @@ static void GetSetObjInstance(Handle<mirror::Object>* obj, ArtField* f, // TODO: Complete these tests for 32b architectures. -static void GetSet64Static(ArtField* f, Thread* self, mirror::ArtMethod* referrer, +static void GetSet64Static(ArtField* f, Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if (defined(__x86_64__) && !defined(__APPLE__)) || (defined(__mips__) && defined(__LP64__)) || \ @@ -2014,7 +2016,7 @@ static void GetSet64Static(ArtField* f, Thread* self, mirror::ArtMethod* referre static void GetSet64Instance(Handle<mirror::Object>* obj, ArtField* f, - Thread* self, mirror::ArtMethod* referrer, StubTest* test) + Thread* self, ArtMethod* referrer, StubTest* test) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { #if (defined(__x86_64__) && !defined(__APPLE__)) || (defined(__mips__) && defined(__LP64__)) || \ defined(__aarch64__) @@ -2060,11 +2062,11 @@ static void TestFields(Thread* self, StubTest* test, Primitive::Type test_type) CHECK(o != nullptr); ScopedObjectAccess soa(self); - StackHandleScope<4> hs(self); + StackHandleScope<3> hs(self); Handle<mirror::Object> obj(hs.NewHandle(soa.Decode<mirror::Object*>(o))); Handle<mirror::Class> c(hs.NewHandle(obj->GetClass())); // Need a method as a referrer - Handle<mirror::ArtMethod> m(hs.NewHandle(c->GetDirectMethod(0))); + ArtMethod* m = c->GetDirectMethod(0, sizeof(void*)); // Play with it... @@ -2079,27 +2081,27 @@ static void TestFields(Thread* self, StubTest* test, Primitive::Type test_type) } switch (type) { case Primitive::Type::kPrimBoolean: - GetSetBooleanStatic(f, self, m.Get(), test); + GetSetBooleanStatic(f, self, m, test); break; case Primitive::Type::kPrimByte: - GetSetByteStatic(f, self, m.Get(), test); + GetSetByteStatic(f, self, m, test); break; case Primitive::Type::kPrimChar: - GetSetCharStatic(f, self, m.Get(), test); + GetSetCharStatic(f, self, m, test); break; case Primitive::Type::kPrimShort: - GetSetShortStatic(f, self, m.Get(), test); + GetSetShortStatic(f, self, m, test); break; case Primitive::Type::kPrimInt: - GetSet32Static(f, self, m.Get(), test); + GetSet32Static(f, self, m, test); break; case Primitive::Type::kPrimLong: - GetSet64Static(f, self, m.Get(), test); + GetSet64Static(f, self, m, test); break; case Primitive::Type::kPrimNot: // Don't try array. if (f->GetTypeDescriptor()[0] != '[') { - GetSetObjStatic(f, self, m.Get(), test); + GetSetObjStatic(f, self, m, test); } break; default: @@ -2118,27 +2120,27 @@ static void TestFields(Thread* self, StubTest* test, Primitive::Type test_type) } switch (type) { case Primitive::Type::kPrimBoolean: - GetSetBooleanInstance(&obj, f, self, m.Get(), test); + GetSetBooleanInstance(&obj, f, self, m, test); break; case Primitive::Type::kPrimByte: - GetSetByteInstance(&obj, f, self, m.Get(), test); + GetSetByteInstance(&obj, f, self, m, test); break; case Primitive::Type::kPrimChar: - GetSetCharInstance(&obj, f, self, m.Get(), test); + GetSetCharInstance(&obj, f, self, m, test); break; case Primitive::Type::kPrimShort: - GetSetShortInstance(&obj, f, self, m.Get(), test); + GetSetShortInstance(&obj, f, self, m, test); break; case Primitive::Type::kPrimInt: - GetSet32Instance(&obj, f, self, m.Get(), test); + GetSet32Instance(&obj, f, self, m, test); break; case Primitive::Type::kPrimLong: - GetSet64Instance(&obj, f, self, m.Get(), test); + GetSet64Instance(&obj, f, self, m, test); break; case Primitive::Type::kPrimNot: // Don't try array. if (f->GetTypeDescriptor()[0] != '[') { - GetSetObjInstance(&obj, f, self, m.Get(), test); + GetSetObjInstance(&obj, f, self, m, test); } break; default: @@ -2235,17 +2237,18 @@ TEST_F(StubTest, IMT) { ASSERT_NE(nullptr, arraylist_jclass); jmethodID arraylist_constructor = env->GetMethodID(arraylist_jclass, "<init>", "()V"); ASSERT_NE(nullptr, arraylist_constructor); - jmethodID contains_jmethod = env->GetMethodID(arraylist_jclass, "contains", "(Ljava/lang/Object;)Z"); + jmethodID contains_jmethod = env->GetMethodID( + arraylist_jclass, "contains", "(Ljava/lang/Object;)Z"); ASSERT_NE(nullptr, contains_jmethod); jmethodID add_jmethod = env->GetMethodID(arraylist_jclass, "add", "(Ljava/lang/Object;)Z"); ASSERT_NE(nullptr, add_jmethod); - // Get mirror representation. - Handle<mirror::ArtMethod> contains_amethod(hs.NewHandle(soa.DecodeMethod(contains_jmethod))); + // Get representation. + ArtMethod* contains_amethod = soa.DecodeMethod(contains_jmethod); // Patch up ArrayList.contains. - if (contains_amethod.Get()->GetEntryPointFromQuickCompiledCode() == nullptr) { - contains_amethod.Get()->SetEntryPointFromQuickCompiledCode(reinterpret_cast<void*>( + if (contains_amethod->GetEntryPointFromQuickCompiledCode() == nullptr) { + contains_amethod->SetEntryPointFromQuickCompiledCode(reinterpret_cast<void*>( StubTest::GetEntrypoint(self, kQuickQuickToInterpreterBridge))); } @@ -2254,11 +2257,12 @@ TEST_F(StubTest, IMT) { // Load List and used methods (JNI). jclass list_jclass = env->FindClass("java/util/List"); ASSERT_NE(nullptr, list_jclass); - jmethodID inf_contains_jmethod = env->GetMethodID(list_jclass, "contains", "(Ljava/lang/Object;)Z"); + jmethodID inf_contains_jmethod = env->GetMethodID( + list_jclass, "contains", "(Ljava/lang/Object;)Z"); ASSERT_NE(nullptr, inf_contains_jmethod); // Get mirror representation. - Handle<mirror::ArtMethod> inf_contains(hs.NewHandle(soa.DecodeMethod(inf_contains_jmethod))); + ArtMethod* inf_contains = soa.DecodeMethod(inf_contains_jmethod); // Object @@ -2287,8 +2291,8 @@ TEST_F(StubTest, IMT) { Invoke3WithReferrerAndHidden(0U, reinterpret_cast<size_t>(array_list.Get()), reinterpret_cast<size_t>(obj.Get()), StubTest::GetEntrypoint(self, kQuickQuickImtConflictTrampoline), - self, contains_amethod.Get(), - static_cast<size_t>(inf_contains.Get()->GetDexMethodIndex())); + self, contains_amethod, + static_cast<size_t>(inf_contains->GetDexMethodIndex())); ASSERT_FALSE(self->IsExceptionPending()); EXPECT_EQ(static_cast<size_t>(JNI_FALSE), result); @@ -2301,33 +2305,31 @@ TEST_F(StubTest, IMT) { // Contains. - result = Invoke3WithReferrerAndHidden(0U, reinterpret_cast<size_t>(array_list.Get()), - reinterpret_cast<size_t>(obj.Get()), - StubTest::GetEntrypoint(self, kQuickQuickImtConflictTrampoline), - self, contains_amethod.Get(), - static_cast<size_t>(inf_contains.Get()->GetDexMethodIndex())); + result = Invoke3WithReferrerAndHidden( + 0U, reinterpret_cast<size_t>(array_list.Get()), reinterpret_cast<size_t>(obj.Get()), + StubTest::GetEntrypoint(self, kQuickQuickImtConflictTrampoline), self, contains_amethod, + static_cast<size_t>(inf_contains->GetDexMethodIndex())); ASSERT_FALSE(self->IsExceptionPending()); EXPECT_EQ(static_cast<size_t>(JNI_TRUE), result); // 2. regular interface trampoline - result = Invoke3WithReferrer(static_cast<size_t>(inf_contains.Get()->GetDexMethodIndex()), + result = Invoke3WithReferrer(static_cast<size_t>(inf_contains->GetDexMethodIndex()), reinterpret_cast<size_t>(array_list.Get()), reinterpret_cast<size_t>(obj.Get()), StubTest::GetEntrypoint(self, kQuickInvokeInterfaceTrampolineWithAccessCheck), - self, contains_amethod.Get()); + self, contains_amethod); ASSERT_FALSE(self->IsExceptionPending()); EXPECT_EQ(static_cast<size_t>(JNI_TRUE), result); - result = Invoke3WithReferrer(static_cast<size_t>(inf_contains.Get()->GetDexMethodIndex()), - reinterpret_cast<size_t>(array_list.Get()), - reinterpret_cast<size_t>(array_list.Get()), - StubTest::GetEntrypoint(self, - kQuickInvokeInterfaceTrampolineWithAccessCheck), - self, contains_amethod.Get()); + result = Invoke3WithReferrer( + static_cast<size_t>(inf_contains->GetDexMethodIndex()), + reinterpret_cast<size_t>(array_list.Get()), reinterpret_cast<size_t>(array_list.Get()), + StubTest::GetEntrypoint(self, kQuickInvokeInterfaceTrampolineWithAccessCheck), self, + contains_amethod); ASSERT_FALSE(self->IsExceptionPending()); EXPECT_EQ(static_cast<size_t>(JNI_FALSE), result); diff --git a/runtime/arch/x86/context_x86.cc b/runtime/arch/x86/context_x86.cc index 06bae75585..7096c82aad 100644 --- a/runtime/arch/x86/context_x86.cc +++ b/runtime/arch/x86/context_x86.cc @@ -16,8 +16,8 @@ #include "context_x86.h" +#include "art_method-inl.h" #include "base/bit_utils.h" -#include "mirror/art_method-inl.h" #include "quick/quick_method_frame_info.h" namespace art { @@ -35,7 +35,7 @@ void X86Context::Reset() { } void X86Context::FillCalleeSaves(const StackVisitor& fr) { - mirror::ArtMethod* method = fr.GetMethod(); + ArtMethod* method = fr.GetMethod(); const QuickMethodFrameInfo frame_info = method->GetQuickFrameInfo(); int spill_pos = 0; diff --git a/runtime/arch/x86/fault_handler_x86.cc b/runtime/arch/x86/fault_handler_x86.cc index 2de69aa679..d7c4cb182a 100644 --- a/runtime/arch/x86/fault_handler_x86.cc +++ b/runtime/arch/x86/fault_handler_x86.cc @@ -16,13 +16,14 @@ #include "fault_handler.h" + #include <sys/ucontext.h> + +#include "art_method-inl.h" #include "base/macros.h" #include "globals.h" #include "base/logging.h" #include "base/hex_dump.h" -#include "mirror/art_method.h" -#include "mirror/art_method-inl.h" #include "thread.h" #include "thread-inl.h" @@ -248,7 +249,7 @@ void FaultManager::HandleNestedSignal(int, siginfo_t*, void* context) { } void FaultManager::GetMethodAndReturnPcAndSp(siginfo_t* siginfo, void* context, - mirror::ArtMethod** out_method, + ArtMethod** out_method, uintptr_t* out_return_pc, uintptr_t* out_sp) { struct ucontext* uc = reinterpret_cast<struct ucontext*>(context); *out_sp = static_cast<uintptr_t>(uc->CTX_ESP); @@ -267,10 +268,10 @@ void FaultManager::GetMethodAndReturnPcAndSp(siginfo_t* siginfo, void* context, reinterpret_cast<uint8_t*>(*out_sp) - GetStackOverflowReservedBytes(kX86)); #endif if (overflow_addr == fault_addr) { - *out_method = reinterpret_cast<mirror::ArtMethod*>(uc->CTX_METHOD); + *out_method = reinterpret_cast<ArtMethod*>(uc->CTX_METHOD); } else { // The method is at the top of the stack. - *out_method = (reinterpret_cast<StackReference<mirror::ArtMethod>* >(*out_sp)[0]).AsMirrorPtr(); + *out_method = *reinterpret_cast<ArtMethod**>(*out_sp); } uint8_t* pc = reinterpret_cast<uint8_t*>(uc->CTX_EIP); diff --git a/runtime/arch/x86/quick_entrypoints_x86.S b/runtime/arch/x86/quick_entrypoints_x86.S index 6ebeba3aaf..9cebb4ed55 100644 --- a/runtime/arch/x86/quick_entrypoints_x86.S +++ b/runtime/arch/x86/quick_entrypoints_x86.S @@ -477,7 +477,7 @@ DEFINE_FUNCTION art_quick_invoke_stub // Nothing left to load. .Lgpr_setup_finished: mov 20(%ebp), %eax // move method pointer into eax - call *MIRROR_ART_METHOD_QUICK_CODE_OFFSET_32(%eax) // call the method + call *ART_METHOD_QUICK_CODE_OFFSET_32(%eax) // call the method mov %ebp, %esp // restore stack pointer CFI_DEF_CFA_REGISTER(esp) POP edi // pop edi @@ -594,7 +594,7 @@ DEFINE_FUNCTION art_quick_invoke_static_stub // Nothing left to load. .Lgpr_setup_finished2: mov 20(%ebp), %eax // move method pointer into eax - call *MIRROR_ART_METHOD_QUICK_CODE_OFFSET_32(%eax) // call the method + call *ART_METHOD_QUICK_CODE_OFFSET_32(%eax) // call the method mov %ebp, %esp // restore stack pointer CFI_DEF_CFA_REGISTER(esp) POP edi // pop edi @@ -1396,7 +1396,7 @@ END_FUNCTION art_quick_proxy_invoke_handler DEFINE_FUNCTION art_quick_imt_conflict_trampoline PUSH ecx movl 8(%esp), %eax // load caller Method* - movl MIRROR_ART_METHOD_DEX_CACHE_METHODS_OFFSET(%eax), %eax // load dex_cache_resolved_methods + movl ART_METHOD_DEX_CACHE_METHODS_OFFSET(%eax), %eax // load dex_cache_resolved_methods movd %xmm7, %ecx // get target method index stored in xmm0 movl MIRROR_OBJECT_ARRAY_DATA_OFFSET(%eax, %ecx, 4), %eax // load the target method POP ecx diff --git a/runtime/arch/x86_64/context_x86_64.cc b/runtime/arch/x86_64/context_x86_64.cc index 2c4532c42b..1fe2ef8fd8 100644 --- a/runtime/arch/x86_64/context_x86_64.cc +++ b/runtime/arch/x86_64/context_x86_64.cc @@ -16,8 +16,8 @@ #include "context_x86_64.h" +#include "art_method-inl.h" #include "base/bit_utils.h" -#include "mirror/art_method-inl.h" #include "quick/quick_method_frame_info.h" namespace art { @@ -35,7 +35,7 @@ void X86_64Context::Reset() { } void X86_64Context::FillCalleeSaves(const StackVisitor& fr) { - mirror::ArtMethod* method = fr.GetMethod(); + ArtMethod* method = fr.GetMethod(); const QuickMethodFrameInfo frame_info = method->GetQuickFrameInfo(); int spill_pos = 0; diff --git a/runtime/arch/x86_64/quick_entrypoints_x86_64.S b/runtime/arch/x86_64/quick_entrypoints_x86_64.S index da4d92b889..bd199dbb82 100644 --- a/runtime/arch/x86_64/quick_entrypoints_x86_64.S +++ b/runtime/arch/x86_64/quick_entrypoints_x86_64.S @@ -57,7 +57,7 @@ MACRO0(SETUP_SAVE_ALL_CALLEE_SAVE_FRAME) PUSH r12 // Callee save. PUSH rbp // Callee save. PUSH rbx // Callee save. - // Create space for FPR args, plus space for StackReference<ArtMethod>. + // Create space for FPR args, plus space for ArtMethod*. subq MACRO_LITERAL(4 * 8 + 8), %rsp CFI_ADJUST_CFA_OFFSET(4 * 8 + 8) // Save FPRs. @@ -67,7 +67,7 @@ MACRO0(SETUP_SAVE_ALL_CALLEE_SAVE_FRAME) movq %xmm15, 32(%rsp) // R10 := ArtMethod* for save all callee save frame method. THIS_LOAD_REQUIRES_READ_BARRIER - movl RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET(%r10), %r10d + movq RUNTIME_SAVE_ALL_CALLEE_SAVE_FRAME_OFFSET(%r10), %r10 // Store ArtMethod* to bottom of stack. movq %r10, 0(%rsp) // Store rsp as the top quick frame. @@ -100,7 +100,7 @@ MACRO0(SETUP_REFS_ONLY_CALLEE_SAVE_FRAME) PUSH r12 // Callee save. PUSH rbp // Callee save. PUSH rbx // Callee save. - // Create space for FPR args, plus space for StackReference<ArtMethod>. + // Create space for FPR args, plus space for ArtMethod*. subq LITERAL(8 + 4 * 8), %rsp CFI_ADJUST_CFA_OFFSET(8 + 4 * 8) // Save FPRs. @@ -110,7 +110,7 @@ MACRO0(SETUP_REFS_ONLY_CALLEE_SAVE_FRAME) movq %xmm15, 32(%rsp) // R10 := ArtMethod* for refs only callee save frame method. THIS_LOAD_REQUIRES_READ_BARRIER - movl RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET(%r10), %r10d + movq RUNTIME_REFS_ONLY_CALLEE_SAVE_FRAME_OFFSET(%r10), %r10 // Store ArtMethod* to bottom of stack. movq %r10, 0(%rsp) // Store rsp as the stop quick frame. @@ -164,13 +164,12 @@ MACRO0(SETUP_REFS_AND_ARGS_CALLEE_SAVE_FRAME) PUSH rbx // Callee save. PUSH rdx // Quick arg 2. PUSH rcx // Quick arg 3. - // Create space for FPR args and create 2 slots, 1 of padding and 1 for the - // StackReference<ArtMethod>. + // Create space for FPR args and create 2 slots for ArtMethod*. subq MACRO_LITERAL(80 + 4 * 8), %rsp CFI_ADJUST_CFA_OFFSET(80 + 4 * 8) // R10 := ArtMethod* for ref and args callee save frame method. THIS_LOAD_REQUIRES_READ_BARRIER - movl RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET(%r10), %r10d + movq RUNTIME_REFS_AND_ARGS_CALLEE_SAVE_FRAME_OFFSET(%r10), %r10 // Save FPRs. movq %xmm0, 16(%rsp) movq %xmm1, 24(%rsp) @@ -210,8 +209,7 @@ MACRO0(SETUP_REFS_AND_ARGS_CALLEE_SAVE_FRAME_WITH_METHOD_IN_RDI) PUSH rbx // Callee save. PUSH rdx // Quick arg 2. PUSH rcx // Quick arg 3. - // Create space for FPR args and create 2 slots, 1 of padding and 1 for the - // StackReference<ArtMethod>. + // Create space for FPR args and create 2 slots for ArtMethod*. subq LITERAL(80 + 4 * 8), %rsp CFI_ADJUST_CFA_OFFSET(80 + 4 * 8) // Save FPRs. @@ -362,7 +360,7 @@ MACRO2(INVOKE_TRAMPOLINE, c_name, cxx_name) // Helper signature is always // (method_idx, *this_object, *caller_method, *self, sp) - movl FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE(%rsp), %edx // pass caller Method* + movq FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE(%rsp), %rdx // pass caller Method* movq %gs:THREAD_SELF_OFFSET, %rcx // pass Thread movq %rsp, %r8 // pass SP @@ -506,13 +504,13 @@ DEFINE_FUNCTION art_quick_invoke_stub #if (STACK_REFERENCE_SIZE != 4) #error "STACK_REFERENCE_SIZE(X86_64) size not as expected." #endif - movl LITERAL(0), (%rsp) // Store null for method* + movq LITERAL(0), (%rsp) // Store null for method* movl %r10d, %ecx // Place size of args in rcx. movq %rdi, %rax // rax := method to be called movq %rsi, %r11 // r11 := arg_array - leaq 4(%rsp), %rdi // rdi is pointing just above the StackReference<method> in the - // stack arguments. + leaq 8(%rsp), %rdi // rdi is pointing just above the ArtMethod* in the stack + // arguments. // Copy arg array into stack. rep movsb // while (rcx--) { *rdi++ = *rsi++ } leaq 1(%r9), %r10 // r10 := shorty + 1 ; ie skip return arg character @@ -524,7 +522,7 @@ DEFINE_FUNCTION art_quick_invoke_stub LOOP_OVER_SHORTY_LOADING_GPRS r8, r8d, .Lgpr_setup_finished LOOP_OVER_SHORTY_LOADING_GPRS r9, r9d, .Lgpr_setup_finished .Lgpr_setup_finished: - call *MIRROR_ART_METHOD_QUICK_CODE_OFFSET_64(%rdi) // Call the method. + call *ART_METHOD_QUICK_CODE_OFFSET_64(%rdi) // Call the method. movq %rbp, %rsp // Restore stack pointer. POP r15 // Pop r15 POP r14 // Pop r14 @@ -600,12 +598,12 @@ DEFINE_FUNCTION art_quick_invoke_static_stub #if (STACK_REFERENCE_SIZE != 4) #error "STACK_REFERENCE_SIZE(X86_64) size not as expected." #endif - movl LITERAL(0), (%rsp) // Store null for method* + movq LITERAL(0), (%rsp) // Store null for method* movl %r10d, %ecx // Place size of args in rcx. movq %rdi, %rax // rax := method to be called movq %rsi, %r11 // r11 := arg_array - leaq 4(%rsp), %rdi // rdi is pointing just above the StackReference<method> in the + leaq 8(%rsp), %rdi // rdi is pointing just above the ArtMethod* in the // stack arguments. // Copy arg array into stack. rep movsb // while (rcx--) { *rdi++ = *rsi++ } @@ -617,7 +615,7 @@ DEFINE_FUNCTION art_quick_invoke_static_stub LOOP_OVER_SHORTY_LOADING_GPRS r8, r8d, .Lgpr_setup_finished2 LOOP_OVER_SHORTY_LOADING_GPRS r9, r9d, .Lgpr_setup_finished2 .Lgpr_setup_finished2: - call *MIRROR_ART_METHOD_QUICK_CODE_OFFSET_64(%rdi) // Call the method. + call *ART_METHOD_QUICK_CODE_OFFSET_64(%rdi) // Call the method. movq %rbp, %rsp // Restore stack pointer. POP r15 // Pop r15 POP r14 // Pop r14 @@ -751,7 +749,7 @@ END_MACRO MACRO3(ONE_ARG_REF_DOWNCALL, c_name, cxx_name, return_macro) DEFINE_FUNCTION VAR(c_name, 0) - movl 8(%rsp), %esi // pass referrer + movq 8(%rsp), %rsi // pass referrer SETUP_REFS_ONLY_CALLEE_SAVE_FRAME // arg0 is in rdi movq %gs:THREAD_SELF_OFFSET, %rdx // pass Thread::Current() @@ -763,7 +761,7 @@ END_MACRO MACRO3(TWO_ARG_REF_DOWNCALL, c_name, cxx_name, return_macro) DEFINE_FUNCTION VAR(c_name, 0) - movl 8(%rsp), %edx // pass referrer + movq 8(%rsp), %rdx // pass referrer SETUP_REFS_ONLY_CALLEE_SAVE_FRAME // arg0 and arg1 are in rdi/rsi movq %gs:THREAD_SELF_OFFSET, %rcx // pass Thread::Current() @@ -775,7 +773,7 @@ END_MACRO MACRO3(THREE_ARG_REF_DOWNCALL, c_name, cxx_name, return_macro) DEFINE_FUNCTION VAR(c_name, 0) - movl 8(%rsp), %ecx // pass referrer + movq 8(%rsp), %rcx // pass referrer SETUP_REFS_ONLY_CALLEE_SAVE_FRAME // arg0, arg1, and arg2 are in rdi/rsi/rdx movq %gs:THREAD_SELF_OFFSET, %r8 // pass Thread::Current() @@ -922,7 +920,7 @@ DEFINE_FUNCTION art_quick_alloc_object_tlab // Fast path tlab allocation. // RDI: uint32_t type_idx, RSI: ArtMethod* // RDX, RCX, R8, R9: free. RAX: return val. - movl MIRROR_ART_METHOD_DEX_CACHE_TYPES_OFFSET(%rsi), %edx // Load dex cache resolved types array + movl ART_METHOD_DEX_CACHE_TYPES_OFFSET(%rsi), %edx // Load dex cache resolved types array // Load the class movl MIRROR_OBJECT_ARRAY_DATA_OFFSET(%rdx, %rdi, MIRROR_OBJECT_ARRAY_COMPONENT_SIZE), %edx testl %edx, %edx // Check null class @@ -1309,7 +1307,7 @@ ONE_ARG_REF_DOWNCALL art_quick_get_obj_static, artGetObjStaticFromCode, RETURN_O // This is singled out as the argument order is different. DEFINE_FUNCTION art_quick_set64_static movq %rsi, %rdx // pass new_val - movl 8(%rsp), %esi // pass referrer + movq 8(%rsp), %rsi // pass referrer SETUP_REFS_ONLY_CALLEE_SAVE_FRAME // field_idx is in rdi movq %gs:THREAD_SELF_OFFSET, %rcx // pass Thread::Current() @@ -1340,9 +1338,9 @@ DEFINE_FUNCTION art_quick_imt_conflict_trampoline int3 int3 #else - movl 8(%rsp), %edi // load caller Method* - movl MIRROR_ART_METHOD_DEX_CACHE_METHODS_OFFSET(%rdi), %edi // load dex_cache_resolved_methods - movl MIRROR_OBJECT_ARRAY_DATA_OFFSET(%rdi, %rax, 4), %edi // load the target method + movq 8(%rsp), %rdi // load caller Method* + movl ART_METHOD_DEX_CACHE_METHODS_OFFSET(%rdi), %edi // load dex_cache_resolved_methods + movq MIRROR_LONG_ARRAY_DATA_OFFSET(%rdi, %rax, 8), %rdi // load the target method jmp art_quick_invoke_interface_trampoline #endif // __APPLE__ END_FUNCTION art_quick_imt_conflict_trampoline @@ -1395,7 +1393,6 @@ END_FUNCTION art_quick_resolution_trampoline * | XMM2 | float arg 3 * | XMM1 | float arg 2 * | XMM0 | float arg 1 - * | Padding | * | RDI/Method* | <- sp * #-------------------# * | Scratch Alloca | 5K scratch space |