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

Side by Side Diff: src/arm/lithium-codegen-arm.cc

Issue 7172030: Revert "Merge arguments branch to bleeding merge." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 6 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/ic-arm.cc ('k') | src/arm/stub-cache-arm.cc » ('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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 2656 matching lines...) Expand 10 before | Expand all | Expand 10 after
2667 // TODO(danno): we could be more clever here, perhaps having a special 2667 // TODO(danno): we could be more clever here, perhaps having a special
2668 // version of the stub that detects if the overflow case actually 2668 // version of the stub that detects if the overflow case actually
2669 // happens, and generate code that returns a double rather than int. 2669 // happens, and generate code that returns a double rather than int.
2670 DeoptimizeIf(cs, instr->environment()); 2670 DeoptimizeIf(cs, instr->environment());
2671 break; 2671 break;
2672 case JSObject::EXTERNAL_FLOAT_ELEMENTS: 2672 case JSObject::EXTERNAL_FLOAT_ELEMENTS:
2673 case JSObject::EXTERNAL_DOUBLE_ELEMENTS: 2673 case JSObject::EXTERNAL_DOUBLE_ELEMENTS:
2674 case JSObject::FAST_DOUBLE_ELEMENTS: 2674 case JSObject::FAST_DOUBLE_ELEMENTS:
2675 case JSObject::FAST_ELEMENTS: 2675 case JSObject::FAST_ELEMENTS:
2676 case JSObject::DICTIONARY_ELEMENTS: 2676 case JSObject::DICTIONARY_ELEMENTS:
2677 case JSObject::NON_STRICT_ARGUMENTS_ELEMENTS:
2678 UNREACHABLE(); 2677 UNREACHABLE();
2679 break; 2678 break;
2680 } 2679 }
2681 } 2680 }
2682 } 2681 }
2683 2682
2684 2683
2685 void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) { 2684 void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) {
2686 ASSERT(ToRegister(instr->object()).is(r1)); 2685 ASSERT(ToRegister(instr->object()).is(r1));
2687 ASSERT(ToRegister(instr->key()).is(r0)); 2686 ASSERT(ToRegister(instr->key()).is(r0));
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
3472 break; 3471 break;
3473 case JSObject::EXTERNAL_INT_ELEMENTS: 3472 case JSObject::EXTERNAL_INT_ELEMENTS:
3474 case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS: 3473 case JSObject::EXTERNAL_UNSIGNED_INT_ELEMENTS:
3475 __ str(value, mem_operand); 3474 __ str(value, mem_operand);
3476 break; 3475 break;
3477 case JSObject::EXTERNAL_FLOAT_ELEMENTS: 3476 case JSObject::EXTERNAL_FLOAT_ELEMENTS:
3478 case JSObject::EXTERNAL_DOUBLE_ELEMENTS: 3477 case JSObject::EXTERNAL_DOUBLE_ELEMENTS:
3479 case JSObject::FAST_DOUBLE_ELEMENTS: 3478 case JSObject::FAST_DOUBLE_ELEMENTS:
3480 case JSObject::FAST_ELEMENTS: 3479 case JSObject::FAST_ELEMENTS:
3481 case JSObject::DICTIONARY_ELEMENTS: 3480 case JSObject::DICTIONARY_ELEMENTS:
3482 case JSObject::NON_STRICT_ARGUMENTS_ELEMENTS:
3483 UNREACHABLE(); 3481 UNREACHABLE();
3484 break; 3482 break;
3485 } 3483 }
3486 } 3484 }
3487 } 3485 }
3488 3486
3489 3487
3490 void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) { 3488 void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) {
3491 ASSERT(ToRegister(instr->object()).is(r2)); 3489 ASSERT(ToRegister(instr->object()).is(r2));
3492 ASSERT(ToRegister(instr->key()).is(r1)); 3490 ASSERT(ToRegister(instr->key()).is(r1));
(...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after
4590 ASSERT(osr_pc_offset_ == -1); 4588 ASSERT(osr_pc_offset_ == -1);
4591 osr_pc_offset_ = masm()->pc_offset(); 4589 osr_pc_offset_ = masm()->pc_offset();
4592 } 4590 }
4593 4591
4594 4592
4595 4593
4596 4594
4597 #undef __ 4595 #undef __
4598 4596
4599 } } // namespace v8::internal 4597 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/arm/ic-arm.cc ('k') | src/arm/stub-cache-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698