2008-10-08 Maciej Stachowiak <mjs@apple.com>

[WebKit.git] / JavaScriptCore / VM / CTI.cpp

diff --git a/JavaScriptCore/VM/CTI.cpp b/JavaScriptCore/VM/CTI.cpp
index 0644a6e1f10e0a63696e5c4bd63f1da0ed5cc98f..29d653795fd4f955dd0afe6fd931c6d0d188fde6 100644 (file)
--- a/JavaScriptCore/VM/CTI.cpp
+++ b/JavaScriptCore/VM/CTI.cpp
@@ -1767,8 +1767,20 @@ void CTI::privateCompileMainPass()
             break;
         }
         case op_to_jsnumber: {
             break;
         }
         case op_to_jsnumber: {

-            emitGetPutArg(instruction[i + 2].u.operand, 0, X86::ecx);
-            emitCall(i, Machine::cti_op_to_jsnumber);
+            emitGetArg(instruction[i + 2].u.operand, X86::eax);
+            
+            m_jit.testl_i32r(JSImmediate::TagBitTypeInteger, X86::eax);
+            X86Assembler::JmpSrc wasImmediate = m_jit.emitUnlinkedJnz();
+
+            emitJumpSlowCaseIfNotJSCell(X86::eax, i);
+
+            m_jit.movl_mr(OBJECT_OFFSET(JSCell, m_structureID), X86::eax, X86::ecx);
+            m_jit.cmpl_i32m(NumberType, OBJECT_OFFSET(StructureID, m_typeInfo.m_type), X86::ecx);
+            
+            m_slowCases.append(SlowCaseEntry(m_jit.emitUnlinkedJne(), i));
+            
+            m_jit.link(wasImmediate, m_jit.label());
+

             emitPutResult(instruction[i + 1].u.operand);
             i += 3;
             break;
             emitPutResult(instruction[i + 1].u.operand);
             i += 3;
             break;


@@ -2518,6 +2530,17 @@ void CTI::privateCompileSlowCases()
             i += 7;
             break;
         }
             i += 7;
             break;
         }

+        case op_to_jsnumber: {
+            m_jit.link(iter->from, m_jit.label());
+            m_jit.link(iter->from, m_jit.label());
+
+            emitPutArg(X86::eax, 0);
+            emitCall(i, Machine::cti_op_to_jsnumber);
+
+            emitPutResult(instruction[i + 1].u.operand);
+            i += 3;
+            break;
+        }

 
         default:
             ASSERT_NOT_REACHED();
 
         default:
             ASSERT_NOT_REACHED();