1 files changed, 75 insertions, 75 deletions

diff --git a/src/interp/interp-trace.cc b/src/interp/interp-trace.cc
index d575441f..8bdfe016 100644
--- a/src/interp/interp-trace.cc
+++ b/src/interp/interp-trace.cc
@@ -89,14 +89,14 @@ void Thread::Trace(Stream* stream) {
                      Bitcast<double>(ReadU64At(pc)));
       break;
 
-    case Opcode::GetLocal:
-    case Opcode::GetGlobal:
+    case Opcode::LocalGet:
+    case Opcode::GlobalGet:
       stream->Writef("%s $%u\n", opcode.GetName(), ReadU32At(pc));
       break;
 
-    case Opcode::SetLocal:
-    case Opcode::SetGlobal:
-    case Opcode::TeeLocal:
+    case Opcode::LocalSet:
+    case Opcode::GlobalSet:
+    case Opcode::LocalTee:
       stream->Writef("%s $%u, %u\n", opcode.GetName(), ReadU32At(pc),
                      Top().i32);
       break;
@@ -144,27 +144,27 @@ void Thread::Trace(Stream* stream) {
       break;
     }
 
-    case Opcode::AtomicWake:
+    case Opcode::AtomicNotify:
     case Opcode::I32AtomicStore:
     case Opcode::I32AtomicStore8:
     case Opcode::I32AtomicStore16:
-    case Opcode::I32AtomicRmw8UAdd:
-    case Opcode::I32AtomicRmw16UAdd:
+    case Opcode::I32AtomicRmw8AddU:
+    case Opcode::I32AtomicRmw16AddU:
     case Opcode::I32AtomicRmwAdd:
-    case Opcode::I32AtomicRmw8USub:
-    case Opcode::I32AtomicRmw16USub:
+    case Opcode::I32AtomicRmw8SubU:
+    case Opcode::I32AtomicRmw16SubU:
     case Opcode::I32AtomicRmwSub:
-    case Opcode::I32AtomicRmw8UAnd:
-    case Opcode::I32AtomicRmw16UAnd:
+    case Opcode::I32AtomicRmw8AndU:
+    case Opcode::I32AtomicRmw16AndU:
     case Opcode::I32AtomicRmwAnd:
-    case Opcode::I32AtomicRmw8UOr:
-    case Opcode::I32AtomicRmw16UOr:
+    case Opcode::I32AtomicRmw8OrU:
+    case Opcode::I32AtomicRmw16OrU:
     case Opcode::I32AtomicRmwOr:
-    case Opcode::I32AtomicRmw8UXor:
-    case Opcode::I32AtomicRmw16UXor:
+    case Opcode::I32AtomicRmw8XorU:
+    case Opcode::I32AtomicRmw16XorU:
     case Opcode::I32AtomicRmwXor:
-    case Opcode::I32AtomicRmw8UXchg:
-    case Opcode::I32AtomicRmw16UXchg:
+    case Opcode::I32AtomicRmw8XchgU:
+    case Opcode::I32AtomicRmw16XchgU:
     case Opcode::I32AtomicRmwXchg:
     case Opcode::I32Store8:
     case Opcode::I32Store16:
@@ -176,8 +176,8 @@ void Thread::Trace(Stream* stream) {
     }
 
     case Opcode::I32AtomicRmwCmpxchg:
-    case Opcode::I32AtomicRmw8UCmpxchg:
-    case Opcode::I32AtomicRmw16UCmpxchg: {
+    case Opcode::I32AtomicRmw8CmpxchgU:
+    case Opcode::I32AtomicRmw16CmpxchgU: {
       const Index memory_index = ReadU32(&pc);
       stream->Writef("%s $%" PRIindex ":%u+$%u, %u, %u\n", opcode.GetName(),
                      memory_index, Pick(3).i32, ReadU32At(pc), Pick(2).i32,
@@ -189,29 +189,29 @@ void Thread::Trace(Stream* stream) {
     case Opcode::I64AtomicStore16:
     case Opcode::I64AtomicStore32:
     case Opcode::I64AtomicStore:
-    case Opcode::I64AtomicRmw8UAdd:
-    case Opcode::I64AtomicRmw16UAdd:
-    case Opcode::I64AtomicRmw32UAdd:
+    case Opcode::I64AtomicRmw8AddU:
+    case Opcode::I64AtomicRmw16AddU:
+    case Opcode::I64AtomicRmw32AddU:
     case Opcode::I64AtomicRmwAdd:
-    case Opcode::I64AtomicRmw8USub:
-    case Opcode::I64AtomicRmw16USub:
-    case Opcode::I64AtomicRmw32USub:
+    case Opcode::I64AtomicRmw8SubU:
+    case Opcode::I64AtomicRmw16SubU:
+    case Opcode::I64AtomicRmw32SubU:
     case Opcode::I64AtomicRmwSub:
-    case Opcode::I64AtomicRmw8UAnd:
-    case Opcode::I64AtomicRmw16UAnd:
-    case Opcode::I64AtomicRmw32UAnd:
+    case Opcode::I64AtomicRmw8AndU:
+    case Opcode::I64AtomicRmw16AndU:
+    case Opcode::I64AtomicRmw32AndU:
     case Opcode::I64AtomicRmwAnd:
-    case Opcode::I64AtomicRmw8UOr:
-    case Opcode::I64AtomicRmw16UOr:
-    case Opcode::I64AtomicRmw32UOr:
+    case Opcode::I64AtomicRmw8OrU:
+    case Opcode::I64AtomicRmw16OrU:
+    case Opcode::I64AtomicRmw32OrU:
     case Opcode::I64AtomicRmwOr:
-    case Opcode::I64AtomicRmw8UXor:
-    case Opcode::I64AtomicRmw16UXor:
-    case Opcode::I64AtomicRmw32UXor:
+    case Opcode::I64AtomicRmw8XorU:
+    case Opcode::I64AtomicRmw16XorU:
+    case Opcode::I64AtomicRmw32XorU:
     case Opcode::I64AtomicRmwXor:
-    case Opcode::I64AtomicRmw8UXchg:
-    case Opcode::I64AtomicRmw16UXchg:
-    case Opcode::I64AtomicRmw32UXchg:
+    case Opcode::I64AtomicRmw8XchgU:
+    case Opcode::I64AtomicRmw16XchgU:
+    case Opcode::I64AtomicRmw32XchgU:
     case Opcode::I64AtomicRmwXchg:
     case Opcode::I64Store8:
     case Opcode::I64Store16:
@@ -234,9 +234,9 @@ void Thread::Trace(Stream* stream) {
 
     case Opcode::I64AtomicWait:
     case Opcode::I64AtomicRmwCmpxchg:
-    case Opcode::I64AtomicRmw8UCmpxchg:
-    case Opcode::I64AtomicRmw16UCmpxchg:
-    case Opcode::I64AtomicRmw32UCmpxchg: {
+    case Opcode::I64AtomicRmw8CmpxchgU:
+    case Opcode::I64AtomicRmw16CmpxchgU:
+    case Opcode::I64AtomicRmw32CmpxchgU: {
       const Index memory_index = ReadU32(&pc);
       stream->Writef("%s $%" PRIindex ":%u+$%u, %" PRIu64 ", %" PRIu64 "\n",
                      opcode.GetName(), memory_index, Pick(3).i32, ReadU32At(pc),
@@ -413,48 +413,48 @@ void Thread::Trace(Stream* stream) {
       stream->Writef("%s %g\n", opcode.GetName(), Bitcast<double>(Top().i64));
       break;
 
-    case Opcode::I32TruncSF32:
-    case Opcode::I32TruncUF32:
-    case Opcode::I64TruncSF32:
-    case Opcode::I64TruncUF32:
+    case Opcode::I32TruncF32S:
+    case Opcode::I32TruncF32U:
+    case Opcode::I64TruncF32S:
+    case Opcode::I64TruncF32U:
     case Opcode::F64PromoteF32:
     case Opcode::I32ReinterpretF32:
-    case Opcode::I32TruncSSatF32:
-    case Opcode::I32TruncUSatF32:
-    case Opcode::I64TruncSSatF32:
-    case Opcode::I64TruncUSatF32:
+    case Opcode::I32TruncSatF32S:
+    case Opcode::I32TruncSatF32U:
+    case Opcode::I64TruncSatF32S:
+    case Opcode::I64TruncSatF32U:
       stream->Writef("%s %g\n", opcode.GetName(), Bitcast<float>(Top().i32));
       break;
 
-    case Opcode::I32TruncSF64:
-    case Opcode::I32TruncUF64:
-    case Opcode::I64TruncSF64:
-    case Opcode::I64TruncUF64:
+    case Opcode::I32TruncF64S:
+    case Opcode::I32TruncF64U:
+    case Opcode::I64TruncF64S:
+    case Opcode::I64TruncF64U:
     case Opcode::F32DemoteF64:
     case Opcode::I64ReinterpretF64:
-    case Opcode::I32TruncSSatF64:
-    case Opcode::I32TruncUSatF64:
-    case Opcode::I64TruncSSatF64:
-    case Opcode::I64TruncUSatF64:
+    case Opcode::I32TruncSatF64S:
+    case Opcode::I32TruncSatF64U:
+    case Opcode::I64TruncSatF64S:
+    case Opcode::I64TruncSatF64U:
       stream->Writef("%s %g\n", opcode.GetName(), Bitcast<double>(Top().i64));
       break;
 
     case Opcode::I32WrapI64:
-    case Opcode::F32ConvertSI64:
-    case Opcode::F32ConvertUI64:
-    case Opcode::F64ConvertSI64:
-    case Opcode::F64ConvertUI64:
+    case Opcode::F32ConvertI64S:
+    case Opcode::F32ConvertI64U:
+    case Opcode::F64ConvertI64S:
+    case Opcode::F64ConvertI64U:
     case Opcode::F64ReinterpretI64:
       stream->Writef("%s %" PRIu64 "\n", opcode.GetName(), Top().i64);
       break;
 
-    case Opcode::I64ExtendSI32:
-    case Opcode::I64ExtendUI32:
-    case Opcode::F32ConvertSI32:
-    case Opcode::F32ConvertUI32:
+    case Opcode::I64ExtendI32S:
+    case Opcode::I64ExtendI32U:
+    case Opcode::F32ConvertI32S:
+    case Opcode::F32ConvertI32U:
     case Opcode::F32ReinterpretI32:
-    case Opcode::F64ConvertSI32:
-    case Opcode::F64ConvertUI32:
+    case Opcode::F64ConvertI32S:
+    case Opcode::F64ConvertI32U:
       stream->Writef("%s %u\n", opcode.GetName(), Top().i32);
       break;
 
@@ -498,14 +498,14 @@ void Thread::Trace(Stream* stream) {
     case Opcode::F64X2Abs:
     case Opcode::F32X4Sqrt:
     case Opcode::F64X2Sqrt:
-    case Opcode::F32X4ConvertSI32X4:
-    case Opcode::F32X4ConvertUI32X4:
-    case Opcode::F64X2ConvertSI64X2:
-    case Opcode::F64X2ConvertUI64X2:
-    case Opcode::I32X4TruncSF32X4Sat:
-    case Opcode::I32X4TruncUF32X4Sat:
-    case Opcode::I64X2TruncSF64X2Sat:
-    case Opcode::I64X2TruncUF64X2Sat: {
+    case Opcode::F32X4ConvertI32X4S:
+    case Opcode::F32X4ConvertI32X4U:
+    case Opcode::F64X2ConvertI64X2S:
+    case Opcode::F64X2ConvertI64X2U:
+    case Opcode::I32X4TruncSatF32X4S:
+    case Opcode::I32X4TruncSatF32X4U:
+    case Opcode::I64X2TruncSatF64X2S:
+    case Opcode::I64X2TruncSatF64X2U: {
       stream->Writef("%s $0x%08x 0x%08x 0x%08x 0x%08x\n", opcode.GetName(),
                      Top().v128_bits.v[0], Top().v128_bits.v[1],
                      Top().v128_bits.v[2], Top().v128_bits.v[3]);