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

Side by Side Diff: src/arm/deoptimizer-arm.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/arm/code-stubs-arm.cc ('k') | src/arm/lithium-arm.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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 new(output_frame_size) FrameDescription(output_frame_size, 0); 486 new(output_frame_size) FrameDescription(output_frame_size, 0);
487 Code* notify_miss = 487 Code* notify_miss =
488 isolate_->builtins()->builtin(Builtins::kNotifyICMiss); 488 isolate_->builtins()->builtin(Builtins::kNotifyICMiss);
489 output_frame->SetState(Smi::FromInt(FullCodeGenerator::NO_REGISTERS)); 489 output_frame->SetState(Smi::FromInt(FullCodeGenerator::NO_REGISTERS));
490 output_frame->SetContinuation( 490 output_frame->SetContinuation(
491 reinterpret_cast<intptr_t>(notify_miss->entry())); 491 reinterpret_cast<intptr_t>(notify_miss->entry()));
492 492
493 ASSERT(compiled_code_->kind() == Code::COMPILED_STUB); 493 ASSERT(compiled_code_->kind() == Code::COMPILED_STUB);
494 int major_key = compiled_code_->major_key(); 494 int major_key = compiled_code_->major_key();
495 CodeStubInterfaceDescriptor* descriptor = 495 CodeStubInterfaceDescriptor* descriptor =
496 isolate_->code_stub_interface_descriptors()[major_key]; 496 isolate_->code_stub_interface_descriptor(major_key);
497 Handle<Code> miss_ic(descriptor->deoptimization_handler); 497 Handle<Code> miss_ic(descriptor->deoptimization_handler_);
498 output_frame->SetPc(reinterpret_cast<intptr_t>(miss_ic->instruction_start())); 498 output_frame->SetPc(reinterpret_cast<intptr_t>(miss_ic->instruction_start()));
499 unsigned input_frame_size = input_->GetFrameSize(); 499 unsigned input_frame_size = input_->GetFrameSize();
500 intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize); 500 intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize);
501 output_frame->SetFrameSlot(0, value); 501 output_frame->SetFrameSlot(0, value);
502 value = input_->GetFrameSlot(input_frame_size - 2 * kPointerSize); 502 value = input_->GetFrameSlot(input_frame_size - 2 * kPointerSize);
503 output_frame->SetRegister(fp.code(), value); 503 output_frame->SetRegister(fp.code(), value);
504 output_frame->SetFp(value); 504 output_frame->SetFp(value);
505 value = input_->GetFrameSlot(input_frame_size - 3 * kPointerSize); 505 value = input_->GetFrameSlot(input_frame_size - 3 * kPointerSize);
506 output_frame->SetRegister(cp.code(), value); 506 output_frame->SetRegister(cp.code(), value);
507 507
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 __ push(ip); 1190 __ push(ip);
1191 __ b(&done); 1191 __ b(&done);
1192 ASSERT(masm()->pc_offset() - start == table_entry_size_); 1192 ASSERT(masm()->pc_offset() - start == table_entry_size_);
1193 } 1193 }
1194 __ bind(&done); 1194 __ bind(&done);
1195 } 1195 }
1196 1196
1197 #undef __ 1197 #undef __
1198 1198
1199 } } // namespace v8::internal 1199 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/arm/code-stubs-arm.cc ('k') | src/arm/lithium-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698