Changeset 209083 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Nov 29, 2016, 11:37:00 AM (8 years ago)

Author:

[email protected]

Message:

Add simple way to implement Wasm ops that require more than one B3 opcode
​https://bugs.webkit.org/show_bug.cgi?id=165129

Reviewed by Geoffrey Garen.

JSTests:

• wasm/function-tests/eqz.js: Added.
• wasm/function-tests/max.js: Added.
• wasm/function-tests/min.js: Added.
• wasm/wasm.json:

Source/JavaScriptCore:

This patch adds a simple way to show the B3IRGenerator opcode script how
to generate code for Wasm opcodes that do not have a one to one mapping.
The syntax is pretty simple right now. There are only three things one
can use as of this patch (although more things might be added in the future)
1) Wasm opcode arguments: These are referred to as @<argument_number>. For example,

I32.sub would map to Sub(@0, @1).

2) 32-bit int constants: These are reffered to as i32(<value>). For example, i32.inc

would map to Add(@0, i32(1))

3) B3 opcodes: These are referred to as the B3 opcode name followed by the B3Value's constructor

arguments. A value may take the result of another value as an argument. For example, you can do
Div(Mul(@0, Add(@0, i32(1))), i32(2)) if there was a b3 opcode that computed the sum from 1 to n.

These scripts are used to implement Wasm's eqz and floating point max/min opcodes. This patch
also adds missing support for the Wasm Neg opcodes.

• jsc.cpp:

(box):
(functionTestWasmModuleFunctions):

• wasm/WasmB3IRGenerator.cpp:

(JSC::Wasm::toB3Op): Deleted.

• wasm/WasmFunctionParser.h:

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

• wasm/WasmModuleParser.cpp:

(JSC::Wasm::ModuleParser::parseType):

• wasm/WasmParser.h:

(JSC::Wasm::Parser::parseUInt8):
(JSC::Wasm::Parser::parseValueType):

• wasm/generateWasmB3IRGeneratorInlinesHeader.py:

(Source):
(Source.init):
(read):
(lex):
(CodeGenerator):
(CodeGenerator.init):
(CodeGenerator.advance):
(CodeGenerator.token):
(CodeGenerator.parseError):
(CodeGenerator.consume):
(CodeGenerator.generateParameters):
(CodeGenerator.generateOpcode):
(CodeGenerator.generate):
(temp):
(generateB3OpCode):
(generateI32ConstCode):
(generateB3Code):
(generateSimpleCode):

• wasm/wasm.json:

File:

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

trunk/Source/JavaScriptCore/jsc.cpp

@@ -2510 +2510 @@
 
     RELEASE_ASSERT(typeString == "f64");
-    return value;
+    return JSValue::decode(bitwise_cast<uint64_t>(value.asNumber()));
 }
 
@@ -2549 +2549 @@
     Wasm::Plan plan(&vm, static_cast<uint8_t*>(source->vector()), source->length());
     plan.run();
-    if (plan.failed())
+    if (plan.failed()) {
+        dataLogLn("failed to parse module: ", plan.errorMessage());
         CRASH();
+    }
 
     if (plan.compiledFunctionCount() != functionCount)