Changeset 39261 in webkit for trunk/JavaScriptCore/jit/JITArithmetic.cpp

Timestamp:

Dec 12, 2008, 5:39:38 PM (16 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/jit/JITArithmetic.cpp (modified) (1 diff)

trunk/JavaScriptCore/jit/JITArithmetic.cpp

@@ -298 +298 @@
 void JIT::compileBinaryArithOpSlowCase(OpcodeID opcodeID, Vector<SlowCaseEntry>::iterator& iter, unsigned dst, unsigned src1, unsigned src2, OperandTypes types, unsigned i)
 {
-    JmpDst here = __ label();
-    __ link(iter->from, here);
+    linkSlowCase(iter);
     if (types.second().isReusable() && isSSE2Present()) {
         if (!types.first().definitelyIsNumber()) {
-            if (linkSlowCaseIfNotJSCell(++iter, src1))
-                ++iter;
-            __ link(iter->from, here);
+            linkSlowCaseIfNotJSCell(iter, src1);
+            linkSlowCase(iter);
         }
         if (!types.second().definitelyIsNumber()) {
-            if (linkSlowCaseIfNotJSCell(++iter, src2))
-                ++iter;
-            __ link(iter->from, here);
-        }
-        __ link((++iter)->from, here);
+            linkSlowCaseIfNotJSCell(iter, src2);
+            linkSlowCase(iter);
+        }
     } else if (types.first().isReusable() && isSSE2Present()) {
         if (!types.first().definitelyIsNumber()) {
-            if (linkSlowCaseIfNotJSCell(++iter, src1))
-                ++iter;
-            __ link(iter->from, here);
+            linkSlowCaseIfNotJSCell(iter, src1);
+            linkSlowCase(iter);
         }
         if (!types.second().definitelyIsNumber()) {
-            if (linkSlowCaseIfNotJSCell(++iter, src2))
-                ++iter;
-            __ link(iter->from, here);
-        }
-        __ link((++iter)->from, here);
-    } else
-        __ link((++iter)->from, here);
+            linkSlowCaseIfNotJSCell(iter, src2);
+            linkSlowCase(iter);
+        }
+    }
+    linkSlowCase(iter);
 
     // additional entry point to handle -0 cases.
     if (opcodeID == op_mul)
-        __ link((++iter)->from, here);
+        linkSlowCase(iter);
 
     emitPutCTIArgFromVirtualRegister(src1, 0, X86::ecx);