From b06b63bbff0208f17ffe57eb148dd9826cdcb04e Mon Sep 17 00:00:00 2001 From: "plind44@gmail.com" Date: Fri, 6 Jun 2014 15:43:19 +0000 Subject: [PATCH] MIPS: Introduce FieldIndex to unify and abstract property/field offset. Port r21720 (aeb7bef) BUG= R=plind44@gmail.com Review URL: https://codereview.chromium.org/314333003 Patch from Balazs Kilvady . git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21722 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/stub-cache-mips.cc | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc index 66b4124..3b66382 100644 --- a/src/mips/stub-cache-mips.cc +++ b/src/mips/stub-cache-mips.cc @@ -561,12 +561,7 @@ void StoreStubCompiler::GenerateStoreField(MacroAssembler* masm, // checks. ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded()); - int index = lookup->GetFieldIndex().field_index(); - - // Adjust for the number of properties stored in the object. Even in the - // face of a transition we can use the old map here because the size of the - // object and the number of in-object properties is not going to change. - index -= object->map()->inobject_properties(); + FieldIndex index = lookup->GetFieldIndex(); Representation representation = lookup->representation(); ASSERT(!representation.IsNone()); @@ -594,14 +589,12 @@ void StoreStubCompiler::GenerateStoreField(MacroAssembler* masm, } } else if (representation.IsDouble()) { // Load the double storage. - if (index < 0) { - int offset = object->map()->instance_size() + (index * kPointerSize); - __ lw(scratch1, FieldMemOperand(receiver_reg, offset)); + if (index.is_inobject()) { + __ lw(scratch1, FieldMemOperand(receiver_reg, index.offset())); } else { __ lw(scratch1, FieldMemOperand(receiver_reg, JSObject::kPropertiesOffset)); - int offset = index * kPointerSize + FixedArray::kHeaderSize; - __ lw(scratch1, FieldMemOperand(scratch1, offset)); + __ lw(scratch1, FieldMemOperand(scratch1, index.offset())); } // Store the value into the storage. @@ -629,10 +622,9 @@ void StoreStubCompiler::GenerateStoreField(MacroAssembler* masm, // TODO(verwaest): Share this code as a code stub. SmiCheck smi_check = representation.IsTagged() ? INLINE_SMI_CHECK : OMIT_SMI_CHECK; - if (index < 0) { + if (index.is_inobject()) { // Set the property straight into the object. - int offset = object->map()->instance_size() + (index * kPointerSize); - __ sw(value_reg, FieldMemOperand(receiver_reg, offset)); + __ sw(value_reg, FieldMemOperand(receiver_reg, index.offset())); if (!representation.IsSmi()) { // Skip updating write barrier if storing a smi. @@ -642,7 +634,7 @@ void StoreStubCompiler::GenerateStoreField(MacroAssembler* masm, // Pass the now unused name_reg as a scratch register. __ mov(name_reg, value_reg); __ RecordWriteField(receiver_reg, - offset, + index.offset(), name_reg, scratch1, kRAHasNotBeenSaved, @@ -652,11 +644,10 @@ void StoreStubCompiler::GenerateStoreField(MacroAssembler* masm, } } else { // Write to the properties array. - int offset = index * kPointerSize + FixedArray::kHeaderSize; // Get the properties array. __ lw(scratch1, FieldMemOperand(receiver_reg, JSObject::kPropertiesOffset)); - __ sw(value_reg, FieldMemOperand(scratch1, offset)); + __ sw(value_reg, FieldMemOperand(scratch1, index.offset())); if (!representation.IsSmi()) { // Skip updating write barrier if storing a smi. @@ -666,7 +657,7 @@ void StoreStubCompiler::GenerateStoreField(MacroAssembler* masm, // Ok to clobber receiver_reg and name_reg, since we return. __ mov(name_reg, value_reg); __ RecordWriteField(scratch1, - offset, + index.offset(), name_reg, receiver_reg, kRAHasNotBeenSaved, @@ -997,20 +988,14 @@ Register LoadStubCompiler::CallbackHandlerFrontend( void LoadStubCompiler::GenerateLoadField(Register reg, Handle holder, - PropertyIndex field, + FieldIndex field, Representation representation) { if (!reg.is(receiver())) __ mov(receiver(), reg); if (kind() == Code::LOAD_IC) { - LoadFieldStub stub(isolate(), - field.is_inobject(holder), - field.translate(holder), - representation); + LoadFieldStub stub(isolate(), field); GenerateTailCall(masm(), stub.GetCode()); } else { - KeyedLoadFieldStub stub(isolate(), - field.is_inobject(holder), - field.translate(holder), - representation); + KeyedLoadFieldStub stub(isolate(), field); GenerateTailCall(masm(), stub.GetCode()); } } -- 2.7.4