ia64/xen-unstable

changeset 14949:fb5d1c6cfddc

xen x86/64 compat: Fix size of accesses to trap_bounce.cs in asm.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Thu Apr 26 10:51:49 2007 +0100 (2007-04-26)
parents d26bdda2854e
children 7f9ce06d3c61
files xen/arch/x86/x86_64/compat/entry.S
line diff
     1.1 --- a/xen/arch/x86/x86_64/compat/entry.S	Thu Apr 26 09:52:34 2007 +0100
     1.2 +++ b/xen/arch/x86/x86_64/compat/entry.S	Thu Apr 26 10:51:49 2007 +0100
     1.3 @@ -101,7 +101,7 @@ compat_test_guest_events:
     1.4          movl  VCPU_event_addr(%rbx),%eax
     1.5          movl  %eax,TRAPBOUNCE_eip(%rdx)
     1.6          movl  VCPU_event_sel(%rbx),%eax
     1.7 -        movl  %eax,TRAPBOUNCE_cs(%rdx)
     1.8 +        movw  %ax,TRAPBOUNCE_cs(%rdx)
     1.9          movb  $TBF_INTERRUPT,TRAPBOUNCE_flags(%rdx)
    1.10          call  compat_create_bounce_frame
    1.11          jmp   compat_test_all_events
    1.12 @@ -126,7 +126,7 @@ compat_process_nmi:
    1.13          sti
    1.14          leaq  VCPU_trap_bounce(%rbx),%rdx
    1.15          movl  %eax,TRAPBOUNCE_eip(%rdx)
    1.16 -        movl  $FLAT_COMPAT_KERNEL_CS,TRAPBOUNCE_cs(%rdx)
    1.17 +        movw  $FLAT_COMPAT_KERNEL_CS,TRAPBOUNCE_cs(%rdx)
    1.18          movb  $TBF_INTERRUPT,TRAPBOUNCE_flags(%rdx)
    1.19          call  compat_create_bounce_frame
    1.20          jmp   compat_test_all_events
    1.21 @@ -164,7 +164,7 @@ compat_failsafe_callback:
    1.22          movl  VCPU_failsafe_addr(%rbx),%eax
    1.23          movl  %eax,TRAPBOUNCE_eip(%rdx)
    1.24          movl  VCPU_failsafe_sel(%rbx),%eax
    1.25 -        movl  %eax,TRAPBOUNCE_cs(%rdx)
    1.26 +        movw  %ax,TRAPBOUNCE_cs(%rdx)
    1.27          movb  $TBF_FAILSAFE,TRAPBOUNCE_flags(%rdx)
    1.28          btq   $_VGCF_failsafe_disables_events,VCPU_guest_context_flags(%rbx)
    1.29          jnc   1f