kvm: move address_mask define to static function
PATCH 1/2 kvm: move address_mask define to static function
Signed-off-by Harvey Harrison <[email protected]>
--- arch/x86/kvm/x86_emulate.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-)
arch/x86/kvm/x86_emulate.c +16 -6
@@ -427,11 +427,21 @@ static u16 twobyte_table[256] = { })/* Access/update address held in a register, based on addressing mode. */ -#define address_mask (reg) \ - ((c->ad_bytes == sizeof(unsigned long)) ? \ - (reg) : ((reg) & ((1UL << (c->ad_bytes << 3)) - 1))) +static inline unsigned long ad_mask (struct decode_cache *c) +{ +return (1UL << (c->ad_bytes <<3 )) -1 ; +} + +static unsigned long address_mask (struct decode_cache *c,unsigned long reg) +{ +if (c->ad_bytes ==sizeof (unsigned long )) +return reg; +else +return reg &ad_mask (c); +} +#define register_address (base, reg) \ - ((base) + address_mask(reg)) + ((base) + address_mask(c, reg))#define register_address_increment (reg, inc) \ do { \/* signed type ensures sign extension to long */ \
@@ -1393,7 +1403,7 @@ special_insn:1 , (c->d & ByteOp) ?1 : c->op_bytes, c->rep_prefix ? -address_mask (c->regs[VCPU_REGS_RCX ]) :1 , +address_mask (c, c->regs[VCPU_REGS_RCX ]) :1 , (ctxt->eflags &EFLG_DF ),register_address (ctxt->es_base, c->regs[VCPU_REGS_RDI]),
@@ -1409,7 +1419,7 @@ special_insn:0 , (c->d & ByteOp) ?1 : c->op_bytes, c->rep_prefix ? -address_mask (c->regs[VCPU_REGS_RCX ]) :1 , +address_mask (c, c->regs[VCPU_REGS_RCX ]) :1 , (ctxt->eflags &EFLG_DF ), register_address(c->override_base ? *c->override_base :
Signature · 1 line
1.5.4.rc5.1138.g2602