WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] x86_emulate: Allow to build outside Xen t

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] x86_emulate: Allow to build outside Xen tree (in tools/test).
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 09 Nov 2007 04:20:34 -0800
Delivery-date: Fri, 09 Nov 2007 04:23:24 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1193998942 0
# Node ID 3e397fa3a6adbe595b038c90179a390ede9ddede
# Parent  055d98aa2dd08211928e6497fe72703b5531046c
x86_emulate: Allow to build outside Xen tree (in tools/test).
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/x86_emulate.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -r 055d98aa2dd0 -r 3e397fa3a6ad xen/arch/x86/x86_emulate.c
--- a/xen/arch/x86/x86_emulate.c        Fri Nov 02 10:16:37 2007 +0000
+++ b/xen/arch/x86/x86_emulate.c        Fri Nov 02 10:22:22 2007 +0000
@@ -262,6 +262,7 @@ struct operand {
 };
 
 /* EFLAGS bit definitions. */
+#define EFLG_RF (1<<16)
 #define EFLG_OF (1<<11)
 #define EFLG_DF (1<<10)
 #define EFLG_IF (1<<9)
@@ -287,9 +288,11 @@ struct operand {
 #if defined(__x86_64__)
 #define _LO32 "k"          /* force 32-bit operand */
 #define _STK  "%%rsp"      /* stack pointer */
+#define _BYTES_PER_LONG "8"
 #elif defined(__i386__)
 #define _LO32 ""           /* force 32-bit operand */
 #define _STK  "%%esp"      /* stack pointer */
+#define _BYTES_PER_LONG "4"
 #endif
 
 /*
@@ -309,7 +312,7 @@ struct operand {
 "pushf; "                                                       \
 "notl %"_LO32 _tmp"; "                                          \
 "andl %"_LO32 _tmp",("_STK"); "                                 \
-"andl %"_LO32 _tmp","STR(BITS_PER_LONG/4)"("_STK"); "           \
+"andl %"_LO32 _tmp",2*"_BYTES_PER_LONG"("_STK"); "              \
 "pop  %"_tmp"; "                                                \
 "orl  %"_LO32 _tmp",("_STK"); "                                 \
 "popf; "                                                        \
@@ -1630,7 +1633,7 @@ x86_emulate(
     }
 
     /* Commit shadow register state. */
-    _regs.eflags &= ~EF_RF;
+    _regs.eflags &= ~EFLG_RF;
     *ctxt->regs = _regs;
 
  done:

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] x86_emulate: Allow to build outside Xen tree (in tools/test)., Xen patchbot-unstable <=