Index: src/x64/lithium-codegen-x64.h |
diff --git a/src/x64/lithium-codegen-x64.h b/src/x64/lithium-codegen-x64.h |
index f44fdb95107f4e7881a9104caf6fc35f8ae87cf6..b3907ce48f15fc012aabcd29ffe4907fe654ec0e 100644 |
--- a/src/x64/lithium-codegen-x64.h |
+++ b/src/x64/lithium-codegen-x64.h |
@@ -60,7 +60,8 @@ class LCodeGen BASE_EMBEDDED { |
status_(UNUSED), |
deferred_(8), |
osr_pc_offset_(-1), |
- resolver_(this) { |
+ resolver_(this), |
+ expected_safepoint_kind_(Safepoint::kSimple) { |
PopulateDeoptimizationLiteralsWithInlinedFunctions(); |
} |
@@ -156,12 +157,26 @@ class LCodeGen BASE_EMBEDDED { |
bool GenerateJumpTable(); |
bool GenerateSafepointTable(); |
+ enum SafepointMode { |
+ RECORD_SIMPLE_SAFEPOINT, |
+ RECORD_SAFEPOINT_WITH_REGISTERS |
+ }; |
+ |
+ void CallCodeGeneric(Handle<Code> code, |
+ RelocInfo::Mode mode, |
+ LInstruction* instr, |
+ SafepointMode safepoint_mode, |
+ int argc); |
+ |
+ |
void CallCode(Handle<Code> code, |
RelocInfo::Mode mode, |
LInstruction* instr); |
+ |
void CallRuntime(const Runtime::Function* function, |
int num_arguments, |
LInstruction* instr); |
+ |
void CallRuntime(Runtime::FunctionId id, |
int num_arguments, |
LInstruction* instr) { |
@@ -169,6 +184,11 @@ class LCodeGen BASE_EMBEDDED { |
CallRuntime(function, num_arguments, instr); |
} |
+ void CallRuntimeFromDeferred(Runtime::FunctionId id, |
+ int argc, |
+ LInstruction* instr); |
+ |
+ |
// Generate a direct call to a known function. Expects the function |
// to be in edi. |
void CallKnownFunction(Handle<JSFunction> function, |
@@ -177,7 +197,9 @@ class LCodeGen BASE_EMBEDDED { |
void LoadHeapObject(Register result, Handle<HeapObject> object); |
- void RegisterLazyDeoptimization(LInstruction* instr); |
+ void RegisterLazyDeoptimization(LInstruction* instr, |
+ SafepointMode safepoint_mode, |
+ int argc); |
void RegisterEnvironmentForDeoptimization(LEnvironment* environment); |
void DeoptimizeIf(Condition cc, LEnvironment* environment); |
@@ -281,6 +303,27 @@ class LCodeGen BASE_EMBEDDED { |
// Compiler from a set of parallel moves to a sequential list of moves. |
LGapResolver resolver_; |
+ Safepoint::Kind expected_safepoint_kind_; |
+ |
+ class PushSafepointRegistersScope BASE_EMBEDDED { |
+ public: |
+ explicit PushSafepointRegistersScope(LCodeGen* codegen) |
+ : codegen_(codegen) { |
+ ASSERT(codegen_->expected_safepoint_kind_ == Safepoint::kSimple); |
+ codegen_->masm_->PushSafepointRegisters(); |
+ codegen_->expected_safepoint_kind_ = Safepoint::kWithRegisters; |
+ } |
+ |
+ ~PushSafepointRegistersScope() { |
+ ASSERT(codegen_->expected_safepoint_kind_ == Safepoint::kWithRegisters); |
+ codegen_->masm_->PopSafepointRegisters(); |
+ codegen_->expected_safepoint_kind_ = Safepoint::kSimple; |
+ } |
+ |
+ private: |
+ LCodeGen* codegen_; |
+ }; |
+ |
friend class LDeferredCode; |
friend class LEnvironment; |
friend class SafepointGenerator; |