From e684a3455bcc29a6e3e66a004e352dea4e1141e7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 13 Feb 2019 15:05:36 +0100 Subject: BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael Brüning --- chromium/v8/src/wasm/wasm-opcodes.cc | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'chromium/v8/src/wasm/wasm-opcodes.cc') diff --git a/chromium/v8/src/wasm/wasm-opcodes.cc b/chromium/v8/src/wasm/wasm-opcodes.cc index 650cb629f62..274f51a7784 100644 --- a/chromium/v8/src/wasm/wasm-opcodes.cc +++ b/chromium/v8/src/wasm/wasm-opcodes.cc @@ -110,12 +110,6 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) { CASE_I32_OP(ConvertI64, "wrap/i64") CASE_CONVERT_OP(Convert, INT, F32, "f32", "trunc") CASE_CONVERT_OP(Convert, INT, F64, "f64", "trunc") - // TODO(kschimpf): Simplify after filling in other saturating operations. - CASE_CONVERT_SAT_OP(Convert, I32, F32, "f32", "trunc") - CASE_CONVERT_SAT_OP(Convert, I32, F64, "f64", "trunc") - CASE_CONVERT_SAT_OP(Convert, I64, F32, "f32", "trunc") - CASE_CONVERT_SAT_OP(Convert, I64, F64, "f64", "trunc") - CASE_CONVERT_OP(Convert, I64, I32, "i32", "extend") CASE_CONVERT_OP(Convert, F32, I32, "i32", "convert") CASE_CONVERT_OP(Convert, F32, I64, "i64", "convert") @@ -151,8 +145,8 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) { CASE_OP(GetGlobal, "get_global") CASE_OP(SetGlobal, "set_global") CASE_ALL_OP(Const, "const") - CASE_OP(MemorySize, "current_memory") - CASE_OP(GrowMemory, "grow_memory") + CASE_OP(MemorySize, "memory.size") + CASE_OP(MemoryGrow, "memory.grow") CASE_ALL_OP(LoadMem, "load") CASE_SIGN_OP(INT, LoadMem8, "load8") CASE_SIGN_OP(INT, LoadMem16, "load16") @@ -198,6 +192,19 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) { CASE_I32_OP(AsmjsSConvertF64, "asmjs_convert_s/f64") CASE_I32_OP(AsmjsUConvertF64, "asmjs_convert_u/f64") + // Numeric Opcodes. + CASE_CONVERT_SAT_OP(Convert, I32, F32, "f32", "trunc") + CASE_CONVERT_SAT_OP(Convert, I32, F64, "f64", "trunc") + CASE_CONVERT_SAT_OP(Convert, I64, F32, "f32", "trunc") + CASE_CONVERT_SAT_OP(Convert, I64, F64, "f64", "trunc") + CASE_OP(MemoryInit, "memory.init") + CASE_OP(MemoryDrop, "memory.drop") + CASE_OP(MemoryCopy, "memory.copy") + CASE_OP(MemoryFill, "memory.fill") + CASE_OP(TableInit, "table.init") + CASE_OP(TableDrop, "table.drop") + CASE_OP(TableCopy, "table.copy") + // SIMD opcodes. CASE_SIMD_OP(Splat, "splat") CASE_SIMD_OP(Neg, "neg") @@ -256,6 +263,8 @@ const char* WasmOpcodes::OpcodeName(WasmOpcode opcode) { CASE_S1x16_OP(AllTrue, "all_true") // Atomic operations. + CASE_OP(AtomicWake, "atomic_wake") + CASE_I32_OP(AtomicWait, "atomic_wait") CASE_UNSIGNED_ALL_OP(AtomicLoad, "atomic_load") CASE_UNSIGNED_ALL_OP(AtomicStore, "atomic_store") CASE_UNSIGNED_ALL_OP(AtomicAdd, "atomic_add") @@ -506,7 +515,7 @@ constexpr uint8_t StoreType::kStoreSizeLog2[]; constexpr ValueType StoreType::kValueType[]; constexpr MachineRepresentation StoreType::kMemRep[]; -int WasmOpcodes::TrapReasonToMessageId(TrapReason reason) { +MessageTemplate WasmOpcodes::TrapReasonToMessageId(TrapReason reason) { switch (reason) { #define TRAPREASON_TO_MESSAGE(name) \ case k##name: \ @@ -519,7 +528,7 @@ int WasmOpcodes::TrapReasonToMessageId(TrapReason reason) { } const char* WasmOpcodes::TrapReasonMessage(TrapReason reason) { - return MessageTemplate::TemplateString(TrapReasonToMessageId(reason)); + return MessageFormatter::TemplateString(TrapReasonToMessageId(reason)); } } // namespace wasm } // namespace internal -- cgit v1.2.1