Revision: 13206
Author: [email protected]
Date: Wed Dec 12 04:51:47 2012
Log: Revert "Remove redundant loads in DoCheckMaps"
This reverts r13200.
[email protected]
Review URL: https://codereview.chromium.org/11552017
http://code.google.com/p/v8/source/detail?r=13206
Modified:
/branches/bleeding_edge/src/arm/lithium-codegen-arm.cc
/branches/bleeding_edge/src/arm/lithium-codegen-arm.h
=======================================
--- /branches/bleeding_edge/src/arm/lithium-codegen-arm.cc Tue Dec 11
12:33:44 2012
+++ /branches/bleeding_edge/src/arm/lithium-codegen-arm.cc Wed Dec 12
04:51:47 2012
@@ -4945,33 +4945,33 @@
}
-void LCodeGen::DoCheckMapCommon(Register map_reg,
+void LCodeGen::DoCheckMapCommon(Register reg,
+ Register scratch,
Handle<Map> map,
CompareMapMode mode,
LEnvironment* env) {
Label success;
- __ CompareMap(map_reg, map, &success, mode);
+ __ CompareMap(reg, scratch, map, &success, mode);
DeoptimizeIf(ne, env);
__ bind(&success);
}
void LCodeGen::DoCheckMaps(LCheckMaps* instr) {
- Register map_reg = scratch0();
+ Register scratch = scratch0();
LOperand* input = instr->value();
ASSERT(input->IsRegister());
Register reg = ToRegister(input);
Label success;
SmallMapList* map_set = instr->hydrogen()->map_set();
- __ ldr(map_reg, FieldMemOperand(reg, HeapObject::kMapOffset));
for (int i = 0; i < map_set->length() - 1; i++) {
Handle<Map> map = map_set->at(i);
- __ CompareMap(map_reg, map, &success, REQUIRE_EXACT_MAP);
+ __ CompareMap(reg, scratch, map, &success, REQUIRE_EXACT_MAP);
__ b(eq, &success);
}
Handle<Map> map = map_set->last();
- DoCheckMapCommon(map_reg, map, REQUIRE_EXACT_MAP, instr->environment());
+ DoCheckMapCommon(reg, scratch, map, REQUIRE_EXACT_MAP,
instr->environment());
__ bind(&success);
}
@@ -5030,29 +5030,28 @@
void LCodeGen::DoCheckPrototypeMaps(LCheckPrototypeMaps* instr) {
ASSERT(instr->temp()->Equals(instr->result()));
- Register prototype_reg = ToRegister(instr->temp());
- Register map_reg = ToRegister(instr->temp2());
+ Register temp1 = ToRegister(instr->temp());
+ Register temp2 = ToRegister(instr->temp2());
Handle<JSObject> holder = instr->holder();
Handle<JSObject> current_prototype = instr->prototype();
// Load prototype object.
- __ LoadHeapObject(prototype_reg, current_prototype);
+ __ LoadHeapObject(temp1, current_prototype);
// Check prototype maps up to the holder.
while (!current_prototype.is_identical_to(holder)) {
- __ ldr(map_reg, FieldMemOperand(prototype_reg,
HeapObject::kMapOffset));
- DoCheckMapCommon(map_reg,
+ DoCheckMapCommon(temp1, temp2,
Handle<Map>(current_prototype->map()),
ALLOW_ELEMENT_TRANSITION_MAPS, instr->environment());
current_prototype =
Handle<JSObject>(JSObject::cast(current_prototype->GetPrototype()));
// Load next prototype object.
- __ LoadHeapObject(prototype_reg, current_prototype);
+ __ LoadHeapObject(temp1, current_prototype);
}
// Check the holder map.
- DoCheckMapCommon(map_reg,
+ DoCheckMapCommon(temp1, temp2,
Handle<Map>(current_prototype->map()),
ALLOW_ELEMENT_TRANSITION_MAPS, instr->environment());
}
=======================================
--- /branches/bleeding_edge/src/arm/lithium-codegen-arm.h Tue Dec 11
12:33:44 2012
+++ /branches/bleeding_edge/src/arm/lithium-codegen-arm.h Wed Dec 12
04:51:47 2012
@@ -131,7 +131,7 @@
void DoDeferredInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr,
Label* map_check);
- void DoCheckMapCommon(Register map_reg, Handle<Map> map,
+ void DoCheckMapCommon(Register reg, Register scratch, Handle<Map> map,
CompareMapMode mode, LEnvironment* env);
// Parallel move support.
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
