| Index: src/mips/macro-assembler-mips.cc
|
| diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
|
| index 1a37d659270686d88bfb16ab8a8e9fba03620a20..45e901bdb91d3eef2c97f9c99dfbd32e2947228d 100644
|
| --- a/src/mips/macro-assembler-mips.cc
|
| +++ b/src/mips/macro-assembler-mips.cc
|
| @@ -2815,46 +2815,6 @@ void MacroAssembler::AllocateAsciiConsString(Register result,
|
| }
|
|
|
|
|
| -void MacroAssembler::AllocateTwoByteSlicedString(Register result,
|
| - Register length,
|
| - Register scratch1,
|
| - Register scratch2,
|
| - Label* gc_required) {
|
| - AllocateInNewSpace(SlicedString::kSize,
|
| - result,
|
| - scratch1,
|
| - scratch2,
|
| - gc_required,
|
| - TAG_OBJECT);
|
| -
|
| - InitializeNewString(result,
|
| - length,
|
| - Heap::kSlicedStringMapRootIndex,
|
| - scratch1,
|
| - scratch2);
|
| -}
|
| -
|
| -
|
| -void MacroAssembler::AllocateAsciiSlicedString(Register result,
|
| - Register length,
|
| - Register scratch1,
|
| - Register scratch2,
|
| - Label* gc_required) {
|
| - AllocateInNewSpace(SlicedString::kSize,
|
| - result,
|
| - scratch1,
|
| - scratch2,
|
| - gc_required,
|
| - TAG_OBJECT);
|
| -
|
| - InitializeNewString(result,
|
| - length,
|
| - Heap::kSlicedAsciiStringMapRootIndex,
|
| - scratch1,
|
| - scratch2);
|
| -}
|
| -
|
| -
|
| // Allocates a heap number or jumps to the label if the young space is full and
|
| // a scavenge is needed.
|
| void MacroAssembler::AllocateHeapNumber(Register result,
|
| @@ -4253,9 +4213,11 @@ void MacroAssembler::PrepareCallCFunction(int num_arguments, Register scratch) {
|
| // mips, even though those argument slots are not normally used.
|
| // Remaining arguments are pushed on the stack, above (higher address than)
|
| // the argument slots.
|
| + ASSERT(StandardFrameConstants::kCArgsSlotsSize % kPointerSize == 0);
|
| int stack_passed_arguments = ((num_arguments <= kRegisterPassedArguments) ?
|
| 0 : num_arguments - kRegisterPassedArguments) +
|
| - kCArgSlotCount;
|
| + (StandardFrameConstants::kCArgsSlotsSize /
|
| + kPointerSize);
|
| if (frame_alignment > kPointerSize) {
|
| // Make stack end at alignment and make room for num_arguments - 4 words
|
| // and the original value of sp.
|
| @@ -4327,9 +4289,11 @@ void MacroAssembler::CallCFunctionHelper(Register function,
|
|
|
| Call(function);
|
|
|
| + ASSERT(StandardFrameConstants::kCArgsSlotsSize % kPointerSize == 0);
|
| int stack_passed_arguments = ((num_arguments <= kRegisterPassedArguments) ?
|
| 0 : num_arguments - kRegisterPassedArguments) +
|
| - kCArgSlotCount;
|
| + (StandardFrameConstants::kCArgsSlotsSize /
|
| + kPointerSize);
|
|
|
| if (OS::ActivationFrameAlignment() > kPointerSize) {
|
| lw(sp, MemOperand(sp, stack_passed_arguments * kPointerSize));
|
|
|