diff options
author | Dave Allison <dallison@google.com> | 2014-04-09 23:36:15 +0000 |
---|---|---|
committer | Dave Allison <dallison@google.com> | 2014-04-09 23:36:15 +0000 |
commit | d6ed642458c8820e1beca72f3d7b5f0be4a4b64b (patch) | |
tree | 1b6e0438f786d6eeb5566e176d71d454a6cdb9e5 /compiler/driver/compiler_driver.cc | |
parent | f9487c039efb4112616d438593a2ab02792e0304 (diff) | |
download | art-d6ed642458c8820e1beca72f3d7b5f0be4a4b64b.zip art-d6ed642458c8820e1beca72f3d7b5f0be4a4b64b.tar.gz art-d6ed642458c8820e1beca72f3d7b5f0be4a4b64b.tar.bz2 |
Revert "Revert "Revert "Use trampolines for calls to helpers"""
This reverts commit f9487c039efb4112616d438593a2ab02792e0304.
Change-Id: Id48a4aae4ecce73db468587967968a3f7618b700
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
-rw-r--r-- | compiler/driver/compiler_driver.cc | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index ba15d2a..b66082d 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -22,8 +22,6 @@ #include <vector> #include <unistd.h> -#include "arch/arm/final_relocations_arm.h" -#include "base/hex_dump.h" #include "base/stl_util.h" #include "base/timing_logger.h" #include "class_linker.h" @@ -506,7 +504,6 @@ void CompilerDriver::CompileAll(jobject class_loader, UniquePtr<ThreadPool> thread_pool(new ThreadPool("Compiler driver thread pool", thread_count_ - 1)); PreCompile(class_loader, dex_files, thread_pool.get(), timings); Compile(class_loader, dex_files, thread_pool.get(), timings); - PostCompile(); if (dump_stats_) { stats_->Dump(); } @@ -618,10 +615,6 @@ void CompilerDriver::PreCompile(jobject class_loader, const std::vector<const De UpdateImageClasses(timings); } -void CompilerDriver::PostCompile() { - BuildEntrypointTrampolineCode(); -} - bool CompilerDriver::IsImageClass(const char* descriptor) const { if (!IsImage()) { return true; @@ -1245,27 +1238,6 @@ bool CompilerDriver::IsSafeCast(const DexCompilationUnit* mUnit, uint32_t dex_pc return result; } -uint32_t CompilerDriver::AddEntrypointTrampoline(uint32_t entrypoint) { - return entrypoint_trampolines_.AddEntrypoint(Thread::Current(), entrypoint); -} - - -void CompilerDriver::BuildEntrypointTrampolineCode() { - const auto& table = entrypoint_trampolines_.GetTrampolineTable(); - for (uint32_t offset : table) { - switch (instruction_set_) { - case kArm: - // Intentional fall through. - case kThumb2: - BuildArmEntrypointTrampolineCall(ThreadOffset<4>(offset)); - break; - default: - UNIMPLEMENTED(FATAL) << "No entrypoint trampolines for this architecture"; - } - } -} - - void CompilerDriver::AddCodePatch(const DexFile* dex_file, uint16_t referrer_class_def_idx, uint32_t referrer_method_idx, @@ -2099,17 +2071,4 @@ bool CompilerDriver::SkipCompilation(const std::string& method_name) { } return !compile; } - -FinalEntrypointRelocationSet* CompilerDriver::AllocateFinalEntrypointRelocationSet( - CompilationUnit* cu) const { - switch (instruction_set_) { - case kArm: - case kThumb2: - return new FinalEntrypointRelocationSetArm(this); - default: - UNIMPLEMENTED(FATAL) << "Cannot allocate FinalEntrypointRelocationSet for non-ARM"; - return nullptr; - } -} - } // namespace art |