External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-07 10:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: x86: only calculate address when necessary in MOV emulation

Browse Source 
Only calculate the address when the operand is memory.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2020-11-26 14:29:50 +00:00 committed by Samuel Ortiz
parent c6aea5af5d
commit 66b001665f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hypervisor/src/arch/x86/emulator/instructions/mov.rs
View File

@ -30,8 +30,6 @@ macro_rules! mov_rm_r {
let src_reg_value = state
.read_reg(insn.op1_register())
.map_err(EmulationError::PlatformEmulationError)?;
let addr = memory_operand_address(insn, state)
.map_err(EmulationError::PlatformEmulationError)?;
match insn.op0_kind() {
OpKind::Register => state
@ -39,7 +37,10 @@ macro_rules! mov_rm_r {
.map_err(EmulationError::PlatformEmulationError)?,
OpKind::Memory => {
let addr = memory_operand_address(insn, state)
.map_err(EmulationError::PlatformEmulationError)?;
let src_reg_value_type: $bound = src_reg_value as $bound;
platform
.write_memory(addr, &src_reg_value_type.to_le_bytes())
.map_err(EmulationError::PlatformEmulationError)?
@ -64,16 +65,19 @@ macro_rules! mov_rm_imm {
platform: &mut dyn PlatformEmulator<CpuState = T>,
) -> Result<(), EmulationError<Exception>> {
let imm = imm_op!($type, insn);
let addr = memory_operand_address(insn, state)
.map_err(EmulationError::PlatformEmulationError)?;
match insn.op0_kind() {
OpKind::Register => state
.write_reg(insn.op0_register(), imm as u64)
.map_err(EmulationError::PlatformEmulationError)?,
OpKind::Memory => platform
.write_memory(addr, &imm.to_le_bytes())
.map_err(EmulationError::PlatformEmulationError)?,
OpKind::Memory => {
let addr = memory_operand_address(insn, state)
.map_err(EmulationError::PlatformEmulationError)?;
platform
.write_memory(addr, &imm.to_le_bytes())
.map_err(EmulationError::PlatformEmulationError)?
}
k => return Err(EmulationError::InvalidOperand(anyhow!("{:?}", k))),
}