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

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

Issue 6592008: X64 Crankshaft: Fix error in r6897. Restore context reg after KeyedCallIC (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 9 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/jump-target-x64.cc ('k') | src/x64/macro-assembler-x64.h » ('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 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 2512 matching lines...) Expand 10 before | Expand all | Expand 10 after
2523 } 2523 }
2524 2524
2525 2525
2526 void LCodeGen::DoCallKeyed(LCallKeyed* instr) { 2526 void LCodeGen::DoCallKeyed(LCallKeyed* instr) {
2527 ASSERT(ToRegister(instr->key()).is(rcx)); 2527 ASSERT(ToRegister(instr->key()).is(rcx));
2528 ASSERT(ToRegister(instr->result()).is(rax)); 2528 ASSERT(ToRegister(instr->result()).is(rax));
2529 2529
2530 int arity = instr->arity(); 2530 int arity = instr->arity();
2531 Handle<Code> ic = StubCache::ComputeKeyedCallInitialize(arity, NOT_IN_LOOP); 2531 Handle<Code> ic = StubCache::ComputeKeyedCallInitialize(arity, NOT_IN_LOOP);
2532 CallCode(ic, RelocInfo::CODE_TARGET, instr); 2532 CallCode(ic, RelocInfo::CODE_TARGET, instr);
2533 __ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset));
2533 } 2534 }
2534 2535
2535 2536
2536 void LCodeGen::DoCallNamed(LCallNamed* instr) { 2537 void LCodeGen::DoCallNamed(LCallNamed* instr) {
2537 ASSERT(ToRegister(instr->result()).is(rax)); 2538 ASSERT(ToRegister(instr->result()).is(rax));
2538 2539
2539 int arity = instr->arity(); 2540 int arity = instr->arity();
2540 Handle<Code> ic = StubCache::ComputeCallInitialize(arity, NOT_IN_LOOP); 2541 Handle<Code> ic = StubCache::ComputeCallInitialize(arity, NOT_IN_LOOP);
2541 __ Move(rcx, instr->name()); 2542 __ Move(rcx, instr->name());
2542 CallCode(ic, RelocInfo::CODE_TARGET, instr); 2543 CallCode(ic, RelocInfo::CODE_TARGET, instr);
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
3551 RegisterEnvironmentForDeoptimization(environment); 3552 RegisterEnvironmentForDeoptimization(environment);
3552 ASSERT(osr_pc_offset_ == -1); 3553 ASSERT(osr_pc_offset_ == -1);
3553 osr_pc_offset_ = masm()->pc_offset(); 3554 osr_pc_offset_ = masm()->pc_offset();
3554 } 3555 }
3555 3556
3556 #undef __ 3557 #undef __
3557 3558
3558 } } // namespace v8::internal 3559 } } // namespace v8::internal
3559 3560
3560 #endif // V8_TARGET_ARCH_X64 3561 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/jump-target-x64.cc ('k') | src/x64/macro-assembler-x64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698