Changeset 93010 in webkit for trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp

Timestamp:

Aug 12, 2011, 4:27:45 PM (14 years ago)

Author:

[email protected]

Message:

DFG JIT has inconsistent use of boxDouble and unboxDouble,
inconsistent use of assertions regarding doubles, and those
assertions are not turned on in debug builds
​https://bugs.webkit.org/show_bug.cgi?id=66160

Reviewed by Gavin Barraclough.

JIT assertions are now turned on in debug builds. JIT
assertions are now used for boxing and unboxing doubles, and boxing
and unboxing no longer involves code duplication.

• dfg/DFGJITCodeGenerator.cpp:

(JSC::DFG::JITCodeGenerator::fillDouble):

• dfg/DFGJITCodeGenerator.h:

(JSC::DFG::JITCodeGenerator::boxDouble):
(JSC::DFG::JITCodeGenerator::unboxDouble):

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::fillNumericToDouble):
(JSC::DFG::GeneralizedRegister::moveTo):
(JSC::DFG::GeneralizedRegister::swapWith):

• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::boxDouble):
(JSC::DFG::JITCompiler::unboxDouble):

• dfg/DFGNode.h:
• dfg/DFGNonSpeculativeJIT.cpp:

(JSC::DFG::NonSpeculativeJIT::knownConstantArithOp):
(JSC::DFG::NonSpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::fillSpeculateDouble):
(JSC::DFG::SpeculativeJIT::convertToDouble):

File:

• trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp

@@ -52 +52 @@
         loadPtr(addressFor(node.virtualRegister()), temporary);
         Jump isInteger = branchPtr(MacroAssembler::AboveOrEqual, temporary, GPRInfo::tagTypeNumberRegister);
-        jitAssertIsJSDouble(temporary);
-        addPtr(GPRInfo::tagTypeNumberRegister, temporary);
-        movePtrToDouble(temporary, fpr);
+        unboxDouble(temporary, fpr);
         Jump hasUnboxedDouble = jump();
         isInteger.link(this);
@@ -198 +196 @@
             }
             
-            jit.moveDoubleToPtr(fpr(), other.gpr());
-            jit.subPtr(GPRInfo::tagTypeNumberRegister, other.gpr());
+            jit.boxDouble(fpr(), other.gpr());
             
             if (done.isSet())
@@ -207 +204 @@
         
         if (UNLIKELY(other.isFPR())) {
-            jit.addPtr(GPRInfo::tagTypeNumberRegister, gpr());
-            jit.movePtrToDouble(gpr(), other.fpr());
+            jit.unboxDouble(gpr(), other.fpr());
             return;
         }
@@ -254 +250 @@
             }
             
-            jit.moveDoubleToPtr(fpr(), other.gpr());
-            jit.subPtr(GPRInfo::tagTypeNumberRegister, other.gpr());
+            jit.boxDouble(fpr(), other.gpr());
             
             if (done.isSet())
                 done.link(&jit);
             
-            jit.addPtr(GPRInfo::tagTypeNumberRegister, scratchGPR);
-            jit.movePtrToDouble(scratchGPR, fpr());
+            jit.unboxDouble(scratchGPR, fpr());
             return;
         }