adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

KVM: x86 emulator: add ad_mask static inline

Browse source 
Replaces open-coded mask calculation in macros.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Harvey Harrison 2008-02-18 11:12:48 -08:00 committed by Avi Kivity
parent 790c73f628
commit ddcb2885e2
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/x86/kvm/x86_emulate.c
View file

@ -480,10 +480,15 @@ static u16 group2_table[] = {
(_type)_x; \
})
static inline unsigned long ad_mask(struct decode_cache *c)
{
return (1UL << (c->ad_bytes << 3)) - 1;
}
/* 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)))
(reg) : ((reg) & ad_mask(c)))
#define register_address(base, reg) \
((base) + address_mask(reg))
#define register_address_increment(reg, inc) \
@ -494,9 +499,9 @@ static u16 group2_table[] = {
(reg) += _inc; \
else \
(reg) = ((reg) & \
~((1UL << (c->ad_bytes << 3)) - 1)) | \
~ad_mask(c)) | \
(((reg) + _inc) & \
((1UL << (c->ad_bytes << 3)) - 1)); \
ad_mask(c)); \
} while (0)
#define JMP_REL(rel) \