| Index: src/ia32/macro-assembler-ia32.h
|
| ===================================================================
|
| --- src/ia32/macro-assembler-ia32.h (revision 9277)
|
| +++ src/ia32/macro-assembler-ia32.h (working copy)
|
| @@ -29,6 +29,7 @@
|
| #define V8_IA32_MACRO_ASSEMBLER_IA32_H_
|
|
|
| #include "assembler.h"
|
| +#include "frames.h"
|
| #include "v8globals.h"
|
|
|
| namespace v8 {
|
| @@ -105,15 +106,6 @@
|
| void DebugBreak();
|
| #endif
|
|
|
| - // ---------------------------------------------------------------------------
|
| - // Activation frames
|
| -
|
| - void EnterInternalFrame() { EnterFrame(StackFrame::INTERNAL); }
|
| - void LeaveInternalFrame() { LeaveFrame(StackFrame::INTERNAL); }
|
| -
|
| - void EnterConstructFrame() { EnterFrame(StackFrame::CONSTRUCT); }
|
| - void LeaveConstructFrame() { LeaveFrame(StackFrame::CONSTRUCT); }
|
| -
|
| // Enter specific kind of exit frame. Expects the number of
|
| // arguments in register eax and sets up the number of arguments in
|
| // register edi and the pointer to the first argument in register
|
| @@ -667,6 +659,9 @@
|
| bool generating_stub() { return generating_stub_; }
|
| void set_allow_stub_calls(bool value) { allow_stub_calls_ = value; }
|
| bool allow_stub_calls() { return allow_stub_calls_; }
|
| + void set_has_frame(bool value) { has_frame_ = value; }
|
| + bool has_frame() { return has_frame_; }
|
| + inline bool AllowThisStubCall(CodeStub* stub);
|
|
|
| // ---------------------------------------------------------------------------
|
| // String utilities.
|
| @@ -690,9 +685,14 @@
|
| return SafepointRegisterStackIndex(reg.code());
|
| }
|
|
|
| + // Activation support.
|
| + void EnterFrame(StackFrame::Type type);
|
| + void LeaveFrame(StackFrame::Type type);
|
| +
|
| private:
|
| bool generating_stub_;
|
| bool allow_stub_calls_;
|
| + bool has_frame_;
|
| // This handle will be patched with the code object on installation.
|
| Handle<Object> code_object_;
|
|
|
| @@ -707,10 +707,6 @@
|
| const CallWrapper& call_wrapper = NullCallWrapper(),
|
| CallKind call_kind = CALL_AS_METHOD);
|
|
|
| - // Activation support.
|
| - void EnterFrame(StackFrame::Type type);
|
| - void LeaveFrame(StackFrame::Type type);
|
| -
|
| void EnterExitFramePrologue();
|
| void EnterExitFrameEpilogue(int argc, bool save_doubles);
|
|
|
|
|