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

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

Issue 6127005: Fix ARM debug build by moving an assert. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 11 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 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 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 DeoptimizeIf(ls, instr->environment()); 1631 DeoptimizeIf(ls, instr->environment());
1632 1632
1633 // There are two words between the frame pointer and the last argument. 1633 // There are two words between the frame pointer and the last argument.
1634 // Subtracting from length accounts for one of them add one more. 1634 // Subtracting from length accounts for one of them add one more.
1635 __ add(length, length, Operand(1)); 1635 __ add(length, length, Operand(1));
1636 __ ldr(result, MemOperand(arguments, length, LSL, kPointerSizeLog2)); 1636 __ ldr(result, MemOperand(arguments, length, LSL, kPointerSizeLog2));
1637 } 1637 }
1638 1638
1639 1639
1640 void LCodeGen::DoLoadKeyedFastElement(LLoadKeyedFastElement* instr) { 1640 void LCodeGen::DoLoadKeyedFastElement(LLoadKeyedFastElement* instr) {
1641 ASSERT(instr->representation().IsTagged());
1641 Register elements = ToRegister(instr->elements()); 1642 Register elements = ToRegister(instr->elements());
1642 Register key = EmitLoadRegister(instr->key(), scratch0()); 1643 Register key = EmitLoadRegister(instr->key(), scratch0());
1643 Register result = ToRegister(instr->result()); 1644 Register result = ToRegister(instr->result());
1644 Register scratch = scratch0(); 1645 Register scratch = scratch0();
1645 ASSERT(result.is(elements)); 1646 ASSERT(result.is(elements));
1646 1647
1647 // Load the result. 1648 // Load the result.
1648 __ add(scratch, elements, Operand(key, LSL, kPointerSizeLog2)); 1649 __ add(scratch, elements, Operand(key, LSL, kPointerSizeLog2));
1649 __ ldr(result, FieldMemOperand(scratch, FixedArray::kHeaderSize)); 1650 __ ldr(result, FieldMemOperand(scratch, FixedArray::kHeaderSize));
1650 1651
1651 // Check for the hole value. 1652 // Check for the hole value.
1652 ASSERT(r.IsTagged());
1653 __ LoadRoot(scratch, Heap::kTheHoleValueRootIndex); 1653 __ LoadRoot(scratch, Heap::kTheHoleValueRootIndex);
1654 __ cmp(result, scratch); 1654 __ cmp(result, scratch);
1655 DeoptimizeIf(eq, instr->environment()); 1655 DeoptimizeIf(eq, instr->environment());
1656 } 1656 }
1657 1657
1658 1658
1659 void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) { 1659 void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) {
1660 ASSERT(ToRegister(instr->object()).is(r1)); 1660 ASSERT(ToRegister(instr->object()).is(r1));
1661 ASSERT(ToRegister(instr->key()).is(r0)); 1661 ASSERT(ToRegister(instr->key()).is(r0));
1662 1662
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
2635 2635
2636 2636
2637 void LCodeGen::DoOsrEntry(LOsrEntry* instr) { 2637 void LCodeGen::DoOsrEntry(LOsrEntry* instr) {
2638 Abort("DoOsrEntry unimplemented."); 2638 Abort("DoOsrEntry unimplemented.");
2639 } 2639 }
2640 2640
2641 2641
2642 #undef __ 2642 #undef __
2643 2643
2644 } } // namespace v8::internal 2644 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698