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

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

Issue 1265723003: [turbofan] Fix kArchTailCallCodeObject on ia32/x64. (Closed) Base URL: ssh://rmcilroy.lon.corp.google.com///usr/local/google/code/v8_full/v8@inter_linkage_change
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 | src/compiler/x64/code-generator-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 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/ia32/assembler-ia32.h" 10 #include "src/ia32/assembler-ia32.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 RecordCallPosition(instr); 311 RecordCallPosition(instr);
312 break; 312 break;
313 } 313 }
314 case kArchTailCallCodeObject: { 314 case kArchTailCallCodeObject: {
315 AssembleDeconstructActivationRecord(); 315 AssembleDeconstructActivationRecord();
316 if (HasImmediateInput(instr, 0)) { 316 if (HasImmediateInput(instr, 0)) {
317 Handle<Code> code = Handle<Code>::cast(i.InputHeapObject(0)); 317 Handle<Code> code = Handle<Code>::cast(i.InputHeapObject(0));
318 __ jmp(code, RelocInfo::CODE_TARGET); 318 __ jmp(code, RelocInfo::CODE_TARGET);
319 } else { 319 } else {
320 Register reg = i.InputRegister(0); 320 Register reg = i.InputRegister(0);
321 __ jmp(Operand(reg, Code::kHeaderSize - kHeapObjectTag)); 321 __ add(reg, Immediate(Code::kHeaderSize - kHeapObjectTag));
322 __ jmp(reg);
322 } 323 }
323 break; 324 break;
324 } 325 }
325 case kArchCallJSFunction: { 326 case kArchCallJSFunction: {
326 EnsureSpaceForLazyDeopt(); 327 EnsureSpaceForLazyDeopt();
327 Register func = i.InputRegister(0); 328 Register func = i.InputRegister(0);
328 if (FLAG_debug_code) { 329 if (FLAG_debug_code) {
329 // Check the function's context matches the context argument. 330 // Check the function's context matches the context argument.
330 __ cmp(esi, FieldOperand(func, JSFunction::kContextOffset)); 331 __ cmp(esi, FieldOperand(func, JSFunction::kContextOffset));
331 __ Assert(equal, kWrongFunctionContext); 332 __ Assert(equal, kWrongFunctionContext);
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 __ Nop(padding_size); 1542 __ Nop(padding_size);
1542 } 1543 }
1543 } 1544 }
1544 } 1545 }
1545 1546
1546 #undef __ 1547 #undef __
1547 1548
1548 } // namespace compiler 1549 } // namespace compiler
1549 } // namespace internal 1550 } // namespace internal
1550 } // namespace v8 1551 } // namespace v8
OLDNEW
« no previous file with comments | « no previous file | src/compiler/x64/code-generator-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698