Changeset 64302 in webkit for trunk/JavaScriptCore/assembler

Timestamp:

Jul 29, 2010, 12:52:22 PM (15 years ago)

Author:

Csaba Osztrogonác

Message:

2010-07-29 Gabor Loki <​[email protected]>

Reviewed by Gavin Barraclough.

Avoid increasing required alignment of target type warning on ARM
​https://bugs.webkit.org/show_bug.cgi?id=38045

The reinterpret_cast<Type1*>([pointer to Type2]) expressions - where
sizeof(Type1) > sizeof(Type2) - cause the following warning on ARM:
increases required alignment of target type warnings.
Casting the type of [pointer to Type2] object to void* bypasses the
warning.

• assembler/ARMAssembler.cpp: (JSC::ARMAssembler::executableCopy):
• assembler/AssemblerBuffer.h: (JSC::AssemblerBuffer::putShortUnchecked): (JSC::AssemblerBuffer::putIntUnchecked): (JSC::AssemblerBuffer::putInt64Unchecked):
• jit/JITStubs.cpp:
• pcre/pcre_compile.cpp: (jsRegExpCompile):
• wtf/FastMalloc.cpp: (WTF::PageHeapAllocator::New): (WTF::TCMalloc_Central_FreeList::Populate):
• wtf/MD5.cpp: (WTF::reverseBytes): (WTF::MD5::addBytes): (WTF::MD5::checksum):
• wtf/StdLibExtras.h: (reinterpret_cast_ptr):
• wtf/Vector.h: (WTF::VectorBuffer::inlineBuffer):
• wtf/qt/StringQt.cpp: (WebCore::String::String):

Location:

trunk/JavaScriptCore/assembler

Files:

• ARMAssembler.cpp (modified) (1 diff)
• AssemblerBuffer.h (modified) (4 diffs)

trunk/JavaScriptCore/assembler/ARMAssembler.cpp

@@ -356 +356 @@
         // The last bit is set if the constant must be placed on constant pool.
         int pos = (*iter) & (~0x1);
-        ARMWord* ldrAddr = reinterpret_cast<ARMWord*>(data + pos);
+        ARMWord* ldrAddr = reinterpret_cast_ptr<ARMWord*>(data + pos);
         ARMWord* addr = getLdrImmAddress(ldrAddr);
         if (*addr != InvalidBranchTarget) {
             if (!(*iter & 1)) {
-                int diff = reinterpret_cast<ARMWord*>(data + *addr) - (ldrAddr + DefaultPrefetching);
+                int diff = reinterpret_cast_ptr<ARMWord*>(data + *addr) - (ldrAddr + DefaultPrefetching);
 
                 if ((diff <= BOFFSET_MAX && diff >= BOFFSET_MIN)) {

trunk/JavaScriptCore/assembler/AssemblerBuffer.h

@@ -34 +34 @@
 #include <wtf/Assertions.h>
 #include <wtf/FastMalloc.h>
+#include <wtf/StdLibExtras.h>
 
 namespace JSC {
@@ -82 +83 @@
         {
             ASSERT(!(m_size > m_capacity - 4));
-            *reinterpret_cast<short*>(&m_buffer[m_size]) = value;
+            *reinterpret_cast_ptr<short*>(&m_buffer[m_size]) = value;
             m_size += 2;
         }
@@ -96 +97 @@
         {
             ASSERT(!(m_size > m_capacity - 4));
-            *reinterpret_cast<int*>(&m_buffer[m_size]) = value;
+            *reinterpret_cast_ptr<int*>(&m_buffer[m_size]) = value;
             m_size += 4;
         }
@@ -103 +104 @@
         {
             ASSERT(!(m_size > m_capacity - 8));
-            *reinterpret_cast<int64_t*>(&m_buffer[m_size]) = value;
+            *reinterpret_cast_ptr<int64_t*>(&m_buffer[m_size]) = value;
             m_size += 8;
         }