2008-09-10 Cameron Zwarich <cwzwarich@uwaterloo.ca>

        Rubber-stamped by Oliver Hunt.

        Fix a typo by renaming the overloaded orl_rr that takes an immediate to
        orl_i32r.

        * VM/CTI.cpp:
        (JSC::CTI::emitFastArithPotentiallyReTagImmediate):
        * masm/X86Assembler.h:
        (JSC::X86Assembler::orl_i32r):
        * wrec/WREC.cpp:
        (JSC::WRECGenerator::generatePatternCharacter):
        (JSC::WRECGenerator::generateCharacterClassInverted):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@36327 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 90a05998a59482b9cc3f26fe6fd9ce41b4ca2ed5..c41036e393f7f28c1b93352f21f98cad30a0f445 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2008-09-10  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Rubber-stamped by Oliver Hunt.
+
+        Fix a typo by renaming the overloaded orl_rr that takes an immediate to
+        orl_i32r.
+
+        * VM/CTI.cpp:
+        (JSC::CTI::emitFastArithPotentiallyReTagImmediate):
+        * masm/X86Assembler.h:
+        (JSC::X86Assembler::orl_i32r):
+        * wrec/WREC.cpp:
+        (JSC::WRECGenerator::generatePatternCharacter):
+        (JSC::WRECGenerator::generateCharacterClassInverted):
+
 2008-09-10  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Geoff Garen.

diff --git a/JavaScriptCore/VM/CTI.cpp b/JavaScriptCore/VM/CTI.cpp
index 7e43560ddf4a765561a991de5394aa46591a880e..0a6d62910e186e76095eb43c621b9b2d4c09a60d 100644 (file)
--- a/JavaScriptCore/VM/CTI.cpp
+++ b/JavaScriptCore/VM/CTI.cpp
@@ -334,7 +334,7 @@ ALWAYS_INLINE void CTI::emitFastArithReTagImmediate(X86Assembler::RegisterID reg
 
 ALWAYS_INLINE void CTI::emitFastArithPotentiallyReTagImmediate(X86Assembler::RegisterID reg)
 {
-    m_jit.orl_rr(JSImmediate::TagBitTypeInteger, reg);
+    m_jit.orl_i32r(JSImmediate::TagBitTypeInteger, reg);
 }
 
 ALWAYS_INLINE void CTI::emitFastArithImmToInt(X86Assembler::RegisterID reg)

diff --git a/JavaScriptCore/masm/X86Assembler.h b/JavaScriptCore/masm/X86Assembler.h
index 0255dcb3528663b0c148751fc7c84a0fdfe592b8..bda055cdf0442d47bb202899e9b86ccaa9105b3d 100644 (file)
--- a/JavaScriptCore/masm/X86Assembler.h
+++ b/JavaScriptCore/masm/X86Assembler.h
@@ -377,7 +377,7 @@ public:
         emitModRm_rr(src, dst);
     }
 
-    void orl_rr(int imm, RegisterID dst)
+    void orl_i32r(int imm, RegisterID dst)
     {
         m_buffer->putByte(OP_GROUP1_EvIb);
         emitModRm_opr(GROUP1_OP_OR, dst);

diff --git a/JavaScriptCore/wrec/WREC.cpp b/JavaScriptCore/wrec/WREC.cpp
index 985746ef1b7a7607fefaa9c6cf1a8d8bb098bebb..2a8a6884b414f17e3d1c3d362c4e5d828e549616 100644 (file)
--- a/JavaScriptCore/wrec/WREC.cpp
+++ b/JavaScriptCore/wrec/WREC.cpp
@@ -685,7 +685,7 @@ void WRECGenerator::generatePatternCharacter(JmpSrcVector& failures, int ch)
         
         // check for ascii case sensitive characters
         if (isASCIIAlpha(ch)) {
-            m_jit.orl_rr(32, currentValueRegister);
+            m_jit.orl_i32r(32, currentValueRegister);
             ch |= 32;
         } else if ((ch > 0x7f) && ((lower = Unicode::toLower(ch)) != (upper = Unicode::toUpper(ch)))) {
             // handle unicode case sentitive characters - branch to success on upper
@@ -824,7 +824,7 @@ void WRECGenerator::generateCharacterClassInverted(JmpSrcVector& matchDest, Char
         }
 
         if (unsigned countAZaz = matchesAZaz.size()) {
-            m_jit.orl_rr(32, currentValueRegister);
+            m_jit.orl_i32r(32, currentValueRegister);
 
             for (unsigned i = 0; i < countAZaz; ++i) {
                 char ch = matchesAZaz[i];