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

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

Issue 6310018: X64 Crankshaft: Remove relative jump to deoptimization code. Fixes logical e... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 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
« no previous file with comments | « src/x64/assembler-x64.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 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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 Address entry = Deoptimizer::GetDeoptimizationEntry(id, Deoptimizer::EAGER); 422 Address entry = Deoptimizer::GetDeoptimizationEntry(id, Deoptimizer::EAGER);
423 ASSERT(entry != NULL); 423 ASSERT(entry != NULL);
424 if (entry == NULL) { 424 if (entry == NULL) {
425 Abort("bailout was not prepared"); 425 Abort("bailout was not prepared");
426 return; 426 return;
427 } 427 }
428 428
429 if (cc == no_condition) { 429 if (cc == no_condition) {
430 __ Jump(entry, RelocInfo::RUNTIME_ENTRY); 430 __ Jump(entry, RelocInfo::RUNTIME_ENTRY);
431 } else { 431 } else {
432 __ j(cc, entry, RelocInfo::RUNTIME_ENTRY); 432 NearLabel done;
433 __ j(NegateCondition(cc), &done);
434 __ Jump(entry, RelocInfo::RUNTIME_ENTRY);
435 __ bind(&done);
433 } 436 }
434 } 437 }
435 438
436 439
437 void LCodeGen::PopulateDeoptimizationData(Handle<Code> code) { 440 void LCodeGen::PopulateDeoptimizationData(Handle<Code> code) {
438 int length = deoptimizations_.length(); 441 int length = deoptimizations_.length();
439 if (length == 0) return; 442 if (length == 0) return;
440 ASSERT(FLAG_deopt); 443 ASSERT(FLAG_deopt);
441 Handle<DeoptimizationInputData> data = 444 Handle<DeoptimizationInputData> data =
442 Factory::NewDeoptimizationInputData(length, TENURED); 445 Factory::NewDeoptimizationInputData(length, TENURED);
(...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after
1888 1891
1889 void LCodeGen::DoOsrEntry(LOsrEntry* instr) { 1892 void LCodeGen::DoOsrEntry(LOsrEntry* instr) {
1890 Abort("Unimplemented: %s", "DoOsrEntry"); 1893 Abort("Unimplemented: %s", "DoOsrEntry");
1891 } 1894 }
1892 1895
1893 #undef __ 1896 #undef __
1894 1897
1895 } } // namespace v8::internal 1898 } } // namespace v8::internal
1896 1899
1897 #endif // V8_TARGET_ARCH_X64 1900 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/assembler-x64.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698