diff options
| author | Ben Murdoch <benm@google.com> | 2011-12-02 17:19:32 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:49 +0000 |
| commit | 3fb3ca8c7ca439d408449a395897395c0faae8d1 (patch) | |
| tree | 5cb33db083ae7ebe431e2a460fb3806c54531f9c /src/frames.h | |
| parent | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (diff) | |
| download | android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.gz android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.tar.bz2 android_external_v8-3fb3ca8c7ca439d408449a395897395c0faae8d1.zip | |
Upgrade to V8 3.4
Merge 3.4.14.35
Simple merge required updates to makefiles only.
Bug: 568872
Change-Id: I403a38452c547e06fcfa951c12eca12a1bc40978
Diffstat (limited to 'src/frames.h')
| -rw-r--r-- | src/frames.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/frames.h b/src/frames.h index aa91026f..f542a92d 100644 --- a/src/frames.h +++ b/src/frames.h @@ -383,6 +383,7 @@ class StandardFrame: public StackFrame { inline Object* GetExpression(int index) const; inline void SetExpression(int index, Object* value); int ComputeExpressionsCount() const; + static Object* GetExpression(Address fp, int index); virtual void SetCallerFp(Address caller_fp); @@ -411,6 +412,7 @@ class StandardFrame: public StackFrame { // Returns the address of the n'th expression stack element. Address GetExpressionAddress(int n) const; + static Address GetExpressionAddress(Address fp, int n); // Determines if the n'th expression stack element is in a stack // handler or not. Requires traversing all handlers in this frame. @@ -483,6 +485,7 @@ class JavaScriptFrame: public StandardFrame { // actual passed arguments are available in an arguments adaptor // frame below it on the stack. inline bool has_adapted_arguments() const; + int GetArgumentsLength() const; // Garbage collection support. virtual void Iterate(ObjectVisitor* v) const; @@ -495,6 +498,9 @@ class JavaScriptFrame: public StandardFrame { // Determine the code for the frame. virtual Code* unchecked_code() const; + // Returns the levels of inlining for this frame. + virtual int GetInlineCount() { return 1; } + // Return a list with JSFunctions of this frame. virtual void GetFunctions(List<JSFunction*>* functions); @@ -533,6 +539,8 @@ class OptimizedFrame : public JavaScriptFrame { // GC support. virtual void Iterate(ObjectVisitor* v) const; + virtual int GetInlineCount(); + // Return a list with JSFunctions of this frame. // The functions are ordered bottom-to-top (i.e. functions.last() // is the top-most activation) @@ -835,7 +843,6 @@ class SafeStackFrameIterator BASE_EMBEDDED { }; -#ifdef ENABLE_LOGGING_AND_PROFILING typedef JavaScriptFrameIteratorTemp<SafeStackFrameIterator> SafeJavaScriptFrameIterator; @@ -847,7 +854,6 @@ class SafeStackTraceFrameIterator: public SafeJavaScriptFrameIterator { Address low_bound, Address high_bound); void Advance(); }; -#endif class StackFrameLocator BASE_EMBEDDED { |
