| Index: src/arm/full-codegen-arm.cc
|
| diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
|
| index a4c6be8aea5f9eccc30f99d6565c3367f653fac2..6aac79ec11ffd966d87ad7a6ba30e7d0d82a31ef 100644
|
| --- a/src/arm/full-codegen-arm.cc
|
| +++ b/src/arm/full-codegen-arm.cc
|
| @@ -96,7 +96,7 @@ class JumpPatchSite BASE_EMBEDDED {
|
| // The live registers are:
|
| // o r1: the JS function object being called (i.e., ourselves)
|
| // o cp: our context
|
| -// o pp: our caller's constant pool pointer (if FLAG_enable_ool_constant_pool)
|
| +// o pp: our caller's constant pool pointer (if enabled)
|
| // o fp: our caller's frame pointer
|
| // o sp: stack pointer
|
| // o lr: return address
|
| @@ -2339,7 +2339,7 @@ void FullCodeGenerator::EmitGeneratorResume(Expression *generator,
|
| __ bind(&resume_frame);
|
| // lr = return address.
|
| // fp = caller's frame pointer.
|
| - // pp = caller's constant pool (if FLAG_enable_ool_constant_pool),
|
| + // pp = caller's constant pool (if FLAG_enable_embedded_constant_pool),
|
| // cp = callee's context,
|
| // r4 = callee's JS function.
|
| __ PushFixedFrame(r4);
|
| @@ -2360,10 +2360,9 @@ void FullCodeGenerator::EmitGeneratorResume(Expression *generator,
|
| __ ldr(r3, FieldMemOperand(r4, JSFunction::kCodeEntryOffset));
|
|
|
| { ConstantPoolUnavailableScope constant_pool_unavailable(masm_);
|
| - if (FLAG_enable_ool_constant_pool) {
|
| + if (FLAG_enable_embedded_constant_pool) {
|
| // Load the new code object's constant pool pointer.
|
| - __ ldr(pp,
|
| - MemOperand(r3, Code::kConstantPoolOffset - Code::kHeaderSize));
|
| + __ LoadConstantPoolPointerRegisterFromCodeTargetAddress(r3);
|
| }
|
|
|
| __ ldr(r2, FieldMemOperand(r1, JSGeneratorObject::kContinuationOffset));
|
| @@ -5480,7 +5479,7 @@ void FullCodeGenerator::EmitLoadStoreICSlot(FeedbackVectorICSlot slot) {
|
|
|
| static Address GetInterruptImmediateLoadAddress(Address pc) {
|
| Address load_address = pc - 2 * Assembler::kInstrSize;
|
| - if (!FLAG_enable_ool_constant_pool) {
|
| + 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.
|
|
|