diff options
Diffstat (limited to 'runtime/arch/mips')
| -rw-r--r-- | runtime/arch/mips/context_mips.h | 2 | ||||
| -rw-r--r-- | runtime/arch/mips/entrypoints_init_mips.cc | 17 | ||||
| -rw-r--r-- | runtime/arch/mips/quick_entrypoints_mips.S | 6 |
3 files changed, 15 insertions, 10 deletions
diff --git a/runtime/arch/mips/context_mips.h b/runtime/arch/mips/context_mips.h index cbad3f963a..d01b95e5f6 100644 --- a/runtime/arch/mips/context_mips.h +++ b/runtime/arch/mips/context_mips.h @@ -79,7 +79,7 @@ class MipsContext : public Context { NO_RETURN void DoLongJump() OVERRIDE; private: - // Pointers to registers in the stack, initialized to NULL except for the special cases below. + // Pointers to registers in the stack, initialized to null except for the special cases below. uintptr_t* gprs_[kNumberOfCoreRegisters]; uint32_t* fprs_[kNumberOfFRegisters]; // Hold values for sp and ra (return address) if they are not located within a stack frame. diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc index e3ec27c100..a980a86135 100644 --- a/runtime/arch/mips/entrypoints_init_mips.cc +++ b/runtime/arch/mips/entrypoints_init_mips.cc @@ -199,7 +199,7 @@ void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, static_assert(IsDirectEntrypoint(kQuickD2iz), "Direct C stub not marked direct."); qpoints->pF2iz = art_f2i; static_assert(IsDirectEntrypoint(kQuickF2iz), "Direct C stub not marked direct."); - qpoints->pIdivmod = NULL; + qpoints->pIdivmod = nullptr; qpoints->pD2l = art_d2l; static_assert(IsDirectEntrypoint(kQuickD2l), "Direct C stub not marked direct."); qpoints->pF2l = art_f2l; @@ -228,19 +228,24 @@ void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, qpoints->pQuickImtConflictTrampoline = art_quick_imt_conflict_trampoline; qpoints->pQuickResolutionTrampoline = art_quick_resolution_trampoline; qpoints->pQuickToInterpreterBridge = art_quick_to_interpreter_bridge; - qpoints->pInvokeDirectTrampolineWithAccessCheck = art_quick_invoke_direct_trampoline_with_access_check; + qpoints->pInvokeDirectTrampolineWithAccessCheck = + art_quick_invoke_direct_trampoline_with_access_check; static_assert(!IsDirectEntrypoint(kQuickInvokeDirectTrampolineWithAccessCheck), "Non-direct C stub marked direct."); - qpoints->pInvokeInterfaceTrampolineWithAccessCheck = art_quick_invoke_interface_trampoline_with_access_check; + qpoints->pInvokeInterfaceTrampolineWithAccessCheck = + art_quick_invoke_interface_trampoline_with_access_check; static_assert(!IsDirectEntrypoint(kQuickInvokeInterfaceTrampolineWithAccessCheck), "Non-direct C stub marked direct."); - qpoints->pInvokeStaticTrampolineWithAccessCheck = art_quick_invoke_static_trampoline_with_access_check; + qpoints->pInvokeStaticTrampolineWithAccessCheck = + art_quick_invoke_static_trampoline_with_access_check; static_assert(!IsDirectEntrypoint(kQuickInvokeStaticTrampolineWithAccessCheck), "Non-direct C stub marked direct."); - qpoints->pInvokeSuperTrampolineWithAccessCheck = art_quick_invoke_super_trampoline_with_access_check; + qpoints->pInvokeSuperTrampolineWithAccessCheck = + art_quick_invoke_super_trampoline_with_access_check; static_assert(!IsDirectEntrypoint(kQuickInvokeSuperTrampolineWithAccessCheck), "Non-direct C stub marked direct."); - qpoints->pInvokeVirtualTrampolineWithAccessCheck = art_quick_invoke_virtual_trampoline_with_access_check; + qpoints->pInvokeVirtualTrampolineWithAccessCheck = + art_quick_invoke_virtual_trampoline_with_access_check; static_assert(!IsDirectEntrypoint(kQuickInvokeVirtualTrampolineWithAccessCheck), "Non-direct C stub marked direct."); diff --git a/runtime/arch/mips/quick_entrypoints_mips.S b/runtime/arch/mips/quick_entrypoints_mips.S index 0c2250eab8..622c48f55f 100644 --- a/runtime/arch/mips/quick_entrypoints_mips.S +++ b/runtime/arch/mips/quick_entrypoints_mips.S @@ -446,7 +446,7 @@ END art_quick_throw_no_such_method * The helper will attempt to locate the target and return a 64-bit result in $v0/$v1 consisting * of the target Method* in $v0 and method->code_ in $v1. * - * If unsuccessful, the helper will return NULL/NULL. There will be a pending exception in the + * If unsuccessful, the helper will return null/null. There will be a pending exception in the * thread and we branch to another stub to deliver it. * * On success this wrapper will restore arguments and *jump* to the target, leaving the lr @@ -484,7 +484,7 @@ INVOKE_TRAMPOLINE art_quick_invoke_virtual_trampoline_with_access_check, artInvo * Invocation stub for quick code. * On entry: * a0 = method pointer - * a1 = argument array or NULL for no argument methods + * a1 = argument array or null for no argument methods * a2 = size of argument array in bytes * a3 = (managed) thread pointer * [sp + 16] = JValue* result @@ -520,7 +520,7 @@ ENTRY art_quick_invoke_stub lw $a3, 12($sp) # copy arg value for a3 lw $t9, MIRROR_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 + sw $zero, 0($sp) # store null for method* at bottom of frame move $sp, $fp # restore the stack lw $s0, 0($sp) .cfi_restore 16 |