Changeset 39058 in webkit for trunk/JavaScriptCore/assembler/MacroAssembler.h

Timestamp:

Dec 5, 2008, 5:36:16 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-05 Gavin Barraclough <​[email protected]>

Reviewed by Geoff Garen.

Second tranche of porting JIT.cpp to MacroAssembler interface.

• assembler/MacroAssembler.h: (JSC::MacroAssembler::mul32): (JSC::MacroAssembler::jl32): (JSC::MacroAssembler::jnzSub32): (JSC::MacroAssembler::joAdd32): (JSC::MacroAssembler::joMul32): (JSC::MacroAssembler::jzSub32):
• jit/JIT.cpp: (JSC::JIT::emitSlowScriptCheck): (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompileSlowCases): (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JIT.h:
• jit/JITInlineMethods.h: (JSC::JIT::emitJumpIfNotJSCell): (JSC::JIT::emitJumpSlowCaseIfNotJSCell):

File:

• trunk/JavaScriptCore/assembler/MacroAssembler.h (modified) (3 diffs)

trunk/JavaScriptCore/assembler/MacroAssembler.h

@@ -298 +298 @@
     }
     
+    void mul32(Imm32 imm, RegisterID src, RegisterID dest)
+    {
+        m_assembler.imull_i32r(src, imm.m_value, dest);
+    }
+    
     void or32(Imm32 imm, RegisterID dest)
     {
@@ -607 +612 @@
         return Jump(m_assembler.jge());
     }
+
+    Jump jl32(RegisterID left, RegisterID right)
+    {
+        m_assembler.cmpl_rr(right, left);
+        return Jump(m_assembler.jl());
+    }
     
     Jump jl32(RegisterID left, Imm32 right)
@@ -738 +749 @@
     //   operation caused an overflow to occur.
 
+    Jump jnzSub32(Imm32 imm, RegisterID dest)
+    {
+        sub32(imm, dest);
+        return Jump(m_assembler.jne());
+    }
+    
+    Jump joAdd32(RegisterID src, RegisterID dest)
+    {
+        add32(src, dest);
+        return Jump(m_assembler.jo());
+    }
+    
+    Jump joAdd32(Imm32 imm, RegisterID dest)
+    {
+        add32(imm, dest);
+        return Jump(m_assembler.jo());
+    }
+    
+    Jump joMul32(Imm32 imm, RegisterID src, RegisterID dest)
+    {
+        mul32(imm, src, dest);
+        return Jump(m_assembler.jo());
+    }
+    
     Jump jzSub32(Imm32 imm, RegisterID dest)
     {
-        if (CAN_SIGN_EXTEND_8_32(imm.m_value))
-            m_assembler.subl_i8r(imm.m_value, dest);
-        else
-            m_assembler.subl_i32r(imm.m_value, dest);
+        sub32(imm, dest);
         return Jump(m_assembler.je());
     }
     
-    Jump joAdd32(RegisterID src, RegisterID dest)
-    {
-        m_assembler.addl_rr(src, dest);
-        return Jump(m_assembler.jo());
-    }
-    
 
     // Miscellaneous operations: