diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /JavaScriptCore/wrec | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'JavaScriptCore/wrec')
| -rw-r--r-- | JavaScriptCore/wrec/WRECGenerator.cpp | 12 | ||||
| -rw-r--r-- | JavaScriptCore/wrec/WRECGenerator.h | 28 |
2 files changed, 20 insertions, 20 deletions
diff --git a/JavaScriptCore/wrec/WRECGenerator.cpp b/JavaScriptCore/wrec/WRECGenerator.cpp index e2e8aba..e62add3 100644 --- a/JavaScriptCore/wrec/WRECGenerator.cpp +++ b/JavaScriptCore/wrec/WRECGenerator.cpp @@ -42,8 +42,8 @@ void Generator::generateEnter() { #if PLATFORM(X86) // On x86 edi & esi are callee preserved registers. - push(X86::edi); - push(X86::esi); + push(X86Registers::edi); + push(X86Registers::esi); #if COMPILER(MSVC) // Move the arguments into registers. @@ -72,8 +72,8 @@ void Generator::generateReturnSuccess() // Restore callee save registers. #if PLATFORM(X86) - pop(X86::esi); - pop(X86::edi); + pop(X86Registers::esi); + pop(X86Registers::edi); #endif ret(); } @@ -111,8 +111,8 @@ void Generator::generateReturnFailure() move(Imm32(-1), returnRegister); #if PLATFORM(X86) - pop(X86::esi); - pop(X86::edi); + pop(X86Registers::esi); + pop(X86Registers::edi); #endif ret(); } diff --git a/JavaScriptCore/wrec/WRECGenerator.h b/JavaScriptCore/wrec/WRECGenerator.h index 8562cac..294c3d0 100644 --- a/JavaScriptCore/wrec/WRECGenerator.h +++ b/JavaScriptCore/wrec/WRECGenerator.h @@ -63,26 +63,26 @@ namespace JSC { } #if PLATFORM(X86) - static const RegisterID input = X86::eax; - static const RegisterID index = X86::edx; - static const RegisterID length = X86::ecx; - static const RegisterID output = X86::edi; + static const RegisterID input = X86Registers::eax; + static const RegisterID index = X86Registers::edx; + static const RegisterID length = X86Registers::ecx; + static const RegisterID output = X86Registers::edi; - static const RegisterID character = X86::esi; - static const RegisterID repeatCount = X86::ebx; // How many times the current atom repeats in the current match. + static const RegisterID character = X86Registers::esi; + static const RegisterID repeatCount = X86Registers::ebx; // How many times the current atom repeats in the current match. - static const RegisterID returnRegister = X86::eax; + static const RegisterID returnRegister = X86Registers::eax; #endif #if PLATFORM(X86_64) - static const RegisterID input = X86::edi; - static const RegisterID index = X86::esi; - static const RegisterID length = X86::edx; - static const RegisterID output = X86::ecx; + static const RegisterID input = X86Registers::edi; + static const RegisterID index = X86Registers::esi; + static const RegisterID length = X86Registers::edx; + static const RegisterID output = X86Registers::ecx; - static const RegisterID character = X86::eax; - static const RegisterID repeatCount = X86::ebx; // How many times the current atom repeats in the current match. + static const RegisterID character = X86Registers::eax; + static const RegisterID repeatCount = X86Registers::ebx; // How many times the current atom repeats in the current match. - static const RegisterID returnRegister = X86::eax; + static const RegisterID returnRegister = X86Registers::eax; #endif void generateEnter(); |