Chromium Code Reviews| Index: src/compiler/wasm-compiler.cc |
| diff --git a/src/compiler/wasm-compiler.cc b/src/compiler/wasm-compiler.cc |
| index 395a8d4f168d6f7b5891c30c6659c8f6728e47cd..7269323f9e4cd91c3b7a9f6c43d704d7e446f422 100644 |
| --- a/src/compiler/wasm-compiler.cc |
| +++ b/src/compiler/wasm-compiler.cc |
| @@ -531,9 +531,11 @@ Node* WasmGraphBuilder::Binop(wasm::WasmOpcode opcode, Node* left, |
| op = m->Uint64Mod(); |
| return graph()->NewNode(op, left, right, |
| trap_->ZeroCheck64(kTrapRemByZero, right)); |
| +#endif |
| case wasm::kExprI64And: |
|
titzer
2016/02/02 10:14:35
Move this instead of adding more #ifdefs
ahaas
2016/02/02 13:32:48
Done.
|
| op = m->Word64And(); |
| break; |
| +#if WASM_64 |
| case wasm::kExprI64Ior: |
| op = m->Word64Or(); |
| break; |
| @@ -812,13 +814,12 @@ Node* WasmGraphBuilder::Unop(wasm::WasmOpcode opcode, Node* input) { |
| break; |
| } |
| } |
| - |
| -#if WASM_64 |
| - // Opcodes only supported on 64-bit platforms. |
| - // TODO(titzer): query the machine operator builder here instead of #ifdef. |
| case wasm::kExprI32ConvertI64: |
| op = m->TruncateInt64ToInt32(); |
| break; |
| +#if WASM_64 |
| + // Opcodes only supported on 64-bit platforms. |
| + // TODO(titzer): query the machine operator builder here instead of #ifdef. |
| case wasm::kExprI64SConvertI32: |
| op = m->ChangeInt32ToInt64(); |
| break; |
| @@ -1873,7 +1874,6 @@ Node* WasmGraphBuilder::String(const char* string) { |
| Graph* WasmGraphBuilder::graph() { return jsgraph()->graph(); } |
| - |
| static void RecordFunctionCompilation(Logger::LogEventsAndTags tag, |
| CompilationInfo* info, |
| const char* message, uint32_t index, |
| @@ -1895,7 +1895,6 @@ static void RecordFunctionCompilation(Logger::LogEventsAndTags tag, |
| } |
| } |
| - |
| Handle<JSFunction> CompileJSToWasmWrapper( |
| Isolate* isolate, wasm::ModuleEnv* module, Handle<String> name, |
| Handle<Code> wasm_code, Handle<JSObject> module_object, uint32_t index) { |