Changeset 208719 in webkit for trunk/Source/JavaScriptCore/wasm/WasmValidate.cpp

Timestamp:

Nov 14, 2016, 5:09:33 PM (9 years ago)

Author:

[email protected]

Message:

Add Wasm select
​https://bugs.webkit.org/show_bug.cgi?id=164743

Reviewed by Saam Barati.

JSTests:

• wasm/function-tests/select.js: Added.

Source/JavaScriptCore:

Also, this patch fixes an issue with the jsc.cpp test harness where negative numbers would be sign extended
when they shouldn't be.

• jsc.cpp:

(box):

• wasm/WasmB3IRGenerator.cpp:
• wasm/WasmFunctionParser.h:

(JSC::Wasm::FunctionParser<Context>::parseExpression):

• wasm/WasmValidate.cpp:

(JSC::Wasm::Validate::addSelect):

File:

• trunk/Source/JavaScriptCore/wasm/WasmValidate.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/wasm/WasmValidate.cpp

@@ -94 +94 @@
     bool WARN_UNUSED_RETURN binaryOp(BinaryOpType, ExpressionType left, ExpressionType right, ExpressionType& result);
     bool WARN_UNUSED_RETURN unaryOp(UnaryOpType, ExpressionType arg, ExpressionType& result);
+    bool WARN_UNUSED_RETURN addSelect(ExpressionType condition, ExpressionType nonZero, ExpressionType zero, ExpressionType& result);
 
     // Control flow
@@ -181 +182 @@
 {
     return ControlData(BlockType::Loop, signature);
+}
+
+bool Validate::addSelect(ExpressionType condition, ExpressionType nonZero, ExpressionType zero, ExpressionType& result)
+{
+    if (condition != I32) {
+        m_errorMessage = makeString("Attempting to use ", toString(condition), " as the condition for select");
+        return false;
+    }
+
+    if (nonZero != zero) {
+        m_errorMessage = makeString("Result types of select don't match. Got: ", toString(nonZero), " and ", toString(zero));
+        return false;
+    }
+
+    result = zero;
+    return true;
 }