Chromium Code Reviews| Index: src/ia32/macro-assembler-ia32.cc |
| diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc |
| index 3356e818922d0ccce2967e4cd2bf6a586917663d..ace1bed569a1550140084519668a825f9d03267d 100644 |
| --- a/src/ia32/macro-assembler-ia32.cc |
| +++ b/src/ia32/macro-assembler-ia32.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: |
| @@ -487,15 +487,49 @@ void MacroAssembler::StoreNumberToDoubleElements( |
| } |
| +void MacroAssembler::CompareMap(Register obj, |
| + Handle<Map> map, |
| + Label* early_success, |
| + CompareMapMode mode) { |
| + cmp(FieldOperand(obj, HeapObject::kMapOffset), map); |
| + if (mode == ALLOW_ELEMENT_TRANSITION_MAPS) { |
| + bool ignore; |
| + Map* transitioned_fast_element_map( |
|
fschneider
2012/01/04 12:17:51
If there is no specific reason to use a raw pointe
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) { |
| + j(equal, early_success, Label::kNear); |
| + cmp(FieldOperand(obj, HeapObject::kMapOffset), |
| + Handle<Map>(transitioned_fast_element_map)); |
|
fschneider
2012/01/04 12:17:51
Then there is no need to create a handle here.
danno
2012/01/05 13:41:57
Done.
|
| + } |
| + |
| + Map* transitioned_double_map( |
|
fschneider
2012/01/04 12:17:51
Same here.
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) { |
| + j(equal, early_success, Label::kNear); |
| + cmp(FieldOperand(obj, HeapObject::kMapOffset), |
| + Handle<Map>(transitioned_double_map)); |
|
fschneider
2012/01/04 12:17:51
and here.
danno
2012/01/05 13:41:57
Done.
|
| + } |
| + } |
| +} |
| + |
| + |
| void MacroAssembler::CheckMap(Register obj, |
| 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); |
| } |
| - cmp(FieldOperand(obj, HeapObject::kMapOffset), Immediate(map)); |
| + |
| + Label success; |
| + CompareMap(obj, map, &success, mode); |
| j(not_equal, fail); |
| + bind(&success); |
| } |