97f8f91bb5
The SafeStackFrameIterator used by CPU profiler checked if Isolate::c_entry_fp is null and if it is not it would think that the control flow currently is in some native code. This assumption is wrong because the native code could have called a JS function but JSEntryStub would not reset c_entry_fp to NULL in that case. This CL adds a check in SafeStackFrameIterator::IsValidTop for the case when there is a JAVA_SCRIPT frame on top of EXIT frame. Also this CL changes ExternalCallbackScope behavior to provide access to the whole stack of the scope objects instead of only top one. This allowed to provide exact callback names for those EXIT frames where external callbacks are called. Without this change it was possible only for the top most native call. BUG=None R=loislo@chromium.org, yangguo@chromium.org Review URL: https://codereview.chromium.org/19775017 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15832 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
71 lines
2.4 KiB
C++
71 lines
2.4 KiB
C++
// Copyright 2010 the V8 project authors. All rights reserved.
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are
|
|
// met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright
|
|
// notice, this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above
|
|
// copyright notice, this list of conditions and the following
|
|
// disclaimer in the documentation and/or other materials provided
|
|
// with the distribution.
|
|
// * Neither the name of Google Inc. nor the names of its
|
|
// contributors may be used to endorse or promote products derived
|
|
// from this software without specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
#ifndef V8_VM_STATE_H_
|
|
#define V8_VM_STATE_H_
|
|
|
|
#include "allocation.h"
|
|
#include "isolate.h"
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
|
|
template <StateTag Tag>
|
|
class VMState BASE_EMBEDDED {
|
|
public:
|
|
explicit inline VMState(Isolate* isolate);
|
|
inline ~VMState();
|
|
|
|
private:
|
|
Isolate* isolate_;
|
|
StateTag previous_tag_;
|
|
};
|
|
|
|
|
|
class ExternalCallbackScope BASE_EMBEDDED {
|
|
public:
|
|
inline ExternalCallbackScope(Isolate* isolate, Address callback);
|
|
inline ~ExternalCallbackScope();
|
|
Address callback() { return callback_; }
|
|
Address* callback_address() { return &callback_; }
|
|
ExternalCallbackScope* previous() { return previous_scope_; }
|
|
inline Address scope_address();
|
|
|
|
private:
|
|
Isolate* isolate_;
|
|
Address callback_;
|
|
ExternalCallbackScope* previous_scope_;
|
|
#ifdef USE_SIMULATOR
|
|
Address scope_address_;
|
|
#endif
|
|
};
|
|
|
|
} } // namespace v8::internal
|
|
|
|
|
|
#endif // V8_VM_STATE_H_
|