[PATCH 1/3] x86, kvm: add ad_mask static inline

From: Harvey Harrison
Date: Mon Feb 18 2008 - 14:12:53 EST


Replaces open-coded mask calculation in macros.

Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
---
arch/x86/kvm/x86_emulate.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 7958600..7460432 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -426,10 +426,15 @@ static u16 twobyte_table[256] = {
(_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) \
@@ -440,9 +445,9 @@ static u16 twobyte_table[256] = {
(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) \
--
1.5.4.1.1278.gc75be


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/