Changeset 39261 in webkit for trunk/JavaScriptCore/assembler

Timestamp:

Dec 12, 2008, 5:39:38 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Geoff Garen.

Move slow-cases of JIT code generation over to the MacroAssembler interface.

• assembler/MacroAssembler.h: (JSC::MacroAssembler::Label::Label): (JSC::MacroAssembler::jae32): (JSC::MacroAssembler::jg32): (JSC::MacroAssembler::jzPtr):
• jit/JIT.cpp: (JSC::JIT::privateCompileSlowCases): (JSC::JIT::privateCompile): (JSC::JIT::emitGetVariableObjectRegister): (JSC::JIT::emitPutVariableObjectRegister):
• jit/JIT.h: (JSC::SlowCaseEntry::SlowCaseEntry): (JSC::JIT::getSlowCase): (JSC::JIT::linkSlowCase):
• jit/JITArithmetic.cpp: (JSC::JIT::compileBinaryArithOpSlowCase):
• jit/JITCall.cpp: (JSC::JIT::compileOpCallInitializeCallFrame): (JSC::JIT::compileOpCall): (JSC::JIT::compileOpCallSlowCase):
• jit/JITInlineMethods.h: (JSC::JIT::emitJumpSlowCaseIfNotJSCell): (JSC::JIT::linkSlowCaseIfNotJSCell):
• jit/JITPropertyAccess.cpp: (JSC::JIT::compileGetByIdHotPath): (JSC::JIT::compilePutByIdHotPath): (JSC::JIT::compileGetByIdSlowCase): (JSC::JIT::compilePutByIdSlowCase):

File:

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

trunk/JavaScriptCore/assembler/MacroAssembler.h

@@ -148 +148 @@
 
     public:
+        Label()
+        {
+        }
+
         Label(MacroAssembler* masm)
             : m_label(masm->m_assembler.label())
@@ -703 +707 @@
     }
     
+    Jump jae32(Address left, RegisterID right)
+    {
+        if (left.offset)
+            m_assembler.cmpl_rm(right, left.offset, left.base);
+        else
+            m_assembler.cmpl_rm(right, left.base);
+        return Jump(m_assembler.jae());
+    }
+    
     Jump jb32(RegisterID left, Address right)
     {
@@ -758 +771 @@
         return Jump(m_assembler.jg());
     }
-    
+
+    Jump jg32(RegisterID reg, Address address)
+    {
+        if (address.offset)
+            m_assembler.cmpl_mr(address.offset, address.base, reg);
+        else
+            m_assembler.cmpl_mr(address.base, reg);
+        return Jump(m_assembler.jg());
+    }
+
     Jump jge32(RegisterID left, RegisterID right)
     {
@@ -913 +935 @@
     //     jne32(reg1, reg2).linkTo(topOfLoop);
 
+    void jae32(RegisterID left, Address right, Label target)
+    {
+        jae32(left, right).linkTo(target, this);
+    }
+
     void je32(RegisterID op1, Imm32 imm, Label target)
     {
@@ -942 +969 @@
         jne32(op1, imm).linkTo(target, this);
     }
+
+#if !PLATFORM(X86_64)
+    void jzPtr(RegisterID reg, Label target)
+    {
+        jzPtr(reg).linkTo(target, this);
+    }
+#endif
 
     void jump(Label target)