Commit 61a23faa authored by John Barboza's avatar John Barboza Committed by Commit Bot

PPC/s390: [arm64] Pair some pushes and delete unused code

Port 193dcf76

Original Commit Message:

    Pair some stack ops so that they deal with an even numbers of registers, add
    padding around profile entry calls, and delete some unused macro assembler code.

R=martyn.capewell@arm.com, joransiu@ca.ibm.com, jyan@ca.ibm.com, bjaideep@ca.ibm.com, michael_dawson@ca.ibm.com
BUG=
LOG=N

Change-Id: I017ccc699839b04bc7295d00c45e315f7cf074c1
Reviewed-on: https://chromium-review.googlesource.com/713996Reviewed-by: 's avatarJunliang Yan <jyan@ca.ibm.com>
Reviewed-by: 's avatarJoran Siu <joransiu@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#48473}
parent d567f413
...@@ -958,50 +958,6 @@ int TurboAssembler::LeaveFrame(StackFrame::Type type, int stack_adjustment) { ...@@ -958,50 +958,6 @@ int TurboAssembler::LeaveFrame(StackFrame::Type type, int stack_adjustment) {
return frame_ends; return frame_ends;
} }
void MacroAssembler::EnterBuiltinFrame(Register context, Register target,
Register argc) {
int fp_delta = 0;
mflr(r0);
if (FLAG_enable_embedded_constant_pool) {
if (target.is_valid()) {
Push(r0, fp, kConstantPoolRegister, context, target);
fp_delta = 3;
} else {
Push(r0, fp, kConstantPoolRegister, context);
fp_delta = 2;
}
} else {
if (target.is_valid()) {
Push(r0, fp, context, target);
fp_delta = 2;
} else {
Push(r0, fp, context);
fp_delta = 1;
}
}
addi(fp, sp, Operand(fp_delta * kPointerSize));
Push(argc);
}
void MacroAssembler::LeaveBuiltinFrame(Register context, Register target,
Register argc) {
Pop(argc);
if (FLAG_enable_embedded_constant_pool) {
if (target.is_valid()) {
Pop(r0, fp, kConstantPoolRegister, context, target);
} else {
Pop(r0, fp, kConstantPoolRegister, context);
}
} else {
if (target.is_valid()) {
Pop(r0, fp, context, target);
} else {
Pop(r0, fp, context);
}
}
mtlr(r0);
}
// ExitFrame layout (probably wrongish.. needs updating) // ExitFrame layout (probably wrongish.. needs updating)
// //
// SP -> previousSP // SP -> previousSP
......
...@@ -1037,9 +1037,6 @@ class MacroAssembler : public TurboAssembler { ...@@ -1037,9 +1037,6 @@ class MacroAssembler : public TurboAssembler {
DecodeField<Field>(reg, reg, rc); DecodeField<Field>(reg, reg, rc);
} }
void EnterBuiltinFrame(Register context, Register target, Register argc);
void LeaveBuiltinFrame(Register context, Register target, Register argc);
private: private:
static const int kSmiShift = kSmiTagSize + kSmiShiftSize; static const int kSmiShift = kSmiTagSize + kSmiShiftSize;
......
...@@ -980,20 +980,6 @@ int TurboAssembler::LeaveFrame(StackFrame::Type type, int stack_adjustment) { ...@@ -980,20 +980,6 @@ int TurboAssembler::LeaveFrame(StackFrame::Type type, int stack_adjustment) {
return frame_ends; return frame_ends;
} }
void MacroAssembler::EnterBuiltinFrame(Register context, Register target,
Register argc) {
CleanseP(r14);
Push(r14, fp, context, target);
la(fp, MemOperand(sp, 2 * kPointerSize));
Push(argc);
}
void MacroAssembler::LeaveBuiltinFrame(Register context, Register target,
Register argc) {
Pop(argc);
Pop(r14, fp, context, target);
}
// ExitFrame layout (probably wrongish.. needs updating) // ExitFrame layout (probably wrongish.. needs updating)
// //
// SP -> previousSP // SP -> previousSP
......
...@@ -1175,9 +1175,6 @@ class MacroAssembler : public TurboAssembler { ...@@ -1175,9 +1175,6 @@ class MacroAssembler : public TurboAssembler {
bool restore_context, bool restore_context,
bool argument_count_is_length = false); bool argument_count_is_length = false);
void EnterBuiltinFrame(Register context, Register target, Register argc);
void LeaveBuiltinFrame(Register context, Register target, Register argc);
// Load the global proxy from the current context. // Load the global proxy from the current context.
void LoadGlobalProxy(Register dst) { void LoadGlobalProxy(Register dst) {
LoadNativeContextSlot(Context::GLOBAL_PROXY_INDEX, dst); LoadNativeContextSlot(Context::GLOBAL_PROXY_INDEX, dst);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment