Skip to content
This repository was archived by the owner on Dec 22, 2021. It is now read-only.

Commit 9c0aaec

Browse files
ngzhianngzhian
authored
Cleanup operators to remove duplicated V128Op (#358)
1 parent 8a7c145 commit 9c0aaec

File tree

1 file changed

+79
-79
lines changed

1 file changed

+79
-79
lines changed

‎interpreter/syntax/operators.ml

+79-79
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,17 @@ let v128_load64_splat align offset =
240240
SimdLoad {ty= V128Type; align; offset; sz = Some (Pack64, PackSplat)}
241241
let v128_store align offset = SimdStore {ty = V128Type; align; offset; sz = None}
242242

243-
let v128_not = Unary (V128 (V128Op.V128 V128Op.Not))
244-
let v128_and = Binary (V128 (V128Op.V128 V128Op.And))
245-
let v128_andnot = Binary (V128 (V128Op.V128 V128Op.AndNot))
246-
let v128_or = Binary (V128 (V128Op.V128 V128Op.Or))
247-
let v128_xor = Binary (V128 (V128Op.V128 V128Op.Xor))
243+
let v128_not = Unary (V128 V128Op.(V128 Not))
244+
let v128_and = Binary (V128 V128Op.(V128 And))
245+
let v128_andnot = Binary (V128 V128Op.(V128 AndNot))
246+
let v128_or = Binary (V128 V128Op.(V128 Or))
247+
let v128_xor = Binary (V128 V128Op.(V128 Xor))
248248
let v128_bitselect = Ternary (V128Op.Bitselect)
249249

250250
let i8x16_swizzle = Binary (V128 V128Op.(I8x16 Swizzle))
251251
let i8x16_shuffle imms = Binary (V128 V128Op.(I8x16 (Shuffle imms)))
252252

253-
let i8x16_splat = Convert (V128 (V128Op.I8x16 V128Op.Splat))
253+
let i8x16_splat = Convert (V128 V128Op.(I8x16 Splat))
254254
let i8x16_extract_lane_s imm = SimdExtract (V128Op.I8x16 (SX, imm))
255255
let i8x16_extract_lane_u imm = SimdExtract (V128Op.I8x16 (ZX, imm))
256256
let i8x16_replace_lane imm = SimdReplace (V128Op.I8x16 imm)
@@ -264,10 +264,10 @@ let i8x16_gt_s = Binary (V128 V128Op.(I8x16 GtS))
264264
let i8x16_gt_u = Binary (V128 V128Op.(I8x16 GtU))
265265
let i8x16_ge_s = Binary (V128 V128Op.(I8x16 GeS))
266266
let i8x16_ge_u = Binary (V128 V128Op.(I8x16 GeU))
267-
let i8x16_neg = Unary (V128 (V128Op.I8x16 V128Op.Neg))
268-
let i8x16_any_true = Test (V128 (V128Op.I8x16 V128Op.AnyTrue))
267+
let i8x16_neg = Unary (V128 V128Op.(I8x16 Neg))
268+
let i8x16_any_true = Test (V128 V128Op.(I8x16 AnyTrue))
269269
let i8x16_bitmask = SimdBitmask V128Op.(I8x16 Bitmask)
270-
let i8x16_all_true = Test (V128 (V128Op.I8x16 V128Op.AllTrue))
270+
let i8x16_all_true = Test (V128 V128Op.(I8x16 AllTrue))
271271
let i8x16_narrow_i16x8_s = Binary (V128 V128Op.(I8x16 NarrowS))
272272
let i8x16_narrow_i16x8_u = Binary (V128 V128Op.(I8x16 NarrowU))
273273
let i16x8_widen_low_i8x16_s = Unary (V128 V128Op.(I16x8 WidenLowS))
@@ -277,20 +277,20 @@ let i16x8_widen_high_i8x16_u = Unary (V128 V128Op.(I16x8 WidenHighU))
277277
let i8x16_shl = SimdShift V128Op.(I8x16 Shl)
278278
let i8x16_shr_s = SimdShift V128Op.(I8x16 ShrS)
279279
let i8x16_shr_u = SimdShift V128Op.(I8x16 ShrU)
280-
let i8x16_add = Binary (V128 (V128Op.I8x16 V128Op.Add))
280+
let i8x16_add = Binary (V128 V128Op.(I8x16 Add))
281281
let i8x16_add_sat_s = Binary (V128 V128Op.(I8x16 AddSatS))
282282
let i8x16_add_sat_u = Binary (V128 V128Op.(I8x16 AddSatU))
283-
let i8x16_sub = Binary (V128 (V128Op.I8x16 V128Op.Sub))
283+
let i8x16_sub = Binary (V128 V128Op.(I8x16 Sub))
284284
let i8x16_sub_sat_s = Binary (V128 V128Op.(I8x16 SubSatS))
285285
let i8x16_sub_sat_u = Binary (V128 V128Op.(I8x16 SubSatU))
286-
let i8x16_abs = Unary (V128 (V128Op.I8x16 V128Op.Abs))
287-
let i8x16_min_s = Binary (V128 (V128Op.I8x16 V128Op.MinS))
288-
let i8x16_min_u = Binary (V128 (V128Op.I8x16 V128Op.MinU))
289-
let i8x16_max_s = Binary (V128 (V128Op.I8x16 V128Op.MaxS))
290-
let i8x16_max_u = Binary (V128 (V128Op.I8x16 V128Op.MaxU))
291-
let i8x16_avgr_u = Binary (V128 (V128Op.I8x16 V128Op.AvgrU))
286+
let i8x16_abs = Unary (V128 V128Op.(I8x16 Abs))
287+
let i8x16_min_s = Binary (V128 V128Op.(I8x16 MinS))
288+
let i8x16_min_u = Binary (V128 V128Op.(I8x16 MinU))
289+
let i8x16_max_s = Binary (V128 V128Op.(I8x16 MaxS))
290+
let i8x16_max_u = Binary (V128 V128Op.(I8x16 MaxU))
291+
let i8x16_avgr_u = Binary (V128 V128Op.(I8x16 AvgrU))
292292

293-
let i16x8_splat = Convert (V128 (V128Op.I16x8 V128Op.Splat))
293+
let i16x8_splat = Convert (V128 V128Op.(I16x8 Splat))
294294
let i16x8_extract_lane_s imm = SimdExtract (V128Op.I16x8 (SX, imm))
295295
let i16x8_extract_lane_u imm = SimdExtract (V128Op.I16x8 (ZX, imm))
296296
let i16x8_replace_lane imm = SimdReplace (V128Op.I16x8 imm)
@@ -304,30 +304,30 @@ let i16x8_gt_s = Binary (V128 V128Op.(I16x8 GtS))
304304
let i16x8_gt_u = Binary (V128 V128Op.(I16x8 GtU))
305305
let i16x8_ge_s = Binary (V128 V128Op.(I16x8 GeS))
306306
let i16x8_ge_u = Binary (V128 V128Op.(I16x8 GeU))
307-
let i16x8_neg = Unary (V128 (V128Op.I16x8 V128Op.Neg))
308-
let i16x8_any_true = Test (V128 (V128Op.I16x8 V128Op.AnyTrue))
307+
let i16x8_neg = Unary (V128 V128Op.(I16x8 Neg))
308+
let i16x8_any_true = Test (V128 V128Op.(I16x8 AnyTrue))
309309
let i16x8_bitmask = SimdBitmask V128Op.(I16x8 Bitmask)
310-
let i16x8_all_true = Test (V128 (V128Op.I16x8 V128Op.AllTrue))
310+
let i16x8_all_true = Test (V128 V128Op.(I16x8 AllTrue))
311311
let i16x8_narrow_i32x4_s = Binary (V128 V128Op.(I16x8 NarrowS))
312312
let i16x8_narrow_i32x4_u = Binary (V128 V128Op.(I16x8 NarrowU))
313313
let i16x8_shl = SimdShift V128Op.(I16x8 Shl)
314314
let i16x8_shr_s = SimdShift V128Op.(I16x8 ShrS)
315315
let i16x8_shr_u = SimdShift V128Op.(I16x8 ShrU)
316-
let i16x8_add = Binary (V128 (V128Op.I16x8 V128Op.Add))
316+
let i16x8_add = Binary (V128 V128Op.(I16x8 Add))
317317
let i16x8_add_sat_s = Binary (V128 V128Op.(I16x8 AddSatS))
318318
let i16x8_add_sat_u = Binary (V128 V128Op.(I16x8 AddSatU))
319-
let i16x8_sub = Binary (V128 (V128Op.I16x8 V128Op.Sub))
319+
let i16x8_sub = Binary (V128 V128Op.(I16x8 Sub))
320320
let i16x8_sub_sat_s = Binary (V128 V128Op.(I16x8 SubSatS))
321321
let i16x8_sub_sat_u = Binary (V128 V128Op.(I16x8 SubSatU))
322-
let i16x8_mul = Binary (V128 (V128Op.I16x8 V128Op.Mul))
323-
let i16x8_abs = Unary (V128 (V128Op.I16x8 V128Op.Abs))
324-
let i16x8_min_s = Binary (V128 (V128Op.I16x8 V128Op.MinS))
325-
let i16x8_min_u = Binary (V128 (V128Op.I16x8 V128Op.MinU))
326-
let i16x8_max_s = Binary (V128 (V128Op.I16x8 V128Op.MaxS))
327-
let i16x8_max_u = Binary (V128 (V128Op.I16x8 V128Op.MaxU))
328-
let i16x8_avgr_u = Binary (V128 (V128Op.I16x8 V128Op.AvgrU))
322+
let i16x8_mul = Binary (V128 V128Op.(I16x8 Mul))
323+
let i16x8_abs = Unary (V128 V128Op.(I16x8 Abs))
324+
let i16x8_min_s = Binary (V128 V128Op.(I16x8 MinS))
325+
let i16x8_min_u = Binary (V128 V128Op.(I16x8 MinU))
326+
let i16x8_max_s = Binary (V128 V128Op.(I16x8 MaxS))
327+
let i16x8_max_u = Binary (V128 V128Op.(I16x8 MaxU))
328+
let i16x8_avgr_u = Binary (V128 V128Op.(I16x8 AvgrU))
329329

330-
let i32x4_splat = Convert (V128 (V128Op.I32x4 V128Op.Splat))
330+
let i32x4_splat = Convert (V128 V128Op.(I32x4 Splat))
331331
let i32x4_extract_lane imm = SimdExtract (V128Op.I32x4 (ZX, imm))
332332
let i32x4_replace_lane imm = SimdReplace (V128Op.I32x4 imm)
333333
let i32x4_eq = Binary (V128 V128Op.(I32x4 Eq))
@@ -340,40 +340,40 @@ let i32x4_gt_s = Binary (V128 V128Op.(I32x4 GtS))
340340
let i32x4_gt_u = Binary (V128 V128Op.(I32x4 GtU))
341341
let i32x4_ge_s = Binary (V128 V128Op.(I32x4 GeS))
342342
let i32x4_ge_u = Binary (V128 V128Op.(I32x4 GeU))
343-
let i32x4_abs = Unary (V128 (V128Op.I32x4 V128Op.Abs))
344-
let i32x4_neg = Unary (V128 (V128Op.I32x4 V128Op.Neg))
345-
let i32x4_any_true = Test (V128 (V128Op.I32x4 V128Op.AnyTrue))
343+
let i32x4_abs = Unary (V128 V128Op.(I32x4 Abs))
344+
let i32x4_neg = Unary (V128 V128Op.(I32x4 Neg))
345+
let i32x4_any_true = Test (V128 V128Op.(I32x4 AnyTrue))
346346
let i32x4_bitmask = SimdBitmask V128Op.(I32x4 Bitmask)
347-
let i32x4_all_true = Test (V128 (V128Op.I32x4 V128Op.AllTrue))
347+
let i32x4_all_true = Test (V128 V128Op.(I32x4 AllTrue))
348348
let i32x4_widen_low_i16x8_s = Unary (V128 V128Op.(I32x4 WidenLowS))
349349
let i32x4_widen_high_i16x8_s = Unary (V128 V128Op.(I32x4 WidenHighS))
350350
let i32x4_widen_low_i16x8_u = Unary (V128 V128Op.(I32x4 WidenLowU))
351351
let i32x4_widen_high_i16x8_u = Unary (V128 V128Op.(I32x4 WidenHighU))
352352
let i32x4_shl = SimdShift V128Op.(I32x4 Shl)
353353
let i32x4_shr_s = SimdShift V128Op.(I32x4 ShrS)
354354
let i32x4_shr_u = SimdShift V128Op.(I32x4 ShrU)
355-
let i32x4_add = Binary (V128 (V128Op.I32x4 V128Op.Add))
356-
let i32x4_sub = Binary (V128 (V128Op.I32x4 V128Op.Sub))
357-
let i32x4_min_s = Binary (V128 (V128Op.I32x4 V128Op.MinS))
358-
let i32x4_min_u = Binary (V128 (V128Op.I32x4 V128Op.MinU))
359-
let i32x4_max_s = Binary (V128 (V128Op.I32x4 V128Op.MaxS))
360-
let i32x4_max_u = Binary (V128 (V128Op.I32x4 V128Op.MaxU))
361-
let i32x4_mul = Binary (V128 (V128Op.I32x4 V128Op.Mul))
355+
let i32x4_add = Binary (V128 V128Op.(I32x4 Add))
356+
let i32x4_sub = Binary (V128 V128Op.(I32x4 Sub))
357+
let i32x4_min_s = Binary (V128 V128Op.(I32x4 MinS))
358+
let i32x4_min_u = Binary (V128 V128Op.(I32x4 MinU))
359+
let i32x4_max_s = Binary (V128 V128Op.(I32x4 MaxS))
360+
let i32x4_max_u = Binary (V128 V128Op.(I32x4 MaxU))
361+
let i32x4_mul = Binary (V128 V128Op.(I32x4 Mul))
362362
let i32x4_trunc_sat_f32x4_s = Unary (V128 V128Op.(I32x4 TruncSatF32x4S))
363363
let i32x4_trunc_sat_f32x4_u = Unary (V128 V128Op.(I32x4 TruncSatF32x4U))
364364

365-
let i64x2_splat = Convert (V128 (V128Op.I64x2 V128Op.Splat))
365+
let i64x2_splat = Convert (V128 V128Op.(I64x2 Splat))
366366
let i64x2_extract_lane imm = SimdExtract (V128Op.I64x2 (ZX, imm))
367367
let i64x2_replace_lane imm = SimdReplace (V128Op.I64x2 imm)
368-
let i64x2_neg = Unary (V128 (V128Op.I64x2 V128Op.Neg))
369-
let i64x2_add = Binary (V128 (V128Op.I64x2 V128Op.Add))
370-
let i64x2_sub = Binary (V128 (V128Op.I64x2 V128Op.Sub))
371-
let i64x2_mul = Binary (V128 (V128Op.I64x2 V128Op.Mul))
368+
let i64x2_neg = Unary (V128 V128Op.(I64x2 Neg))
369+
let i64x2_add = Binary (V128 V128Op.(I64x2 Add))
370+
let i64x2_sub = Binary (V128 V128Op.(I64x2 Sub))
371+
let i64x2_mul = Binary (V128 V128Op.(I64x2 Mul))
372372
let i64x2_shl = SimdShift V128Op.(I64x2 Shl)
373373
let i64x2_shr_s = SimdShift V128Op.(I64x2 ShrS)
374374
let i64x2_shr_u = SimdShift V128Op.(I64x2 ShrU)
375375

376-
let f32x4_splat = Convert (V128 (V128Op.F32x4 V128Op.Splat))
376+
let f32x4_splat = Convert (V128 V128Op.(F32x4 Splat))
377377
let f32x4_extract_lane imm = SimdExtract (V128Op.F32x4 (ZX, imm))
378378
let f32x4_replace_lane imm = SimdReplace (V128Op.F32x4 imm)
379379
let f32x4_eq = Binary (V128 V128Op.(F32x4 Eq))
@@ -382,25 +382,25 @@ let f32x4_lt = Binary (V128 V128Op.(F32x4 Lt))
382382
let f32x4_le = Binary (V128 V128Op.(F32x4 Le))
383383
let f32x4_gt = Binary (V128 V128Op.(F32x4 Gt))
384384
let f32x4_ge = Binary (V128 V128Op.(F32x4 Ge))
385-
let f32x4_abs = Unary (V128 (V128Op.F32x4 V128Op.Abs))
386-
let f32x4_neg = Unary (V128 (V128Op.F32x4 V128Op.Neg))
387-
let f32x4_sqrt = Unary (V128 (V128Op.F32x4 V128Op.Sqrt))
388-
let f32x4_ceil = Unary (V128 (V128Op.(F32x4 Ceil)))
389-
let f32x4_floor = Unary (V128 (V128Op.(F32x4 Floor)))
390-
let f32x4_trunc = Unary (V128 (V128Op.(F32x4 Trunc)))
391-
let f32x4_nearest = Unary (V128 (V128Op.(F32x4 Nearest)))
392-
let f32x4_add = Binary (V128 (V128Op.F32x4 V128Op.Add))
393-
let f32x4_sub = Binary (V128 (V128Op.F32x4 V128Op.Sub))
394-
let f32x4_mul = Binary (V128 (V128Op.F32x4 V128Op.Mul))
395-
let f32x4_div = Binary (V128 (V128Op.F32x4 V128Op.Div))
396-
let f32x4_min = Binary (V128 (V128Op.F32x4 V128Op.Min))
397-
let f32x4_max = Binary (V128 (V128Op.F32x4 V128Op.Max))
385+
let f32x4_abs = Unary (V128 V128Op.(F32x4 Abs))
386+
let f32x4_neg = Unary (V128 V128Op.(F32x4 Neg))
387+
let f32x4_sqrt = Unary (V128 V128Op.(F32x4 Sqrt))
388+
let f32x4_ceil = Unary (V128 V128Op.(F32x4 Ceil))
389+
let f32x4_floor = Unary (V128 V128Op.(F32x4 Floor))
390+
let f32x4_trunc = Unary (V128 V128Op.(F32x4 Trunc))
391+
let f32x4_nearest = Unary (V128 V128Op.(F32x4 Nearest))
392+
let f32x4_add = Binary (V128 V128Op.(F32x4 Add))
393+
let f32x4_sub = Binary (V128 V128Op.(F32x4 Sub))
394+
let f32x4_mul = Binary (V128 V128Op.(F32x4 Mul))
395+
let f32x4_div = Binary (V128 V128Op.(F32x4 Div))
396+
let f32x4_min = Binary (V128 V128Op.(F32x4 Min))
397+
let f32x4_max = Binary (V128 V128Op.(F32x4 Max))
398398
let f32x4_convert_i32x4_s = Unary (V128 V128Op.(F32x4 ConvertI32x4S))
399399
let f32x4_convert_i32x4_u = Unary (V128 V128Op.(F32x4 ConvertI32x4U))
400-
let f32x4_pmin = Binary (V128 (V128Op.F32x4 V128Op.Pmin))
401-
let f32x4_pmax = Binary (V128 (V128Op.F32x4 V128Op.Pmax))
400+
let f32x4_pmin = Binary (V128 V128Op.(F32x4 Pmin))
401+
let f32x4_pmax = Binary (V128 V128Op.(F32x4 Pmax))
402402

403-
let f64x2_splat = Convert (V128 (V128Op.F64x2 V128Op.Splat))
403+
let f64x2_splat = Convert (V128 V128Op.(F64x2 Splat))
404404
let f64x2_extract_lane imm = SimdExtract (V128Op.F64x2 (ZX, imm))
405405
let f64x2_replace_lane imm = SimdReplace (V128Op.F64x2 imm)
406406
let f64x2_eq = Binary (V128 V128Op.(F64x2 Eq))
@@ -409,18 +409,18 @@ let f64x2_lt = Binary (V128 V128Op.(F64x2 Lt))
409409
let f64x2_le = Binary (V128 V128Op.(F64x2 Le))
410410
let f64x2_gt = Binary (V128 V128Op.(F64x2 Gt))
411411
let f64x2_ge = Binary (V128 V128Op.(F64x2 Ge))
412-
let f64x2_neg = Unary (V128 (V128Op.F64x2 V128Op.Neg))
413-
let f64x2_sqrt = Unary (V128 (V128Op.F64x2 V128Op.Sqrt))
414-
let f64x2_ceil = Unary (V128 (V128Op.(F64x2 Ceil)))
415-
let f64x2_floor = Unary (V128 (V128Op.(F64x2 Floor)))
416-
let f64x2_trunc = Unary (V128 (V128Op.(F64x2 Trunc)))
417-
let f64x2_nearest = Unary (V128 (V128Op.(F64x2 Nearest)))
418-
let f64x2_add = Binary (V128 (V128Op.F64x2 V128Op.Add))
419-
let f64x2_sub = Binary (V128 (V128Op.F64x2 V128Op.Sub))
420-
let f64x2_mul = Binary (V128 (V128Op.F64x2 V128Op.Mul))
421-
let f64x2_div = Binary (V128 (V128Op.F64x2 V128Op.Div))
422-
let f64x2_min = Binary (V128 (V128Op.F64x2 V128Op.Min))
423-
let f64x2_max = Binary (V128 (V128Op.F64x2 V128Op.Max))
424-
let f64x2_abs = Unary (V128 (V128Op.F64x2 V128Op.Abs))
425-
let f64x2_pmin = Binary (V128 (V128Op.F64x2 V128Op.Pmin))
426-
let f64x2_pmax = Binary (V128 (V128Op.F64x2 V128Op.Pmax))
412+
let f64x2_neg = Unary (V128 V128Op.(F64x2 Neg))
413+
let f64x2_sqrt = Unary (V128 V128Op.(F64x2 Sqrt))
414+
let f64x2_ceil = Unary (V128 V128Op.(F64x2 Ceil))
415+
let f64x2_floor = Unary (V128 V128Op.(F64x2 Floor))
416+
let f64x2_trunc = Unary (V128 V128Op.(F64x2 Trunc))
417+
let f64x2_nearest = Unary (V128 V128Op.(F64x2 Nearest))
418+
let f64x2_add = Binary (V128 V128Op.(F64x2 Add))
419+
let f64x2_sub = Binary (V128 V128Op.(F64x2 Sub))
420+
let f64x2_mul = Binary (V128 V128Op.(F64x2 Mul))
421+
let f64x2_div = Binary (V128 V128Op.(F64x2 Div))
422+
let f64x2_min = Binary (V128 V128Op.(F64x2 Min))
423+
let f64x2_max = Binary (V128 V128Op.(F64x2 Max))
424+
let f64x2_abs = Unary (V128 V128Op.(F64x2 Abs))
425+
let f64x2_pmin = Binary (V128 V128Op.(F64x2 Pmin))
426+
let f64x2_pmax = Binary (V128 V128Op.(F64x2 Pmax))

0 commit comments

Comments
 (0)