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

Tue, 16 Aug 2016 16:32:17 -0700

Title: [204539] trunk/Source/_javascript_Core
Revision
204539
Author
[email protected]
Date
2016-08-16 16:31:38 -0700 (Tue, 16 Aug 2016)

Log Message

Add WASM I32 simple operators.
https://bugs.webkit.org/show_bug.cgi?id=160914

Reviewed by Benjamin Poulain.

This patch adds support for the i32 simple binary operators.

* wasm/WASMB3IRGenerator.cpp:
(JSC::WASM::toB3Op):
(JSC::WASM::B3IRGenerator::binaryOp):
* wasm/WASMFunctionParser.h:
(JSC::WASM::WASMFunctionParser<Context>::parseExpression):
* wasm/WASMOps.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (204538 => 204539)


--- trunk/Source/_javascript_Core/ChangeLog	2016-08-16 23:05:59 UTC (rev 204538)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-08-16 23:31:38 UTC (rev 204539)
@@ -1,3 +1,19 @@
+2016-08-16  Keith Miller  <[email protected]>
+
+        Add WASM I32 simple operators.
+        https://bugs.webkit.org/show_bug.cgi?id=160914
+
+        Reviewed by Benjamin Poulain.
+
+        This patch adds support for the i32 simple binary operators.
+
+        * wasm/WASMB3IRGenerator.cpp:
+        (JSC::WASM::toB3Op):
+        (JSC::WASM::B3IRGenerator::binaryOp):
+        * wasm/WASMFunctionParser.h:
+        (JSC::WASM::WASMFunctionParser<Context>::parseExpression):
+        * wasm/WASMOps.h:
+
 2016-08-15  Ryosuke Niwa  <[email protected]>
 
         Conversion to sequence<T> is broken for iterable objects

Modified: trunk/Source/_javascript_Core/wasm/WASMB3IRGenerator.cpp (204538 => 204539)


--- trunk/Source/_javascript_Core/wasm/WASMB3IRGenerator.cpp	2016-08-16 23:05:59 UTC (rev 204538)
+++ trunk/Source/_javascript_Core/wasm/WASMB3IRGenerator.cpp	2016-08-16 23:31:38 UTC (rev 204539)
@@ -41,6 +41,15 @@
 
 using namespace B3;
 
+inline JSC::B3::Opcode toB3Op(WASMBinaryOpType op)
+{
+    switch (op) {
+#define CREATE_CASE(name, op, b3op) case WASMBinaryOpType::name: return b3op;
+    FOR_EACH_WASM_BINARY_OP(CREATE_CASE)
+#undef CREATE_CASE
+    }
+}
+
 class B3IRGenerator {
 public:
     typedef Value* ExpressionType;
@@ -82,13 +91,8 @@
 
 bool B3IRGenerator::binaryOp(WASMBinaryOpType op, ExpressionType left, ExpressionType right, ExpressionType& result)
 {
-    switch (op) {
-    case WASMBinaryOpType::I32Add: {
-        ASSERT(left->type() == B3::Int32 && right->type() == B3::Int32);
-        result = m_currentBlock->appendNew<Value>(m_proc, Add, Origin(), left, right);
-        return true;
-    }
-    }
+    result = m_currentBlock->appendNew<Value>(m_proc, toB3Op(op), Origin(), left, right);
+    return true;
 }
 
 B3IRGenerator::ExpressionType B3IRGenerator::addConstant(WASMValueType type, uint64_t value)

Modified: trunk/Source/_javascript_Core/wasm/WASMFunctionParser.h (204538 => 204539)


--- trunk/Source/_javascript_Core/wasm/WASMFunctionParser.h	2016-08-16 23:05:59 UTC (rev 204538)
+++ trunk/Source/_javascript_Core/wasm/WASMFunctionParser.h	2016-08-16 23:31:38 UTC (rev 204539)
@@ -110,7 +110,7 @@
 bool WASMFunctionParser<Context>::parseExpression(WASMOpType op)
 {
     switch (op) {
-#define CREATE_CASE(name, value) case name:
+#define CREATE_CASE(name, id, b3op) case name:
     FOR_EACH_WASM_BINARY_OP(CREATE_CASE) {
 #undef CREATE_CASE
         ExpressionType left = m_expressionStack.takeLast();

Modified: trunk/Source/_javascript_Core/wasm/WASMOps.h (204538 => 204539)


--- trunk/Source/_javascript_Core/wasm/WASMOps.h	2016-08-16 23:05:59 UTC (rev 204538)
+++ trunk/Source/_javascript_Core/wasm/WASMOps.h	2016-08-16 23:31:38 UTC (rev 204539)
@@ -32,17 +32,41 @@
 namespace WASM {
 
 #define FOR_EACH_WASM_SPECIAL_OP(macro) \
-    macro(I32Const, 0x10)
+    macro(I32Const, 0x10, NA)
 
 #define FOR_EACH_WASM_CONTROL_FLOW_OP(macro) \
-    macro(Block, 0x01) \
-    macro(Return, 0x09) \
-    macro(End, 0x0f)
+    macro(Block, 0x01, NA) \
+    macro(Return, 0x09, NA) \
+    macro(End, 0x0f, NA)
 
 #define FOR_EACH_WASM_UNARY_OP(macro)
 
 #define FOR_EACH_WASM_BINARY_OP(macro) \
-    macro(I32Add, 0x40)
+    macro(I32Add, 0x40, Add) \
+    macro(I32Sub, 0x41, Sub) \
+    macro(I32Mul, 0x42, Mul) \
+    macro(I32DivS, 0x43, Div) \
+    /* macro(I32DivU, 0x44) */ \
+    macro(I32RemS, 0x45, Mod) \
+    macro(I32RemU, 0x46, Mod) \
+    macro(I32And, 0x47, BitAnd) \
+    macro(I32Or, 0x48, BitOr) \
+    macro(I32Xor, 0x49, BitXor) \
+    macro(I32Shl, 0x4a, Shl) \
+    macro(I32ShrU, 0x4b, SShr) \
+    macro(I32ShrS, 0x4c, ZShr) \
+    /* macro(I32RotR, 0xb6) */ \
+    /* macro(I32RotL, 0xb7) */ \
+    macro(I32Eq, 0x4d, Equal) \
+    macro(I32Ne, 0x4e, NotEqual) \
+    macro(I32LtS, 0x4f, LessThan) \
+    macro(I32LeS, 0x50, LessEqual) \
+    macro(I32LtU, 0x51, Below) \
+    macro(I32LeU, 0x52, BelowEqual) \
+    macro(I32GtS, 0x53, GreaterThan) \
+    macro(I32GeS, 0x54, GreaterEqual) \
+    macro(I32GtU, 0x55, Above) \
+    macro(I32GeU, 0x56, AboveEqual) \
 
 #define FOR_EACH_WASM_OP(macro) \
     FOR_EACH_WASM_SPECIAL_OP(macro) \
@@ -50,7 +74,7 @@
     FOR_EACH_WASM_UNARY_OP(macro) \
     FOR_EACH_WASM_BINARY_OP(macro)
 
-#define CREATE_ENUM_VALUE(name, id) name = id,
+#define CREATE_ENUM_VALUE(name, id, b3op) name = id,
 
 enum WASMOpType : uint8_t {
     FOR_EACH_WASM_OP(CREATE_ENUM_VALUE)

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

Reply via email to