[webkit-changes] [193955] trunk/Source/JavaScriptCore

Fri, 11 Dec 2015 09:16:33 -0800

Title: [193955] trunk/Source/_javascript_Core
Revision
193955
Author
[email protected]
Date
2015-12-11 09:15:58 -0800 (Fri, 11 Dec 2015)

Log Message

[JSC] Little cleanup of FTLOutput type casts and conversions
https://bugs.webkit.org/show_bug.cgi?id=152166

Reviewed by Geoffrey Garen.

Clean up:
-Change fpCast() to explicit conversion doubleToFloat() and floatToDouble()
 to match B3's opcodes.
-Remove unused conversion functions.
-Use the most specific cast function when possible.
-Functions that are only used inside FTLOutput are made private.
 In FTLB3Output, those functions were removed.

* ftl/FTLB3Output.h:
(JSC::FTL::Output::doubleToFloat):
(JSC::FTL::Output::floatToDouble):
(JSC::FTL::Output::fround):
(JSC::FTL::Output::fpToInt): Deleted.
(JSC::FTL::Output::fpToUInt): Deleted.
(JSC::FTL::Output::intToFP): Deleted.
(JSC::FTL::Output::unsignedToFP): Deleted.
(JSC::FTL::Output::intCast): Deleted.
(JSC::FTL::Output::fpCast): Deleted.
(JSC::FTL::Output::intToPtr): Deleted.
(JSC::FTL::Output::ptrToInt): Deleted.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileGetByVal):
(JSC::FTL::DFG::LowerDFGToLLVM::compilePutByVal):
* ftl/FTLOutput.h:
(JSC::FTL::Output::doubleToFloat):
(JSC::FTL::Output::floatToDouble):
(JSC::FTL::Output::intCast):
(JSC::FTL::Output::fpToInt):
(JSC::FTL::Output::fpToUInt):
(JSC::FTL::Output::fpCast):
(JSC::FTL::Output::intToFP):
(JSC::FTL::Output::unsignedToFP):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (193954 => 193955)


--- trunk/Source/_javascript_Core/ChangeLog	2015-12-11 15:03:21 UTC (rev 193954)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-12-11 17:15:58 UTC (rev 193955)
@@ -1,3 +1,43 @@
+2015-12-11  Benjamin Poulain  <[email protected]>
+
+        [JSC] Little cleanup of FTLOutput type casts and conversions
+        https://bugs.webkit.org/show_bug.cgi?id=152166
+
+        Reviewed by Geoffrey Garen.
+
+        Clean up:
+        -Change fpCast() to explicit conversion doubleToFloat() and floatToDouble()
+         to match B3's opcodes.
+        -Remove unused conversion functions.
+        -Use the most specific cast function when possible.
+        -Functions that are only used inside FTLOutput are made private.
+         In FTLB3Output, those functions were removed.
+
+        * ftl/FTLB3Output.h:
+        (JSC::FTL::Output::doubleToFloat):
+        (JSC::FTL::Output::floatToDouble):
+        (JSC::FTL::Output::fround):
+        (JSC::FTL::Output::fpToInt): Deleted.
+        (JSC::FTL::Output::fpToUInt): Deleted.
+        (JSC::FTL::Output::intToFP): Deleted.
+        (JSC::FTL::Output::unsignedToFP): Deleted.
+        (JSC::FTL::Output::intCast): Deleted.
+        (JSC::FTL::Output::fpCast): Deleted.
+        (JSC::FTL::Output::intToPtr): Deleted.
+        (JSC::FTL::Output::ptrToInt): Deleted.
+        * ftl/FTLLowerDFGToLLVM.cpp:
+        (JSC::FTL::DFG::LowerDFGToLLVM::compileGetByVal):
+        (JSC::FTL::DFG::LowerDFGToLLVM::compilePutByVal):
+        * ftl/FTLOutput.h:
+        (JSC::FTL::Output::doubleToFloat):
+        (JSC::FTL::Output::floatToDouble):
+        (JSC::FTL::Output::intCast):
+        (JSC::FTL::Output::fpToInt):
+        (JSC::FTL::Output::fpToUInt):
+        (JSC::FTL::Output::fpCast):
+        (JSC::FTL::Output::intToFP):
+        (JSC::FTL::Output::unsignedToFP):
+
 2015-12-10  Youenn Fablet  <[email protected]>
 
         Binding and builtin generators should lowercase RTCXX as rtcXX and not rTCXX

Modified: trunk/Source/_javascript_Core/ftl/FTLB3Output.h (193954 => 193955)


--- trunk/Source/_javascript_Core/ftl/FTLB3Output.h	2015-12-11 15:03:21 UTC (rev 193954)
+++ trunk/Source/_javascript_Core/ftl/FTLB3Output.h	2015-12-11 17:15:58 UTC (rev 193955)
@@ -181,23 +181,17 @@
     LValue signExt32To64(LValue value) { return m_block->appendNew<B3::Value>(m_proc, B3::SExt32, origin(), value); }
     LValue zeroExt(LValue value, LType type) { return m_block->appendNew<B3::Value>(m_proc, B3::ZExt32, type, origin(), value); }
     LValue zeroExtPtr(LValue value) { return zeroExt(value, B3::Int64); }
-    LValue fpToInt(LValue value, LType type) { CRASH(); }
-    LValue fpToUInt(LValue value, LType type) { CRASH(); }
     LValue fpToInt32(LValue value) { CRASH(); }
     LValue fpToUInt32(LValue value) { CRASH(); }
-    LValue intToFP(LValue value, LType type) { CRASH(); }
     LValue intToDouble(LValue value) { return m_block->appendNew<B3::Value>(m_proc, B3::IToD, origin(), value); }
-    LValue unsignedToFP(LValue value, LType type) { CRASH(); }
     LValue unsignedToDouble(LValue value) { CRASH(); }
-    LValue intCast(LValue value, LType type) { CRASH(); }
     LValue castToInt32(LValue value)
     {
         return value->type() == B3::Int32 ? value :
             m_block->appendNew<B3::Value>(m_proc, B3::Trunc, origin(), value);
     }
-    LValue fpCast(LValue value, LType type) { CRASH(); }
-    LValue intToPtr(LValue value, LType type) { CRASH(); }
-    LValue ptrToInt(LValue value, LType type) { CRASH(); }
+    LValue doubleToFloat(LValue value) { return m_block->appendNew<B3::Value>(m_proc, B3::DoubleToFloat, origin(), value); }
+    LValue floatToDouble(LValue value) { return m_block->appendNew<B3::Value>(m_proc, B3::FloatToDouble, origin(), value); }
     LValue bitCast(LValue, LType);
     LValue fround(LValue doubleValue);
 
@@ -545,8 +539,7 @@
 
 inline LValue Output::fround(LValue doubleValue)
 {
-    LValue asFloat = m_block->appendNew<B3::Value>(m_proc, B3::DoubleToFloat, origin(), doubleValue);
-    return m_block->appendNew<B3::Value>(m_proc, B3::FloatToDouble, origin(), asFloat);
+    return floatToDouble(doubleToFloat(doubleValue));
 }
 
 #if COMPILER(GCC_OR_CLANG)

Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (193954 => 193955)


--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp	2015-12-11 15:03:21 UTC (rev 193954)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp	2015-12-11 17:15:58 UTC (rev 193955)
@@ -3011,7 +3011,7 @@
                         return;
                     }
                     
-                    setDouble(m_out.unsignedToFP(result, m_out.doubleType));
+                    setDouble(m_out.unsignedToDouble(result));
                     return;
                 }
             
@@ -3020,7 +3020,7 @@
                 LValue result;
                 switch (type) {
                 case TypeFloat32:
-                    result = m_out.fpCast(m_out.loadFloat(pointer), m_out.doubleType);
+                    result = m_out.floatToDouble(m_out.loadFloat(pointer));
                     break;
                 case TypeFloat64:
                     result = m_out.loadDouble(pointer);
@@ -3291,7 +3291,7 @@
                     LValue value = lowDouble(child3);
                     switch (type) {
                     case TypeFloat32:
-                        valueToStore = m_out.fpCast(value, m_out.floatType);
+                        valueToStore = m_out.doubleToFloat(value);
                         storeType = Output::StoreFloat;
                         break;
                     case TypeFloat64:

Modified: trunk/Source/_javascript_Core/ftl/FTLOutput.h (193954 => 193955)


--- trunk/Source/_javascript_Core/ftl/FTLOutput.h	2015-12-11 15:03:21 UTC (rev 193954)
+++ trunk/Source/_javascript_Core/ftl/FTLOutput.h	2015-12-11 17:15:58 UTC (rev 193955)
@@ -219,17 +219,13 @@
     LValue signExt32To64(LValue value) { return signExt(value, int64); }
     LValue zeroExt(LValue value, LType type) { return buildZExt(m_builder, value, type); }
     LValue zeroExtPtr(LValue value) { return zeroExt(value, intPtr); }
-    LValue fpToInt(LValue value, LType type) { return buildFPToSI(m_builder, value, type); }
-    LValue fpToUInt(LValue value, LType type) { return buildFPToUI(m_builder, value, type); }
     LValue fpToInt32(LValue value) { return fpToInt(value, int32); }
     LValue fpToUInt32(LValue value) { return fpToUInt(value, int32); }
-    LValue intToFP(LValue value, LType type) { return buildSIToFP(m_builder, value, type); }
     LValue intToDouble(LValue value) { return intToFP(value, doubleType); }
-    LValue unsignedToFP(LValue value, LType type) { return buildUIToFP(m_builder, value, type); }
     LValue unsignedToDouble(LValue value) { return unsignedToFP(value, doubleType); }
-    LValue intCast(LValue value, LType type) { return buildIntCast(m_builder, value, type); }
     LValue castToInt32(LValue value) { return intCast(value, int32); }
-    LValue fpCast(LValue value, LType type) { return buildFPCast(m_builder, value, type); }
+    LValue doubleToFloat(LValue value) { return fpCast(value, floatType); }
+    LValue floatToDouble(LValue value) { return fpCast(value, doubleType); }
     LValue intToPtr(LValue value, LType type) { return buildIntToPtr(m_builder, value, type); }
     LValue ptrToInt(LValue value, LType type) { return buildPtrToInt(m_builder, value, type); }
     LValue bitCast(LValue value, LType type) { return buildBitCast(m_builder, value, type); }
@@ -476,6 +472,12 @@
     LBasicBlock m_nextBlock;
 
 private:
+    LValue intCast(LValue value, LType type) { return buildIntCast(m_builder, value, type); }
+    LValue fpToInt(LValue value, LType type) { return buildFPToSI(m_builder, value, type); }
+    LValue fpToUInt(LValue value, LType type) { return buildFPToUI(m_builder, value, type); }
+    LValue fpCast(LValue value, LType type) { return buildFPCast(m_builder, value, type); }
+    LValue intToFP(LValue value, LType type) { return buildSIToFP(m_builder, value, type); }
+    LValue unsignedToFP(LValue value, LType type) { return buildUIToFP(m_builder, value, type); }
     LValue signExt(LValue value, LType type) { return buildSExt(m_builder, value, type); }
 };
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to