Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-18 06:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KVM: x86 emulator: put register operand fetch into a function

Browse Source 
The code is repeated three times, put it into fetch_register_operand()

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2010-08-01 12:53:09 +03:00
parent 3d9e77dff8
commit 91ff3cb43c
1 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
arch/x86/kvm/emulate.c
View File

@ -539,6 +539,24 @@ static int test_cc(unsigned int condition, unsigned int flags)
return (!!rc ^ (condition & 1)); return (!!rc ^ (condition & 1));
} }
static void fetch_register_operand(struct operand *op)
{
switch (op->bytes) {
case 1:
op->val = *(u8 *)op->addr.reg;
break;
case 2:
op->val = *(u16 *)op->addr.reg;
break;
case 4:
op->val = *(u32 *)op->addr.reg;
break;
case 8:
op->val = *(u64 *)op->addr.reg;
break;
}
}
static void decode_register_operand(struct operand *op, static void decode_register_operand(struct operand *op,
struct decode_cache *c, struct decode_cache *c,
int inhibit_bytereg) int inhibit_bytereg)
@ -551,23 +569,12 @@ static void decode_register_operand(struct operand *op,
op->type = OP_REG; op->type = OP_REG;
if ((c->d & ByteOp) && !inhibit_bytereg) { if ((c->d & ByteOp) && !inhibit_bytereg) {
op->addr.reg = decode_register(reg, c->regs, highbyte_regs); op->addr.reg = decode_register(reg, c->regs, highbyte_regs);
op->val = *(u8 *)op->addr.reg;
op->bytes = 1; op->bytes = 1;
} else { } else {
op->addr.reg = decode_register(reg, c->regs, 0); op->addr.reg = decode_register(reg, c->regs, 0);
op->bytes = c->op_bytes; op->bytes = c->op_bytes;
switch (op->bytes) {
case 2:
op->val = *(u16 *)op->addr.reg;
break;
case 4:
op->val = *(u32 *)op->addr.reg;
break;
case 8:
op->val = *(u64 *) op->addr.reg;
break;
}
} }
fetch_register_operand(op);
op->orig_val = op->val; op->orig_val = op->val;
} }
@ -2507,20 +2514,7 @@ done_prefixes:
c->src.type = OP_REG; c->src.type = OP_REG;
c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes; c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
c->src.addr.reg = &c->regs[VCPU_REGS_RAX]; c->src.addr.reg = &c->regs[VCPU_REGS_RAX];
switch (c->src.bytes) { fetch_register_operand(&c->src);
case 1:
c->src.val = *(u8 *)c->src.addr.reg;
break;
case 2:
c->src.val = *(u16 *)c->src.addr.reg;
break;
case 4:
c->src.val = *(u32 *)c->src.addr.reg;
break;
case 8:
c->src.val = *(u64 *)c->src.addr.reg;
break;
}
break; break;
case SrcOne: case SrcOne:
c->src.bytes = 1; c->src.bytes = 1;
@ -2606,20 +2600,7 @@ done_prefixes:
c->dst.type = OP_REG; c->dst.type = OP_REG;
c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes; c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
c->dst.addr.reg = &c->regs[VCPU_REGS_RAX]; c->dst.addr.reg = &c->regs[VCPU_REGS_RAX];
switch (c->dst.bytes) { fetch_register_operand(&c->dst);
case 1:
c->dst.val = *(u8 *)c->dst.addr.reg;
break;
case 2:
c->dst.val = *(u16 *)c->dst.addr.reg;
break;
case 4:
c->dst.val = *(u32 *)c->dst.addr.reg;
break;
case 8:
c->dst.val = *(u64 *)c->dst.addr.reg;
break;
}
c->dst.orig_val = c->dst.val; c->dst.orig_val = c->dst.val;
break; break;
case DstDI: case DstDI: