lkml.org 
[lkml]   [2008]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 1/3] x86, kvm: add ad_mask static inline
From
Date
Replaces open-coded mask calculation in macros.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
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



\
 
 \ /
  Last update: 2008-02-18 20:15    [W:0.044 / U:0.220 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site