Commit c234e475 authored by cwzwarich@webkit.org's avatar cwzwarich@webkit.org

Rubber-stamped by Oliver Hunt.

Removed unused ARMv5 code. The ARMv5 case now falls under the general
unaligned accessed case.

* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneDeserializer::readLittleEndian):
(WebCore::CloneDeserializer::readString):


git-svn-id: svn://svn.chromium.org/blink/trunk@80950 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 5bf63c34
2011-03-12 Cameron Zwarich <zwarich@apple.com>
Rubber-stamped by Oliver Hunt.
Removed unused ARMv5 code. The ARMv5 case now falls under the general
unaligned accessed case.
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneDeserializer::readLittleEndian):
(WebCore::CloneDeserializer::readString):
2011-03-12 Cameron Zwarich <zwarich@apple.com> 2011-03-12 Cameron Zwarich <zwarich@apple.com>
Reviewed by Oliver Hunt. Reviewed by Oliver Hunt.
......
...@@ -873,12 +873,7 @@ private: ...@@ -873,12 +873,7 @@ private:
if (sizeof(T) == 1) if (sizeof(T) == 1)
value = *ptr++; value = *ptr++;
else { else {
#if CPU(ARMV5_OR_LOWER)
// To protect misaligned memory access.
memcpy(&value, ptr, sizeof(T));
#else
value = *reinterpret_cast<const T*>(ptr); value = *reinterpret_cast<const T*>(ptr);
#endif
ptr += sizeof(T); ptr += sizeof(T);
} }
return true; return true;
...@@ -971,14 +966,7 @@ private: ...@@ -971,14 +966,7 @@ private:
return false; return false;
#if ASSUME_LITTLE_ENDIAN #if ASSUME_LITTLE_ENDIAN
#if CPU(ARMV5_OR_LOWER)
// To protect misaligned memory access.
Vector<UChar> alignedBuffer(length);
memcpy(alignedBuffer.data(), ptr, length * sizeof(UChar));
str = UString::adopt(alignedBuffer);
#else
str = UString(reinterpret_cast<const UChar*>(ptr), length); str = UString(reinterpret_cast<const UChar*>(ptr), length);
#endif
ptr += length * sizeof(UChar); ptr += length * sizeof(UChar);
#else #else
Vector<UChar> buffer; Vector<UChar> buffer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment