AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

MIPS: Fix after 'Reland remaining parts of 'Use weak cells in map checks in polymorphic ICs''.

Browse Source 
Fix d2e54925ca

In 'MIPS: Change CmpWeakValue to a more MIPS like GetWeakValue.'
a25003cfa6
we switched to use GetWeakValue.

BUG=

Review URL: https://codereview.chromium.org/782273004

Cr-Commit-Position: refs/heads/master@{#25746}
This commit is contained in:
balazs.kilvady 2014-12-10 05:13:53 -08:00 committed by Commit bot
parent 071a28605e
commit 30f2578ca2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ic/mips/ic-compiler-mips.cc
View File

@ -58,13 +58,13 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types,
// Check map and tail call if there's a match.
// Separate compare from branch, to provide path for above JumpIfSmi().
Handle<WeakCell> cell = Map::WeakCellForMap(map);
__ CmpWeakValue(match, map_reg, cell);
__ GetWeakValue(match, cell);
if (type->Is(HeapType::Number())) {
DCHECK(!number_case.is_unused());
__ bind(&number_case);
}
__ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match,
Operand(zero_reg));
Operand(map_reg));
}
}
DCHECK(number_of_handled_maps != 0);
@ -91,13 +91,13 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
__ lw(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset));
for (int i = 0; i < receiver_count; ++i) {
Handle<WeakCell> cell = Map::WeakCellForMap(receiver_maps->at(i));
__ CmpWeakValue(match, map_reg, cell);
__ GetWeakValue(match, cell);
if (transitioned_maps->at(i).is_null()) {
__ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq, match,
Operand(zero_reg));
Operand(map_reg));
} else {
Label next_map;
__ Branch(&next_map, ne, match, Operand(zero_reg));
__ Branch(&next_map, ne, match, Operand(map_reg));
Handle<WeakCell> cell = Map::WeakCellForMap(transitioned_maps->at(i));
__ LoadWeakValue(transition_map(), cell, &miss);
__ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET);

10
src/ic/mips64/ic-compiler-mips64.cc
View File

@ -58,13 +58,13 @@ Handle<Code> PropertyICCompiler::CompilePolymorphic(TypeHandleList* types,
// Check map and tail call if there's a match.
// Separate compare from branch, to provide path for above JumpIfSmi().
Handle<WeakCell> cell = Map::WeakCellForMap(map);
__ CmpWeakValue(match, map_reg, cell);
__ GetWeakValue(match, cell);
if (type->Is(HeapType::Number())) {
DCHECK(!number_case.is_unused());
__ bind(&number_case);
}
__ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq, match,
Operand(zero_reg));
Operand(map_reg));
}
}
DCHECK(number_of_handled_maps != 0);
@ -91,13 +91,13 @@ Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic(
__ ld(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset));
for (int i = 0; i < receiver_count; ++i) {
Handle<WeakCell> cell = Map::WeakCellForMap(receiver_maps->at(i));
__ CmpWeakValue(match, map_reg, cell);
__ GetWeakValue(match, cell);
if (transitioned_maps->at(i).is_null()) {
__ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq, match,
Operand(zero_reg));
Operand(map_reg));
} else {
Label next_map;
__ Branch(&next_map, ne, match, Operand(zero_reg));
__ Branch(&next_map, ne, match, Operand(map_reg));
Handle<WeakCell> cell = Map::WeakCellForMap(transitioned_maps->at(i));
__ LoadWeakValue(transition_map(), cell, &miss);
__ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET);