diff options
| -rw-r--r-- | src/wasm/wasm-binary.cpp | 2 | ||||
| -rw-r--r-- | src/wasm/wasm-stack.cpp | 120 |
2 files changed, 61 insertions, 61 deletions
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp index daefbc28c..e4b942203 100644 --- a/src/wasm/wasm-binary.cpp +++ b/src/wasm/wasm-binary.cpp @@ -3830,7 +3830,7 @@ BinaryConsts::ASTNodes WasmBinaryBuilder::readExpression(Expression*& curr) { break; } case BinaryConsts::GCPrefix: { - uint8_t opcode = getInt8(); + auto opcode = getU32LEB(); if (maybeVisitI31New(curr, opcode)) { break; } diff --git a/src/wasm/wasm-stack.cpp b/src/wasm/wasm-stack.cpp index 83586f559..b887f6ec5 100644 --- a/src/wasm/wasm-stack.cpp +++ b/src/wasm/wasm-stack.cpp @@ -2001,12 +2001,12 @@ void BinaryInstWriter::visitTupleExtract(TupleExtract* curr) { } void BinaryInstWriter::visitI31New(I31New* curr) { - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::I31New); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::I31New); } void BinaryInstWriter::visitI31Get(I31Get* curr) { o << int8_t(BinaryConsts::GCPrefix) - << int8_t(curr->signed_ ? BinaryConsts::I31GetS : BinaryConsts::I31GetU); + << U32LEB(curr->signed_ ? BinaryConsts::I31GetS : BinaryConsts::I31GetU); } void BinaryInstWriter::visitCallRef(CallRef* curr) { @@ -2016,16 +2016,16 @@ void BinaryInstWriter::visitCallRef(CallRef* curr) { void BinaryInstWriter::visitRefTest(RefTest* curr) { o << int8_t(BinaryConsts::GCPrefix); - o << int8_t(BinaryConsts::RefTestStatic); + o << U32LEB(BinaryConsts::RefTestStatic); parent.writeIndexedHeapType(curr->intendedType); } void BinaryInstWriter::visitRefCast(RefCast* curr) { o << int8_t(BinaryConsts::GCPrefix); if (curr->safety == RefCast::Unsafe) { - o << int8_t(BinaryConsts::RefCastNopStatic); + o << U32LEB(BinaryConsts::RefCastNopStatic); } else { - o << int8_t(BinaryConsts::RefCastStatic); + o << U32LEB(BinaryConsts::RefCastStatic); } parent.writeIndexedHeapType(curr->intendedType); } @@ -2040,29 +2040,29 @@ void BinaryInstWriter::visitBrOn(BrOn* curr) { break; case BrOnCast: o << int8_t(BinaryConsts::GCPrefix); - o << int8_t(BinaryConsts::BrOnCastStatic); + o << U32LEB(BinaryConsts::BrOnCastStatic); break; case BrOnCastFail: o << int8_t(BinaryConsts::GCPrefix); - o << int8_t(BinaryConsts::BrOnCastStaticFail); + o << U32LEB(BinaryConsts::BrOnCastStaticFail); break; case BrOnFunc: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::BrOnFunc); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::BrOnFunc); break; case BrOnNonFunc: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::BrOnNonFunc); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::BrOnNonFunc); break; case BrOnData: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::BrOnData); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::BrOnData); break; case BrOnNonData: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::BrOnNonData); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::BrOnNonData); break; case BrOnI31: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::BrOnI31); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::BrOnI31); break; case BrOnNonI31: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::BrOnNonI31); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::BrOnNonI31); break; default: WASM_UNREACHABLE("invalid br_on_*"); @@ -2076,9 +2076,9 @@ void BinaryInstWriter::visitBrOn(BrOn* curr) { void BinaryInstWriter::visitStructNew(StructNew* curr) { o << int8_t(BinaryConsts::GCPrefix); if (curr->isWithDefault()) { - o << int8_t(BinaryConsts::StructNewDefault); + o << U32LEB(BinaryConsts::StructNewDefault); } else { - o << int8_t(BinaryConsts::StructNew); + o << U32LEB(BinaryConsts::StructNew); } parent.writeIndexedHeapType(curr->type.getHeapType()); } @@ -2094,13 +2094,13 @@ void BinaryInstWriter::visitStructGet(StructGet* curr) { } else { op = BinaryConsts::StructGetU; } - o << int8_t(BinaryConsts::GCPrefix) << int8_t(op); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(op); parent.writeIndexedHeapType(heapType); o << U32LEB(curr->index); } void BinaryInstWriter::visitStructSet(StructSet* curr) { - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::StructSet); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::StructSet); parent.writeIndexedHeapType(curr->ref->type.getHeapType()); o << U32LEB(curr->index); } @@ -2108,16 +2108,16 @@ void BinaryInstWriter::visitStructSet(StructSet* curr) { void BinaryInstWriter::visitArrayNew(ArrayNew* curr) { o << int8_t(BinaryConsts::GCPrefix); if (curr->isWithDefault()) { - o << int8_t(BinaryConsts::ArrayNewDefault); + o << U32LEB(BinaryConsts::ArrayNewDefault); } else { - o << int8_t(BinaryConsts::ArrayNew); + o << U32LEB(BinaryConsts::ArrayNew); } parent.writeIndexedHeapType(curr->type.getHeapType()); } void BinaryInstWriter::visitArrayInit(ArrayInit* curr) { o << int8_t(BinaryConsts::GCPrefix); - o << int8_t(BinaryConsts::ArrayInitStatic); + o << U32LEB(BinaryConsts::ArrayInitStatic); parent.writeIndexedHeapType(curr->type.getHeapType()); o << U32LEB(curr->values.size()); } @@ -2133,22 +2133,22 @@ void BinaryInstWriter::visitArrayGet(ArrayGet* curr) { } else { op = BinaryConsts::ArrayGetU; } - o << int8_t(BinaryConsts::GCPrefix) << int8_t(op); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(op); parent.writeIndexedHeapType(heapType); } void BinaryInstWriter::visitArraySet(ArraySet* curr) { - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::ArraySet); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::ArraySet); parent.writeIndexedHeapType(curr->ref->type.getHeapType()); } void BinaryInstWriter::visitArrayLen(ArrayLen* curr) { - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::ArrayLen); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::ArrayLen); parent.writeIndexedHeapType(curr->ref->type.getHeapType()); } void BinaryInstWriter::visitArrayCopy(ArrayCopy* curr) { - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::ArrayCopy); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::ArrayCopy); parent.writeIndexedHeapType(curr->destRef->type.getHeapType()); parent.writeIndexedHeapType(curr->srcRef->type.getHeapType()); } @@ -2159,13 +2159,13 @@ void BinaryInstWriter::visitRefAs(RefAs* curr) { o << int8_t(BinaryConsts::RefAsNonNull); break; case RefAsFunc: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::RefAsFunc); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::RefAsFunc); break; case RefAsData: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::RefAsData); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::RefAsData); break; case RefAsI31: - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::RefAsI31); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::RefAsI31); break; default: WASM_UNREACHABLE("invalid ref.as_*"); @@ -2176,38 +2176,38 @@ void BinaryInstWriter::visitStringNew(StringNew* curr) { o << int8_t(BinaryConsts::GCPrefix); switch (curr->op) { case StringNewUTF8: - o << int8_t(BinaryConsts::StringNewWTF8); + o << U32LEB(BinaryConsts::StringNewWTF8); o << int8_t(0); // Memory index. o << U32LEB(BinaryConsts::StringPolicy::UTF8); break; case StringNewWTF8: - o << int8_t(BinaryConsts::StringNewWTF8); + o << U32LEB(BinaryConsts::StringNewWTF8); o << int8_t(0); // Memory index. o << U32LEB(BinaryConsts::StringPolicy::WTF8); break; case StringNewReplace: - o << int8_t(BinaryConsts::StringNewWTF8); + o << U32LEB(BinaryConsts::StringNewWTF8); o << int8_t(0); // Memory index. o << U32LEB(BinaryConsts::StringPolicy::Replace); break; case StringNewWTF16: - o << int8_t(BinaryConsts::StringNewWTF16); + o << U32LEB(BinaryConsts::StringNewWTF16); o << int8_t(0); // Memory index. break; case StringNewUTF8Array: - o << int8_t(BinaryConsts::StringNewWTF8Array) + o << U32LEB(BinaryConsts::StringNewWTF8Array) << U32LEB(BinaryConsts::StringPolicy::UTF8); break; case StringNewWTF8Array: - o << int8_t(BinaryConsts::StringNewWTF8Array) + o << U32LEB(BinaryConsts::StringNewWTF8Array) << U32LEB(BinaryConsts::StringPolicy::WTF8); break; case StringNewReplaceArray: - o << int8_t(BinaryConsts::StringNewWTF8Array) + o << U32LEB(BinaryConsts::StringNewWTF8Array) << U32LEB(BinaryConsts::StringPolicy::Replace); break; case StringNewWTF16Array: - o << int8_t(BinaryConsts::StringNewWTF16Array); + o << U32LEB(BinaryConsts::StringNewWTF16Array); break; default: WASM_UNREACHABLE("invalid string.new*"); @@ -2215,7 +2215,7 @@ void BinaryInstWriter::visitStringNew(StringNew* curr) { } void BinaryInstWriter::visitStringConst(StringConst* curr) { - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::StringConst) + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::StringConst) << U32LEB(parent.getStringIndex(curr->string)); } @@ -2223,21 +2223,21 @@ void BinaryInstWriter::visitStringMeasure(StringMeasure* curr) { o << int8_t(BinaryConsts::GCPrefix); switch (curr->op) { case StringMeasureUTF8: - o << int8_t(BinaryConsts::StringMeasureWTF8) + o << U32LEB(BinaryConsts::StringMeasureWTF8) << U32LEB(BinaryConsts::StringPolicy::UTF8); break; case StringMeasureWTF8: - o << int8_t(BinaryConsts::StringMeasureWTF8) + o << U32LEB(BinaryConsts::StringMeasureWTF8) << U32LEB(BinaryConsts::StringPolicy::WTF8); break; case StringMeasureWTF16: - o << int8_t(BinaryConsts::StringMeasureWTF16); + o << U32LEB(BinaryConsts::StringMeasureWTF16); break; case StringMeasureIsUSV: - o << int8_t(BinaryConsts::StringIsUSV); + o << U32LEB(BinaryConsts::StringIsUSV); break; case StringMeasureWTF16View: - o << int8_t(BinaryConsts::StringViewWTF16Length); + o << U32LEB(BinaryConsts::StringViewWTF16Length); break; default: WASM_UNREACHABLE("invalid string.new*"); @@ -2248,29 +2248,29 @@ void BinaryInstWriter::visitStringEncode(StringEncode* curr) { o << int8_t(BinaryConsts::GCPrefix); switch (curr->op) { case StringEncodeUTF8: - o << int8_t(BinaryConsts::StringEncodeWTF8); + o << U32LEB(BinaryConsts::StringEncodeWTF8); o << int8_t(0); // Memory index. o << U32LEB(BinaryConsts::StringPolicy::UTF8); break; case StringEncodeWTF8: - o << int8_t(BinaryConsts::StringEncodeWTF8); + o << U32LEB(BinaryConsts::StringEncodeWTF8); o << int8_t(0); // Memory index. o << U32LEB(BinaryConsts::StringPolicy::WTF8); break; case StringEncodeWTF16: - o << int8_t(BinaryConsts::StringEncodeWTF16); + o << U32LEB(BinaryConsts::StringEncodeWTF16); o << int8_t(0); // Memory index. break; case StringEncodeUTF8Array: - o << int8_t(BinaryConsts::StringEncodeWTF8Array); + o << U32LEB(BinaryConsts::StringEncodeWTF8Array); o << U32LEB(BinaryConsts::StringPolicy::UTF8); break; case StringEncodeWTF8Array: - o << int8_t(BinaryConsts::StringEncodeWTF8Array) + o << U32LEB(BinaryConsts::StringEncodeWTF8Array) << U32LEB(BinaryConsts::StringPolicy::WTF8); break; case StringEncodeWTF16Array: - o << int8_t(BinaryConsts::StringEncodeWTF16Array); + o << U32LEB(BinaryConsts::StringEncodeWTF16Array); break; default: WASM_UNREACHABLE("invalid string.new*"); @@ -2278,24 +2278,24 @@ void BinaryInstWriter::visitStringEncode(StringEncode* curr) { } void BinaryInstWriter::visitStringConcat(StringConcat* curr) { - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::StringConcat); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::StringConcat); } void BinaryInstWriter::visitStringEq(StringEq* curr) { - o << int8_t(BinaryConsts::GCPrefix) << int8_t(BinaryConsts::StringEq); + o << int8_t(BinaryConsts::GCPrefix) << U32LEB(BinaryConsts::StringEq); } void BinaryInstWriter::visitStringAs(StringAs* curr) { o << int8_t(BinaryConsts::GCPrefix); switch (curr->op) { case StringAsWTF8: - o << int8_t(BinaryConsts::StringAsWTF8); + o << U32LEB(BinaryConsts::StringAsWTF8); break; case StringAsWTF16: - o << int8_t(BinaryConsts::StringAsWTF16); + o << U32LEB(BinaryConsts::StringAsWTF16); break; case StringAsIter: - o << int8_t(BinaryConsts::StringAsIter); + o << U32LEB(BinaryConsts::StringAsIter); break; default: WASM_UNREACHABLE("invalid string.as*"); @@ -2304,27 +2304,27 @@ void BinaryInstWriter::visitStringAs(StringAs* curr) { void BinaryInstWriter::visitStringWTF8Advance(StringWTF8Advance* curr) { o << int8_t(BinaryConsts::GCPrefix) - << int8_t(BinaryConsts::StringViewWTF8Advance); + << U32LEB(BinaryConsts::StringViewWTF8Advance); } void BinaryInstWriter::visitStringWTF16Get(StringWTF16Get* curr) { o << int8_t(BinaryConsts::GCPrefix) - << int8_t(BinaryConsts::StringViewWTF16GetCodePoint); + << U32LEB(BinaryConsts::StringViewWTF16GetCodePoint); } void BinaryInstWriter::visitStringIterNext(StringIterNext* curr) { o << int8_t(BinaryConsts::GCPrefix) - << int8_t(BinaryConsts::StringViewIterNext); + << U32LEB(BinaryConsts::StringViewIterNext); } void BinaryInstWriter::visitStringIterMove(StringIterMove* curr) { o << int8_t(BinaryConsts::GCPrefix); switch (curr->op) { case StringIterMoveAdvance: - o << int8_t(BinaryConsts::StringViewIterAdvance); + o << U32LEB(BinaryConsts::StringViewIterAdvance); break; case StringIterMoveRewind: - o << int8_t(BinaryConsts::StringViewIterRewind); + o << U32LEB(BinaryConsts::StringViewIterRewind); break; default: WASM_UNREACHABLE("invalid string.move*"); @@ -2335,10 +2335,10 @@ void BinaryInstWriter::visitStringSliceWTF(StringSliceWTF* curr) { o << int8_t(BinaryConsts::GCPrefix); switch (curr->op) { case StringSliceWTF8: - o << int8_t(BinaryConsts::StringViewWTF8Slice); + o << U32LEB(BinaryConsts::StringViewWTF8Slice); break; case StringSliceWTF16: - o << int8_t(BinaryConsts::StringViewWTF16Slice); + o << U32LEB(BinaryConsts::StringViewWTF16Slice); break; default: WASM_UNREACHABLE("invalid string.move*"); @@ -2347,7 +2347,7 @@ void BinaryInstWriter::visitStringSliceWTF(StringSliceWTF* curr) { void BinaryInstWriter::visitStringSliceIter(StringSliceIter* curr) { o << int8_t(BinaryConsts::GCPrefix) - << int8_t(BinaryConsts::StringViewIterSlice); + << U32LEB(BinaryConsts::StringViewIterSlice); } void BinaryInstWriter::emitScopeEnd(Expression* curr) { |