Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

KVM: x86 emulator: pass destination type to ____emulate_2op()

Browse Source 
We'll need it later so we can use a register for the destination.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2010-08-16 17:49:52 +03:00
parent f2f3184534
commit b3b3d25a12
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,13 +194,13 @@ struct group_dual {
#define ON64(x) #define ON64(x)
#endif #endif
#define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix, _dsttype) \
do { \ do { \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
_PRE_EFLAGS("0", "4", "2") \ _PRE_EFLAGS("0", "4", "2") \
_op _suffix " %"_x"3,%1; " \ _op _suffix " %"_x"3,%1; " \
_POST_EFLAGS("0", "4", "2") \ _POST_EFLAGS("0", "4", "2") \
: "=m" (_eflags), "=m" ((_dst).val), \ : "=m" (_eflags), "=m" (*(_dsttype*)&(_dst).val),\
"=&r" (_tmp) \ "=&r" (_tmp) \
: _y ((_src).val), "i" (EFLAGS_MASK)); \ : _y ((_src).val), "i" (EFLAGS_MASK)); \
} while (0) } while (0)
@ -213,13 +213,13 @@ struct group_dual {
\ \
switch ((_dst).bytes) { \ switch ((_dst).bytes) { \
case 2: \ case 2: \
____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \ ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w",u16);\
break; \ break; \
case 4: \ case 4: \
____emulate_2op(_op,_src,_dst,_eflags,_lx,_ly,"l"); \ ____emulate_2op(_op,_src,_dst,_eflags,_lx,_ly,"l",u32);\
break; \ break; \
case 8: \ case 8: \
ON64(____emulate_2op(_op,_src,_dst,_eflags,_qx,_qy,"q")); \ ON64(____emulate_2op(_op,_src,_dst,_eflags,_qx,_qy,"q",u64)); \
break; \ break; \
} \ } \
} while (0) } while (0)
@ -229,7 +229,7 @@ struct group_dual {
unsigned long _tmp; \ unsigned long _tmp; \
switch ((_dst).bytes) { \ switch ((_dst).bytes) { \
case 1: \ case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
break; \ break; \
default: \ default: \
__emulate_2op_nobyte(_op, _src, _dst, _eflags, \ __emulate_2op_nobyte(_op, _src, _dst, _eflags, \