Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 50ff06c2f891e104af9f353011f57158eb5050e0..ea3fa00889a7752f6db34c02d25fcd63609ff7d7 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -3042,7 +3042,12 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) { |
if (access.IsExternalMemory()) { |
Register result = ToRegister(instr->result()); |
- __ ldr(result, MemOperand(object, offset)); |
+ MemOperand operand = MemOperand(object, offset); |
+ if (access.representation().IsByte()) { |
+ __ ldrb(result, operand); |
+ } else { |
+ __ ldr(result, operand); |
+ } |
return; |
} |
@@ -3053,11 +3058,15 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) { |
} |
Register result = ToRegister(instr->result()); |
- if (access.IsInobject()) { |
- __ ldr(result, FieldMemOperand(object, offset)); |
- } else { |
+ if (!access.IsInobject()) { |
__ ldr(result, FieldMemOperand(object, JSObject::kPropertiesOffset)); |
- __ ldr(result, FieldMemOperand(result, offset)); |
+ object = result; |
+ } |
+ MemOperand operand = FieldMemOperand(object, offset); |
+ if (access.representation().IsByte()) { |
+ __ ldrb(result, operand); |
+ } else { |
+ __ ldr(result, operand); |
} |
} |
@@ -4163,7 +4172,12 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
if (access.IsExternalMemory()) { |
Register value = ToRegister(instr->value()); |
- __ str(value, MemOperand(object, offset)); |
+ MemOperand operand = MemOperand(object, offset); |
+ if (representation.IsByte()) { |
+ __ strb(value, operand); |
+ } else { |
+ __ str(value, operand); |
+ } |
return; |
} |
@@ -4208,7 +4222,12 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
instr->hydrogen()->value()->IsHeapObject() |
? OMIT_SMI_CHECK : INLINE_SMI_CHECK; |
if (access.IsInobject()) { |
- __ str(value, FieldMemOperand(object, offset)); |
+ MemOperand operand = FieldMemOperand(object, offset); |
+ if (representation.IsByte()) { |
+ __ strb(value, operand); |
+ } else { |
+ __ str(value, operand); |
+ } |
if (instr->hydrogen()->NeedsWriteBarrier()) { |
// Update the write barrier for the object for in-object properties. |
__ RecordWriteField(object, |
@@ -4222,7 +4241,12 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
} |
} else { |
__ ldr(scratch, FieldMemOperand(object, JSObject::kPropertiesOffset)); |
- __ str(value, FieldMemOperand(scratch, offset)); |
+ MemOperand operand = FieldMemOperand(scratch, offset); |
+ if (representation.IsByte()) { |
+ __ strb(value, operand); |
+ } else { |
+ __ str(value, operand); |
+ } |
if (instr->hydrogen()->NeedsWriteBarrier()) { |
// Update the write barrier for the properties array. |
// object is used as a scratch register. |