ia64/xen-unstable

changeset 5421:509905cdbafe

bitkeeper revision 1.1705.1.11 (42a973edqzXeILWidAcIO3yLhNMSwQ)

fix compilation with newer binutils that don't accept the l suffix for mov when using segment register

Signed-off-by: Fl?vio Bruno Leitner <fbl@conectiva.com.br>
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vh249@arcadians.cl.cam.ac.uk
date Fri Jun 10 11:05:17 2005 +0000 (2005-06-10)
parents 8c95b4009c7f
children 0381e85305cf
files xen/arch/x86/x86_32/entry.S xen/include/asm-x86/x86_32/asm_defns.h
line diff
     1.1 --- a/xen/arch/x86/x86_32/entry.S	Fri Jun 10 09:34:30 2005 +0000
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Fri Jun 10 11:05:17 2005 +0000
     1.3 @@ -176,10 +176,10 @@ vmx_process_softirqs:
     1.4  restore_all_guest:
     1.5          testl $X86_EFLAGS_VM,UREGS_eflags(%esp)
     1.6          jnz  restore_all_vm86
     1.7 -FLT1:   movl UREGS_ds(%esp),%ds
     1.8 -FLT2:   movl UREGS_es(%esp),%es
     1.9 -FLT3:   movl UREGS_fs(%esp),%fs
    1.10 -FLT4:   movl UREGS_gs(%esp),%gs
    1.11 +FLT1:   mov UREGS_ds(%esp),%ds
    1.12 +FLT2:   mov UREGS_es(%esp),%es
    1.13 +FLT3:   mov UREGS_fs(%esp),%fs
    1.14 +FLT4:   mov UREGS_gs(%esp),%gs
    1.15  restore_all_vm86:
    1.16          popl %ebx
    1.17          popl %ecx
    1.18 @@ -306,7 +306,7 @@ create_bounce_frame:
    1.19          testl $(2|X86_EFLAGS_VM),%ecx
    1.20          jz   ring1 /* jump if returning to an existing ring-1 activation */
    1.21          movl VCPU_kernel_sp(%ebx),%esi
    1.22 -FLT6:   movl VCPU_kernel_ss(%ebx),%gs
    1.23 +FLT6:   mov VCPU_kernel_ss(%ebx),%gs
    1.24          testl $X86_EFLAGS_VM,UREGS_eflags+4(%esp)
    1.25          jz   nvm86_1
    1.26          subl $16,%esi       /* push ES/DS/FS/GS (VM86 stack frame) */
    1.27 @@ -326,7 +326,7 @@ FLT12:  movl %eax,%gs:4(%esi)
    1.28          jmp 1f
    1.29  ring1:  /* obtain ss/esp from oldss/oldesp -- a ring-1 activation exists */
    1.30          movl UREGS_esp+4(%esp),%esi
    1.31 -FLT13:  movl UREGS_ss+4(%esp),%gs 
    1.32 +FLT13:  mov UREGS_ss+4(%esp),%gs 
    1.33  1:      /* Construct a stack frame: EFLAGS, CS/EIP */
    1.34          movb TRAPBOUNCE_flags(%edx),%cl
    1.35          subl $12,%esi
    1.36 @@ -383,7 +383,7 @@ 2:      testl $X86_EFLAGS_VM,UREGS_eflag
    1.37  nvm86_3:/* Rewrite our stack frame and return to ring 1. */
    1.38          /* IA32 Ref. Vol. 3: TF, VM, RF and NT flags are cleared on trap. */
    1.39          andl $0xfffcbeff,UREGS_eflags+4(%esp)
    1.40 -        movl %gs,UREGS_ss+4(%esp)
    1.41 +        mov %gs,UREGS_ss+4(%esp)
    1.42          movl %esi,UREGS_esp+4(%esp)
    1.43          movzwl TRAPBOUNCE_cs(%edx),%eax
    1.44          movl %eax,UREGS_cs+4(%esp)
    1.45 @@ -670,7 +670,7 @@ do_switch_vm86:
    1.46  
    1.47          # GS:ESI == Ring-1 stack activation
    1.48          movl UREGS_esp(%esp),%esi
    1.49 -VFLT1:  movl UREGS_ss(%esp),%gs
    1.50 +VFLT1:  mov UREGS_ss(%esp),%gs
    1.51  
    1.52          # ES:EDI == Ring-0 stack activation
    1.53          leal UREGS_eip(%esp),%edi
     2.1 --- a/xen/include/asm-x86/x86_32/asm_defns.h	Fri Jun 10 09:34:30 2005 +0000
     2.2 +++ b/xen/include/asm-x86/x86_32/asm_defns.h	Fri Jun 10 11:05:17 2005 +0000
     2.3 @@ -19,10 +19,10 @@
     2.4          "jmp 3f;"                                                       \
     2.5          "2:testb $3,"STR(UREGS_cs)"(%esp);"                             \
     2.6          "jz 1f;"                                                        \
     2.7 -        "movl %ds,"STR(UREGS_ds)"(%esp);"                               \
     2.8 -        "movl %es,"STR(UREGS_es)"(%esp);"                               \
     2.9 -        "movl %fs,"STR(UREGS_fs)"(%esp);"                               \
    2.10 -        "movl %gs,"STR(UREGS_gs)"(%esp);"                               \
    2.11 +        "mov %ds,"STR(UREGS_ds)"(%esp);"                                \
    2.12 +        "mov %es,"STR(UREGS_es)"(%esp);"                                \
    2.13 +        "mov %fs,"STR(UREGS_fs)"(%esp);"                                \
    2.14 +        "mov %gs,"STR(UREGS_gs)"(%esp);"                                \
    2.15          "3:"
    2.16  
    2.17  #define SAVE_ALL_NOSEGREGS(_reg)                \
    2.18 @@ -31,8 +31,8 @@
    2.19  
    2.20  #define SET_XEN_SEGMENTS(_reg)                                  \
    2.21          "movl $("STR(__HYPERVISOR_DS)"),%e"STR(_reg)"x;"        \
    2.22 -        "movl %e"STR(_reg)"x,%ds;"                              \
    2.23 -        "movl %e"STR(_reg)"x,%es;"
    2.24 +        "mov %e"STR(_reg)"x,%ds;"                              \
    2.25 +        "mov %e"STR(_reg)"x,%es;"
    2.26  
    2.27  #define SAVE_ALL(_reg)                          \
    2.28          __SAVE_ALL_PRE                          \
    2.29 @@ -56,10 +56,10 @@
    2.30          jmp 3f;                                         \
    2.31          2:testb $3,UREGS_cs(%esp);                      \
    2.32          jz 1f;                                          \
    2.33 -        movl %ds,UREGS_ds(%esp);                        \
    2.34 -        movl %es,UREGS_es(%esp);                        \
    2.35 -        movl %fs,UREGS_fs(%esp);                        \
    2.36 -        movl %gs,UREGS_gs(%esp);                        \
    2.37 +        mov %ds,UREGS_ds(%esp);                         \
    2.38 +        mov %es,UREGS_es(%esp);                         \
    2.39 +        mov %fs,UREGS_fs(%esp);                         \
    2.40 +        mov %gs,UREGS_gs(%esp);                         \
    2.41          3:
    2.42  
    2.43  #define SAVE_ALL_NOSEGREGS(_reg)                \
    2.44 @@ -68,8 +68,8 @@
    2.45  
    2.46  #define SET_XEN_SEGMENTS(_reg)                          \
    2.47          movl $(__HYPERVISOR_DS),%e ## _reg ## x;        \
    2.48 -        movl %e ## _reg ## x,%ds;                       \
    2.49 -        movl %e ## _reg ## x,%es;
    2.50 +        mov %e ## _reg ## x,%ds;                        \
    2.51 +        mov %e ## _reg ## x,%es;
    2.52  
    2.53  #define SAVE_ALL(_reg)                          \
    2.54          __SAVE_ALL_PRE                          \