Replace ExtractLane format with BinaryImm8

Like https://github.com/bytecodealliance/wasmtime/pull/1762, this change the name of the `ExtractLane` format to the more-general `BinaryImm8` and renames its immediate argument from `lane` to `imm`.
This commit is contained in:
Andrew Brown
2020-05-27 09:24:46 -07:00
parent 7d6e94b952
commit a27a079d65
9 changed files with 36 additions and 39 deletions

View File

@@ -1195,10 +1195,10 @@ fn convert_extractlane(
let mut pos = FuncCursor::new(func).at_inst(inst);
pos.use_srcloc(inst);
if let ir::InstructionData::ExtractLane {
if let ir::InstructionData::BinaryImm8 {
opcode: ir::Opcode::Extractlane,
arg,
lane,
imm: lane,
} = pos.func.dfg[inst]
{
// NOTE: the following legalization assumes that the upper bits of the XMM register do

View File

@@ -756,10 +756,10 @@ impl<'a> Verifier<'a> {
| UnaryIeee64 { .. }
| UnaryBool { .. }
| Binary { .. }
| BinaryImm8 { .. }
| BinaryImm { .. }
| Ternary { .. }
| TernaryImm8 { .. }
| ExtractLane { .. }
| Shuffle { .. }
| IntCompare { .. }
| IntCompareImm { .. }
@@ -1912,9 +1912,9 @@ impl<'a> Verifier<'a> {
Ok(())
}
}
ir::InstructionData::ExtractLane {
ir::InstructionData::BinaryImm8 {
opcode: ir::instructions::Opcode::Extractlane,
lane,
imm: lane,
arg,
..
}

View File

@@ -508,6 +508,7 @@ pub fn write_operands(
constant_handle, ..
} => write!(w, " {}", constant_handle),
Binary { args, .. } => write!(w, " {}, {}", args[0], args[1]),
BinaryImm8 { arg, imm, .. } => write!(w, " {}, {}", arg, imm),
BinaryImm { arg, imm, .. } => write!(w, " {}, {}", arg, imm),
Ternary { args, .. } => write!(w, " {}, {}, {}", args[0], args[1], args[2]),
MultiAry { ref args, .. } => {
@@ -519,7 +520,6 @@ pub fn write_operands(
}
NullAry { .. } => write!(w, " "),
TernaryImm8 { imm, args, .. } => write!(w, " {}, {}, {}", args[0], args[1], imm),
ExtractLane { lane, arg, .. } => write!(w, " {}, {}", arg, lane),
Shuffle { mask, args, .. } => {
let data = dfg.immediates.get(mask).expect(
"Expected the shuffle mask to already be inserted into the immediates table",