Move TrapReason messages over to messages.h

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/machine-type.h"
+#include "src/messages.h"

[Michael Starzinger, 2016/04/11 14:05:24]

nit: Not sure about the header inclusion policy in WAMS, "wasm-opcodes.h" sounds
like a pretty central header. Not sure if it should pull in "messages.h". But
that is internal to WASM, so I don't mind either way.

 #include "src/signature.h"
 
 namespace v8 {
 namespace internal {
 namespace wasm {
 
 // Binary encoding of local types.
 enum LocalTypeCode {
   kLocalVoid = 0,
   kLocalI32 = 1,
@@ skipping 304 matching lines @@
   V(l_il, kAstI64, kAstI32, kAstI64)
 
 enum WasmOpcode {
 // Declare expression opcodes.
 #define DECLARE_NAMED_ENUM(name, opcode, sig) kExpr##name = opcode,
   FOREACH_OPCODE(DECLARE_NAMED_ENUM)
 #undef DECLARE_NAMED_ENUM
 };
 
 // The reason for a trap.
+#define FOREACH_TRAPREASON(V) \
+  V(TrapUnreachable)          \
+  V(TrapMemOutOfBounds)       \
+  V(TrapDivByZero)            \
+  V(TrapDivUnrepresentable)   \
+  V(TrapRemByZero)            \
+  V(TrapFloatUnrepresentable) \
+  V(TrapFuncInvalid)          \
+  V(TrapFuncSigMismatch)
+
 enum TrapReason {
-  kTrapUnreachable,
-  kTrapMemOutOfBounds,
-  kTrapDivByZero,
-  kTrapDivUnrepresentable,
-  kTrapRemByZero,
-  kTrapFloatUnrepresentable,
-  kTrapFuncInvalid,
-  kTrapFuncSigMismatch,
+#define DECLARE_ENUM(name) k##name,
+  FOREACH_TRAPREASON(DECLARE_ENUM)
   kTrapCount
+#undef DECLARE_ENUM
 };
 
 // A collection of opcode-related static methods.
 class WasmOpcodes {
  public:
   static bool IsSupported(WasmOpcode opcode);
   static const char* OpcodeName(WasmOpcode opcode);
   static FunctionSig* Signature(WasmOpcode opcode);
 
   static byte MemSize(MachineType type) {
@@ skipping 149 matching lines @@
         return "f64";
       case kAstStmt:
         return "<stmt>";
       case kAstEnd:
         return "<end>";
       default:
         return "<unknown>";
     }
   }
 
+  static int TrapReasonToMessageId(TrapReason reason) {
+    switch (reason) {
+#define TRAPREASON_TO_MESSAGE(name)     \
+      case k##name:                     \
+        return MessageTemplate::kWasm##name;
+      FOREACH_TRAPREASON(TRAPREASON_TO_MESSAGE)
+#undef TRAPREASON_TO_MESSAGE
+      default:
+        return MessageTemplate::kNone;
+    }
+  }
+
   static const char* TrapReasonName(TrapReason reason) {

[Michael Starzinger, 2016/04/11 14:05:24]

nit/suggestion: Calling this "TrapReasonMessage" would make more sense now IMHO.
But that is internal to WASM, so I don't mind either way.

-    switch (reason) {
-      case kTrapUnreachable:
-        return "unreachable";
-      case kTrapMemOutOfBounds:
-        return "memory access out of bounds";
-      case kTrapDivByZero:
-        return "divide by zero";
-      case kTrapDivUnrepresentable:
-        return "divide result unrepresentable";
-      case kTrapRemByZero:
-        return "remainder by zero";
-      case kTrapFloatUnrepresentable:
-        return "integer result unrepresentable";
-      case kTrapFuncInvalid:
-        return "invalid function";
-      case kTrapFuncSigMismatch:
-        return "function signature mismatch";
-      default:
-        return "<?>";
-    }
+    return MessageTemplate::TemplateString(TrapReasonToMessageId(reason));
   }
 };
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_WASM_OPCODES_H_