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

Side by Side Diff: src/ia32/deoptimizer-ia32.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/ia32/code-stubs-ia32.cc ('k') | src/ia32/lithium-ia32.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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 new(output_frame_size) FrameDescription(output_frame_size, 0); 594 new(output_frame_size) FrameDescription(output_frame_size, 0);
595 Code* notify_miss = 595 Code* notify_miss =
596 isolate_->builtins()->builtin(Builtins::kNotifyICMiss); 596 isolate_->builtins()->builtin(Builtins::kNotifyICMiss);
597 output_frame->SetState(Smi::FromInt(FullCodeGenerator::NO_REGISTERS)); 597 output_frame->SetState(Smi::FromInt(FullCodeGenerator::NO_REGISTERS));
598 output_frame->SetContinuation( 598 output_frame->SetContinuation(
599 reinterpret_cast<uint32_t>(notify_miss->entry())); 599 reinterpret_cast<uint32_t>(notify_miss->entry()));
600 600
601 ASSERT(compiled_code_->kind() == Code::COMPILED_STUB); 601 ASSERT(compiled_code_->kind() == Code::COMPILED_STUB);
602 int major_key = compiled_code_->major_key(); 602 int major_key = compiled_code_->major_key();
603 CodeStubInterfaceDescriptor* descriptor = 603 CodeStubInterfaceDescriptor* descriptor =
604 isolate_->code_stub_interface_descriptors()[major_key]; 604 isolate_->code_stub_interface_descriptor(major_key);
605 Handle<Code> miss_ic(descriptor->deoptimization_handler); 605 Handle<Code> miss_ic(descriptor->deoptimization_handler_);
606 output_frame->SetPc(reinterpret_cast<intptr_t>(miss_ic->instruction_start())); 606 output_frame->SetPc(reinterpret_cast<intptr_t>(miss_ic->instruction_start()));
607 unsigned input_frame_size = input_->GetFrameSize(); 607 unsigned input_frame_size = input_->GetFrameSize();
608 intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize); 608 intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize);
609 output_frame->SetFrameSlot(0, value); 609 output_frame->SetFrameSlot(0, value);
610 value = input_->GetFrameSlot(input_frame_size - 2 * kPointerSize); 610 value = input_->GetFrameSlot(input_frame_size - 2 * kPointerSize);
611 output_frame->SetRegister(ebp.code(), value); 611 output_frame->SetRegister(ebp.code(), value);
612 output_frame->SetFp(value); 612 output_frame->SetFp(value);
613 value = input_->GetFrameSlot(input_frame_size - 3 * kPointerSize); 613 value = input_->GetFrameSlot(input_frame_size - 3 * kPointerSize);
614 output_frame->SetRegister(esi.code(), value); 614 output_frame->SetRegister(esi.code(), value);
615 615
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 } 1282 }
1283 __ bind(&done); 1283 __ bind(&done);
1284 } 1284 }
1285 1285
1286 #undef __ 1286 #undef __
1287 1287
1288 1288
1289 } } // namespace v8::internal 1289 } } // namespace v8::internal
1290 1290
1291 #endif // V8_TARGET_ARCH_IA32 1291 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/ia32/code-stubs-ia32.cc ('k') | src/ia32/lithium-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698