[wasm] TrapIf and TrapUnless TurboFan operators implemented on ia32.

src/wasm/wasm-opcodes.h

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_WASM_OPCODES_H_
 #define V8_WASM_OPCODES_H_
 
 #include "src/globals.h"
 #include "src/machine-type.h"
+#include "src/runtime/runtime.h"

[titzer, 2016/12/15 14:21:08]

I think it's best not to include the runtime header into the opcodes header for
WASM. This is only needed because the runtime header defines an enum. Is there
another place to put the helper function?

[ahaas, 2016/12/15 16:55:51]

I moved the function to wasm-compiler.cc

 #include "src/signature.h"
 
 namespace v8 {
 namespace internal {
 namespace wasm {
 
 // Binary encoding of local types.
 enum LocalTypeCode {
   kLocalVoid = 0x40,
   kLocalI32 = 0x7f,
@@ skipping 506 matching lines @@
  public:
   static const char* OpcodeName(WasmOpcode opcode);
   static const char* ShortOpcodeName(WasmOpcode opcode);
   static FunctionSig* Signature(WasmOpcode opcode);
   static FunctionSig* AsmjsSignature(WasmOpcode opcode);
   static FunctionSig* AtomicSignature(WasmOpcode opcode);
   static bool IsPrefixOpcode(WasmOpcode opcode);
 
   static int TrapReasonToMessageId(TrapReason reason);
   static const char* TrapReasonMessage(TrapReason reason);
-  static int32_t TrapReasonToFunctionId(TrapReason reason);
+  static Runtime::FunctionId TrapReasonToFunctionId(TrapReason reason);
 
   static byte MemSize(MachineType type) {
     return 1 << ElementSizeLog2Of(type.representation());
   }
 
   static byte MemSize(LocalType type) { return 1 << ElementSizeLog2Of(type); }
 
   static LocalTypeCode LocalTypeCodeFor(LocalType type) {
     switch (type) {
       case kAstI32:
@@ skipping 131 matching lines @@
       default:
         return "<unknown>";
     }
   }
 };
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_WASM_OPCODES_H_