Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 716c65718f2c3afb76165184e758bf5e21d6d301..8b58804834e9a8886dfdc15fa9d0fe7de431bdd7 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -3275,12 +3275,15 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) { |
if (access.IsExternalMemory()) { |
Register result = ToRegister(instr->result()); |
- if (instr->object()->IsConstantOperand()) { |
- ExternalReference external_reference = ToExternalReference( |
- LConstantOperand::cast(instr->object())); |
- __ mov(result, MemOperand::StaticVariable(external_reference)); |
+ MemOperand operand = instr->object()->IsConstantOperand() |
+ ? MemOperand::StaticVariable(ToExternalReference( |
+ LConstantOperand::cast(instr->object()))) |
+ : MemOperand(ToRegister(instr->object()), offset); |
+ if (access.representation().IsByte()) { |
+ ASSERT(instr->hydrogen()->representation().IsInteger32()); |
+ __ movzx_b(result, operand); |
} else { |
- __ mov(result, MemOperand(ToRegister(instr->object()), offset)); |
+ __ mov(result, operand); |
} |
return; |
} |
@@ -3299,11 +3302,15 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) { |
} |
Register result = ToRegister(instr->result()); |
- if (access.IsInobject()) { |
- __ mov(result, FieldOperand(object, offset)); |
- } else { |
+ if (!access.IsInobject()) { |
__ mov(result, FieldOperand(object, JSObject::kPropertiesOffset)); |
- __ mov(result, FieldOperand(result, offset)); |
+ object = result; |
+ } |
+ if (access.representation().IsByte()) { |
+ ASSERT(instr->hydrogen()->representation().IsInteger32()); |
+ __ movzx_b(result, FieldOperand(object, offset)); |
+ } else { |
+ __ mov(result, FieldOperand(object, offset)); |
} |
} |
@@ -4479,10 +4486,18 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
: MemOperand(ToRegister(instr->object()), offset); |
if (instr->value()->IsConstantOperand()) { |
LConstantOperand* operand_value = LConstantOperand::cast(instr->value()); |
- __ mov(operand, Immediate(ToInteger32(operand_value))); |
+ if (representation.IsByte()) { |
+ __ mov_b(operand, ToInteger32(operand_value)); |
+ } else { |
+ __ mov(operand, Immediate(ToInteger32(operand_value))); |
+ } |
} else { |
Register value = ToRegister(instr->value()); |
- __ mov(operand, value); |
+ if (representation.IsByte()) { |
+ __ mov_b(operand, value); |
+ } else { |
+ __ mov(operand, value); |
+ } |
} |
return; |
} |
@@ -4555,17 +4570,28 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
__ mov(write_register, FieldOperand(object, JSObject::kPropertiesOffset)); |
} |
+ MemOperand operand = FieldOperand(write_register, offset); |
if (instr->value()->IsConstantOperand()) { |
LConstantOperand* operand_value = LConstantOperand::cast(instr->value()); |
if (operand_value->IsRegister()) { |
- __ mov(FieldOperand(write_register, offset), ToRegister(operand_value)); |
+ Register value = ToRegister(operand_value); |
+ if (representation.IsByte()) { |
+ __ mov_b(operand, value); |
+ } else { |
+ __ mov(operand, value); |
+ } |
} else { |
Handle<Object> handle_value = ToHandle(operand_value); |
ASSERT(!instr->hydrogen()->NeedsWriteBarrier()); |
- __ mov(FieldOperand(write_register, offset), handle_value); |
+ __ mov(operand, handle_value); |
} |
} else { |
- __ mov(FieldOperand(write_register, offset), ToRegister(instr->value())); |
+ Register value = ToRegister(instr->value()); |
+ if (representation.IsByte()) { |
+ __ mov_b(operand, value); |
+ } else { |
+ __ mov(operand, value); |
+ } |
} |
if (instr->hydrogen()->NeedsWriteBarrier()) { |