External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 21:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: Bump iced-x86 to 1.10.0

Browse Source 
And fix related warnings: op_kind and op_register are being deprecated
as they might panic.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Samuel Ortiz 2020-12-14 11:46:40 +01:00 committed by Rob Bradford
parent 3ee56112cb
commit 21dcac7721
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -437,9 +437,9 @@ dependencies = [
[[package]] [[package]]
name = "iced-x86" name = "iced-x86"
version = "1.9.1" version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "248ce8ff0784d2b15f3c3d8b01f529be0e18aa693a2ba7415df76857967c8fc3" checksum = "b0be3ac4fec5cdbfd39a653e9145789e7a989359874da3cf2f18611468937767"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"rustc_version", "rustc_version",

2
hypervisor/Cargo.toml
View File

@ -32,7 +32,7 @@ git = "https://github.com/rust-vmm/linux-loader"
features = ["elf", "bzimage"] features = ["elf", "bzimage"]
[target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86] [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86]
version = "1.9.1" version = "1.10"
default-features = false default-features = false
features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"] features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"]

21
hypervisor/src/arch/x86/emulator/instructions/mod.rs
View File

@ -38,8 +38,14 @@ fn get_op<T: CpuStateManager>(
} }
} }
let value = match insn.op_kind(op_index) { let value = match insn
OpKind::Register => state.read_reg(insn.op_register(op_index))?, .try_op_kind(op_index)
.map_err(|e| PlatformError::InvalidOperand(e.into()))?
{
OpKind::Register => state.read_reg(
insn.try_op_register(op_index)
.map_err(|e| PlatformError::InvalidOperand(e.into()))?,
)?,
OpKind::Memory => { OpKind::Memory => {
let addr = memory_operand_address(insn, state, false)?; let addr = memory_operand_address(insn, state, false)?;
let mut memory: [u8; 8] = [0; 8]; let mut memory: [u8; 8] = [0; 8];
@ -85,8 +91,15 @@ fn set_op<T: CpuStateManager>(
} }
} }
match insn.op_kind(op_index) { match insn
OpKind::Register => state.write_reg(insn.op_register(op_index), value)?, .try_op_kind(op_index)
.map_err(|e| PlatformError::InvalidOperand(e.into()))?
{
OpKind::Register => state.write_reg(
insn.try_op_register(op_index)
.map_err(|e| PlatformError::InvalidOperand(e.into()))?,
value,
)?,
OpKind::Memory => { OpKind::Memory => {
let addr = memory_operand_address(insn, state, true)?; let addr = memory_operand_address(insn, state, true)?;
platform.write_memory(addr, &value.to_le_bytes()[..op_size])?; platform.write_memory(addr, &value.to_le_bytes()[..op_size])?;