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

Side by Side Diff: src/x64/ic-x64.cc

Issue 7247001: Merge r8390 from bleeding edge (fix missing write barrier in arguments IC). (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 9 years, 6 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/version.cc ('k') | test/mjsunit/arguments-escape.js » ('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 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 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 // ----------- S t a t e ------------- 1301 // ----------- S t a t e -------------
1302 // -- rax : value 1302 // -- rax : value
1303 // -- rcx : key 1303 // -- rcx : key
1304 // -- rdx : receiver 1304 // -- rdx : receiver
1305 // -- rsp[0] : return address 1305 // -- rsp[0] : return address
1306 // ----------------------------------- 1306 // -----------------------------------
1307 Label slow, notin; 1307 Label slow, notin;
1308 Operand mapped_location = GenerateMappedArgumentsLookup( 1308 Operand mapped_location = GenerateMappedArgumentsLookup(
1309 masm, rdx, rcx, rbx, rdi, r8, &notin, &slow); 1309 masm, rdx, rcx, rbx, rdi, r8, &notin, &slow);
1310 __ movq(mapped_location, rax); 1310 __ movq(mapped_location, rax);
1311 __ lea(r9, mapped_location);
1312 __ movq(r8, rax);
1313 __ RecordWrite(rbx, r9, r8);
1311 __ Ret(); 1314 __ Ret();
1312 __ bind(&notin); 1315 __ bind(&notin);
1313 // The unmapped lookup expects that the parameter map is in rbx. 1316 // The unmapped lookup expects that the parameter map is in rbx.
1314 Operand unmapped_location = 1317 Operand unmapped_location =
1315 GenerateUnmappedArgumentsLookup(masm, rcx, rbx, rdi, &slow); 1318 GenerateUnmappedArgumentsLookup(masm, rcx, rbx, rdi, &slow);
1316 __ movq(unmapped_location, rax); 1319 __ movq(unmapped_location, rax);
1320 __ lea(r9, unmapped_location);
1321 __ movq(r8, rax);
1322 __ RecordWrite(rbx, r9, r8);
1317 __ Ret(); 1323 __ Ret();
1318 __ bind(&slow); 1324 __ bind(&slow);
1319 GenerateMiss(masm, false); 1325 GenerateMiss(masm, false);
1320 } 1326 }
1321 1327
1322 1328
1323 void KeyedCallIC::GenerateNonStrictArguments(MacroAssembler* masm, 1329 void KeyedCallIC::GenerateNonStrictArguments(MacroAssembler* masm,
1324 int argc) { 1330 int argc) {
1325 // ----------- S t a t e ------------- 1331 // ----------- S t a t e -------------
1326 // rcx : function name 1332 // rcx : function name
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1753 Condition cc = *jmp_address == Assembler::kJncShortOpcode 1759 Condition cc = *jmp_address == Assembler::kJncShortOpcode
1754 ? not_zero 1760 ? not_zero
1755 : zero; 1761 : zero;
1756 *jmp_address = static_cast<byte>(Assembler::kJccShortPrefix | cc); 1762 *jmp_address = static_cast<byte>(Assembler::kJccShortPrefix | cc);
1757 } 1763 }
1758 1764
1759 1765
1760 } } // namespace v8::internal 1766 } } // namespace v8::internal
1761 1767
1762 #endif // V8_TARGET_ARCH_X64 1768 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/version.cc ('k') | test/mjsunit/arguments-escape.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698