Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Side by Side Diff: src/arm/ic-arm.cc

Issue 10991045: Fix ARM bug introduced in r12604 that caused crashes on ARM (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/arm/code-stubs-arm.cc ('k') | src/arm/macro-assembler-arm.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
1373 if (check_map == kCheckMap) { 1373 if (check_map == kCheckMap) {
1374 // Check for fast double array case. If this fails, call through to the 1374 // Check for fast double array case. If this fails, call through to the
1375 // runtime. 1375 // runtime.
1376 __ CompareRoot(elements_map, Heap::kFixedDoubleArrayMapRootIndex); 1376 __ CompareRoot(elements_map, Heap::kFixedDoubleArrayMapRootIndex);
1377 __ b(ne, slow); 1377 __ b(ne, slow);
1378 } 1378 }
1379 __ bind(&fast_double_without_map_check); 1379 __ bind(&fast_double_without_map_check);
1380 __ StoreNumberToDoubleElements(value, 1380 __ StoreNumberToDoubleElements(value,
1381 key, 1381 key,
1382 receiver, 1382 receiver,
1383 elements, 1383 elements, // Overwritten.
1384 r3, 1384 r3, // Scratch regs...
1385 r4, 1385 r4,
1386 r5, 1386 r5,
1387 r6, 1387 r6,
1388 &transition_double_elements); 1388 &transition_double_elements);
1389 if (increment_length == kIncrementLength) { 1389 if (increment_length == kIncrementLength) {
1390 // Add 1 to receiver->length. 1390 // Add 1 to receiver->length.
1391 __ add(scratch_value, key, Operand(Smi::FromInt(1))); 1391 __ add(scratch_value, key, Operand(Smi::FromInt(1)));
1392 __ str(scratch_value, FieldMemOperand(receiver, JSArray::kLengthOffset)); 1392 __ str(scratch_value, FieldMemOperand(receiver, JSArray::kLengthOffset));
1393 } 1393 }
1394 __ Ret(); 1394 __ Ret();
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1792 } else { 1792 } else {
1793 ASSERT(Assembler::GetCondition(branch_instr) == ne); 1793 ASSERT(Assembler::GetCondition(branch_instr) == ne);
1794 patcher.EmitCondition(eq); 1794 patcher.EmitCondition(eq);
1795 } 1795 }
1796 } 1796 }
1797 1797
1798 1798
1799 } } // namespace v8::internal 1799 } } // namespace v8::internal
1800 1800
1801 #endif // V8_TARGET_ARCH_ARM 1801 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/code-stubs-arm.cc ('k') | src/arm/macro-assembler-arm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698