Reviewers: Vyacheslav Egorov,
Description:
Move the is_pregenerated flag so it does not overlap other flags.
Remove the before-or-after InstanceOf stub rule, which was too
subtle and lacked checking ssertions.
Unify the way the CEntry stub is pregenerated so that it is done
in the same way.
Please review this at http://codereview.chromium.org/8065006/
SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/
Affected files:
M src/arm/code-stubs-arm.cc
M src/code-stubs.h
M src/code-stubs.cc
M src/heap.cc
M src/ia32/code-stubs-ia32.cc
M src/objects.h
M src/x64/code-stubs-x64.cc
Index: src/arm/code-stubs-arm.cc
===================================================================
--- src/arm/code-stubs-arm.cc (revision 9462)
+++ src/arm/code-stubs-arm.cc (working copy)
@@ -3405,6 +3405,7 @@
void CodeStub::GenerateStubsAheadOfTime() {
+ CEntryStub::GenerateFixedRegStubsAheadOfTime();
WriteInt32ToHeapNumberStub::GenerateFixedRegStubsAheadOfTime();
StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime();
RecordWriteStub::GenerateFixedRegStubsAheadOfTime();
@@ -3419,6 +3420,13 @@
}
+void CEntryStub::GenerateFixedRegStubsAheadOfTime() {
+ CEntryStub stub(1, kDontSaveFPRegs);
+ Handle<Code> code = stub.GetCode();
+ code->set_is_pregenerated(true);
+}
+
+
void CEntryStub::GenerateThrowTOS(MacroAssembler* masm) {
__ Throw(r0);
}
Index: src/code-stubs.cc
===================================================================
--- src/code-stubs.cc (revision 9462)
+++ src/code-stubs.cc (working copy)
@@ -130,6 +130,8 @@
heap->public_set_code_stubs(*dict);
code = *new_object;
Activate(code);
+ } else {
+ ASSERT(IsPregenerated() == code->is_pregenerated());
}
ASSERT(!NeedsImmovableCode() || heap->lo_space()->Contains(code));
Index: src/code-stubs.h
===================================================================
--- src/code-stubs.h (revision 9462)
+++ src/code-stubs.h (working copy)
@@ -50,13 +50,6 @@
V(RegExpExec) \
V(TranscendentalCache) \
V(Instanceof) \
- /* All stubs above this line only exist in a few versions, which are
*/ \
- /* generated ahead of time. Therefore compiling a call to one of
*/ \
- /* them can't cause a new stub to be compiled, so compiling a call to
*/ \
- /* them is GC safe. The ones below this line exist in many variants
*/ \
- /* so code compiling a call to one can cause a GC. This means they
*/ \
- /* can't be called from other stubs, since stub generation code is
*/ \
- /* not GC safe.
*/ \
V(ConvertToDouble) \
V(WriteInt32ToHeapNumber) \
V(StackCheck) \
@@ -154,9 +147,7 @@
}
// See comment above, where Instanceof is defined.
- virtual bool IsPregenerated() {
- return MajorKey() <= Instanceof;
- }
+ virtual bool IsPregenerated() { return false; }
static void GenerateStubsAheadOfTime();
static void GenerateFPStubs();
@@ -574,6 +565,7 @@
// their code generation. On machines that always have gp registers
(x64) we
// can generate both variants ahead of time.
virtual bool IsPregenerated();
+ static void GenerateFixedRegStubsAheadOfTime();
private:
void GenerateCore(MacroAssembler* masm,
Index: src/heap.cc
===================================================================
--- src/heap.cc (revision 9462)
+++ src/heap.cc (working copy)
@@ -2170,9 +2170,6 @@
// create them if we need them during the creation of another stub.
// Stub creation mixes raw pointers and handles in an unsafe manner so
// we cannot create stubs while we are creating stubs.
- CEntryStub ces(1);
- ces.GetCode();
-
CodeStub::GenerateStubsAheadOfTime();
}
Index: src/ia32/code-stubs-ia32.cc
===================================================================
--- src/ia32/code-stubs-ia32.cc (revision 9462)
+++ src/ia32/code-stubs-ia32.cc (working copy)
@@ -4415,6 +4415,7 @@
void CodeStub::GenerateStubsAheadOfTime() {
+ CEntryStub::GenerateFixedRegStubsAheadOfTime();
StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime();
// It is important that the store buffer overflow stubs are generated
first.
RecordWriteStub::GenerateFixedRegStubsAheadOfTime();
@@ -4429,6 +4430,13 @@
}
+void CEntryStub::GenerateFixedRegStubsAheadOfTime() {
+ CEntryStub stub(1, kDontSaveFPRegs);
+ Handle<Code> code = stub.GetCode();
+ code->set_is_pregenerated(true);
+}
+
+
void CEntryStub::GenerateThrowTOS(MacroAssembler* masm) {
__ Throw(eax);
}
Index: src/objects.h
===================================================================
--- src/objects.h (revision 9462)
+++ src/objects.h (working copy)
@@ -3888,7 +3888,7 @@
class IsPregeneratedField: public BitField<bool, 14, 1> {};
// Signed field cannot be encoded using the BitField class.
- static const int kArgumentsCountShift = 14;
+ static const int kArgumentsCountShift = 15;
static const int kArgumentsCountMask = ~((1 << kArgumentsCountShift) -
1);
static const int kFlagsNotUsedInLookup =
Index: src/x64/code-stubs-x64.cc
===================================================================
--- src/x64/code-stubs-x64.cc (revision 9462)
+++ src/x64/code-stubs-x64.cc (working copy)
@@ -3370,13 +3370,16 @@
bool CEntryStub::IsPregenerated() {
+#ifdef _WIN64
return result_size_ == 1;
+#else
+ return true;
+#endif
}
void CodeStub::GenerateStubsAheadOfTime() {
- CEntryStub save_doubles(1, kSaveFPRegs);
- save_doubles.GetCode()->set_is_pregenerated(true);
+ CEntryStub::GenerateFixedRegStubsAheadOfTime();
StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime();
// It is important that the store buffer overflow stubs are generated
first.
RecordWriteStub::GenerateFixedRegStubsAheadOfTime();
@@ -3387,6 +3390,14 @@
}
+void CEntryStub::GenerateFixedRegStubsAheadOfTime() {
+ CEntryStub stub(1, kDontSaveFPRegs);
+ stub.GetCode()->set_is_pregenerated(true);
+ CEntryStub save_doubles(1, kSaveFPRegs);
+ save_doubles.GetCode()->set_is_pregenerated(true);
+}
+
+
void CEntryStub::GenerateThrowTOS(MacroAssembler* masm) {
// Throw exception in eax.
__ Throw(rax);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
