summaryrefslogtreecommitdiff
path: root/src/interp/interp.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp/interp.cc')
-rw-r--r--src/interp/interp.cc100
1 files changed, 50 insertions, 50 deletions
diff --git a/src/interp/interp.cc b/src/interp/interp.cc
index afdc23ee..20711305 100644
--- a/src/interp/interp.cc
+++ b/src/interp/interp.cc
@@ -1575,33 +1575,33 @@ Result Thread::Run(int num_instructions) {
CHECK_TRAP(PushRep<double>(ReadU64(&pc)));
break;
- case Opcode::GetGlobal: {
+ case Opcode::GlobalGet: {
Index index = ReadU32(&pc);
assert(index < env_->globals_.size());
CHECK_TRAP(Push(env_->globals_[index].typed_value.value));
break;
}
- case Opcode::SetGlobal: {
+ case Opcode::GlobalSet: {
Index index = ReadU32(&pc);
assert(index < env_->globals_.size());
env_->globals_[index].typed_value.value = Pop();
break;
}
- case Opcode::GetLocal: {
+ case Opcode::LocalGet: {
Value value = Pick(ReadU32(&pc));
CHECK_TRAP(Push(value));
break;
}
- case Opcode::SetLocal: {
+ case Opcode::LocalSet: {
Value value = Pop();
Pick(ReadU32(&pc)) = value;
break;
}
- case Opcode::TeeLocal:
+ case Opcode::LocalTee:
Pick(ReadU32(&pc)) = Top();
break;
@@ -1824,19 +1824,19 @@ Result Thread::Run(int num_instructions) {
case Opcode::I64AtomicRmw##rmwop: \
CHECK_TRAP(AtomicRmw<uint64_t, uint64_t>(func<uint64_t>, &pc)); \
break; \
- case Opcode::I32AtomicRmw8U##rmwop: \
+ case Opcode::I32AtomicRmw8##rmwop##U: \
CHECK_TRAP(AtomicRmw<uint8_t, uint32_t>(func<uint32_t>, &pc)); \
break; \
- case Opcode::I32AtomicRmw16U##rmwop: \
+ case Opcode::I32AtomicRmw16##rmwop##U: \
CHECK_TRAP(AtomicRmw<uint16_t, uint32_t>(func<uint32_t>, &pc)); \
break; \
- case Opcode::I64AtomicRmw8U##rmwop: \
+ case Opcode::I64AtomicRmw8##rmwop##U: \
CHECK_TRAP(AtomicRmw<uint8_t, uint64_t>(func<uint64_t>, &pc)); \
break; \
- case Opcode::I64AtomicRmw16U##rmwop: \
+ case Opcode::I64AtomicRmw16##rmwop##U: \
CHECK_TRAP(AtomicRmw<uint16_t, uint64_t>(func<uint64_t>, &pc)); \
break; \
- case Opcode::I64AtomicRmw32U##rmwop: \
+ case Opcode::I64AtomicRmw32##rmwop##U: \
CHECK_TRAP(AtomicRmw<uint32_t, uint64_t>(func<uint64_t>, &pc)); \
break /* no semicolon */
@@ -1857,23 +1857,23 @@ Result Thread::Run(int num_instructions) {
CHECK_TRAP(AtomicRmwCmpxchg<uint64_t, uint64_t>(&pc));
break;
- case Opcode::I32AtomicRmw8UCmpxchg:
+ case Opcode::I32AtomicRmw8CmpxchgU:
CHECK_TRAP(AtomicRmwCmpxchg<uint8_t, uint32_t>(&pc));
break;
- case Opcode::I32AtomicRmw16UCmpxchg:
+ case Opcode::I32AtomicRmw16CmpxchgU:
CHECK_TRAP(AtomicRmwCmpxchg<uint16_t, uint32_t>(&pc));
break;
- case Opcode::I64AtomicRmw8UCmpxchg:
+ case Opcode::I64AtomicRmw8CmpxchgU:
CHECK_TRAP(AtomicRmwCmpxchg<uint8_t, uint64_t>(&pc));
break;
- case Opcode::I64AtomicRmw16UCmpxchg:
+ case Opcode::I64AtomicRmw16CmpxchgU:
CHECK_TRAP(AtomicRmwCmpxchg<uint16_t, uint64_t>(&pc));
break;
- case Opcode::I64AtomicRmw32UCmpxchg:
+ case Opcode::I64AtomicRmw32CmpxchgU:
CHECK_TRAP(AtomicRmwCmpxchg<uint32_t, uint64_t>(&pc));
break;
@@ -2270,35 +2270,35 @@ Result Thread::Run(int num_instructions) {
CHECK_TRAP(Binop(Ge<double>));
break;
- case Opcode::I32TruncSF32:
+ case Opcode::I32TruncF32S:
CHECK_TRAP(UnopTrap(IntTrunc<int32_t, float>));
break;
- case Opcode::I32TruncSSatF32:
+ case Opcode::I32TruncSatF32S:
CHECK_TRAP(Unop(IntTruncSat<int32_t, float>));
break;
- case Opcode::I32TruncSF64:
+ case Opcode::I32TruncF64S:
CHECK_TRAP(UnopTrap(IntTrunc<int32_t, double>));
break;
- case Opcode::I32TruncSSatF64:
+ case Opcode::I32TruncSatF64S:
CHECK_TRAP(Unop(IntTruncSat<int32_t, double>));
break;
- case Opcode::I32TruncUF32:
+ case Opcode::I32TruncF32U:
CHECK_TRAP(UnopTrap(IntTrunc<uint32_t, float>));
break;
- case Opcode::I32TruncUSatF32:
+ case Opcode::I32TruncSatF32U:
CHECK_TRAP(Unop(IntTruncSat<uint32_t, float>));
break;
- case Opcode::I32TruncUF64:
+ case Opcode::I32TruncF64U:
CHECK_TRAP(UnopTrap(IntTrunc<uint32_t, double>));
break;
- case Opcode::I32TruncUSatF64:
+ case Opcode::I32TruncSatF64U:
CHECK_TRAP(Unop(IntTruncSat<uint32_t, double>));
break;
@@ -2306,59 +2306,59 @@ Result Thread::Run(int num_instructions) {
CHECK_TRAP(Push<uint32_t>(Pop<uint64_t>()));
break;
- case Opcode::I64TruncSF32:
+ case Opcode::I64TruncF32S:
CHECK_TRAP(UnopTrap(IntTrunc<int64_t, float>));
break;
- case Opcode::I64TruncSSatF32:
+ case Opcode::I64TruncSatF32S:
CHECK_TRAP(Unop(IntTruncSat<int64_t, float>));
break;
- case Opcode::I64TruncSF64:
+ case Opcode::I64TruncF64S:
CHECK_TRAP(UnopTrap(IntTrunc<int64_t, double>));
break;
- case Opcode::I64TruncSSatF64:
+ case Opcode::I64TruncSatF64S:
CHECK_TRAP(Unop(IntTruncSat<int64_t, double>));
break;
- case Opcode::I64TruncUF32:
+ case Opcode::I64TruncF32U:
CHECK_TRAP(UnopTrap(IntTrunc<uint64_t, float>));
break;
- case Opcode::I64TruncUSatF32:
+ case Opcode::I64TruncSatF32U:
CHECK_TRAP(Unop(IntTruncSat<uint64_t, float>));
break;
- case Opcode::I64TruncUF64:
+ case Opcode::I64TruncF64U:
CHECK_TRAP(UnopTrap(IntTrunc<uint64_t, double>));
break;
- case Opcode::I64TruncUSatF64:
+ case Opcode::I64TruncSatF64U:
CHECK_TRAP(Unop(IntTruncSat<uint64_t, double>));
break;
- case Opcode::I64ExtendSI32:
+ case Opcode::I64ExtendI32S:
CHECK_TRAP(Push<uint64_t>(Pop<int32_t>()));
break;
- case Opcode::I64ExtendUI32:
+ case Opcode::I64ExtendI32U:
CHECK_TRAP(Push<uint64_t>(Pop<uint32_t>()));
break;
- case Opcode::F32ConvertSI32:
+ case Opcode::F32ConvertI32S:
CHECK_TRAP(Push<float>(Pop<int32_t>()));
break;
- case Opcode::F32ConvertUI32:
+ case Opcode::F32ConvertI32U:
CHECK_TRAP(Push<float>(Pop<uint32_t>()));
break;
- case Opcode::F32ConvertSI64:
+ case Opcode::F32ConvertI64S:
CHECK_TRAP(Push<float>(Pop<int64_t>()));
break;
- case Opcode::F32ConvertUI64:
+ case Opcode::F32ConvertI64U:
CHECK_TRAP(Push<float>(wabt_convert_uint64_to_float(Pop<uint64_t>())));
break;
@@ -2390,19 +2390,19 @@ Result Thread::Run(int num_instructions) {
CHECK_TRAP(PushRep<float>(Pop<uint32_t>()));
break;
- case Opcode::F64ConvertSI32:
+ case Opcode::F64ConvertI32S:
CHECK_TRAP(Push<double>(Pop<int32_t>()));
break;
- case Opcode::F64ConvertUI32:
+ case Opcode::F64ConvertI32U:
CHECK_TRAP(Push<double>(Pop<uint32_t>()));
break;
- case Opcode::F64ConvertSI64:
+ case Opcode::F64ConvertI64S:
CHECK_TRAP(Push<double>(Pop<int64_t>()));
break;
- case Opcode::F64ConvertUI64:
+ case Opcode::F64ConvertI64U:
CHECK_TRAP(
Push<double>(wabt_convert_uint64_to_double(Pop<uint64_t>())));
break;
@@ -2496,7 +2496,7 @@ Result Thread::Run(int num_instructions) {
case Opcode::I32AtomicWait:
case Opcode::I64AtomicWait:
- case Opcode::AtomicWake:
+ case Opcode::AtomicNotify:
// TODO(binji): Implement.
TRAP(Unreachable);
break;
@@ -3208,35 +3208,35 @@ Result Thread::Run(int num_instructions) {
CHECK_TRAP(SimdUnop<v128, int64_t>(FloatSqrt<double>));
break;
- case Opcode::F32X4ConvertSI32X4:
+ case Opcode::F32X4ConvertI32X4S:
CHECK_TRAP(SimdUnop<v128, int32_t>(SimdConvert<float, int32_t>));
break;
- case Opcode::F32X4ConvertUI32X4:
+ case Opcode::F32X4ConvertI32X4U:
CHECK_TRAP(SimdUnop<v128, uint32_t>(SimdConvert<float, uint32_t>));
break;
- case Opcode::F64X2ConvertSI64X2:
+ case Opcode::F64X2ConvertI64X2S:
CHECK_TRAP(SimdUnop<v128, int64_t>(SimdConvert<double, int64_t>));
break;
- case Opcode::F64X2ConvertUI64X2:
+ case Opcode::F64X2ConvertI64X2U:
CHECK_TRAP(SimdUnop<v128, uint64_t>(SimdConvert<double, uint64_t>));
break;
- case Opcode::I32X4TruncSF32X4Sat:
+ case Opcode::I32X4TruncSatF32X4S:
CHECK_TRAP(SimdUnop<v128, int32_t>(IntTruncSat<int32_t, float>));
break;
- case Opcode::I32X4TruncUF32X4Sat:
+ case Opcode::I32X4TruncSatF32X4U:
CHECK_TRAP(SimdUnop<v128, uint32_t>(IntTruncSat<uint32_t, float>));
break;
- case Opcode::I64X2TruncSF64X2Sat:
+ case Opcode::I64X2TruncSatF64X2S:
CHECK_TRAP(SimdUnop<v128, int64_t>(IntTruncSat<int64_t, double>));
break;
- case Opcode::I64X2TruncUF64X2Sat:
+ case Opcode::I64X2TruncSatF64X2U:
CHECK_TRAP(SimdUnop<v128, uint64_t>(IntTruncSat<uint64_t, double>));
break;
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-25 19:49:21 +0000