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

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

Issue 14429003: Refactor ExternalReference::isolate_address() to not rely on Isolate::Current(). (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 8 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
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 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 __ sub(r4, fp, r4); 658 __ sub(r4, fp, r4);
659 659
660 // Allocate a new deoptimizer object. 660 // Allocate a new deoptimizer object.
661 // Pass four arguments in r0 to r3 and fifth argument on stack. 661 // Pass four arguments in r0 to r3 and fifth argument on stack.
662 __ PrepareCallCFunction(6, r5); 662 __ PrepareCallCFunction(6, r5);
663 __ ldr(r0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); 663 __ ldr(r0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
664 __ mov(r1, Operand(type())); // bailout type, 664 __ mov(r1, Operand(type())); // bailout type,
665 // r2: bailout id already loaded. 665 // r2: bailout id already loaded.
666 // r3: code address or 0 already loaded. 666 // r3: code address or 0 already loaded.
667 __ str(r4, MemOperand(sp, 0 * kPointerSize)); // Fp-to-sp delta. 667 __ str(r4, MemOperand(sp, 0 * kPointerSize)); // Fp-to-sp delta.
668 __ mov(r5, Operand(ExternalReference::isolate_address())); 668 __ mov(r5, Operand(ExternalReference::isolate_address(isolate)));
669 __ str(r5, MemOperand(sp, 1 * kPointerSize)); // Isolate. 669 __ str(r5, MemOperand(sp, 1 * kPointerSize)); // Isolate.
670 // Call Deoptimizer::New(). 670 // Call Deoptimizer::New().
671 { 671 {
672 AllowExternalCallThatCantCauseGC scope(masm()); 672 AllowExternalCallThatCantCauseGC scope(masm());
673 __ CallCFunction(ExternalReference::new_deoptimizer_function(isolate), 6); 673 __ CallCFunction(ExternalReference::new_deoptimizer_function(isolate), 6);
674 } 674 }
675 675
676 // Preserve "deoptimizer" object in register r0 and get the input 676 // Preserve "deoptimizer" object in register r0 and get the input
677 // frame descriptor pointer to r1 (deoptimizer->input_); 677 // frame descriptor pointer to r1 (deoptimizer->input_);
678 __ ldr(r1, MemOperand(r0, Deoptimizer::input_offset())); 678 __ ldr(r1, MemOperand(r0, Deoptimizer::input_offset()));
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 __ push(ip); 826 __ push(ip);
827 __ b(&done); 827 __ b(&done);
828 ASSERT(masm()->pc_offset() - start == table_entry_size_); 828 ASSERT(masm()->pc_offset() - start == table_entry_size_);
829 } 829 }
830 __ bind(&done); 830 __ bind(&done);
831 } 831 }
832 832
833 #undef __ 833 #undef __
834 834
835 } } // namespace v8::internal 835 } } // namespace v8::internal
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698