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

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

Issue 11441013: Fix isolate bug introduced by generated code stubs (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Review feedback Created 8 years 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/code-stubs-x64.cc ('k') | src/x64/lithium-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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 new(output_frame_size) FrameDescription(output_frame_size, 0); 484 new(output_frame_size) FrameDescription(output_frame_size, 0);
485 Code* notify_miss = 485 Code* notify_miss =
486 isolate_->builtins()->builtin(Builtins::kNotifyICMiss); 486 isolate_->builtins()->builtin(Builtins::kNotifyICMiss);
487 output_frame->SetState(Smi::FromInt(FullCodeGenerator::NO_REGISTERS)); 487 output_frame->SetState(Smi::FromInt(FullCodeGenerator::NO_REGISTERS));
488 output_frame->SetContinuation( 488 output_frame->SetContinuation(
489 reinterpret_cast<intptr_t>(notify_miss->entry())); 489 reinterpret_cast<intptr_t>(notify_miss->entry()));
490 490
491 ASSERT(compiled_code_->kind() == Code::COMPILED_STUB); 491 ASSERT(compiled_code_->kind() == Code::COMPILED_STUB);
492 int major_key = compiled_code_->major_key(); 492 int major_key = compiled_code_->major_key();
493 CodeStubInterfaceDescriptor* descriptor = 493 CodeStubInterfaceDescriptor* descriptor =
494 isolate_->code_stub_interface_descriptors()[major_key]; 494 isolate_->code_stub_interface_descriptor(major_key);
495 Handle<Code> miss_ic(descriptor->deoptimization_handler); 495 Handle<Code> miss_ic(descriptor->deoptimization_handler_);
496 output_frame->SetPc(reinterpret_cast<intptr_t>(miss_ic->instruction_start())); 496 output_frame->SetPc(reinterpret_cast<intptr_t>(miss_ic->instruction_start()));
497 unsigned input_frame_size = input_->GetFrameSize(); 497 unsigned input_frame_size = input_->GetFrameSize();
498 intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize); 498 intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize);
499 output_frame->SetFrameSlot(0, value); 499 output_frame->SetFrameSlot(0, value);
500 value = input_->GetFrameSlot(input_frame_size - 2 * kPointerSize); 500 value = input_->GetFrameSlot(input_frame_size - 2 * kPointerSize);
501 output_frame->SetRegister(rbp.code(), value); 501 output_frame->SetRegister(rbp.code(), value);
502 output_frame->SetFp(value); 502 output_frame->SetFp(value);
503 value = input_->GetFrameSlot(input_frame_size - 3 * kPointerSize); 503 value = input_->GetFrameSlot(input_frame_size - 3 * kPointerSize);
504 output_frame->SetRegister(rsi.code(), value); 504 output_frame->SetRegister(rsi.code(), value);
505 505
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
1177 } 1177 }
1178 __ bind(&done); 1178 __ bind(&done);
1179 } 1179 }
1180 1180
1181 #undef __ 1181 #undef __
1182 1182
1183 1183
1184 } } // namespace v8::internal 1184 } } // namespace v8::internal
1185 1185
1186 #endif // V8_TARGET_ARCH_X64 1186 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/code-stubs-x64.cc ('k') | src/x64/lithium-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698