Changeset 44886 in webkit for trunk/JavaScriptCore/yarr/RegexJIT.cpp

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):

File:

• trunk/JavaScriptCore/yarr/RegexJIT.cpp (modified) (3 diffs)

trunk/JavaScriptCore/yarr/RegexJIT.cpp

@@ -44 +44 @@
     friend void jitCompileRegex(JSGlobalData* globalData, RegexCodeBlock& jitObject, const UString& pattern, unsigned& numSubpatterns, const char*& error, bool ignoreCase, bool multiline);
 
-#if PLATFORM(ARM_V7)
+#if PLATFORM_ARM_ARCH(7)
     static const RegisterID input = ARM::r0;
     static const RegisterID index = ARM::r1;
@@ -1309 +1309 @@
         loadPtr(Address(X86::ebp, 2 * sizeof(void*)), output);
     #endif
-#elif PLATFORM(ARM_V7)
+#elif PLATFORM_ARM_ARCH(7)
         push(ARM::r4);
         push(ARM::r5);
@@ -1326 +1326 @@
         pop(X86::ebx);
         pop(X86::ebp);
-#elif PLATFORM(ARM_V7)
+#elif PLATFORM_ARM_ARCH(7)
         pop(ARM::r6);
         pop(ARM::r5);