Revision: 23821
Author: [email protected]
Date: Wed Sep 10 07:17:23 2014 UTC
Log: X87: Unify JSEntryStub and JSConstructEntryStub, and some more
code stub cleanups.
port r23742.
original commit message:
Unify JSEntryStub and JSConstructEntryStub, and some more code stub
cleanups.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/557233002
Patch from Jing Bao <[email protected]>.
https://code.google.com/p/v8/source/detail?r=23821
Modified:
/branches/bleeding_edge/src/x87/code-stubs-x87.cc
/branches/bleeding_edge/src/x87/code-stubs-x87.h
=======================================
--- /branches/bleeding_edge/src/x87/code-stubs-x87.cc Mon Sep 8 09:11:11
2014 UTC
+++ /branches/bleeding_edge/src/x87/code-stubs-x87.cc Wed Sep 10 07:17:23
2014 UTC
@@ -2073,7 +2073,7 @@
}
-void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) {
+void JSEntryStub::Generate(MacroAssembler* masm) {
Label invoke, handler_entry, exit;
Label not_outermost_js, not_outermost_js_2;
@@ -2084,7 +2084,7 @@
__ mov(ebp, esp);
// Push marker in two places.
- int marker = is_construct ? StackFrame::ENTRY_CONSTRUCT :
StackFrame::ENTRY;
+ int marker = type();
__ push(Immediate(Smi::FromInt(marker))); // context slot
__ push(Immediate(Smi::FromInt(marker))); // function slot
// Save callee-saved registers (C calling conventions).
@@ -2135,7 +2135,7 @@
// pop the faked function when we return. Notice that we cannot store a
// reference to the trampoline code directly in this stub, because the
// builtin stubs may not have been generated yet.
- if (is_construct) {
+ if (type() == StackFrame::ENTRY_CONSTRUCT) {
ExternalReference
construct_entry(Builtins::kJSConstructEntryTrampoline,
isolate());
__ mov(edx, Immediate(construct_entry));
=======================================
--- /branches/bleeding_edge/src/x87/code-stubs-x87.h Wed Sep 10 02:44:43
2014 UTC
+++ /branches/bleeding_edge/src/x87/code-stubs-x87.h Wed Sep 10 07:17:23
2014 UTC
@@ -65,8 +65,6 @@
ResultBits::encode(result.code()) |
IndexBits::encode(index.code()) |
LookupModeBits::encode(mode);
}
-
- void Generate(MacroAssembler* masm);
static void GenerateNegativeLookup(MacroAssembler* masm,
Label* miss,
@@ -116,7 +114,7 @@
class IndexBits: public BitField<int, 6, 3> {};
class LookupModeBits: public BitField<LookupMode, 9, 1> {};
- DEFINE_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
+ DEFINE_PLATFORM_CODE_STUB(NameDictionaryLookup, PlatformCodeStub);
};
@@ -324,7 +322,7 @@
virtual inline Major MajorKey() const FINAL OVERRIDE { return
RecordWrite; }
- void Generate(MacroAssembler* masm);
+ virtual void Generate(MacroAssembler* masm) OVERRIDE;
void GenerateIncremental(MacroAssembler* masm, Mode mode);
void CheckNeedsToInformIncrementalMarker(
MacroAssembler* masm,
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
