Index: src/ia32/lithium-codegen-ia32.h |
diff --git a/src/ia32/lithium-codegen-ia32.h b/src/ia32/lithium-codegen-ia32.h |
index 52f33614b3192fc1f51007bd2c84e0debb93aae3..7ad278ff0f81bf5b45a707e7487f019a64c6ffb1 100644 |
--- a/src/ia32/lithium-codegen-ia32.h |
+++ b/src/ia32/lithium-codegen-ia32.h |
@@ -34,6 +34,7 @@ |
#include "deoptimizer.h" |
#include "safepoint-table.h" |
#include "scopes.h" |
+#include "ia32/lithium-gap-resolver-ia32.h" |
namespace v8 { |
namespace internal { |
@@ -80,10 +81,20 @@ class LCodeGen BASE_EMBEDDED { |
scope_(chunk->graph()->info()->scope()), |
status_(UNUSED), |
deferred_(8), |
- osr_pc_offset_(-1) { |
+ osr_pc_offset_(-1), |
+ resolver_(this) { |
PopulateDeoptimizationLiteralsWithInlinedFunctions(); |
} |
+ // Simple accessors. |
+ MacroAssembler* masm() const { return masm_; } |
+ |
+ // Support for converting LOperands to assembler types. |
+ Operand ToOperand(LOperand* op) const; |
+ Register ToRegister(LOperand* op) const; |
+ XMMRegister ToDoubleRegister(LOperand* op) const; |
+ Immediate ToImmediate(LOperand* op); |
+ |
// Try to generate code for the entire chunk, but it may fail if the |
// chunk contains constructs we cannot handle. Returns true if the |
// code generation attempt succeeded. |
@@ -129,7 +140,6 @@ class LCodeGen BASE_EMBEDDED { |
LChunk* chunk() const { return chunk_; } |
Scope* scope() const { return scope_; } |
HGraph* graph() const { return chunk_->graph(); } |
- MacroAssembler* masm() const { return masm_; } |
int GetNextEmittedBlock(int block); |
LInstruction* GetNextInstruction(); |
@@ -191,11 +201,7 @@ class LCodeGen BASE_EMBEDDED { |
Register ToRegister(int index) const; |
XMMRegister ToDoubleRegister(int index) const; |
- Register ToRegister(LOperand* op) const; |
- XMMRegister ToDoubleRegister(LOperand* op) const; |
int ToInteger32(LConstantOperand* op) const; |
- Operand ToOperand(LOperand* op) const; |
- Immediate ToImmediate(LOperand* op); |
// Specific math operations - used from DoUnaryMathOperation. |
void DoMathAbs(LUnaryMathOperation* instr); |