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

cranelift: Implement table_addr in interpreter (#4433)

Browse Source
This commit is contained in:
Afonso Bordado
2022-07-13 20:53:42 +01:00
committed by GitHub
parent 03ece34cbb
commit 4ea46c3ca8
2 changed files with 165 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,7 +410,28 @@ where
}
Opcode::GetPinnedReg => unimplemented!("GetPinnedReg"),
Opcode::SetPinnedReg => unimplemented!("SetPinnedReg"),
Opcode::TableAddr => unimplemented!("TableAddr"),
Opcode::TableAddr => {
if let InstructionData::TableAddr { table, offset, .. } = inst {
let table = &state.get_current_function().tables[table];
let base = state.resolve_global_value(table.base_gv)?;
let bound = state.resolve_global_value(table.bound_gv)?;
let index_ty = table.index_type;
let element_size = V::int(u64::from(table.element_size) as i128, index_ty)?;
let inst_offset = V::int(i32::from(offset) as i128, index_ty)?;
let byte_offset = arg(0)?.mul(element_size.clone())?.add(inst_offset)?;
let bound_bytes = bound.mul(element_size)?;
if byte_offset.gt(&bound_bytes)? {
return Ok(ControlFlow::Trap(CraneliftTrap::User(
TrapCode::HeapOutOfBounds,
)));
}
assign(base.add(byte_offset)?)
} else {
unreachable!()
}
}
Opcode::Iconst => assign(Value::int(imm().into_int()?, ctrl_ty)?),
Opcode::F32const => assign(imm()),
Opcode::F64const => assign(imm()),