Changeset 47530 in webkit for trunk/JavaScriptCore/wrec


Ignore:
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:
Location:
trunk/JavaScriptCore/wrec
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/wrec/WRECGenerator.cpp

    r40799 r47530  
    4343#if PLATFORM(X86)
    4444    // On x86 edi & esi are callee preserved registers.
    45     push(X86::edi);
    46     push(X86::esi);
     45    push(X86Registers::edi);
     46    push(X86Registers::esi);
    4747   
    4848#if COMPILER(MSVC)
    … …  
    7373    // Restore callee save registers.
    7474#if PLATFORM(X86)
    75     pop(X86::esi);
    76     pop(X86::edi);
     75    pop(X86Registers::esi);
     76    pop(X86Registers::edi);
    7777#endif
    7878    ret();
    … …  
    112112
    113113#if PLATFORM(X86)
    114     pop(X86::esi);
    115     pop(X86::edi);
     114    pop(X86Registers::esi);
     115    pop(X86Registers::edi);
    116116#endif
    117117    ret();

  • trunk/JavaScriptCore/wrec/WRECGenerator.h

    r40799 r47530  
    6464
    6565#if PLATFORM(X86)
    66         static const RegisterID input = X86::eax;
    67         static const RegisterID index = X86::edx;
    68         static const RegisterID length = X86::ecx;
    69         static const RegisterID output = X86::edi;
     66        static const RegisterID input = X86Registers::eax;
     67        static const RegisterID index = X86Registers::edx;
     68        static const RegisterID length = X86Registers::ecx;
     69        static const RegisterID output = X86Registers::edi;
    7070
    71         static const RegisterID character = X86::esi;
    72         static const RegisterID repeatCount = X86::ebx; // How many times the current atom repeats in the current match.
     71        static const RegisterID character = X86Registers::esi;
     72        static const RegisterID repeatCount = X86Registers::ebx; // How many times the current atom repeats in the current match.
    7373
    74         static const RegisterID returnRegister = X86::eax;
     74        static const RegisterID returnRegister = X86Registers::eax;
    7575#endif
    7676#if PLATFORM(X86_64)
    77         static const RegisterID input = X86::edi;
    78         static const RegisterID index = X86::esi;
    79         static const RegisterID length = X86::edx;
    80         static const RegisterID output = X86::ecx;
     77        static const RegisterID input = X86Registers::edi;
     78        static const RegisterID index = X86Registers::esi;
     79        static const RegisterID length = X86Registers::edx;
     80        static const RegisterID output = X86Registers::ecx;
    8181
    82         static const RegisterID character = X86::eax;
    83         static const RegisterID repeatCount = X86::ebx; // How many times the current atom repeats in the current match.
     82        static const RegisterID character = X86Registers::eax;
     83        static const RegisterID repeatCount = X86Registers::ebx; // How many times the current atom repeats in the current match.
    8484
    85         static const RegisterID returnRegister = X86::eax;
     85        static const RegisterID returnRegister = X86Registers::eax;
    8686#endif
    8787
Note: See TracChangeset for help on using the changeset viewer.