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

Side by Side Diff: src/arm/deoptimizer-arm.cc

Issue 1696043002: [runtime] Unify and simplify how frames are marked (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Fix merge problems Created 4 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
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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/codegen.h" 5 #include "src/codegen.h"
6 #include "src/deoptimizer.h" 6 #include "src/deoptimizer.h"
7 #include "src/full-codegen/full-codegen.h" 7 #include "src/full-codegen/full-codegen.h"
8 #include "src/register-configuration.h" 8 #include "src/register-configuration.h"
9 #include "src/safepoint-table.h" 9 #include "src/safepoint-table.h"
10 10
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // address for lazy deoptimization) and compute the fp-to-sp delta in 149 // address for lazy deoptimization) and compute the fp-to-sp delta in
150 // register r4. 150 // register r4.
151 __ mov(r3, lr); 151 __ mov(r3, lr);
152 // Correct one word for bailout id. 152 // Correct one word for bailout id.
153 __ add(r4, sp, Operand(kSavedRegistersAreaSize + (1 * kPointerSize))); 153 __ add(r4, sp, Operand(kSavedRegistersAreaSize + (1 * kPointerSize)));
154 __ sub(r4, fp, r4); 154 __ sub(r4, fp, r4);
155 155
156 // Allocate a new deoptimizer object. 156 // Allocate a new deoptimizer object.
157 // Pass four arguments in r0 to r3 and fifth argument on stack. 157 // Pass four arguments in r0 to r3 and fifth argument on stack.
158 __ PrepareCallCFunction(6, r5); 158 __ PrepareCallCFunction(6, r5);
159 __ mov(r0, Operand(0));
160 Label context_check;
161 __ ldr(r1, MemOperand(fp, CommonFrameConstants::kContextOrFrameTypeOffset));
162 __ JumpIfSmi(r1, &context_check);
159 __ ldr(r0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); 163 __ ldr(r0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
164 __ bind(&context_check);
160 __ mov(r1, Operand(type())); // bailout type, 165 __ mov(r1, Operand(type())); // bailout type,
161 // r2: bailout id already loaded. 166 // r2: bailout id already loaded.
162 // r3: code address or 0 already loaded. 167 // r3: code address or 0 already loaded.
163 __ str(r4, MemOperand(sp, 0 * kPointerSize)); // Fp-to-sp delta. 168 __ str(r4, MemOperand(sp, 0 * kPointerSize)); // Fp-to-sp delta.
164 __ mov(r5, Operand(ExternalReference::isolate_address(isolate()))); 169 __ mov(r5, Operand(ExternalReference::isolate_address(isolate())));
165 __ str(r5, MemOperand(sp, 1 * kPointerSize)); // Isolate. 170 __ str(r5, MemOperand(sp, 1 * kPointerSize)); // Isolate.
166 // Call Deoptimizer::New(). 171 // Call Deoptimizer::New().
167 { 172 {
168 AllowExternalCallThatCantCauseGC scope(masm()); 173 AllowExternalCallThatCantCauseGC scope(masm());
169 __ CallCFunction(ExternalReference::new_deoptimizer_function(isolate()), 6); 174 __ CallCFunction(ExternalReference::new_deoptimizer_function(isolate()), 6);
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) { 334 void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
330 DCHECK(FLAG_enable_embedded_constant_pool); 335 DCHECK(FLAG_enable_embedded_constant_pool);
331 SetFrameSlot(offset, value); 336 SetFrameSlot(offset, value);
332 } 337 }
333 338
334 339
335 #undef __ 340 #undef __
336 341
337 } // namespace internal 342 } // namespace internal
338 } // namespace v8 343 } // namespace v8
OLDNEW
« no previous file with comments | « src/arm/codegen-arm.cc ('k') | src/arm/frames-arm.h » ('j') | src/x64/macro-assembler-x64.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698