Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index fd9b56820592b0cd8bb20495d26cb04bf1acade5..d2d152389a14056906a2e0c8ba320c61a95d9628 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -1,4 +1,4 @@ |
-// Copyright 2011 the V8 project authors. All rights reserved. |
+// Copyright 2012 the V8 project authors. All rights reserved. |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
// met: |
@@ -1993,18 +1993,49 @@ void MacroAssembler::StoreNumberToDoubleElements(Register value_reg, |
} |
+void MacroAssembler::CompareMap(Register obj, |
+ Register scratch, |
+ Handle<Map> map, |
+ Label* early_success, |
+ CompareMapMode mode) { |
+ ldr(scratch, FieldMemOperand(obj, HeapObject::kMapOffset)); |
+ cmp(scratch, Operand(map)); |
+ if (mode == ALLOW_ELEMENT_TRANSITION_MAPS) { |
+ Map* transitioned_fast_element_map( |
+ map->LookupElementsTransitionMap(FAST_ELEMENTS, NULL)); |
+ ASSERT(transitioned_fast_element_map == NULL || |
+ map->elements_kind() != FAST_ELEMENTS); |
+ if (transitioned_fast_element_map != NULL) { |
+ b(eq, early_success); |
+ cmp(scratch, Operand(Handle<Map>(transitioned_fast_element_map))); |
+ } |
+ |
+ Map* transitioned_double_map( |
+ map->LookupElementsTransitionMap(FAST_DOUBLE_ELEMENTS, NULL)); |
+ ASSERT(transitioned_double_map == NULL || |
+ map->elements_kind() == FAST_SMI_ONLY_ELEMENTS); |
+ if (transitioned_double_map != NULL) { |
+ b(eq, early_success); |
+ cmp(scratch, Operand(Handle<Map>(transitioned_double_map))); |
+ } |
+ } |
+} |
+ |
+ |
void MacroAssembler::CheckMap(Register obj, |
Register scratch, |
Handle<Map> map, |
Label* fail, |
- SmiCheckType smi_check_type) { |
+ SmiCheckType smi_check_type, |
+ CompareMapMode mode) { |
if (smi_check_type == DO_SMI_CHECK) { |
JumpIfSmi(obj, fail); |
} |
- ldr(scratch, FieldMemOperand(obj, HeapObject::kMapOffset)); |
- mov(ip, Operand(map)); |
- cmp(scratch, ip); |
+ |
+ Label success; |
+ CompareMap(obj, scratch, map, &success, mode); |
b(ne, fail); |
+ bind(&success); |
} |