From 0827316df587899e72a2d4c66525da1ca4281f10 Mon Sep 17 00:00:00 2001 From: "mvstanton@chromium.org" Date: Tue, 15 Jul 2014 10:19:30 +0000 Subject: [PATCH] Enum RegisterInfo renamed to ParameterIndices. "Info" is information-poor. R=mstarzinger@chromium.org Review URL: https://codereview.chromium.org/385953004 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22404 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/code-stubs.cc | 6 +++--- src/code-stubs.h | 5 +++-- src/ic.h | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/code-stubs.cc b/src/code-stubs.cc index c36568c..d4745cc 100644 --- a/src/code-stubs.cc +++ b/src/code-stubs.cc @@ -576,7 +576,7 @@ void KeyedLoadFastElementStub::InitializeInterfaceDescriptor( CodeStubInterfaceDescriptor* descriptor) { Register registers[] = { LoadIC::ReceiverRegister(), LoadIC::NameRegister() }; - STATIC_ASSERT(LoadIC::kRegisterArgumentCount == 2); + STATIC_ASSERT(LoadIC::kParameterCount == 2); descriptor->Initialize(ARRAY_SIZE(registers), registers, FUNCTION_ADDR(KeyedLoadIC_MissFromStubFailure)); } @@ -586,7 +586,7 @@ void KeyedLoadDictionaryElementStub::InitializeInterfaceDescriptor( CodeStubInterfaceDescriptor* descriptor) { Register registers[] = { LoadIC::ReceiverRegister(), LoadIC::NameRegister() }; - STATIC_ASSERT(LoadIC::kRegisterArgumentCount == 2); + STATIC_ASSERT(LoadIC::kParameterCount == 2); descriptor->Initialize(ARRAY_SIZE(registers), registers, FUNCTION_ADDR(KeyedLoadIC_MissFromStubFailure)); } @@ -596,7 +596,7 @@ void KeyedLoadGenericElementStub::InitializeInterfaceDescriptor( CodeStubInterfaceDescriptor* descriptor) { Register registers[] = { LoadIC::ReceiverRegister(), LoadIC::NameRegister() }; - STATIC_ASSERT(LoadIC::kRegisterArgumentCount == 2); + STATIC_ASSERT(LoadIC::kParameterCount == 2); descriptor->Initialize( ARRAY_SIZE(registers), registers, Runtime::FunctionForId(Runtime::kKeyedGetProperty)->entry); diff --git a/src/code-stubs.h b/src/code-stubs.h index f6ae893..5dc9896 100644 --- a/src/code-stubs.h +++ b/src/code-stubs.h @@ -2455,12 +2455,13 @@ class ElementsTransitionAndStoreStub : public HydrogenCodeStub { virtual void InitializeInterfaceDescriptor( CodeStubInterfaceDescriptor* descriptor) V8_OVERRIDE; - enum RegisterInfo { + // Parameters accessed via CodeStubGraphBuilder::GetParameter() + enum ParameterIndices { kValueIndex, kMapIndex, kKeyIndex, kObjectIndex, - kRegisterArgumentCount + kParameterCount }; static const Register ValueRegister() { diff --git a/src/ic.h b/src/ic.h index 262893f..4647c9c 100644 --- a/src/ic.h +++ b/src/ic.h @@ -396,10 +396,10 @@ class LoadIC: public IC { class ContextualModeBits: public BitField {}; STATIC_ASSERT(static_cast(NOT_CONTEXTUAL) == 0); - enum RegisterInfo { + enum ParameterIndices { kReceiverIndex, kNameIndex, - kRegisterArgumentCount + kParameterCount }; static const Register ReceiverRegister(); static const Register NameRegister(); @@ -583,11 +583,11 @@ class StoreIC: public IC { static const ExtraICState kStrictModeState = 1 << StrictModeState::kShift; - enum RegisterInfo { + enum ParameterIndices { kReceiverIndex, kNameIndex, kValueIndex, - kRegisterArgumentCount + kParameterCount }; static const Register ReceiverRegister(); static const Register NameRegister(); -- 2.7.4