diff options
author | Elliott Hughes <enh@google.com> | 2014-12-11 14:34:28 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-12-12 09:33:34 -0800 |
commit | 956af0f0cb05422e38c1d22cbef309d16b8a1a12 (patch) | |
tree | b558c804d206dad8da648b815750f1b3c97610ae /runtime/arch/arm64 | |
parent | 407d77f344cfbdbbfb50531c5f0766bc0892e2fe (diff) | |
download | art-956af0f0cb05422e38c1d22cbef309d16b8a1a12.zip art-956af0f0cb05422e38c1d22cbef309d16b8a1a12.tar.gz art-956af0f0cb05422e38c1d22cbef309d16b8a1a12.tar.bz2 |
Remove portable.
Change-Id: I3bf3250fa866fd2265f1b115d52fa5dedc48a7fc
Diffstat (limited to 'runtime/arch/arm64')
-rw-r--r-- | runtime/arch/arm64/entrypoints_init_arm64.cc | 7 | ||||
-rw-r--r-- | runtime/arch/arm64/portable_entrypoints_arm64.S | 30 |
2 files changed, 1 insertions, 36 deletions
diff --git a/runtime/arch/arm64/entrypoints_init_arm64.cc b/runtime/arch/arm64/entrypoints_init_arm64.cc index 2d26c03..e68d41d 100644 --- a/runtime/arch/arm64/entrypoints_init_arm64.cc +++ b/runtime/arch/arm64/entrypoints_init_arm64.cc @@ -16,7 +16,6 @@ #include "entrypoints/interpreter/interpreter_entrypoints.h" #include "entrypoints/jni/jni_entrypoints.h" -#include "entrypoints/portable/portable_entrypoints.h" #include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_default_externs.h" #include "entrypoints/quick/quick_entrypoints.h" @@ -39,7 +38,7 @@ extern "C" double art_quick_fmod(double a, double b); // REM_DOUBLE[_2ADD void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, - PortableEntryPoints* ppoints, QuickEntryPoints* qpoints) { + QuickEntryPoints* qpoints) { // Interpreter ipoints->pInterpreterToInterpreterBridge = artInterpreterToInterpreterBridge; ipoints->pInterpreterToCompiledCodeBridge = artInterpreterToCompiledCodeBridge; @@ -47,10 +46,6 @@ void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, // JNI jpoints->pDlsymLookup = art_jni_dlsym_lookup_stub; - // Portable - ppoints->pPortableResolutionTrampoline = art_portable_resolution_trampoline; - ppoints->pPortableToInterpreterBridge = art_portable_to_interpreter_bridge; - // Alloc ResetQuickAllocEntryPoints(qpoints); diff --git a/runtime/arch/arm64/portable_entrypoints_arm64.S b/runtime/arch/arm64/portable_entrypoints_arm64.S deleted file mode 100644 index 9e2c030..0000000 --- a/runtime/arch/arm64/portable_entrypoints_arm64.S +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "asm_support_arm64.S" - - /* - * Portable invocation stub. - */ -UNIMPLEMENTED art_portable_invoke_stub - -UNIMPLEMENTED art_portable_proxy_invoke_handler - -UNIMPLEMENTED art_portable_resolution_trampoline - -UNIMPLEMENTED art_portable_to_interpreter_bridge - -UNIMPLEMENTED art_portable_imt_conflict_trampoline |