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

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

Issue 6598036: Merge r6964 from the bleeding_edge to the 3.0 branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.0/
Patch Set: Created 9 years, 9 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/ia32/virtual-frame-ia32.h ('k') | src/version.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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 1291
1292 void VirtualFrame::EmitPush(Immediate immediate, TypeInfo info) { 1292 void VirtualFrame::EmitPush(Immediate immediate, TypeInfo info) {
1293 ASSERT(stack_pointer_ == element_count() - 1); 1293 ASSERT(stack_pointer_ == element_count() - 1);
1294 elements_.Add(FrameElement::MemoryElement(info)); 1294 elements_.Add(FrameElement::MemoryElement(info));
1295 stack_pointer_++; 1295 stack_pointer_++;
1296 __ push(immediate); 1296 __ push(immediate);
1297 } 1297 }
1298 1298
1299 1299
1300 void VirtualFrame::PushUntaggedElement(Handle<Object> value) { 1300 void VirtualFrame::PushUntaggedElement(Handle<Object> value) {
1301 ASSERT(!ConstantPoolOverflowed());
1301 elements_.Add(FrameElement::ConstantElement(value, FrameElement::NOT_SYNCED)); 1302 elements_.Add(FrameElement::ConstantElement(value, FrameElement::NOT_SYNCED));
1302 elements_[element_count() - 1].set_untagged_int32(true); 1303 elements_[element_count() - 1].set_untagged_int32(true);
1303 } 1304 }
1304 1305
1305 1306
1306 void VirtualFrame::Push(Expression* expr) { 1307 void VirtualFrame::Push(Expression* expr) {
1307 ASSERT(expr->IsTrivial()); 1308 ASSERT(expr->IsTrivial());
1308 1309
1309 Literal* lit = expr->AsLiteral(); 1310 Literal* lit = expr->AsLiteral();
1310 if (lit != NULL) { 1311 if (lit != NULL) {
(...skipping 15 matching lines...) Expand all
1326 } 1327 }
1327 UNREACHABLE(); 1328 UNREACHABLE();
1328 } 1329 }
1329 1330
1330 1331
1331 #undef __ 1332 #undef __
1332 1333
1333 } } // namespace v8::internal 1334 } } // namespace v8::internal
1334 1335
1335 #endif // V8_TARGET_ARCH_IA32 1336 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/ia32/virtual-frame-ia32.h ('k') | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698