Changeset 47530 in webkit for trunk/JavaScriptCore/assembler/X86Assembler.h

Timestamp:

Aug 19, 2009, 5:02:24 PM (16 years ago)

Author:

[email protected]

Message:

2009-08-19 Yong Li <​[email protected]>

Reviewed by Gavin Barraclough.

Change namespace ARM to ARMRegisters
X86 to X86Registers to avoid conflict with macros
​https://bugs.webkit.org/show_bug.cgi?id=28428

• assembler/ARMAssembler.cpp:
• assembler/ARMAssembler.h:
• assembler/ARMv7Assembler.h:
• assembler/MacroAssemblerARM.h:
• assembler/MacroAssemblerARMv7.h:
• assembler/MacroAssemblerX86Common.h:
• assembler/MacroAssemblerX86_64.h:
• assembler/X86Assembler.h:
• jit/JIT.h:
• jit/JITArithmetic.cpp:
• jit/JITInlineMethods.h:
• jit/JITOpcodes.cpp:
• wrec/WRECGenerator.cpp:
• wrec/WRECGenerator.h:
• yarr/RegexJIT.cpp:

File:

• trunk/JavaScriptCore/assembler/X86Assembler.h (modified) (6 diffs)

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -44 +44 @@
 #endif
 
-namespace X86 {
+namespace X86Registers {
     typedef enum {
         eax,
@@ -81 +81 @@
 class X86Assembler {
 public:
-    typedef X86::RegisterID RegisterID;
-    typedef X86::XMMRegisterID XMMRegisterID;
+    typedef X86Registers::RegisterID RegisterID;
+    typedef X86Registers::XMMRegisterID XMMRegisterID;
     typedef XMMRegisterID FPRegisterID;
 
@@ -1119 +1119 @@
     void movl_rm(RegisterID src, void* addr)
     {
-        if (src == X86::eax)
+        if (src == X86Registers::eax)
             movl_EAXm(addr);
         else 
@@ -1127 +1127 @@
     void movl_mr(void* addr, RegisterID dst)
     {
-        if (dst == X86::eax)
+        if (dst == X86Registers::eax)
             movl_mEAX(addr);
         else
@@ -1893 +1893 @@
         // Internals; ModRm and REX formatters.
 
-        static const RegisterID noBase = X86::ebp;
-        static const RegisterID hasSib = X86::esp;
-        static const RegisterID noIndex = X86::esp;
-#if PLATFORM(X86_64)
-        static const RegisterID noBase2 = X86::r13;
-        static const RegisterID hasSib2 = X86::r12;
+        static const RegisterID noBase = X86Registers::ebp;
+        static const RegisterID hasSib = X86Registers::esp;
+        static const RegisterID noIndex = X86Registers::esp;
+#if PLATFORM(X86_64)
+        static const RegisterID noBase2 = X86Registers::r13;
+        static const RegisterID hasSib2 = X86Registers::r12;
 
         // Registers r8 & above require a REX prefixe.
         inline bool regRequiresRex(int reg)
         {
-            return (reg >= X86::r8);
+            return (reg >= X86Registers::r8);
         }
 
@@ -1909 +1909 @@
         inline bool byteRegRequiresRex(int reg)
         {
-            return (reg >= X86::esp);
+            return (reg >= X86Registers::esp);
         }