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

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

Issue 5788001: ARM: Fix heap number allocation in lithium-codegen-arm that assumed... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 10 years 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/lithium-arm.cc ('k') | src/arm/macro-assembler-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 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 1715 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 public: 1726 public:
1727 DeferredNumberTagD(LCodeGen* codegen, LNumberTagD* instr) 1727 DeferredNumberTagD(LCodeGen* codegen, LNumberTagD* instr)
1728 : LDeferredCode(codegen), instr_(instr) { } 1728 : LDeferredCode(codegen), instr_(instr) { }
1729 virtual void Generate() { codegen()->DoDeferredNumberTagD(instr_); } 1729 virtual void Generate() { codegen()->DoDeferredNumberTagD(instr_); }
1730 private: 1730 private:
1731 LNumberTagD* instr_; 1731 LNumberTagD* instr_;
1732 }; 1732 };
1733 1733
1734 DoubleRegister input_reg = ToDoubleRegister(instr->input()); 1734 DoubleRegister input_reg = ToDoubleRegister(instr->input());
1735 Register reg = ToRegister(instr->result()); 1735 Register reg = ToRegister(instr->result());
1736 Register tmp = ToRegister(instr->temp()); 1736 Register temp1 = ToRegister(instr->temp1());
1737 Register temp2 = ToRegister(instr->temp2());
1737 Register scratch = r9; 1738 Register scratch = r9;
1738 1739
1739 DeferredNumberTagD* deferred = new DeferredNumberTagD(this, instr); 1740 DeferredNumberTagD* deferred = new DeferredNumberTagD(this, instr);
1740 if (FLAG_inline_new) { 1741 if (FLAG_inline_new) {
1741 __ LoadRoot(scratch, Heap::kHeapNumberMapRootIndex); 1742 __ LoadRoot(scratch, Heap::kHeapNumberMapRootIndex);
1742 __ AllocateHeapNumber(reg, tmp, ip, scratch, deferred->entry()); 1743 __ AllocateHeapNumber(reg, temp1, temp2, scratch, deferred->entry());
1743 } else { 1744 } else {
1744 __ jmp(deferred->entry()); 1745 __ jmp(deferred->entry());
1745 } 1746 }
1746 __ bind(deferred->exit()); 1747 __ bind(deferred->exit());
1747 __ sub(ip, reg, Operand(kHeapObjectTag)); 1748 __ sub(ip, reg, Operand(kHeapObjectTag));
1748 __ vstr(input_reg, ip, HeapNumber::kValueOffset); 1749 __ vstr(input_reg, ip, HeapNumber::kValueOffset);
1749 } 1750 }
1750 1751
1751 1752
1752 void LCodeGen::DoDeferredNumberTagD(LNumberTagD* instr) { 1753 void LCodeGen::DoDeferredNumberTagD(LNumberTagD* instr) {
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
2137 2138
2138 2139
2139 void LCodeGen::DoOsrEntry(LOsrEntry* instr) { 2140 void LCodeGen::DoOsrEntry(LOsrEntry* instr) {
2140 Abort("DoOsrEntry unimplemented."); 2141 Abort("DoOsrEntry unimplemented.");
2141 } 2142 }
2142 2143
2143 2144
2144 #undef __ 2145 #undef __
2145 2146
2146 } } // namespace v8::internal 2147 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/arm/lithium-arm.cc ('k') | src/arm/macro-assembler-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698