Revision: 22706
Author: [email protected]
Date: Wed Jul 30 12:21:41 2014 UTC
Log: Remove keyed_store_calling convention and friends
BUG=
[email protected]
Review URL: https://codereview.chromium.org/424423002
http://code.google.com/p/v8/source/detail?r=22706
Modified:
/branches/bleeding_edge/src/arm/ic-arm.cc
/branches/bleeding_edge/src/arm/stub-cache-arm.cc
/branches/bleeding_edge/src/arm64/ic-arm64.cc
/branches/bleeding_edge/src/arm64/stub-cache-arm64.cc
/branches/bleeding_edge/src/ia32/ic-ia32.cc
/branches/bleeding_edge/src/ia32/stub-cache-ia32.cc
/branches/bleeding_edge/src/ic.h
/branches/bleeding_edge/src/stub-cache.cc
/branches/bleeding_edge/src/x64/ic-x64.cc
/branches/bleeding_edge/src/x64/stub-cache-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/ic-arm.cc Tue Jul 29 16:07:34 2014 UTC
+++ /branches/bleeding_edge/src/arm/ic-arm.cc Wed Jul 30 12:21:41 2014 UTC
@@ -512,21 +512,6 @@
const Register StoreIC::ReceiverRegister() { return r1; }
const Register StoreIC::NameRegister() { return r2; }
const Register StoreIC::ValueRegister() { return r0; }
-
-
-const Register KeyedStoreIC::ReceiverRegister() {
- return StoreIC::ReceiverRegister();
-}
-
-
-const Register KeyedStoreIC::NameRegister() {
- return StoreIC::NameRegister();
-}
-
-
-const Register KeyedStoreIC::ValueRegister() {
- return StoreIC::ValueRegister();
-}
const Register KeyedStoreIC::MapRegister() {
=======================================
--- /branches/bleeding_edge/src/arm/stub-cache-arm.cc Wed Jul 30 12:01:48
2014 UTC
+++ /branches/bleeding_edge/src/arm/stub-cache-arm.cc Wed Jul 30 12:21:41
2014 UTC
@@ -1167,19 +1167,10 @@
// receiver, name, scratch1, scratch2, scratch3.
Register receiver = StoreIC::ReceiverRegister();
Register name = StoreIC::NameRegister();
+ ASSERT(r3.is(KeyedStoreIC::MapRegister()));
static Register registers[] = { receiver, name, r3, r4, r5 };
return registers;
}
-
-
-Register* PropertyAccessCompiler::keyed_store_calling_convention() {
- // receiver, name, scratch1/map, scratch2, scratch3.
- Register receiver = KeyedStoreIC::ReceiverRegister();
- Register name = KeyedStoreIC::NameRegister();
- Register map = KeyedStoreIC::MapRegister();
- static Register registers[] = { receiver, name, map, r4, r5 };
- return registers;
-}
Register NamedStoreHandlerCompiler::value() { return
StoreIC::ValueRegister(); }
=======================================
--- /branches/bleeding_edge/src/arm64/ic-arm64.cc Tue Jul 29 16:07:34 2014
UTC
+++ /branches/bleeding_edge/src/arm64/ic-arm64.cc Wed Jul 30 12:21:41 2014
UTC
@@ -530,21 +530,6 @@
const Register StoreIC::ReceiverRegister() { return x1; }
const Register StoreIC::NameRegister() { return x2; }
const Register StoreIC::ValueRegister() { return x0; }
-
-
-const Register KeyedStoreIC::ReceiverRegister() {
- return StoreIC::ReceiverRegister();
-}
-
-
-const Register KeyedStoreIC::NameRegister() {
- return StoreIC::NameRegister();
-}
-
-
-const Register KeyedStoreIC::ValueRegister() {
- return StoreIC::ValueRegister();
-}
const Register KeyedStoreIC::MapRegister() {
=======================================
--- /branches/bleeding_edge/src/arm64/stub-cache-arm64.cc Wed Jul 30
12:19:19 2014 UTC
+++ /branches/bleeding_edge/src/arm64/stub-cache-arm64.cc Wed Jul 30
12:21:41 2014 UTC
@@ -1147,19 +1147,10 @@
// receiver, value, scratch1, scratch2, scratch3.
Register receiver = StoreIC::ReceiverRegister();
Register name = StoreIC::NameRegister();
+ ASSERT(x3.is(KeyedStoreIC::MapRegister()));
static Register registers[] = { receiver, name, x3, x4, x5 };
return registers;
}
-
-
-Register* PropertyAccessCompiler::keyed_store_calling_convention() {
- // receiver, name, scratch1/map, scratch2, scratch3.
- Register receiver = KeyedStoreIC::ReceiverRegister();
- Register name = KeyedStoreIC::NameRegister();
- Register map = KeyedStoreIC::MapRegister();
- static Register registers[] = { receiver, name, map, x4, x5 };
- return registers;
-}
Register NamedStoreHandlerCompiler::value() { return
StoreIC::ValueRegister(); }
=======================================
--- /branches/bleeding_edge/src/ia32/ic-ia32.cc Tue Jul 29 16:07:34 2014 UTC
+++ /branches/bleeding_edge/src/ia32/ic-ia32.cc Wed Jul 30 12:21:41 2014 UTC
@@ -988,21 +988,6 @@
const Register StoreIC::ReceiverRegister() { return edx; }
const Register StoreIC::NameRegister() { return ecx; }
const Register StoreIC::ValueRegister() { return eax; }
-
-
-const Register KeyedStoreIC::ReceiverRegister() {
- return StoreIC::ReceiverRegister();
-}
-
-
-const Register KeyedStoreIC::NameRegister() {
- return StoreIC::NameRegister();
-}
-
-
-const Register KeyedStoreIC::ValueRegister() {
- return StoreIC::ValueRegister();
-}
const Register KeyedStoreIC::MapRegister() {
=======================================
--- /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Wed Jul 30 12:01:48
2014 UTC
+++ /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Wed Jul 30 12:21:41
2014 UTC
@@ -1196,19 +1196,10 @@
// receiver, name, scratch1, scratch2, scratch3.
Register receiver = StoreIC::ReceiverRegister();
Register name = StoreIC::NameRegister();
+ ASSERT(ebx.is(KeyedStoreIC::MapRegister()));
static Register registers[] = { receiver, name, ebx, edi, no_reg };
return registers;
}
-
-
-Register* PropertyAccessCompiler::keyed_store_calling_convention() {
- // receiver, name, scratch1/map, scratch2, scratch3.
- Register receiver = KeyedStoreIC::ReceiverRegister();
- Register name = KeyedStoreIC::NameRegister();
- Register map = KeyedStoreIC::MapRegister();
- static Register registers[] = { receiver, name, map, edi, no_reg };
- return registers;
-}
Register NamedStoreHandlerCompiler::value() { return
StoreIC::ValueRegister(); }
=======================================
--- /branches/bleeding_edge/src/ic.h Tue Jul 29 16:07:34 2014 UTC
+++ /branches/bleeding_edge/src/ic.h Wed Jul 30 12:21:41 2014 UTC
@@ -689,10 +689,6 @@
ExtraICState extra_state) {
return ExtraICStateKeyedAccessStoreMode::decode(extra_state);
}
-
- static const Register ReceiverRegister();
- static const Register NameRegister();
- static const Register ValueRegister();
// The map register isn't part of the normal call specification, but
// ElementsTransitionAndStoreStub, used in polymorphic keyed store
=======================================
--- /branches/bleeding_edge/src/stub-cache.cc Wed Jul 30 12:01:48 2014 UTC
+++ /branches/bleeding_edge/src/stub-cache.cc Wed Jul 30 12:21:41 2014 UTC
@@ -1099,12 +1099,9 @@
Register* PropertyAccessCompiler::GetCallingConvention(Code::Kind kind) {
if (kind == Code::LOAD_IC || kind == Code::KEYED_LOAD_IC) {
return load_calling_convention();
- } else if (kind == Code::STORE_IC) {
- return store_calling_convention();
- } else {
- ASSERT_EQ(Code::KEYED_STORE_IC, kind);
- return keyed_store_calling_convention();
}
+ ASSERT(kind == Code::STORE_IC || kind == Code::KEYED_STORE_IC);
+ return store_calling_convention();
}
=======================================
--- /branches/bleeding_edge/src/x64/ic-x64.cc Tue Jul 29 16:07:34 2014 UTC
+++ /branches/bleeding_edge/src/x64/ic-x64.cc Wed Jul 30 12:21:41 2014 UTC
@@ -1014,21 +1014,6 @@
const Register StoreIC::ReceiverRegister() { return rdx; }
const Register StoreIC::NameRegister() { return rcx; }
const Register StoreIC::ValueRegister() { return rax; }
-
-
-const Register KeyedStoreIC::ReceiverRegister() {
- return StoreIC::ReceiverRegister();
-}
-
-
-const Register KeyedStoreIC::NameRegister() {
- return StoreIC::NameRegister();
-}
-
-
-const Register KeyedStoreIC::ValueRegister() {
- return StoreIC::ValueRegister();
-}
const Register KeyedStoreIC::MapRegister() {
=======================================
--- /branches/bleeding_edge/src/x64/stub-cache-x64.cc Wed Jul 30 12:01:48
2014 UTC
+++ /branches/bleeding_edge/src/x64/stub-cache-x64.cc Wed Jul 30 12:21:41
2014 UTC
@@ -1126,19 +1126,10 @@
// receiver, name, scratch1, scratch2, scratch3.
Register receiver = KeyedStoreIC::ReceiverRegister();
Register name = KeyedStoreIC::NameRegister();
+ ASSERT(rbx.is(KeyedStoreIC::MapRegister()));
static Register registers[] = { receiver, name, rbx, rdi, r8 };
return registers;
}
-
-
-Register* PropertyAccessCompiler::keyed_store_calling_convention() {
- // receiver, name, scratch1/map, scratch2, scratch3.
- Register receiver = KeyedStoreIC::ReceiverRegister();
- Register name = KeyedStoreIC::NameRegister();
- Register map = KeyedStoreIC::MapRegister();
- static Register registers[] = { receiver, name, map, rdi, r8 };
- return registers;
-}
Register NamedStoreHandlerCompiler::value() { return
StoreIC::ValueRegister(); }
--
--
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.
