github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 04:33:55 +00:00
Code Issues Projects Releases Wiki Activity

hv: instr_emul: remove goto in get_gva_di_check

Browse Source 
remove goto statement in get_gva_di_check() routine

Tracked-On: #861
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Li, Fei1 2019-01-11 07:58:53 +08:00 committed by wenlingz
parent cd85115ec9
commit 433a492a4e
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hypervisor/arch/x86/guest/instr_emul.c
View File

@ -999,14 +999,12 @@ static int32_t get_gva_di_check(struct acrn_vcpu *vcpu, struct instr_emul_vie *v
static int32_t emulate_movs(struct acrn_vcpu *vcpu, const struct instr_emul_vie *vie) static int32_t emulate_movs(struct acrn_vcpu *vcpu, const struct instr_emul_vie *vie)
{ {
uint64_t src_gva, gpa, val = 0UL; uint64_t src_gva, gpa, val = 0UL;
uint64_t rcx, rdi, rsi, rflags; uint64_t rcx = 0U, rdi, rsi, rflags;
uint32_t err_code; uint32_t err_code;
enum cpu_reg_name seg; enum cpu_reg_name seg;
int32_t error;
uint8_t repeat, opsize = vie->opsize; uint8_t repeat, opsize = vie->opsize;
bool is_mmio_write; bool is_mmio_write, done = false;
error = 0;
is_mmio_write = (vcpu->req.reqs.mmio.direction == REQUEST_WRITE); is_mmio_write = (vcpu->req.reqs.mmio.direction == REQUEST_WRITE);
/* /*
@ -1026,11 +1024,11 @@ static int32_t emulate_movs(struct acrn_vcpu *vcpu, const struct instr_emul_vie
* address size of the instruction. * address size of the instruction.
*/ */
if ((rcx & size2mask[vie->addrsize]) == 0UL) { if ((rcx & size2mask[vie->addrsize]) == 0UL) {
error = 0; done = true;
goto done;
} }
} }
if (!done) {
seg = (vie->seg_override != 0U) ? (vie->segment_register) : CPU_REG_DS; seg = (vie->seg_override != 0U) ? (vie->segment_register) : CPU_REG_DS;
if (is_mmio_write) { if (is_mmio_write) {
@ -1075,8 +1073,9 @@ static int32_t emulate_movs(struct acrn_vcpu *vcpu, const struct instr_emul_vie
vcpu_retain_rip(vcpu); vcpu_retain_rip(vcpu);
} }
} }
done: }
return error;
return 0;
} }
static int32_t emulate_stos(struct acrn_vcpu *vcpu, const struct instr_emul_vie *vie) static int32_t emulate_stos(struct acrn_vcpu *vcpu, const struct instr_emul_vie *vie)