Chromium Code Reviews| Index: src/arm/macro-assembler-arm.cc |
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
| index 59a5e5ba79efc38b5fbbfbf4c9e76a25d4cdc2f6..ca3771fc9e5333ba348803a54e2dd1db03821f30 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: |
| @@ -1992,18 +1992,50 @@ 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) { |
| + bool ignore; |
| + Map* transitioned_fast_element_map( |
|
fschneider
2012/01/04 12:17:51
Handle<Map>
danno
2012/01/05 13:41:57
Done.
|
| + map->LookupElementsTransitionMap(FAST_ELEMENTS, &ignore)); |
| + 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( |
|
fschneider
2012/01/04 12:17:51
Handle<Map>
danno
2012/01/05 13:41:57
Done.
|
| + map->LookupElementsTransitionMap(FAST_DOUBLE_ELEMENTS, &ignore)); |
| + 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); |
| } |