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

Side by Side Diff: src/compiler/x87/code-generator-x87.cc

Issue 1256163003: X87: [turbofan] Fix kArchTailCallCodeObject on ia32/x64. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/compiler/code-generator.h" 5 #include "src/compiler/code-generator.h"
6 6
7 #include "src/compiler/code-generator-impl.h" 7 #include "src/compiler/code-generator-impl.h"
8 #include "src/compiler/gap-resolver.h" 8 #include "src/compiler/gap-resolver.h"
9 #include "src/compiler/node-matchers.h" 9 #include "src/compiler/node-matchers.h"
10 #include "src/scopes.h" 10 #include "src/scopes.h"
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 } 331 }
332 break; 332 break;
333 } 333 }
334 case kArchTailCallCodeObject: { 334 case kArchTailCallCodeObject: {
335 AssembleDeconstructActivationRecord(); 335 AssembleDeconstructActivationRecord();
336 if (HasImmediateInput(instr, 0)) { 336 if (HasImmediateInput(instr, 0)) {
337 Handle<Code> code = Handle<Code>::cast(i.InputHeapObject(0)); 337 Handle<Code> code = Handle<Code>::cast(i.InputHeapObject(0));
338 __ jmp(code, RelocInfo::CODE_TARGET); 338 __ jmp(code, RelocInfo::CODE_TARGET);
339 } else { 339 } else {
340 Register reg = i.InputRegister(0); 340 Register reg = i.InputRegister(0);
341 __ jmp(Operand(reg, Code::kHeaderSize - kHeapObjectTag)); 341 __ add(reg, Immediate(Code::kHeaderSize - kHeapObjectTag));
342 __ jmp(reg);
342 } 343 }
343 break; 344 break;
344 } 345 }
345 case kArchCallJSFunction: { 346 case kArchCallJSFunction: {
346 EnsureSpaceForLazyDeopt(); 347 EnsureSpaceForLazyDeopt();
347 Register func = i.InputRegister(0); 348 Register func = i.InputRegister(0);
348 if (FLAG_debug_code) { 349 if (FLAG_debug_code) {
349 // Check the function's context matches the context argument. 350 // Check the function's context matches the context argument.
350 __ cmp(esi, FieldOperand(func, JSFunction::kContextOffset)); 351 __ cmp(esi, FieldOperand(func, JSFunction::kContextOffset));
351 __ Assert(equal, kWrongFunctionContext); 352 __ Assert(equal, kWrongFunctionContext);
(...skipping 1487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1839 __ Nop(padding_size); 1840 __ Nop(padding_size);
1840 } 1841 }
1841 } 1842 }
1842 } 1843 }
1843 1844
1844 #undef __ 1845 #undef __
1845 1846
1846 } // namespace compiler 1847 } // namespace compiler
1847 } // namespace internal 1848 } // namespace internal
1848 } // namespace v8 1849 } // namespace v8
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698