| Index: runtime/vm/assembler_arm.cc
|
| ===================================================================
|
| --- runtime/vm/assembler_arm.cc (revision 30114)
|
| +++ runtime/vm/assembler_arm.cc (working copy)
|
| @@ -2621,28 +2621,21 @@
|
| }
|
|
|
|
|
| -void Assembler::EnterStubFrame(bool uses_pp) {
|
| +void Assembler::EnterStubFrame(bool load_pp) {
|
| // Push 0 as saved PC for stub frames.
|
| mov(IP, ShifterOperand(LR));
|
| mov(LR, ShifterOperand(0));
|
| - RegList regs = (1 << FP) | (1 << IP) | (1 << LR);
|
| - if (uses_pp) {
|
| - regs |= (1 << PP);
|
| - }
|
| + RegList regs = (1 << PP) | (1 << FP) | (1 << IP) | (1 << LR);
|
| EnterFrame(regs, 0);
|
| - if (uses_pp) {
|
| + if (load_pp) {
|
| // Setup pool pointer for this stub.
|
| LoadPoolPointer();
|
| }
|
| }
|
|
|
|
|
| -void Assembler::LeaveStubFrame(bool uses_pp) {
|
| - RegList regs = (1 << FP) | (1 << LR);
|
| - if (uses_pp) {
|
| - regs |= (1 << PP);
|
| - }
|
| - LeaveFrame(regs);
|
| +void Assembler::LeaveStubFrame() {
|
| + LeaveFrame((1 << PP) | (1 << FP) | (1 << LR));
|
| // Adjust SP for null PC pushed in EnterStubFrame.
|
| AddImmediate(SP, kWordSize);
|
| }
|
| @@ -2768,4 +2761,3 @@
|
| } // namespace dart
|
|
|
| #endif // defined TARGET_ARCH_ARM
|
| -
|
|
|