Skip to content

Commit 00bc624

Browse files
MaxGraeyMaxGraey
authored
fix: Update Binaryen constants to reflect opcode renumbering (#1552)
1 parent d0a2c9e commit 00bc624

File tree

2 files changed

+97
-85
lines changed

2 files changed

+97
-85
lines changed

‎src/glue/binaryen.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ export declare function _BinaryenMemoryFillId(): BinaryenExpressionId;
105105
export declare function _BinaryenRefNullId(): BinaryenExpressionId;
106106
export declare function _BinaryenRefIsNullId(): BinaryenExpressionId;
107107
export declare function _BinaryenRefFuncId(): BinaryenExpressionId;
108+
export declare function _BinaryenRefEqId(): BinaryenExpressionId;
108109
export declare function _BinaryenTryId(): BinaryenExpressionId;
109110
export declare function _BinaryenThrowId(): BinaryenExpressionId;
110111
export declare function _BinaryenRethrowId(): BinaryenExpressionId;

‎src/module.ts‎

Lines changed: 96 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ export enum ExpressionId {
8686
MemoryGrow = 21 /* _BinaryenMemoryGrowId */,
8787
Nop = 22 /* _BinaryenNopId */,
8888
Unreachable = 23 /* _BinaryenUnreachableId */,
89-
AtomicCmpxchg = 25 /* _BinaryenAtomicCmpxchgId */,
9089
AtomicRMW = 24 /* _BinaryenAtomicRMWId */,
90+
AtomicCmpxchg = 25 /* _BinaryenAtomicCmpxchgId */,
9191
AtomicWait = 26 /* _BinaryenAtomicWaitId */,
9292
AtomicNotify = 27 /* _BinaryenAtomicNotifyId */,
9393
AtomicFence = 28 /* _BinaryenAtomicFenceId */,
@@ -97,20 +97,22 @@ export enum ExpressionId {
9797
SIMDTernary = 32 /* _BinaryenSIMDTernaryId */,
9898
SIMDShift = 33 /* _BinaryenSIMDShiftId */,
9999
SIMDLoad = 34 /* _BinaryenSIMDLoadId */,
100-
MemoryInit = 35 /* _BinaryenMemoryInitId */,
101-
DataDrop = 36 /* _BinaryenDataDropId */,
102-
MemoryCopy = 37 /* _BinaryenMemoryCopyId */,
103-
MemoryFill = 38 /* _BinaryenMemoryFillId */,
104-
Pop = 39 /* _BinaryenPopId */,
105-
RefNull = 40 /* _BinaryenRefNullId */,
106-
RefIsNull = 41 /* _BinaryenRefIsNullId */,
107-
RefFunc = 42 /* _BinaryenRefFuncId */,
108-
Try = 44 /* _BinaryenTryId */,
109-
Throw = 45 /* _BinaryenThrowId */,
110-
Rethrow = 46 /* _BinaryenRethrowId */,
111-
BrOnExn = 47 /* _BinaryenBrOnExnId */,
112-
TupleMake = 48 /* _BinaryenTupleMakeId */,
113-
TupleExtract = 49 /* _BinaryenTupleExtractId */
100+
// SIMDLoadStoreLane = 35,
101+
MemoryInit = 36 /* _BinaryenMemoryInitId */,
102+
DataDrop = 37 /* _BinaryenDataDropId */,
103+
MemoryCopy = 38 /* _BinaryenMemoryCopyId */,
104+
MemoryFill = 39 /* _BinaryenMemoryFillId */,
105+
Pop = 40 /* _BinaryenPopId */,
106+
RefNull = 41 /* _BinaryenRefNullId */,
107+
RefIsNull = 42 /* _BinaryenRefIsNullId */,
108+
RefFunc = 43 /* _BinaryenRefFuncId */,
109+
RefEq = 44 /* _BinaryenRefEqId */,
110+
Try = 45 /* _BinaryenTryId */,
111+
Throw = 46 /* _BinaryenThrowId */,
112+
Rethrow = 47 /* _BinaryenRethrowId */,
113+
BrOnExn = 48 /* _BinaryenBrOnExnId */,
114+
TupleMake = 49 /* _BinaryenTupleMakeId */,
115+
TupleExtract = 50 /* _BinaryenTupleExtractId */
114116
}
115117

116118
export enum UnaryOp {
@@ -193,48 +195,49 @@ export enum UnaryOp {
193195
AllTrueI8x16 = 70 /* _BinaryenAllTrueVecI8x16 */,
194196
BitmaskI8x16 = 71 /* __BinaryenBitmaskVecI8x16 */,
195197
AbsI16x8 = 72 /* __BinaryenAbsVecI16x8 */,
196-
NegI16x8 = 73 /* _BinaryenNegVecI16x8 */,
197-
AnyTrueI16x8 = 74 /* _BinaryenAnyTrueVecI16x8 */,
198-
AllTrueI16x8 = 75 /* _BinaryenAllTrueVecI16x8 */,
199-
BitmaskI16x8 = 76 /* _BinaryenBitmaskVecI16x8 */,
200-
AbsI32x4 = 77 /* _BinaryenAbsVecI32x4 */,
201-
NegI32x4 = 78 /* _BinaryenNegVecI32x4 */,
202-
AnyTrueI32x4 = 79 /* _BinaryenAnyTrueVecI32x4 */,
203-
AllTrueI32x4 = 80 /* _BinaryenAllTrueVecI32x4 */,
204-
BitmaskI32x4 = 81 /* _BinaryenBitmaskVecI32x4 */,
205-
NegI64x2 = 82 /* _BinaryenNegVecI64x2 */,
206-
AnyTrueI64x2 = 83 /* _BinaryenAnyTrueVecI64x2 */,
207-
AllTrueI64x2 = 84 /* _BinaryenAllTrueVecI64x2 */,
208-
AbsF32x4 = 85 /* _BinaryenAbsVecF32x4 */,
209-
NegF32x4 = 86 /* _BinaryenNegVecF32x4 */,
210-
SqrtF32x4 = 87 /* _BinaryenSqrtVecF32x4 */,
211-
CeilF32x4 = 88 /* _BinaryenCeilVecF32x4 */,
212-
FloorF32x4 = 89 /* _BinaryenFloorVecF32x4 */,
198+
// PopcntVecI8x16
199+
NegI16x8 = 74 /* _BinaryenNegVecI16x8 */,
200+
AnyTrueI16x8 = 75 /* _BinaryenAnyTrueVecI16x8 */,
201+
AllTrueI16x8 = 76 /* _BinaryenAllTrueVecI16x8 */,
202+
BitmaskI16x8 = 77 /* _BinaryenBitmaskVecI16x8 */,
203+
AbsI32x4 = 78 /* _BinaryenAbsVecI32x4 */,
204+
NegI32x4 = 79 /* _BinaryenNegVecI32x4 */,
205+
AnyTrueI32x4 = 80 /* _BinaryenAnyTrueVecI32x4 */,
206+
AllTrueI32x4 = 81 /* _BinaryenAllTrueVecI32x4 */,
207+
BitmaskI32x4 = 82 /* _BinaryenBitmaskVecI32x4 */,
208+
NegI64x2 = 83 /* _BinaryenNegVecI64x2 */,
209+
AnyTrueI64x2 = 84 /* _BinaryenAnyTrueVecI64x2 */,
210+
AllTrueI64x2 = 85 /* _BinaryenAllTrueVecI64x2 */,
211+
AbsF32x4 = 86 /* _BinaryenAbsVecF32x4 */,
212+
NegF32x4 = 87 /* _BinaryenNegVecF32x4 */,
213+
SqrtF32x4 = 88 /* _BinaryenSqrtVecF32x4 */,
214+
CeilF32x4 = 89 /* _BinaryenCeilVecF32x4 */,
215+
FloorF32x4 = 90 /* _BinaryenFloorVecF32x4 */,
213216
TruncF32x4 = 90 /* BinaryenTruncVecF32x4 */,
214217
NearestF32x4 = 91 /* BinaryenNearestVecF32x4 */,
215-
AbsF64x2 = 92 /* _BinaryenAbsVecF64x2 */,
216-
NegF64x2 = 93 /* _BinaryenNegVecF64x2 */,
217-
SqrtF64x2 = 94 /* _BinaryenSqrtVecF64x2 */,
218-
CeilF64x2 = 95 /* _BinaryenCeilVecF64x2 */,
219-
FloorF64x2 = 96 /* _BinaryenFloorVecF64x2 */,
218+
AbsF64x2 = 93 /* _BinaryenAbsVecF64x2 */,
219+
NegF64x2 = 94 /* _BinaryenNegVecF64x2 */,
220+
SqrtF64x2 = 95 /* _BinaryenSqrtVecF64x2 */,
221+
CeilF64x2 = 96 /* _BinaryenCeilVecF64x2 */,
222+
FloorF64x2 = 97 /* _BinaryenFloorVecF64x2 */,
220223
TruncF64x2 = 97 /* BinaryenTruncVecF64x2 */,
221224
NearestF64x2 = 98 /* BinaryenNearestVecF64x2 */,
222-
TruncSatF32x4ToI32x4 = 99 /* _BinaryenTruncSatSVecF32x4ToVecI32x4 */,
223-
TruncSatF32x4ToU32x4 = 100 /* _BinaryenTruncSatUVecF32x4ToVecI32x4 */,
224-
TruncSatF64x2ToI64x2 = 101 /* _BinaryenTruncSatSVecF64x2ToVecI64x2 */,
225-
TruncSatF64x2ToU64x2 = 102 /* _BinaryenTruncSatUVecF64x2ToVecI64x2 */,
226-
ConvertI32x4ToF32x4 = 103 /* _BinaryenConvertSVecI32x4ToVecF32x4 */,
227-
ConvertU32x4ToF32x4 = 104 /* _BinaryenConvertUVecI32x4ToVecF32x4 */,
228-
ConvertI64x2ToF64x2 = 105 /* _BinaryenConvertSVecI64x2ToVecF64x2 */,
229-
ConvertU64x2ToF64x2 = 106 /* _BinaryenConvertUVecI64x2ToVecF64x2 */,
230-
WidenLowI8x16ToI16x8 = 107 /* _BinaryenWidenLowSVecI8x16ToVecI16x8 */,
231-
WidenHighI8x16ToI16x8 = 108 /* _BinaryenWidenHighSVecI8x16ToVecI16x8 */,
232-
WidenLowU8x16ToU16x8 = 109 /* _BinaryenWidenLowUVecI8x16ToVecI16x8 */,
233-
WidenHighU8x16ToU16x8 = 110 /* _BinaryenWidenHighUVecI8x16ToVecI16x8 */,
234-
WidenLowI16x8ToI32x4 = 111 /* _BinaryenWidenLowSVecI16x8ToVecI32x4 */,
235-
WidenHighI16x8ToI32x4 = 112 /* _BinaryenWidenHighSVecI16x8ToVecI32x4 */,
236-
WidenLowU16x8ToU32x4 = 113 /* _BinaryenWidenLowUVecI16x8ToVecI32x4 */,
237-
WidenHighU16x8ToU32x4 = 114 /* _BinaryenWidenHighUVecI16x8ToVecI32x4 */
225+
TruncSatF32x4ToI32x4 = 100 /* _BinaryenTruncSatSVecF32x4ToVecI32x4 */,
226+
TruncSatF32x4ToU32x4 = 101 /* _BinaryenTruncSatUVecF32x4ToVecI32x4 */,
227+
TruncSatF64x2ToI64x2 = 102 /* _BinaryenTruncSatSVecF64x2ToVecI64x2 */,
228+
TruncSatF64x2ToU64x2 = 103 /* _BinaryenTruncSatUVecF64x2ToVecI64x2 */,
229+
ConvertI32x4ToF32x4 = 104 /* _BinaryenConvertSVecI32x4ToVecF32x4 */,
230+
ConvertU32x4ToF32x4 = 105 /* _BinaryenConvertUVecI32x4ToVecF32x4 */,
231+
ConvertI64x2ToF64x2 = 106 /* _BinaryenConvertSVecI64x2ToVecF64x2 */,
232+
ConvertU64x2ToF64x2 = 107 /* _BinaryenConvertUVecI64x2ToVecF64x2 */,
233+
WidenLowI8x16ToI16x8 = 108 /* _BinaryenWidenLowSVecI8x16ToVecI16x8 */,
234+
WidenHighI8x16ToI16x8 = 109 /* _BinaryenWidenHighSVecI8x16ToVecI16x8 */,
235+
WidenLowU8x16ToU16x8 = 110 /* _BinaryenWidenLowUVecI8x16ToVecI16x8 */,
236+
WidenHighU8x16ToU16x8 = 111 /* _BinaryenWidenHighUVecI8x16ToVecI16x8 */,
237+
WidenLowI16x8ToI32x4 = 112 /* _BinaryenWidenLowSVecI16x8ToVecI32x4 */,
238+
WidenHighI16x8ToI32x4 = 113 /* _BinaryenWidenHighSVecI16x8ToVecI32x4 */,
239+
WidenLowU16x8ToU32x4 = 114 /* _BinaryenWidenLowUVecI16x8ToVecI32x4 */,
240+
WidenHighU16x8ToU32x4 = 115 /* _BinaryenWidenHighUVecI16x8ToVecI32x4 */
238241
}
239242

240243
export enum BinaryOp {
@@ -386,38 +389,46 @@ export enum BinaryOp {
386389
MaxI16x8 = 143 /* _BinaryenMaxSVecI16x8 */,
387390
MaxU16x8 = 144 /* _BinaryenMaxUVecI16x8 */,
388391
AvgrU16x8 = 145 /* _BinaryenAvgrUVecI16x8 */,
389-
AddI32x4 = 146 /* _BinaryenAddVecI32x4 */,
390-
SubI32x4 = 147 /* _BinaryenSubVecI32x4 */,
391-
MulI32x4 = 148 /* _BinaryenMulVecI32x4 */,
392-
MinI32x4 = 149 /* _BinaryenMinSVecI32x4 */,
393-
MinU32x4 = 150 /* _BinaryenMinUVecI32x4 */,
394-
MaxI32x4 = 151 /* _BinaryenMaxSVecI32x4 */,
395-
MaxU32x4 = 152 /* _BinaryenMaxUVecI32x4 */,
396-
DotI16x8 = 153 /* _BinaryenDotSVecI16x8ToVecI32x4 */,
397-
AddI64x2 = 154 /* _BinaryenAddVecI64x2 */,
398-
SubI64x2 = 155 /* _BinaryenSubVecI64x2 */,
399-
400-
AddF32x4 = 157 /* _BinaryenAddVecF32x4 */,
401-
SubF32x4 = 158 /* _BinaryenSubVecF32x4 */,
402-
MulF32x4 = 159 /* _BinaryenMulVecF32x4 */,
403-
DivF32x4 = 160 /* _BinaryenDivVecF32x4 */,
404-
MinF32x4 = 161 /* _BinaryenMinVecF32x4 */,
405-
MaxF32x4 = 162 /* _BinaryenMaxVecF32x4 */,
406-
PminF32x4 = 163 /* _BinaryenPMinVecF32x4 */,
407-
PmaxF32x4 = 164 /* _BinaryenPMaxVecF32x4 */,
408-
AddF64x2 = 165 /* _BinaryenAddVecF64x2 */,
409-
SubF64x2 = 166 /* _BinaryenSubVecF64x2 */,
410-
MulF64x2 = 167 /* _BinaryenMulVecF64x2 */,
411-
DivF64x2 = 168 /* _BinaryenDivVecF64x2 */,
412-
MinF64x2 = 169 /* _BinaryenMinVecF64x2 */,
413-
MaxF64x2 = 170 /* _BinaryenMaxVecF64x2 */,
414-
PminF64x2 = 171 /* _BinaryenPMinVecF64x2 */,
415-
PmaxF64x2 = 172 /* _BinaryenPMaxVecF64x2 */,
416-
NarrowI16x8ToI8x16 = 173 /* _BinaryenNarrowSVecI16x8ToVecI8x16 */,
417-
NarrowU16x8ToU8x16 = 174 /* _BinaryenNarrowUVecI16x8ToVecI8x16 */,
418-
NarrowI32x4ToI16x8 = 175 /* _BinaryenNarrowSVecI32x4ToVecI16x8 */,
419-
NarrowU32x4ToU16x8 = 176 /* _BinaryenNarrowUVecI32x4ToVecI16x8 */,
420-
SwizzleV8x16 = 177 /* _BinaryenSwizzleVec8x16 */
392+
// Q15MulrSatSVecI16x8,
393+
// ExtMulLowSVecI16x8,
394+
// ExtMulHighSVecI16x8,
395+
// ExtMulLowUVecI16x8,
396+
// ExtMulHighUVecI16x8,
397+
AddI32x4 = 151 /* _BinaryenAddVecI32x4 */,
398+
SubI32x4 = 152 /* _BinaryenSubVecI32x4 */,
399+
MulI32x4 = 153 /* _BinaryenMulVecI32x4 */,
400+
MinI32x4 = 154 /* _BinaryenMinSVecI32x4 */,
401+
MinU32x4 = 155 /* _BinaryenMinUVecI32x4 */,
402+
MaxI32x4 = 156 /* _BinaryenMaxSVecI32x4 */,
403+
MaxU32x4 = 157 /* _BinaryenMaxUVecI32x4 */,
404+
DotI16x8 = 158 /* _BinaryenDotSVecI16x8ToVecI32x4 */,
405+
AddI64x2 = 163 /* _BinaryenAddVecI64x2 */,
406+
SubI64x2 = 164 /* _BinaryenSubVecI64x2 */,
407+
// ExtMulLowSVecI64x2
408+
// ExtMulHighSVecI64x2
409+
// ExtMulLowUVecI64x2
410+
// ExtMulHighUVecI64x2
411+
AddF32x4 = 170 /* _BinaryenAddVecF32x4 */,
412+
SubF32x4 = 171 /* _BinaryenSubVecF32x4 */,
413+
MulF32x4 = 172 /* _BinaryenMulVecF32x4 */,
414+
DivF32x4 = 173 /* _BinaryenDivVecF32x4 */,
415+
MinF32x4 = 174 /* _BinaryenMinVecF32x4 */,
416+
MaxF32x4 = 175 /* _BinaryenMaxVecF32x4 */,
417+
PminF32x4 = 176 /* _BinaryenPMinVecF32x4 */,
418+
PmaxF32x4 = 177 /* _BinaryenPMaxVecF32x4 */,
419+
AddF64x2 = 178 /* _BinaryenAddVecF64x2 */,
420+
SubF64x2 = 179 /* _BinaryenSubVecF64x2 */,
421+
MulF64x2 = 180 /* _BinaryenMulVecF64x2 */,
422+
DivF64x2 = 181 /* _BinaryenDivVecF64x2 */,
423+
MinF64x2 = 182 /* _BinaryenMinVecF64x2 */,
424+
MaxF64x2 = 183 /* _BinaryenMaxVecF64x2 */,
425+
PminF64x2 = 184 /* _BinaryenPMinVecF64x2 */,
426+
PmaxF64x2 = 185 /* _BinaryenPMaxVecF64x2 */,
427+
NarrowI16x8ToI8x16 = 186 /* _BinaryenNarrowSVecI16x8ToVecI8x16 */,
428+
NarrowU16x8ToU8x16 = 187 /* _BinaryenNarrowUVecI16x8ToVecI8x16 */,
429+
NarrowI32x4ToI16x8 = 188 /* _BinaryenNarrowSVecI32x4ToVecI16x8 */,
430+
NarrowU32x4ToU16x8 = 189 /* _BinaryenNarrowUVecI32x4ToVecI16x8 */,
431+
SwizzleV8x16 = 190 /* _BinaryenSwizzleVec8x16 */
421432
}
422433

423434
export enum AtomicRMWOp {

0 commit comments

Comments
 (0)