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

Side by Side Diff: src/ia32/macro-assembler-ia32.cc

Issue 9124004: Backport hash collision workaround to 3.6. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.6/
Patch Set: Created 8 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
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 1983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1994 ret(bytes_dropped); 1994 ret(bytes_dropped);
1995 } else { 1995 } else {
1996 pop(scratch); 1996 pop(scratch);
1997 add(Operand(esp), Immediate(bytes_dropped)); 1997 add(Operand(esp), Immediate(bytes_dropped));
1998 push(scratch); 1998 push(scratch);
1999 ret(0); 1999 ret(0);
2000 } 2000 }
2001 } 2001 }
2002 2002
2003 2003
2004
2005
2006 void MacroAssembler::Drop(int stack_elements) { 2004 void MacroAssembler::Drop(int stack_elements) {
2007 if (stack_elements > 0) { 2005 if (stack_elements > 0) {
2008 add(Operand(esp), Immediate(stack_elements * kPointerSize)); 2006 add(Operand(esp), Immediate(stack_elements * kPointerSize));
2009 } 2007 }
2010 } 2008 }
2011 2009
2012 2010
2013 void MacroAssembler::Move(Register dst, Register src) { 2011 void MacroAssembler::Move(Register dst, Register src) {
2014 if (!dst.is(src)) { 2012 if (!dst.is(src)) {
2015 mov(dst, src); 2013 mov(dst, src);
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
2284 2282
2285 // Check that the code was patched as expected. 2283 // Check that the code was patched as expected.
2286 ASSERT(masm_.pc_ == address_ + size_); 2284 ASSERT(masm_.pc_ == address_ + size_);
2287 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap); 2285 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap);
2288 } 2286 }
2289 2287
2290 2288
2291 } } // namespace v8::internal 2289 } } // namespace v8::internal
2292 2290
2293 #endif // V8_TARGET_ARCH_IA32 2291 #endif // V8_TARGET_ARCH_IA32
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698