Skip to content

Commit

Permalink
KVM: x86 emulator: simplify emulate_2op_cl()
Browse files Browse the repository at this point in the history
emulate_2op_cl() is always called with the same parameters.  Simplify
by passing just the emulation context.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  • Loading branch information
Avi Kivity committed Sep 25, 2011
1 parent 761441b commit 29053a6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/x86/kvm/emulate.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ struct gprefix {
__emulate_2op_nobyte(ctxt, _op, "w", "r", _LO32, "r", "", "r")

/* Instruction has three operands and one operand is stored in ECX register */
#define __emulate_2op_cl(_op, ctxt, _suffix, _type) \
#define __emulate_2op_cl(ctxt, _op, _suffix, _type) \
do { \
unsigned long _tmp; \
_type _clv = (ctxt)->src2.val; \
Expand All @@ -287,13 +287,13 @@ struct gprefix {
do { \
switch ((ctxt)->dst.bytes) { \
case 2: \
__emulate_2op_cl(_op, ctxt, "w", u16); \
__emulate_2op_cl(ctxt, _op, "w", u16); \
break; \
case 4: \
__emulate_2op_cl(_op, ctxt, "l", u32); \
__emulate_2op_cl(ctxt, _op, "l", u32); \
break; \
case 8: \
ON64(__emulate_2op_cl(_op, ctxt, "q", ulong)); \
ON64(__emulate_2op_cl(ctxt, _op, "q", ulong)); \
break; \
} \
} while (0)
Expand Down

0 comments on commit 29053a6

Please sign in to comment.