Index: src/ia32/macro-assembler-ia32.cc |
diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc |
index 365ad3cc0ef40c58313058bca7d9949967196414..f35d16a3231fc259c00c69921d9c53a7cf13b567 100644 |
--- a/src/ia32/macro-assembler-ia32.cc |
+++ b/src/ia32/macro-assembler-ia32.cc |
@@ -1023,34 +1023,21 @@ void MacroAssembler::LeaveApiExitFrame(bool restore_context) { |
} |
-void MacroAssembler::PushTryHandler(StackHandler::Kind kind, |
- int handler_index) { |
+void MacroAssembler::PushStackHandler() { |
// Adjust this code if not the case. |
- STATIC_ASSERT(StackHandlerConstants::kSize == 3 * kPointerSize); |
+ STATIC_ASSERT(StackHandlerConstants::kSize == 1 * kPointerSize); |
STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0); |
- STATIC_ASSERT(StackHandlerConstants::kStateOffset == 1 * kPointerSize); |
- STATIC_ASSERT(StackHandlerConstants::kContextOffset == 2 * kPointerSize); |
- |
- // We will build up the handler from the bottom by pushing on the stack. |
- // First push the context. |
- if (kind == StackHandler::JS_ENTRY) { |
- push(Immediate(Smi::FromInt(0))); // No context. |
- } else { |
- push(esi); |
- } |
- |
- // Push the index. |
- push(Immediate(handler_index)); |
// Link the current handler as the next handler. |
ExternalReference handler_address(Isolate::kHandlerAddress, isolate()); |
push(Operand::StaticVariable(handler_address)); |
+ |
// Set this new handler as the current one. |
mov(Operand::StaticVariable(handler_address), esp); |
} |
-void MacroAssembler::PopTryHandler() { |
+void MacroAssembler::PopStackHandler() { |
STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0); |
ExternalReference handler_address(Isolate::kHandlerAddress, isolate()); |
pop(Operand::StaticVariable(handler_address)); |