Commit 422b0fa7 authored by mbrandy's avatar mbrandy Committed by Commit bot

PPC: [calls] Consistent call protocol for calls.

Port b37907ff

Original commit message:
    The number of actual arguments should always be available, there's no
    point in trying to optimize away a simple assignment of an immediate to
    a register before some calls.

    The main motivation is to have a consistent state at the beginning of every
    function. Currently the arguments register (i.e. rax or eax) either contains
    the number of arguments or some random garbage depending on whether
    the callsite decided that the callee might need the information or not.
    This causes trouble with runtime implementations of functions that
    do not set internal_formal_parameter_count to the DontAdaptArguments
    sentinel (we don't have any of those yet), but also makes it impossible
    to sanity check the arguments in the callee, because the callee doesn't
    know whether the caller decided to pass the number of arguments or
    random garbage.

R=bmeurer@chromium.org, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com, dstence@us.ibm.com
BUG=v8:4413
LOG=n

Review URL: https://codereview.chromium.org/1314353007

Cr-Commit-Position: refs/heads/master@{#30662}
parent 50fa1e50
......@@ -3653,11 +3653,8 @@ void LCodeGen::CallKnownFunction(Handle<JSFunction> function,
// Change context.
__ LoadP(cp, FieldMemOperand(function_reg, JSFunction::kContextOffset));
// Set r3 to arguments count if adaption is not needed. Assumes that r3
// is available to write to at this point.
if (dont_adapt_arguments) {
__ mov(r3, Operand(arity));
}
// Always initialize r3 to the number of actual arguments.
__ mov(r3, Operand(arity));
bool is_self_call = function.is_identical_to(info()->closure());
......@@ -4070,9 +4067,7 @@ void LCodeGen::DoCallJSFunction(LCallJSFunction* instr) {
DCHECK(ToRegister(instr->function()).is(r4));
DCHECK(ToRegister(instr->result()).is(r3));
if (instr->hydrogen()->pass_argument_count()) {
__ mov(r3, Operand(instr->arity()));
}
__ mov(r3, Operand(instr->arity()));
// Change context.
__ LoadP(cp, FieldMemOperand(r4, JSFunction::kContextOffset));
......
......@@ -988,10 +988,10 @@ void MacroAssembler::InvokePrologue(const ParameterCount& expected,
if (expected.is_immediate()) {
DCHECK(actual.is_immediate());
mov(r3, Operand(actual.immediate()));
if (expected.immediate() == actual.immediate()) {
definitely_matches = true;
} else {
mov(r3, Operand(actual.immediate()));
const int sentinel = SharedFunctionInfo::kDontAdaptArgumentsSentinel;
if (expected.immediate() == sentinel) {
// Don't worry about adapting arguments for builtins that
......@@ -1006,9 +1006,9 @@ void MacroAssembler::InvokePrologue(const ParameterCount& expected,
}
} else {
if (actual.is_immediate()) {
mov(r3, Operand(actual.immediate()));
cmpi(expected.reg(), Operand(actual.immediate()));
beq(&regular_invoke);
mov(r3, Operand(actual.immediate()));
} else {
cmp(expected.reg(), actual.reg());
beq(&regular_invoke);
......
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