Changeset 52797 in webkit for trunk/JavaScriptCore/assembler/ARMAssembler.h

Timestamp:

Jan 5, 2010, 7:53:17 AM (15 years ago)

Author:

[email protected]

Message:

Follow r52729 in ARMAssembler.
​https://bugs.webkit.org/show_bug.cgi?id=33208

Reviewed by Maciej Stachowiak.

Use WTF_ARM_ARCH_AT_LEAST instead of ARM_ARCH_VERSION

• assembler/ARMAssembler.cpp:

(JSC::ARMAssembler::encodeComplexImm): Move tmp declaration to ARMv7

• assembler/ARMAssembler.h:

(JSC::ARMAssembler::):
(JSC::ARMAssembler::bkpt):

File:

• trunk/JavaScriptCore/assembler/ARMAssembler.h (modified) (5 diffs)

trunk/JavaScriptCore/assembler/ARMAssembler.h

@@ -139 +139 @@
             FTOSID = 0x0ebd0b40,
             FMSTAT = 0x0ef1fa10,
-#if ARM_ARCH_VERSION >= 5
+#if WTF_ARM_ARCH_AT_LEAST(5)
             CLZ = 0x016f0f10,
             BKPT = 0xe120070,
 #endif
-#if ARM_ARCH_VERSION >= 7
+#if WTF_ARM_ARCH_AT_LEAST(7)
             MOVW = 0x03000000,
             MOVT = 0x03400000,
@@ -343 +343 @@
         }
 
-#if ARM_ARCH_VERSION >= 7
+#if WTF_ARM_ARCH_AT_LEAST(7)
         void movw_r(int rd, ARMWord op2, Condition cc = AL)
         {
@@ -531 +531 @@
         }
 
-#if ARM_ARCH_VERSION >= 5
+#if WTF_ARM_ARCH_AT_LEAST(5)
         void clz_r(int rd, int rm, Condition cc = AL)
         {
@@ -540 +540 @@
         void bkpt(ARMWord value)
         {
-#if ARM_ARCH_VERSION >= 5
+#if WTF_ARM_ARCH_AT_LEAST(5)
             m_buffer.putInt(BKPT | ((value & 0xff0) << 4) | (value & 0xf));
 #else
@@ -748 +748 @@
         static ARMWord getOp2(ARMWord imm);
 
-#if ARM_ARCH_VERSION >= 7
+#if WTF_ARM_ARCH_AT_LEAST(7)
         static ARMWord getImm16Op2(ARMWord imm)
         {