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

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

Issue 160520: X64: Add missing pop when calling handler with Out-of-memory exception. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 4 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 | « no previous file | src/x64/disasm-x64.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 6449 matching lines...) Expand 10 before | Expand all | Expand 10 after
6460 ExternalReference pending_exception(Top::k_pending_exception_address); 6460 ExternalReference pending_exception(Top::k_pending_exception_address);
6461 __ store_rax(pending_exception); 6461 __ store_rax(pending_exception);
6462 6462
6463 // Restore the stack to the address of the ENTRY handler 6463 // Restore the stack to the address of the ENTRY handler
6464 __ movq(rsp, rdx); 6464 __ movq(rsp, rdx);
6465 6465
6466 // Clear the context pointer; 6466 // Clear the context pointer;
6467 __ xor_(rsi, rsi); 6467 __ xor_(rsi, rsi);
6468 6468
6469 // Restore registers from handler. 6469 // Restore registers from handler.
6470 6470 __ pop(kScratchRegister); // Next Handler. Not used.
6471 __ pop(rbp); // FP 6471 __ pop(rbp); // FP
6472 ASSERT_EQ(StackHandlerConstants::kFPOffset + kPointerSize, 6472 ASSERT_EQ(StackHandlerConstants::kFPOffset + kPointerSize,
6473 StackHandlerConstants::kStateOffset); 6473 StackHandlerConstants::kStateOffset);
6474 __ pop(rdx); // State 6474 __ pop(rdx); // State
6475 6475
6476 ASSERT_EQ(StackHandlerConstants::kStateOffset + kPointerSize, 6476 ASSERT_EQ(StackHandlerConstants::kStateOffset + kPointerSize,
6477 StackHandlerConstants::kPCOffset); 6477 StackHandlerConstants::kPCOffset);
6478 __ ret(0); 6478 __ ret(0);
6479 } 6479 }
6480 6480
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
7258 int CompareStub::MinorKey() { 7258 int CompareStub::MinorKey() {
7259 // Encode the two parameters in a unique 16 bit value. 7259 // Encode the two parameters in a unique 16 bit value.
7260 ASSERT(static_cast<unsigned>(cc_) < (1 << 15)); 7260 ASSERT(static_cast<unsigned>(cc_) < (1 << 15));
7261 return (static_cast<unsigned>(cc_) << 1) | (strict_ ? 1 : 0); 7261 return (static_cast<unsigned>(cc_) << 1) | (strict_ ? 1 : 0);
7262 } 7262 }
7263 7263
7264 7264
7265 #undef __ 7265 #undef __
7266 7266
7267 } } // namespace v8::internal 7267 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/x64/disasm-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698