Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Unified Diff: src/full-codegen/arm/full-codegen-arm.cc

Issue 2816703002: [arm] Remove embedded constant pool support. (Closed)
Patch Set: [arm] Remove embedded constant pool support. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/flag-definitions.h ('k') | src/register-configuration.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/full-codegen/arm/full-codegen-arm.cc
diff --git a/src/full-codegen/arm/full-codegen-arm.cc b/src/full-codegen/arm/full-codegen-arm.cc
index 8a9edc7b8342f23e0719836e18e4211bd408ae34..7550f3ab094327d8b1d16f436afc82016e91b9c1 100644
--- a/src/full-codegen/arm/full-codegen-arm.cc
+++ b/src/full-codegen/arm/full-codegen-arm.cc
@@ -2760,43 +2760,7 @@ void FullCodeGenerator::PushFunctionArgumentForContextAllocation() {
static Address GetInterruptImmediateLoadAddress(Address pc) {
Address load_address = pc - 2 * Assembler::kInstrSize;
- if (!FLAG_enable_embedded_constant_pool) {
- DCHECK(Assembler::IsLdrPcImmediateOffset(Memory::int32_at(load_address)));
- } else if (Assembler::IsLdrPpRegOffset(Memory::int32_at(load_address))) {
- // This is an extended constant pool lookup.
- if (CpuFeatures::IsSupported(ARMv7)) {
- load_address -= 2 * Assembler::kInstrSize;
- DCHECK(Assembler::IsMovW(Memory::int32_at(load_address)));
- DCHECK(Assembler::IsMovT(
- Memory::int32_at(load_address + Assembler::kInstrSize)));
- } else {
- load_address -= 4 * Assembler::kInstrSize;
- DCHECK(Assembler::IsMovImmed(Memory::int32_at(load_address)));
- DCHECK(Assembler::IsOrrImmed(
- Memory::int32_at(load_address + Assembler::kInstrSize)));
- DCHECK(Assembler::IsOrrImmed(
- Memory::int32_at(load_address + 2 * Assembler::kInstrSize)));
- DCHECK(Assembler::IsOrrImmed(
- Memory::int32_at(load_address + 3 * Assembler::kInstrSize)));
- }
- } else if (CpuFeatures::IsSupported(ARMv7) &&
- Assembler::IsMovT(Memory::int32_at(load_address))) {
- // This is a movw / movt immediate load.
- load_address -= Assembler::kInstrSize;
- DCHECK(Assembler::IsMovW(Memory::int32_at(load_address)));
- } else if (!CpuFeatures::IsSupported(ARMv7) &&
- Assembler::IsOrrImmed(Memory::int32_at(load_address))) {
- // This is a mov / orr immediate load.
- load_address -= 3 * Assembler::kInstrSize;
- DCHECK(Assembler::IsMovImmed(Memory::int32_at(load_address)));
- DCHECK(Assembler::IsOrrImmed(
- Memory::int32_at(load_address + Assembler::kInstrSize)));
- DCHECK(Assembler::IsOrrImmed(
- Memory::int32_at(load_address + 2 * Assembler::kInstrSize)));
- } else {
- // This is a small constant pool lookup.
- DCHECK(Assembler::IsLdrPpImmediateOffset(Memory::int32_at(load_address)));
- }
+ DCHECK(Assembler::IsLdrPcImmediateOffset(Memory::int32_at(load_address)));
return load_address;
}
« no previous file with comments | « src/flag-definitions.h ('k') | src/register-configuration.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698