Index: src/mips/macro-assembler-mips.cc |
diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc |
index 6c07e6863af97f882c20c16f97a2b356775a9ca5..ae44b3d4db197cee34996f7e29fba11afb8322e1 100644 |
--- a/src/mips/macro-assembler-mips.cc |
+++ b/src/mips/macro-assembler-mips.cc |
@@ -3270,101 +3270,6 @@ void MacroAssembler::PopTryHandler() { |
} |
-void MacroAssembler::JumpToHandlerEntry() { |
- // Compute the handler entry address and jump to it. The handler table is |
- // a fixed array of (smi-tagged) code offsets. |
- // v0 = exception, a1 = code object, a2 = state. |
- lw(a3, FieldMemOperand(a1, Code::kHandlerTableOffset)); // Handler table. |
- Addu(a3, a3, Operand(FixedArray::kHeaderSize - kHeapObjectTag)); |
- srl(a2, a2, StackHandler::kKindWidth); // Handler index. |
- sll(a2, a2, kPointerSizeLog2); |
- Addu(a2, a3, a2); |
- lw(a2, MemOperand(a2)); // Smi-tagged offset. |
- Addu(a1, a1, Operand(Code::kHeaderSize - kHeapObjectTag)); // Code start. |
- sra(t9, a2, kSmiTagSize); |
- Addu(t9, t9, a1); |
- Jump(t9); // Jump. |
-} |
- |
- |
-void MacroAssembler::Throw(Register value) { |
- // Adjust this code if not the case. |
- STATIC_ASSERT(StackHandlerConstants::kSize == 5 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0); |
- STATIC_ASSERT(StackHandlerConstants::kCodeOffset == 1 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kStateOffset == 2 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kContextOffset == 3 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kFPOffset == 4 * kPointerSize); |
- |
- // The exception is expected in v0. |
- Move(v0, value); |
- |
- // Drop the stack pointer to the top of the top handler. |
- li(a3, Operand(ExternalReference(Isolate::kHandlerAddress, |
- isolate()))); |
- lw(sp, MemOperand(a3)); |
- |
- // Restore the next handler. |
- pop(a2); |
- sw(a2, MemOperand(a3)); |
- |
- // Get the code object (a1) and state (a2). Restore the context and frame |
- // pointer. |
- MultiPop(a1.bit() | a2.bit() | cp.bit() | fp.bit()); |
- |
- // If the handler is a JS frame, restore the context to the frame. |
- // (kind == ENTRY) == (fp == 0) == (cp == 0), so we could test either fp |
- // or cp. |
- Label done; |
- Branch(&done, eq, cp, Operand(zero_reg)); |
- sw(cp, MemOperand(fp, StandardFrameConstants::kContextOffset)); |
- bind(&done); |
- |
- JumpToHandlerEntry(); |
-} |
- |
- |
-void MacroAssembler::ThrowUncatchable(Register value) { |
- // Adjust this code if not the case. |
- STATIC_ASSERT(StackHandlerConstants::kSize == 5 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kCodeOffset == 1 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kStateOffset == 2 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kContextOffset == 3 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kFPOffset == 4 * kPointerSize); |
- |
- // The exception is expected in v0. |
- if (!value.is(v0)) { |
- mov(v0, value); |
- } |
- // Drop the stack pointer to the top of the top stack handler. |
- li(a3, Operand(ExternalReference(Isolate::kHandlerAddress, isolate()))); |
- lw(sp, MemOperand(a3)); |
- |
- // Unwind the handlers until the ENTRY handler is found. |
- Label fetch_next, check_kind; |
- jmp(&check_kind); |
- bind(&fetch_next); |
- lw(sp, MemOperand(sp, StackHandlerConstants::kNextOffset)); |
- |
- bind(&check_kind); |
- STATIC_ASSERT(StackHandler::JS_ENTRY == 0); |
- lw(a2, MemOperand(sp, StackHandlerConstants::kStateOffset)); |
- And(a2, a2, Operand(StackHandler::KindField::kMask)); |
- Branch(&fetch_next, ne, a2, Operand(zero_reg)); |
- |
- // Set the top handler address to next handler past the top ENTRY handler. |
- pop(a2); |
- sw(a2, MemOperand(a3)); |
- |
- // Get the code object (a1) and state (a2). Clear the context and frame |
- // pointer (0 was saved in the handler). |
- MultiPop(a1.bit() | a2.bit() | cp.bit() | fp.bit()); |
- |
- JumpToHandlerEntry(); |
-} |
- |
- |
void MacroAssembler::Allocate(int object_size, |
Register result, |
Register scratch1, |