T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move immediate value retrieval to imm

Browse Source 
Copyright (c) 2021, Arm Limited
This commit is contained in:
dheaton-arm
2021-09-10 12:36:33 +01:00
parent bca3cb32ef
commit 4a4f940fac
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
cranelift/interpreter/src/step.rs
View File

@@ -76,6 +76,16 @@ where
.as_slice(); .as_slice();
DataValue::V128(buffer.try_into().expect("a 16-byte data buffer")) DataValue::V128(buffer.try_into().expect("a 16-byte data buffer"))
} }
InstructionData::Shuffle { mask, .. } => {
let mask = state
.get_current_function()
.dfg
.immediates
.get(mask)
.unwrap()
.as_slice();
DataValue::V128(mask.try_into().expect("a 16-byte vector mask"))
}
_ => inst.imm_value().unwrap(), _ => inst.imm_value().unwrap(),
}) })
}; };
@@ -777,28 +787,18 @@ where
ValueConversionKind::RoundNearestEven(ctrl_ty), ValueConversionKind::RoundNearestEven(ctrl_ty),
)?), )?),
Opcode::Shuffle => { Opcode::Shuffle => {
if let InstructionData::Shuffle { mask, .. } = inst { let mask = imm().into_array()?;
let mask = state let a = Value::into_array(&arg(0)?)?;
.get_current_function() let b = Value::into_array(&arg(1)?)?;
.dfg let mut new = [0u8; 16];
.immediates for i in 0..mask.len() {
.get(mask) if (mask[i] as usize) < a.len() {
.unwrap() new[i] = a[mask[i] as usize];
.as_slice(); } else if (mask[i] as usize - a.len()) < b.len() {
let a = Value::into_array(&arg(0)?)?; new[i] = b[mask[i] as usize - a.len()];
let b = Value::into_array(&arg(1)?)?; } // else leave as 0.
let mut new = [0u8; 16];
for i in 0..mask.len() {
if (mask[i] as usize) < a.len() {
new[i] = a[mask[i] as usize];
} else if (mask[i] as usize - a.len()) < b.len() {
new[i] = b[mask[i] as usize - a.len()];
} // else leave as 0.
}
assign(Value::vector(new, ctrl_ty)?)
} else {
unreachable!();
} }
assign(Value::vector(new, ctrl_ty)?)
} }
Opcode::Swizzle => { Opcode::Swizzle => {
let x = Value::into_array(&arg(0)?)?; let x = Value::into_array(&arg(0)?)?;