Reviewers: danno,
Description:
X87: Revert "X87: Introduce FieldIndex to unify and abstract property/field
offset"
Port r21732 (48d2cc6)
Origin commit message:
Due to assorted failures
BUG=
Please review this at https://codereview.chromium.org/326883003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+27, -12 lines):
M src/x87/stub-cache-x87.cc
Index: src/x87/stub-cache-x87.cc
diff --git a/src/x87/stub-cache-x87.cc b/src/x87/stub-cache-x87.cc
index
fee4871fde5013ee6ab1b85c67510f535c2bef92..7e31b0bc3e8ff601fb696a8ce150238a50c78eac
100644
--- a/src/x87/stub-cache-x87.cc
+++ b/src/x87/stub-cache-x87.cc
@@ -660,7 +660,12 @@ void
StoreStubCompiler::GenerateStoreField(MacroAssembler* masm,
// checks.
ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded());
- FieldIndex index = lookup->GetFieldIndex();
+ 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();
Representation representation = lookup->representation();
ASSERT(!representation.IsNone());
@@ -685,11 +690,13 @@ void
StoreStubCompiler::GenerateStoreField(MacroAssembler* masm,
}
} else if (representation.IsDouble()) {
// Load the double storage.
- if (index.is_inobject()) {
- __ mov(scratch1, FieldOperand(receiver_reg, index.offset()));
+ if (index < 0) {
+ int offset = object->map()->instance_size() + (index * kPointerSize);
+ __ mov(scratch1, FieldOperand(receiver_reg, offset));
} else {
__ mov(scratch1, FieldOperand(receiver_reg,
JSObject::kPropertiesOffset));
- __ mov(scratch1, FieldOperand(scratch1, index.offset()));
+ int offset = index * kPointerSize + FixedArray::kHeaderSize;
+ __ mov(scratch1, FieldOperand(scratch1, offset));
}
// Store the value into the storage.
@@ -717,16 +724,17 @@ 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.is_inobject()) {
+ if (index < 0) {
// Set the property straight into the object.
- __ mov(FieldOperand(receiver_reg, index.offset()), value_reg);
+ int offset = object->map()->instance_size() + (index * kPointerSize);
+ __ mov(FieldOperand(receiver_reg, offset), value_reg);
if (!representation.IsSmi()) {
// Update the write barrier for the array address.
// Pass the value being stored in the now unused name_reg.
__ mov(name_reg, value_reg);
__ RecordWriteField(receiver_reg,
- index.offset(),
+ offset,
name_reg,
scratch1,
EMIT_REMEMBERED_SET,
@@ -734,16 +742,17 @@ void
StoreStubCompiler::GenerateStoreField(MacroAssembler* masm,
}
} else {
// Write to the properties array.
+ int offset = index * kPointerSize + FixedArray::kHeaderSize;
// Get the properties array (optimistically).
__ mov(scratch1, FieldOperand(receiver_reg,
JSObject::kPropertiesOffset));
- __ mov(FieldOperand(scratch1, index.offset()), value_reg);
+ __ mov(FieldOperand(scratch1, offset), value_reg);
if (!representation.IsSmi()) {
// Update the write barrier for the array address.
// Pass the value being stored in the now unused name_reg.
__ mov(name_reg, value_reg);
__ RecordWriteField(scratch1,
- index.offset(),
+ offset,
name_reg,
receiver_reg,
EMIT_REMEMBERED_SET,
@@ -962,14 +971,20 @@ Register LoadStubCompiler::CallbackHandlerFrontend(
void LoadStubCompiler::GenerateLoadField(Register reg,
Handle<JSObject> holder,
- FieldIndex field,
+ PropertyIndex field,
Representation representation) {
if (!reg.is(receiver())) __ mov(receiver(), reg);
if (kind() == Code::LOAD_IC) {
- LoadFieldStub stub(isolate(), field);
+ LoadFieldStub stub(isolate(),
+ field.is_inobject(holder),
+ field.translate(holder),
+ representation);
GenerateTailCall(masm(), stub.GetCode());
} else {
- KeyedLoadFieldStub stub(isolate(), field);
+ KeyedLoadFieldStub stub(isolate(),
+ field.is_inobject(holder),
+ field.translate(holder),
+ representation);
GenerateTailCall(masm(), stub.GetCode());
}
}
--
--
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.
