[Xen-changelog] [xen-unstable] [XEN] Fix arg clobber test for debug version of hypercall code.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 9deecd4f9cf9ce47aaae2caf1ccee85a9ebfecdb
# Parent  f90ac959db92722e6786a19c95dc95c8f93d7642
[XEN] Fix arg clobber test for debug version of hypercall code.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/x86_32/entry.S |    2 +-
 xen/arch/x86/x86_64/entry.S |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r f90ac959db92 -r 9deecd4f9cf9 xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S       Wed Sep 20 09:48:41 2006 +0100
+++ b/xen/arch/x86/x86_32/entry.S       Wed Sep 20 09:56:50 2006 +0100
@@ -198,7 +198,7 @@ ENTRY(hypercall)
         /* Deliberately corrupt parameter regs used by this hypercall. */
         addl  $24,%esp     # Shadow parameters
         popl  %ecx         # Shadow EIP
-        cmpl  %ecx,UREGS_eip(%esp)
+        cmpl  %ecx,UREGS_eip+4(%esp)
         popl  %ecx         # Shadow hypercall index
         jne   skip_clobber # If EIP has changed then don't clobber
         movzb hypercall_args_table(,%ecx,1),%ecx
diff -r f90ac959db92 -r 9deecd4f9cf9 xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S       Wed Sep 20 09:48:41 2006 +0100
+++ b/xen/arch/x86/x86_64/entry.S       Wed Sep 20 09:56:50 2006 +0100
@@ -152,7 +152,7 @@ ENTRY(syscall_enter)
 #ifndef NDEBUG
         /* Deliberately corrupt parameter regs used by this hypercall. */
         popq  %r10         # Shadow RIP
-        cmpq  %r10,UREGS_rip(%rsp)
+        cmpq  %r10,UREGS_rip+8(%rsp)
         popq  %rcx         # Shadow hypercall index
         jne   skip_clobber /* If RIP has changed then don't clobber. */
         leaq  hypercall_args_table(%rip),%r10

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