[Xen-changelog] [xen-3.1-testing] x86_emulate: fix side-effect macro call.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1202293115 0
# Node ID eaf6859479991e6b5e477a7edd2070fd77e48fd1
# Parent  1f0b26a308eee21743b33f4d8c128f8681b54602
x86_emulate: fix side-effect macro call.
Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
xen-unstable changeset:   16980:bf4a24c172d23ae9839ee564225d49ed95167de3
xen-unstable date:        Tue Feb 05 15:50:59 2008 +0000
---
 xen/arch/x86/x86_emulate.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff -r 1f0b26a308ee -r eaf685947999 xen/arch/x86/x86_emulate.c
--- a/xen/arch/x86/x86_emulate.c        Wed Feb 06 10:18:09 2008 +0000
+++ b/xen/arch/x86/x86_emulate.c        Wed Feb 06 10:18:35 2008 +0000
@@ -513,7 +513,8 @@ do {                                    
 
 #define jmp_rel(rel)                                                    \
 do {                                                                    \
-    _regs.eip += (int)(rel);                                            \
+    int _rel = (int)(rel);                                              \
+    _regs.eip += _rel;                                                  \
     if ( !mode_64bit() )                                                \
         _regs.eip = ((op_bytes == 2)                                    \
                      ? (uint16_t)_regs.eip : (uint32_t)_regs.eip);      \
@@ -2069,9 +2070,11 @@ x86_emulate(
         break;
     }
 
-    case 0xeb: /* jmp (short) */
-        jmp_rel(insn_fetch_type(int8_t));
-        break;
+    case 0xeb: /* jmp (short) */ {
+        int rel = insn_fetch_type(int8_t);
+        jmp_rel(rel);
+        break;
+    }
 
     case 0xf5: /* cmc */
         _regs.eflags ^= EFLG_CF;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog