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

Side by Side Diff: src/virtual-frame-ia32.cc

Issue 57057: Merge bugfix for issue 294 from bleeding_edge to trunk. (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 11 years, 8 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/api.cc ('k') | 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 2008 the V8 project authors. All rights reserved. 1 // Copyright 2008 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 959 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 // The element is memory, a register, or a constant. 970 // The element is memory, a register, or a constant.
971 if (element.is_memory()) { 971 if (element.is_memory()) {
972 // Memory elements could only be the backing store of a copy. 972 // Memory elements could only be the backing store of a copy.
973 // Allocate the original to a register. 973 // Allocate the original to a register.
974 ASSERT(index <= stack_pointer_); 974 ASSERT(index <= stack_pointer_);
975 Result temp = cgen_->allocator()->Allocate(); 975 Result temp = cgen_->allocator()->Allocate();
976 ASSERT(temp.is_valid()); 976 ASSERT(temp.is_valid());
977 Use(temp.reg(), index); 977 Use(temp.reg(), index);
978 FrameElement new_element = 978 FrameElement new_element =
979 FrameElement::RegisterElement(temp.reg(), FrameElement::SYNCED); 979 FrameElement::RegisterElement(temp.reg(), FrameElement::SYNCED);
980 // Preserve the copy flag on the element.
981 if (element.is_copied()) new_element.set_copied();
980 elements_[index] = new_element; 982 elements_[index] = new_element;
981 __ mov(temp.reg(), Operand(ebp, fp_relative(index))); 983 __ mov(temp.reg(), Operand(ebp, fp_relative(index)));
982 return Result(temp.reg(), cgen_); 984 return Result(temp.reg(), cgen_);
983 } else if (element.is_register()) { 985 } else if (element.is_register()) {
984 return Result(element.reg(), cgen_); 986 return Result(element.reg(), cgen_);
985 } else { 987 } else {
986 ASSERT(element.is_constant()); 988 ASSERT(element.is_constant());
987 return Result(element.handle(), cgen_); 989 return Result(element.handle(), cgen_);
988 } 990 }
989 } 991 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 ASSERT(stack_pointer_ == elements_.length() - 1); 1027 ASSERT(stack_pointer_ == elements_.length() - 1);
1026 elements_.Add(FrameElement::MemoryElement()); 1028 elements_.Add(FrameElement::MemoryElement());
1027 stack_pointer_++; 1029 stack_pointer_++;
1028 __ push(immediate); 1030 __ push(immediate);
1029 } 1031 }
1030 1032
1031 1033
1032 #undef __ 1034 #undef __
1033 1035
1034 } } // namespace v8::internal 1036 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698