languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 12:48:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: Fix double use of IP when storing object fields with large offsets.

Browse source 
TEST=language/large_class_declaration --noopt
R=fschneider@google.com

Review URL: https://codereview.chromium.org/1409733009 .
This commit is contained in:
Ryan Macnak 2015-11-05 09:54:50 -08:00
parent 9dcd1fd076
commit 7e2e9cb949
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
runtime/vm/assembler_arm.cc
View file

@ -1724,7 +1724,9 @@ void Assembler::WriteShadowedFieldPair(Register base,
Register UseRegister(Register reg, RegList* used) {
ASSERT(reg != THR);
ASSERT(reg != SP);
ASSERT(reg != FP);
ASSERT(reg != PC);
ASSERT((*used & (1 << reg)) == 0);
*used |= (1 << reg);
@ -1740,7 +1742,8 @@ Register AllocateRegister(RegList* used) {
}
void Assembler::VerifiedWrite(const Address& address,
void Assembler::VerifiedWrite(Register object,
const Address& address,
Register new_value,
FieldContent old_content) {
#if defined(DEBUG)
@ -1750,6 +1753,9 @@ void Assembler::VerifiedWrite(const Address& address,
RegList used = 0;
UseRegister(new_value, &used);
Register base = UseRegister(address.rn(), &used);
if ((object != base) && (object != kNoRegister)) {
UseRegister(object, &used);
}
if (address.rm() != kNoRegister) {
UseRegister(address.rm(), &used);
}
@ -1818,7 +1824,7 @@ void Assembler::StoreIntoObject(Register object,
Register value,
bool can_value_be_smi) {
ASSERT(object != value);
VerifiedWrite(dest, value, kHeapObjectOrSmi);
VerifiedWrite(object, dest, value, kHeapObjectOrSmi);
Label done;
if (can_value_be_smi) {
StoreIntoObjectFilter(object, value, &done);
@ -1861,7 +1867,7 @@ void Assembler::StoreIntoObjectNoBarrier(Register object,
const Address& dest,
Register value,
FieldContent old_content) {
VerifiedWrite(dest, value, old_content);
VerifiedWrite(object, dest, value, old_content);
#if defined(DEBUG)
Label done;
StoreIntoObjectFilter(object, value, &done);
@ -1895,7 +1901,7 @@ void Assembler::StoreIntoObjectNoBarrier(Register object,
(value.IsOld() && value.IsNotTemporaryScopedHandle()));
// No store buffer update.
LoadObject(IP, value);
VerifiedWrite(dest, IP, old_content);
VerifiedWrite(object, dest, IP, old_content);
}
@ -1908,8 +1914,11 @@ void Assembler::StoreIntoObjectNoBarrierOffset(Register object,
StoreIntoObjectNoBarrier(object, FieldAddress(object, offset), value,
old_content);
} else {
AddImmediate(IP, object, offset - kHeapObjectTag);
StoreIntoObjectNoBarrier(object, Address(IP), value, old_content);
Register base = object == R9 ? R8 : R9;
Push(base);
AddImmediate(base, object, offset - kHeapObjectTag);
StoreIntoObjectNoBarrier(object, Address(base), value, old_content);
Pop(base);
}
}
@ -1973,7 +1982,7 @@ void Assembler::StoreIntoSmiField(const Address& dest, Register value) {
Stop("New value must be Smi.");
Bind(&done);
#endif // defined(DEBUG)
VerifiedWrite(dest, value, kOnlySmi);
VerifiedWrite(kNoRegister, dest, value, kOnlySmi);
}

3
runtime/vm/assembler_arm.h
View file

@ -1200,7 +1200,8 @@ class Assembler : public ValueObject {
Condition cond = AL);
// Writes new_value to address and its shadow location, if enabled, after
// verifying that its old value matches its shadow.
void VerifiedWrite(const Address& address,
void VerifiedWrite(Register object,
const Address& address,
Register new_value,
FieldContent old_content);