Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index d022a82f4df540d5078dcdebc184eb3bba1566fd..fbdd3ac660b05d5b1a09ad88ede100316a40488c 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -685,6 +685,13 @@ double LCodeGen::ToDouble(LConstantOperand* op) const { |
} |
+ExternalReference LCodeGen::ToExternalReference(LConstantOperand* op) const { |
+ HConstant* constant = chunk_->LookupConstant(op); |
+ ASSERT(constant->HasExternalReferenceValue()); |
+ return constant->ExternalReferenceValue(); |
+} |
+ |
+ |
bool LCodeGen::IsInteger32(LConstantOperand* op) const { |
return chunk_->LookupLiteralRepresentation(op).IsSmiOrInteger32(); |
} |
@@ -1846,6 +1853,11 @@ void LCodeGen::DoConstantD(LConstantD* instr) { |
} |
+void LCodeGen::DoConstantE(LConstantE* instr) { |
+ __ lea(ToRegister(instr->result()), Operand::StaticVariable(instr->value())); |
+} |
+ |
+ |
void LCodeGen::DoConstantT(LConstantT* instr) { |
Register reg = ToRegister(instr->result()); |
Handle<Object> handle = instr->value(); |
@@ -3042,6 +3054,17 @@ void LCodeGen::DoStoreContextSlot(LStoreContextSlot* instr) { |
void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) { |
HObjectAccess access = instr->hydrogen()->access(); |
int offset = access.offset(); |
+ |
+ if (access.IsExternalMemory()) { |
+ MemOperand operand = instr->object()->IsConstantOperand() |
+ ? MemOperand::StaticVariable(ToExternalReference( |
+ LConstantOperand::cast(instr->object()))) |
danno
2013/07/29 10:40:14
nit: funky indentatoin
Benedikt Meurer
2013/07/29 13:57:51
Done.
|
+ : MemOperand(ToRegister(instr->object()), offset); |
+ Register result = ToRegister(instr->result()); |
+ __ mov(result, operand); |
+ return; |
+ } |
+ |
Register object = ToRegister(instr->object()); |
if (FLAG_track_double_fields && |
instr->hydrogen()->representation().IsDouble()) { |
@@ -4321,10 +4344,25 @@ void LCodeGen::DoInnerAllocatedObject(LInnerAllocatedObject* instr) { |
void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
Representation representation = instr->representation(); |
- Register object = ToRegister(instr->object()); |
HObjectAccess access = instr->hydrogen()->access(); |
int offset = access.offset(); |
+ if (access.IsExternalMemory()) { |
+ MemOperand operand = instr->object()->IsConstantOperand() |
+ ? MemOperand::StaticVariable(ToExternalReference( |
+ LConstantOperand::cast(instr->object()))) |
danno
2013/07/29 10:40:14
nit: funky indentatoin
Benedikt Meurer
2013/07/29 13:57:51
Sven suggested to keep it this way.
|
+ : MemOperand(ToRegister(instr->object()), offset); |
+ if (instr->value()->IsConstantOperand()) { |
+ __ mov(operand, Immediate(ToInteger32( |
+ LConstantOperand::cast(instr->value())))); |
danno
2013/07/29 10:40:14
nit: funky indentatoin
Benedikt Meurer
2013/07/29 13:57:51
Done.
|
+ } else { |
+ Register value = ToRegister(instr->value()); |
+ __ mov(operand, value); |
+ } |
+ return; |
+ } |
+ |
+ Register object = ToRegister(instr->object()); |
Handle<Map> transition = instr->transition(); |
if (FLAG_track_fields && representation.IsSmi()) { |
@@ -4389,8 +4427,7 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
Register write_register = object; |
if (!access.IsInobject()) { |
write_register = ToRegister(instr->temp()); |
- __ mov(write_register, |
- FieldOperand(object, JSObject::kPropertiesOffset)); |
+ __ mov(write_register, FieldOperand(object, JSObject::kPropertiesOffset)); |
} |
if (instr->value()->IsConstantOperand()) { |