| Index: src/mips/macro-assembler-mips.cc
|
| diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
|
| index 224bc5c7f4d71a2a100977a25da6fd25df2159e0..2bac670fe1b4ca9bbf0c328c1586d0845672de76 100644
|
| --- a/src/mips/macro-assembler-mips.cc
|
| +++ b/src/mips/macro-assembler-mips.cc
|
| @@ -4270,34 +4270,8 @@ void MacroAssembler::GetMapConstructor(Register result, Register map,
|
| }
|
|
|
|
|
| -void MacroAssembler::TryGetFunctionPrototype(Register function,
|
| - Register result,
|
| - Register scratch,
|
| - Label* miss,
|
| - bool miss_on_bound_function) {
|
| - Label non_instance;
|
| - if (miss_on_bound_function) {
|
| - // Check that the receiver isn't a smi.
|
| - JumpIfSmi(function, miss);
|
| -
|
| - // Check that the function really is a function. Load map into result reg.
|
| - GetObjectType(function, result, scratch);
|
| - Branch(miss, ne, scratch, Operand(JS_FUNCTION_TYPE));
|
| -
|
| - lw(scratch,
|
| - FieldMemOperand(function, JSFunction::kSharedFunctionInfoOffset));
|
| - lw(scratch,
|
| - FieldMemOperand(scratch, SharedFunctionInfo::kCompilerHintsOffset));
|
| - And(scratch, scratch,
|
| - Operand(Smi::FromInt(1 << SharedFunctionInfo::kBoundFunction)));
|
| - Branch(miss, ne, scratch, Operand(zero_reg));
|
| -
|
| - // Make sure that the function has an instance prototype.
|
| - lbu(scratch, FieldMemOperand(result, Map::kBitFieldOffset));
|
| - And(scratch, scratch, Operand(1 << Map::kHasNonInstancePrototype));
|
| - Branch(&non_instance, ne, scratch, Operand(zero_reg));
|
| - }
|
| -
|
| +void MacroAssembler::TryGetFunctionPrototype(Register function, Register result,
|
| + Register scratch, Label* miss) {
|
| // Get the prototype or initial map from the function.
|
| lw(result,
|
| FieldMemOperand(function, JSFunction::kPrototypeOrInitialMapOffset));
|
| @@ -4316,15 +4290,6 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
|
| // Get the prototype from the initial map.
|
| lw(result, FieldMemOperand(result, Map::kPrototypeOffset));
|
|
|
| - if (miss_on_bound_function) {
|
| - jmp(&done);
|
| -
|
| - // Non-instance prototype: Fetch prototype from constructor field
|
| - // in initial map.
|
| - bind(&non_instance);
|
| - GetMapConstructor(result, result, scratch, scratch);
|
| - }
|
| -
|
| // All done.
|
| bind(&done);
|
| }
|
| @@ -5556,65 +5521,6 @@ void MacroAssembler::CallCFunctionHelper(Register function,
|
| #undef BRANCH_ARGS_CHECK
|
|
|
|
|
| -void MacroAssembler::PatchRelocatedValue(Register li_location,
|
| - Register scratch,
|
| - Register new_value) {
|
| - lw(scratch, MemOperand(li_location));
|
| - // At this point scratch is a lui(at, ...) instruction.
|
| - if (emit_debug_code()) {
|
| - And(scratch, scratch, kOpcodeMask);
|
| - Check(eq, kTheInstructionToPatchShouldBeALui,
|
| - scratch, Operand(LUI));
|
| - lw(scratch, MemOperand(li_location));
|
| - }
|
| - srl(t9, new_value, kImm16Bits);
|
| - Ins(scratch, t9, 0, kImm16Bits);
|
| - sw(scratch, MemOperand(li_location));
|
| -
|
| - lw(scratch, MemOperand(li_location, kInstrSize));
|
| - // scratch is now ori(at, ...).
|
| - if (emit_debug_code()) {
|
| - And(scratch, scratch, kOpcodeMask);
|
| - Check(eq, kTheInstructionToPatchShouldBeAnOri,
|
| - scratch, Operand(ORI));
|
| - lw(scratch, MemOperand(li_location, kInstrSize));
|
| - }
|
| - Ins(scratch, new_value, 0, kImm16Bits);
|
| - sw(scratch, MemOperand(li_location, kInstrSize));
|
| -
|
| - // Update the I-cache so the new lui and ori can be executed.
|
| - FlushICache(li_location, 2);
|
| -}
|
| -
|
| -void MacroAssembler::GetRelocatedValue(Register li_location,
|
| - Register value,
|
| - Register scratch) {
|
| - lw(value, MemOperand(li_location));
|
| - if (emit_debug_code()) {
|
| - And(value, value, kOpcodeMask);
|
| - Check(eq, kTheInstructionShouldBeALui,
|
| - value, Operand(LUI));
|
| - lw(value, MemOperand(li_location));
|
| - }
|
| -
|
| - // value now holds a lui instruction. Extract the immediate.
|
| - sll(value, value, kImm16Bits);
|
| -
|
| - lw(scratch, MemOperand(li_location, kInstrSize));
|
| - if (emit_debug_code()) {
|
| - And(scratch, scratch, kOpcodeMask);
|
| - Check(eq, kTheInstructionShouldBeAnOri,
|
| - scratch, Operand(ORI));
|
| - lw(scratch, MemOperand(li_location, kInstrSize));
|
| - }
|
| - // "scratch" now holds an ori instruction. Extract the immediate.
|
| - andi(scratch, scratch, kImm16Mask);
|
| -
|
| - // Merge the results.
|
| - or_(value, value, scratch);
|
| -}
|
| -
|
| -
|
| void MacroAssembler::CheckPageFlag(
|
| Register object,
|
| Register scratch,
|
|
|