Revision: 3962
Author: [email protected]
Date: Fri Feb 26 01:32:48 2010
Log: Inlining a few virtual frame functions.
Introducing a virtual-frame-inl.h file containing some platform-independent
virtual frame function which are small enough to be inlined.
Removed unnecessary #include of virtual-frame.h from
register-allocator-inl.h
and added the necessary explicit includes in a number of files.
Review URL: http://codereview.chromium.org/660104
http://code.google.com/p/v8/source/detail?r=3962
Added:
/branches/bleeding_edge/src/virtual-frame-inl.h
Modified:
/branches/bleeding_edge/src/arm/codegen-arm.cc
/branches/bleeding_edge/src/arm/codegen-arm.h
/branches/bleeding_edge/src/arm/fast-codegen-arm.cc
/branches/bleeding_edge/src/arm/full-codegen-arm.cc
/branches/bleeding_edge/src/arm/jump-target-arm.cc
/branches/bleeding_edge/src/arm/virtual-frame-arm.cc
/branches/bleeding_edge/src/arm/virtual-frame-arm.h
/branches/bleeding_edge/src/codegen-inl.h
/branches/bleeding_edge/src/codegen.cc
/branches/bleeding_edge/src/full-codegen.cc
/branches/bleeding_edge/src/ia32/codegen-ia32.cc
/branches/bleeding_edge/src/ia32/codegen-ia32.h
/branches/bleeding_edge/src/ia32/full-codegen-ia32.cc
/branches/bleeding_edge/src/ia32/jump-target-ia32.cc
/branches/bleeding_edge/src/ia32/register-allocator-ia32.cc
/branches/bleeding_edge/src/ia32/virtual-frame-ia32.cc
/branches/bleeding_edge/src/ia32/virtual-frame-ia32.h
/branches/bleeding_edge/src/jump-target-inl.h
/branches/bleeding_edge/src/jump-target.cc
/branches/bleeding_edge/src/register-allocator-inl.h
/branches/bleeding_edge/src/register-allocator.cc
/branches/bleeding_edge/src/virtual-frame.cc
/branches/bleeding_edge/src/x64/codegen-x64.cc
/branches/bleeding_edge/src/x64/codegen-x64.h
/branches/bleeding_edge/src/x64/fast-codegen-x64.cc
/branches/bleeding_edge/src/x64/full-codegen-x64.cc
/branches/bleeding_edge/src/x64/jump-target-x64.cc
/branches/bleeding_edge/src/x64/register-allocator-x64.cc
/branches/bleeding_edge/src/x64/virtual-frame-x64.cc
/branches/bleeding_edge/src/x64/virtual-frame-x64.h
/branches/bleeding_edge/tools/gyp/v8.gyp
/branches/bleeding_edge/tools/visual_studio/v8_base.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_base_arm.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_base_x64.vcproj
=======================================
--- /dev/null
+++ /branches/bleeding_edge/src/virtual-frame-inl.h Fri Feb 26 01:32:48 2010
@@ -0,0 +1,109 @@
+// Copyright 2008 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_VIRTUAL_FRAME_INL_H_
+#define V8_VIRTUAL_FRAME_INL_H_
+
+#include "virtual-frame.h"
+
+namespace v8 {
+namespace internal {
+
+// When cloned, a frame is a deep copy of the original.
+VirtualFrame::VirtualFrame(VirtualFrame* original)
+ : elements_(original->element_count()),
+ stack_pointer_(original->stack_pointer_) {
+ elements_.AddAll(original->elements_);
+ // Copy register locations from original.
+ memcpy(®ister_locations_,
+ original->register_locations_,
+ sizeof(register_locations_));
+}
+
+
+void VirtualFrame::PushFrameSlotAt(int index) {
+ elements_.Add(CopyElementAt(index));
+}
+
+
+void VirtualFrame::Push(Register reg, NumberInfo::Type info) {
+ if (is_used(reg)) {
+ int index = register_location(reg);
+ FrameElement element = CopyElementAt(index, info);
+ elements_.Add(element);
+ } else {
+ Use(reg, element_count());
+ FrameElement element =
+ FrameElement::RegisterElement(reg, FrameElement::NOT_SYNCED, info);
+ elements_.Add(element);
+ }
+}
+
+
+void VirtualFrame::Push(Handle<Object> value) {
+ FrameElement element =
+ FrameElement::ConstantElement(value, FrameElement::NOT_SYNCED);
+ elements_.Add(element);
+}
+
+
+void VirtualFrame::Push(Smi* value) {
+ Push(Handle<Object> (value));
+}
+
+
+void VirtualFrame::Nip(int num_dropped) {
+ ASSERT(num_dropped >= 0);
+ if (num_dropped == 0) return;
+ Result tos = Pop();
+ if (num_dropped > 1) {
+ Drop(num_dropped - 1);
+ }
+ SetElementAt(0, &tos);
+}
+
+
+bool VirtualFrame::Equals(VirtualFrame* other) {
+#ifdef DEBUG
+ for (int i = 0; i < RegisterAllocator::kNumRegisters; i++) {
+ if (register_location(i) != other->register_location(i)) {
+ return false;
+ }
+ }
+ if (element_count() != other->element_count()) return false;
+#endif
+ if (stack_pointer_ != other->stack_pointer_) return false;
+ for (int i = 0; i < element_count(); i++) {
+ if (!elements_[i].Equals(other->elements_[i])) return false;
+ }
+
+ return true;
+}
+
+} } // namespace v8::internal
+
+#endif // V8_VIRTUAL_FRAME_INL_H_
=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.cc Wed Feb 24 00:33:51 2010
+++ /branches/bleeding_edge/src/arm/codegen-arm.cc Fri Feb 26 01:32:48 2010
@@ -35,7 +35,7 @@
#include "register-allocator-inl.h"
#include "runtime.h"
#include "scopes.h"
-
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
@@ -131,9 +131,6 @@
state_(NULL),
function_return_is_shadowed_(false) {
}
-
-
-Scope* CodeGenerator::scope() { return info_->function()->scope(); }
// Calling conventions:
=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.h Tue Feb 23 02:29:02 2010
+++ /branches/bleeding_edge/src/arm/codegen-arm.h Fri Feb 26 01:32:48 2010
@@ -203,7 +203,7 @@
// Accessors
inline bool is_eval();
- Scope* scope();
+ inline Scope* scope();
// Generating deferred code.
void ProcessDeferred();
=======================================
--- /branches/bleeding_edge/src/arm/fast-codegen-arm.cc Tue Feb 23 04:40:36
2010
+++ /branches/bleeding_edge/src/arm/fast-codegen-arm.cc Fri Feb 26 01:32:48
2010
@@ -29,6 +29,7 @@
#include "codegen-inl.h"
#include "fast-codegen.h"
+#include "scopes.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/arm/full-codegen-arm.cc Tue Feb 23 04:40:36
2010
+++ /branches/bleeding_edge/src/arm/full-codegen-arm.cc Fri Feb 26 01:32:48
2010
@@ -32,6 +32,7 @@
#include "debug.h"
#include "full-codegen.h"
#include "parser.h"
+#include "scopes.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/arm/jump-target-arm.cc Wed Sep 9 03:49:40
2009
+++ /branches/bleeding_edge/src/arm/jump-target-arm.cc Fri Feb 26 01:32:48
2010
@@ -30,6 +30,7 @@
#include "codegen-inl.h"
#include "jump-target-inl.h"
#include "register-allocator-inl.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/arm/virtual-frame-arm.cc Mon Feb 15
06:47:03 2010
+++ /branches/bleeding_edge/src/arm/virtual-frame-arm.cc Fri Feb 26
01:32:48 2010
@@ -30,6 +30,7 @@
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "scopes.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/arm/virtual-frame-arm.h Mon Feb 15 06:47:03
2010
+++ /branches/bleeding_edge/src/arm/virtual-frame-arm.h Fri Feb 26 01:32:48
2010
@@ -62,7 +62,7 @@
VirtualFrame();
// Construct a virtual frame as a clone of an existing one.
- explicit VirtualFrame(VirtualFrame* original);
+ explicit inline VirtualFrame(VirtualFrame* original);
CodeGenerator* cgen() { return CodeGeneratorScope::Current(); }
MacroAssembler* masm() { return cgen()->masm(); }
@@ -344,9 +344,9 @@
void EmitPushMultiple(int count, int src_regs);
// Push an element on the virtual frame.
- void Push(Register reg, NumberInfo::Type info = NumberInfo::kUnknown);
- void Push(Handle<Object> value);
- void Push(Smi* value) { Push(Handle<Object>(value)); }
+ inline void Push(Register reg, NumberInfo::Type info =
NumberInfo::kUnknown);
+ inline void Push(Handle<Object> value);
+ inline void Push(Smi* value);
// Pushing a result invalidates it (its contents become owned by the
frame).
void Push(Result* result) {
@@ -362,7 +362,7 @@
// Nip removes zero or more elements from immediately below the top
// of the frame, leaving the previous top-of-frame value on top of
// the frame. Nip(k) is equivalent to x = Pop(), Drop(k), Push(x).
- void Nip(int num_dropped);
+ inline void Nip(int num_dropped);
private:
static const int kLocal0Offset = JavaScriptFrameConstants::kLocal0Offset;
@@ -457,7 +457,7 @@
// Push a copy of a frame slot (typically a local or parameter) on top of
// the frame.
- void PushFrameSlotAt(int index);
+ inline void PushFrameSlotAt(int index);
// Push a the value of a frame slot (typically a local or parameter) on
// top of the frame and invalidate the slot.
@@ -500,7 +500,7 @@
// Register counts are correctly updated.
int InvalidateFrameSlotAt(int index);
- bool Equals(VirtualFrame* other);
+ inline bool Equals(VirtualFrame* other);
// Classes that need raw access to the elements_ array.
friend class DeferredCode;
=======================================
--- /branches/bleeding_edge/src/codegen-inl.h Mon Feb 8 00:54:27 2010
+++ /branches/bleeding_edge/src/codegen-inl.h Fri Feb 26 01:32:48 2010
@@ -50,7 +50,10 @@
namespace internal {
Handle<Script> CodeGenerator::script() { return info_->script(); }
+
bool CodeGenerator::is_eval() { return info_->is_eval(); }
+
+Scope* CodeGenerator::scope() { return info_->function()->scope(); }
} } // namespace v8::internal
=======================================
--- /branches/bleeding_edge/src/codegen.cc Tue Feb 23 02:29:02 2010
+++ /branches/bleeding_edge/src/codegen.cc Fri Feb 26 01:32:48 2010
@@ -39,6 +39,7 @@
#include "runtime.h"
#include "scopeinfo.h"
#include "stub-cache.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/full-codegen.cc Thu Feb 18 04:59:41 2010
+++ /branches/bleeding_edge/src/full-codegen.cc Fri Feb 26 01:32:48 2010
@@ -30,6 +30,7 @@
#include "codegen-inl.h"
#include "compiler.h"
#include "full-codegen.h"
+#include "scopes.h"
#include "stub-cache.h"
#include "debug.h"
#include "liveedit.h"
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.cc Thu Feb 25 10:04:25
2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.cc Fri Feb 26 01:32:48
2010
@@ -39,6 +39,7 @@
#include "register-allocator-inl.h"
#include "runtime.h"
#include "scopes.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
@@ -114,9 +115,6 @@
function_return_is_shadowed_(false),
in_spilled_code_(false) {
}
-
-
-Scope* CodeGenerator::scope() { return info_->function()->scope(); }
// Calling conventions:
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.h Tue Feb 23 02:29:02 2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.h Fri Feb 26 01:32:48 2010
@@ -343,7 +343,7 @@
// Accessors
inline bool is_eval();
- Scope* scope();
+ inline Scope* scope();
// Generating deferred code.
void ProcessDeferred();
=======================================
--- /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Thu Feb 25
10:04:25 2010
+++ /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Fri Feb 26
01:32:48 2010
@@ -32,6 +32,7 @@
#include "debug.h"
#include "full-codegen.h"
#include "parser.h"
+#include "scopes.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/ia32/jump-target-ia32.cc Wed Sep 9
03:49:40 2009
+++ /branches/bleeding_edge/src/ia32/jump-target-ia32.cc Fri Feb 26
01:32:48 2010
@@ -30,6 +30,7 @@
#include "codegen-inl.h"
#include "jump-target-inl.h"
#include "register-allocator-inl.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/ia32/register-allocator-ia32.cc Mon Nov 16
15:11:19 2009
+++ /branches/bleeding_edge/src/ia32/register-allocator-ia32.cc Fri Feb 26
01:32:48 2010
@@ -29,6 +29,7 @@
#include "codegen-inl.h"
#include "register-allocator-inl.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/ia32/virtual-frame-ia32.cc Thu Feb 25
10:04:25 2010
+++ /branches/bleeding_edge/src/ia32/virtual-frame-ia32.cc Fri Feb 26
01:32:48 2010
@@ -30,6 +30,7 @@
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "scopes.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/ia32/virtual-frame-ia32.h Thu Feb 25
10:04:25 2010
+++ /branches/bleeding_edge/src/ia32/virtual-frame-ia32.h Fri Feb 26
01:32:48 2010
@@ -76,7 +76,7 @@
VirtualFrame();
// Construct a virtual frame as a clone of an existing one.
- explicit VirtualFrame(VirtualFrame* original);
+ explicit inline VirtualFrame(VirtualFrame* original);
CodeGenerator* cgen() { return CodeGeneratorScope::Current(); }
@@ -395,11 +395,9 @@
NumberInfo::Type info = NumberInfo::kUnknown);
// Push an element on the virtual frame.
- void Push(Register reg, NumberInfo::Type info = NumberInfo::kUnknown);
- void Push(Handle<Object> value);
- void Push(Smi* value) {
- Push(Handle<Object> (value));
- }
+ inline void Push(Register reg, NumberInfo::Type info =
NumberInfo::kUnknown);
+ inline void Push(Handle<Object> value);
+ inline void Push(Smi* value);
// Pushing a result invalidates it (its contents become owned by the
// frame).
@@ -422,7 +420,7 @@
// Nip removes zero or more elements from immediately below the top
// of the frame, leaving the previous top-of-frame value on top of
// the frame. Nip(k) is equivalent to x = Pop(), Drop(k), Push(x).
- void Nip(int num_dropped);
+ inline void Nip(int num_dropped);
private:
static const int kLocal0Offset = JavaScriptFrameConstants::kLocal0Offset;
@@ -530,7 +528,7 @@
// Push a copy of a frame slot (typically a local or parameter) on top of
// the frame.
- void PushFrameSlotAt(int index);
+ inline void PushFrameSlotAt(int index);
// Push a the value of a frame slot (typically a local or parameter) on
// top of the frame and invalidate the slot.
@@ -589,7 +587,7 @@
// (via PrepareForCall).
Result RawCallCodeObject(Handle<Code> code, RelocInfo::Mode rmode);
- bool Equals(VirtualFrame* other);
+ inline bool Equals(VirtualFrame* other);
// Classes that need raw access to the elements_ array.
friend class DeferredCode;
=======================================
--- /branches/bleeding_edge/src/jump-target-inl.h Mon Feb 22 07:42:23 2010
+++ /branches/bleeding_edge/src/jump-target-inl.h Fri Feb 26 01:32:48 2010
@@ -28,6 +28,8 @@
#ifndef V8_JUMP_TARGET_INL_H_
#define V8_JUMP_TARGET_INL_H_
+#include "virtual-frame-inl.h"
+
namespace v8 {
namespace internal {
@@ -36,14 +38,15 @@
}
void JumpTarget::InitializeEntryElement(int index, FrameElement* target) {
- entry_frame_->elements_[index].clear_copied();
+ FrameElement* element = &entry_frame_->elements_[index];
+ element->clear_copied();
if (target->is_register()) {
entry_frame_->set_register_location(target->reg(), index);
} else if (target->is_copy()) {
entry_frame_->elements_[target->index()].set_copied();
}
if (direction_ == BIDIRECTIONAL && !target->is_copy()) {
- entry_frame_->elements_[index].set_number_info(NumberInfo::kUnknown);
+ element->set_number_info(NumberInfo::kUnknown);
}
}
=======================================
--- /branches/bleeding_edge/src/jump-target.cc Mon Feb 22 07:42:23 2010
+++ /branches/bleeding_edge/src/jump-target.cc Fri Feb 26 01:32:48 2010
@@ -100,9 +100,8 @@
// change our decision about undetermined or invalid elements.
if (element == NULL || !element->is_valid()) break;
- element = element->Combine(&reaching_frames_[j]->elements_[i]);
-
FrameElement* other = &reaching_frames_[j]->elements_[i];
+ element = element->Combine(other);
if (element != NULL && !element->is_copy()) {
ASSERT(other != NULL);
// We overwrite the number information of one of the incoming
frames.
=======================================
--- /branches/bleeding_edge/src/register-allocator-inl.h Mon Feb 8
06:33:34 2010
+++ /branches/bleeding_edge/src/register-allocator-inl.h Fri Feb 26
01:32:48 2010
@@ -30,7 +30,6 @@
#include "codegen.h"
#include "register-allocator.h"
-#include "virtual-frame.h"
#if V8_TARGET_ARCH_IA32
#include "ia32/register-allocator-ia32-inl.h"
=======================================
--- /branches/bleeding_edge/src/register-allocator.cc Mon Feb 15 06:24:38
2010
+++ /branches/bleeding_edge/src/register-allocator.cc Fri Feb 26 01:32:48
2010
@@ -29,6 +29,7 @@
#include "codegen-inl.h"
#include "register-allocator-inl.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/virtual-frame.cc Mon Feb 15 06:24:38 2010
+++ /branches/bleeding_edge/src/virtual-frame.cc Fri Feb 26 01:32:48 2010
@@ -29,6 +29,7 @@
#include "codegen-inl.h"
#include "register-allocator-inl.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
@@ -36,18 +37,6 @@
//
-------------------------------------------------------------------------
// VirtualFrame implementation.
-// When cloned, a frame is a deep copy of the original.
-VirtualFrame::VirtualFrame(VirtualFrame* original)
- : elements_(original->element_count()),
- stack_pointer_(original->stack_pointer_) {
- elements_.AddAll(original->elements_);
- // Copy register locations from original.
- memcpy(®ister_locations_,
- original->register_locations_,
- sizeof(register_locations_));
-}
-
-
// Create a duplicate of an existing valid frame element.
// We can pass an optional number type information that will override the
// existing information about the backing element. The new information must
@@ -336,61 +325,6 @@
}
value->Unuse();
}
-
-
-void VirtualFrame::PushFrameSlotAt(int index) {
- elements_.Add(CopyElementAt(index));
-}
-
-
-void VirtualFrame::Push(Register reg, NumberInfo::Type info) {
- if (is_used(reg)) {
- int index = register_location(reg);
- FrameElement element = CopyElementAt(index, info);
- elements_.Add(element);
- } else {
- Use(reg, element_count());
- FrameElement element =
- FrameElement::RegisterElement(reg, FrameElement::NOT_SYNCED, info);
- elements_.Add(element);
- }
-}
-
-
-void VirtualFrame::Push(Handle<Object> value) {
- FrameElement element =
- FrameElement::ConstantElement(value, FrameElement::NOT_SYNCED);
- elements_.Add(element);
-}
-
-
-void VirtualFrame::Nip(int num_dropped) {
- ASSERT(num_dropped >= 0);
- if (num_dropped == 0) return;
- Result tos = Pop();
- if (num_dropped > 1) {
- Drop(num_dropped - 1);
- }
- SetElementAt(0, &tos);
-}
-
-
-bool VirtualFrame::Equals(VirtualFrame* other) {
-#ifdef DEBUG
- for (int i = 0; i < RegisterAllocator::kNumRegisters; i++) {
- if (register_location(i) != other->register_location(i)) {
- return false;
- }
- }
- if (element_count() != other->element_count()) return false;
-#endif
- if (stack_pointer_ != other->stack_pointer_) return false;
- for (int i = 0; i < element_count(); i++) {
- if (!elements_[i].Equals(other->elements_[i])) return false;
- }
-
- return true;
-}
// Specialization of List::ResizeAdd to non-inlined version for
FrameElements.
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Thu Feb 25 05:06:05 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Fri Feb 26 01:32:48 2010
@@ -36,6 +36,7 @@
#include "regexp-macro-assembler.h"
#include "register-allocator-inl.h"
#include "scopes.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
@@ -257,9 +258,6 @@
function_return_is_shadowed_(false),
in_spilled_code_(false) {
}
-
-
-Scope* CodeGenerator::scope() { return info_->function()->scope(); }
void CodeGenerator::DeclareGlobals(Handle<FixedArray> pairs) {
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.h Tue Feb 23 02:29:02 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.h Fri Feb 26 01:32:48 2010
@@ -343,7 +343,7 @@
// Accessors
inline bool is_eval();
- Scope* scope();
+ inline Scope* scope();
// Generating deferred code.
void ProcessDeferred();
=======================================
--- /branches/bleeding_edge/src/x64/fast-codegen-x64.cc Tue Feb 23 04:40:36
2010
+++ /branches/bleeding_edge/src/x64/fast-codegen-x64.cc Fri Feb 26 01:32:48
2010
@@ -29,6 +29,7 @@
#include "codegen-inl.h"
#include "fast-codegen.h"
+#include "scopes.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/x64/full-codegen-x64.cc Tue Feb 23 04:40:36
2010
+++ /branches/bleeding_edge/src/x64/full-codegen-x64.cc Fri Feb 26 01:32:48
2010
@@ -32,6 +32,7 @@
#include "debug.h"
#include "full-codegen.h"
#include "parser.h"
+#include "scopes.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/x64/jump-target-x64.cc Thu Aug 27 23:18:36
2009
+++ /branches/bleeding_edge/src/x64/jump-target-x64.cc Fri Feb 26 01:32:48
2010
@@ -30,6 +30,7 @@
#include "codegen-inl.h"
#include "jump-target-inl.h"
#include "register-allocator-inl.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/x64/register-allocator-x64.cc Thu Aug 27
23:18:36 2009
+++ /branches/bleeding_edge/src/x64/register-allocator-x64.cc Fri Feb 26
01:32:48 2010
@@ -29,6 +29,7 @@
#include "codegen-inl.h"
#include "register-allocator-inl.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/x64/virtual-frame-x64.cc Wed Feb 17
05:16:53 2010
+++ /branches/bleeding_edge/src/x64/virtual-frame-x64.cc Fri Feb 26
01:32:48 2010
@@ -30,6 +30,7 @@
#include "codegen-inl.h"
#include "register-allocator-inl.h"
#include "scopes.h"
+#include "virtual-frame-inl.h"
namespace v8 {
namespace internal {
=======================================
--- /branches/bleeding_edge/src/x64/virtual-frame-x64.h Mon Feb 15 06:24:38
2010
+++ /branches/bleeding_edge/src/x64/virtual-frame-x64.h Fri Feb 26 01:32:48
2010
@@ -76,7 +76,7 @@
VirtualFrame();
// Construct a virtual frame as a clone of an existing one.
- explicit VirtualFrame(VirtualFrame* original);
+ explicit inline VirtualFrame(VirtualFrame* original);
CodeGenerator* cgen() { return CodeGeneratorScope::Current(); }
MacroAssembler* masm() { return cgen()->masm(); }
@@ -395,9 +395,9 @@
void EmitPush(Handle<Object> value);
// Push an element on the virtual frame.
- void Push(Register reg, NumberInfo::Type info = NumberInfo::kUnknown);
- void Push(Handle<Object> value);
- void Push(Smi* value) { Push(Handle<Object>(value)); }
+ inline void Push(Register reg, NumberInfo::Type info =
NumberInfo::kUnknown);
+ inline void Push(Handle<Object> value);
+ inline void Push(Smi* value);
// Pushing a result invalidates it (its contents become owned by the
// frame).
@@ -414,7 +414,7 @@
// Nip removes zero or more elements from immediately below the top
// of the frame, leaving the previous top-of-frame value on top of
// the frame. Nip(k) is equivalent to x = Pop(), Drop(k), Push(x).
- void Nip(int num_dropped);
+ inline void Nip(int num_dropped);
private:
static const int kLocal0Offset = JavaScriptFrameConstants::kLocal0Offset;
@@ -506,7 +506,7 @@
// Push a copy of a frame slot (typically a local or parameter) on top of
// the frame.
- void PushFrameSlotAt(int index);
+ inline void PushFrameSlotAt(int index);
// Push a the value of a frame slot (typically a local or parameter) on
// top of the frame and invalidate the slot.
@@ -557,7 +557,7 @@
// (via PrepareForCall).
Result RawCallCodeObject(Handle<Code> code, RelocInfo::Mode rmode);
- bool Equals(VirtualFrame* other);
+ inline bool Equals(VirtualFrame* other);
// Classes that need raw access to the elements_ array.
friend class DeferredCode;
=======================================
--- /branches/bleeding_edge/tools/gyp/v8.gyp Wed Feb 24 00:30:12 2010
+++ /branches/bleeding_edge/tools/gyp/v8.gyp Fri Feb 26 01:32:48 2010
@@ -390,6 +390,7 @@
'../../src/variables.h',
'../../src/version.cc',
'../../src/version.h',
+ '../../src/virtual-frame-inl.h',
'../../src/virtual-frame.h',
'../../src/virtual-frame.cc',
'../../src/zone-inl.h',
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_base.vcproj Fri Feb 19
01:17:37 2010
+++ /branches/bleeding_edge/tools/visual_studio/v8_base.vcproj Fri Feb 26
01:32:48 2010
@@ -935,6 +935,10 @@
<File
RelativePath="..\..\src\version.h"
>
+ </File>
+ <File
+ RelativePath="..\..\src\virtual-frame-inl.h"
+ >
</File>
<File
RelativePath="..\..\src\virtual-frame.h"
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_base_arm.vcproj Wed Feb
17 12:37:08 2010
+++ /branches/bleeding_edge/tools/visual_studio/v8_base_arm.vcproj Fri Feb
26 01:32:48 2010
@@ -947,6 +947,10 @@
<File
RelativePath="..\..\src\version.h"
>
+ </File>
+ <File
+ RelativePath="..\..\src\virtual-frame-inl.h"
+ >
</File>
<File
RelativePath="..\..\src\virtual-frame.h"
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_base_x64.vcproj Wed Feb
17 12:37:08 2010
+++ /branches/bleeding_edge/tools/visual_studio/v8_base_x64.vcproj Fri Feb
26 01:32:48 2010
@@ -936,6 +936,10 @@
<File
RelativePath="..\..\src\version.h"
>
+ </File>
+ <File
+ RelativePath="..\..\src\virtual-frame-inl.h"
+ >
</File>
<File
RelativePath="..\..\src\virtual-frame.h"
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
