Changeset 44886 in webkit for trunk/JavaScriptCore/assembler

Timestamp:

Jun 19, 2009, 6:07:06 PM (16 years ago)

Author:

[email protected]

Message:

2009-06-19 Gabor Loki <​[email protected]>

Reviewed by Gavin Barraclough.

Reorganize ARM architecture specific macros.
Use PLATFORM_ARM_ARCH(7) instead of PLATFORM(ARM_V7).

Bug 24986: ARM JIT port
<​https://bugs.webkit.org/show_bug.cgi?id=24986>

• assembler/ARMv7Assembler.h:
• assembler/AbstractMacroAssembler.h: (JSC::AbstractMacroAssembler::Imm32::Imm32):
• assembler/MacroAssembler.h:
• assembler/MacroAssemblerCodeRef.h: (JSC::MacroAssemblerCodePtr::MacroAssemblerCodePtr):
• jit/ExecutableAllocator.h: (JSC::ExecutableAllocator::cacheFlush):
• jit/JIT.h:
• jit/JITInlineMethods.h: (JSC::JIT::restoreArgumentReferenceForTrampoline):
• jit/JITStubs.cpp:
• jit/JITStubs.h:
• wtf/Platform.h:
• yarr/RegexJIT.cpp: (JSC::Yarr::RegexGenerator::generateEnter): (JSC::Yarr::RegexGenerator::generateReturn):

Location:

trunk/JavaScriptCore/assembler

Files:

• ARMv7Assembler.h (modified) (2 diffs)
• AbstractMacroAssembler.h (modified) (3 diffs)
• MacroAssembler.h (modified) (1 diff)
• MacroAssemblerCodeRef.h (modified) (3 diffs)

trunk/JavaScriptCore/assembler/ARMv7Assembler.h

@@ -29 +29 @@
 #include <wtf/Platform.h>
 
-#if ENABLE(ASSEMBLER) && PLATFORM(ARM_V7)
+#if ENABLE(ASSEMBLER) && PLATFORM_ARM_ARCH(7)
 
 #include "AssemblerBuffer.h"
@@ -1754 +1754 @@
 } // namespace JSC
 
-#endif // ENABLE(ASSEMBLER) && PLATFORM(ARM_V7)
+#endif // ENABLE(ASSEMBLER) && PLATFORM_ARM_ARCH(7)
 
 #endif // ARMAssembler_h

trunk/JavaScriptCore/assembler/AbstractMacroAssembler.h

@@ -176 +176 @@
         explicit Imm32(int32_t value)
             : m_value(value)
-#if PLATFORM(ARM_V7)
+#if PLATFORM_ARM_ARCH(7)
             , m_isPointer(false)
 #endif
@@ -185 +185 @@
         explicit Imm32(ImmPtr ptr)
             : m_value(ptr.asIntptr())
-#if PLATFORM(ARM_V7)
+#if PLATFORM_ARM_ARCH(7)
             , m_isPointer(true)
 #endif
@@ -193 +193 @@
 
         int32_t m_value;
-#if PLATFORM(ARM_V7)
+#if PLATFORM_ARM_ARCH(7)
         // We rely on being able to regenerate code to recover exception handling
         // information.  Since ARMv7 supports 16-bit immediates there is a danger

trunk/JavaScriptCore/assembler/MacroAssembler.h

@@ -31 +31 @@
 #if ENABLE(ASSEMBLER)
 
-#if PLATFORM(ARM_V7)
+#if PLATFORM_ARM_ARCH(7)
 #include "MacroAssemblerARMv7.h"
 namespace JSC { typedef MacroAssemblerARMv7 MacroAssemblerBase; };

trunk/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -38 +38 @@
 // ASSERT_VALID_CODE_POINTER checks that ptr is a non-null pointer, and that it is a valid
 // instruction address on the platform (for example, check any alignment requirements).
-#if PLATFORM(ARM_V7)
+#if PLATFORM_ARM_ARCH(7)
 // ARM/thumb instructions must be 16-bit aligned, but all code pointers to be loaded
 // into the processor are decorated with the bottom bit set, indicating that this is
@@ -125 +125 @@
 
     explicit MacroAssemblerCodePtr(void* value)
-#if PLATFORM(ARM_V7)
+#if PLATFORM_ARM_ARCH(7)
         // Decorate the pointer as a thumb code pointer.
         : m_value(reinterpret_cast<char*>(value) + 1)
@@ -142 +142 @@
 
     void* executableAddress() const { return m_value; }
-#if PLATFORM(ARM_V7)
+#if PLATFORM_ARM_ARCH(7)
     // To use this pointer as a data address remove the decoration.
     void* dataLocation() const { ASSERT_VALID_CODE_POINTER(m_value); return reinterpret_cast<char*>(m_value) - 1; }