ia64/xen-unstable

changeset 17697:e48453f82d30

x86: Change a local label in asm entry stubs to really be local.
This prevents it appearing in crash traces, where it can be a bit confusing.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu May 22 10:41:49 2008 +0100 (2008-05-22)
parents 3ed3d0688fa8
children b259eebb0223
files xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_64/compat/entry.S xen/arch/x86/x86_64/entry.S
line diff
     1.1 --- a/xen/arch/x86/x86_32/entry.S	Thu May 22 10:40:40 2008 +0100
     1.2 +++ b/xen/arch/x86/x86_32/entry.S	Thu May 22 10:41:49 2008 +0100
     1.3 @@ -197,13 +197,12 @@ 1:      sti
     1.4  #define SHADOW_BYTES 24 /* 6 shadow parameters */
     1.5  #endif
     1.6          cmpb  $0,tb_init_done
     1.7 -        je    tracing_off
     1.8 +        je    1f
     1.9          call  trace_hypercall
    1.10          /* Now restore all the registers that trace_hypercall clobbered */
    1.11          movl  UREGS_eax+SHADOW_BYTES(%esp),%eax /* Hypercall # */
    1.12  #undef SHADOW_BYTES
    1.13 -tracing_off:
    1.14 -        call *hypercall_table(,%eax,4)
    1.15 +1:      call *hypercall_table(,%eax,4)
    1.16          addl  $24,%esp     # Discard the shadow parameters
    1.17  #ifndef NDEBUG
    1.18          /* Deliberately corrupt real parameter regs used by this hypercall. */
     2.1 --- a/xen/arch/x86/x86_64/compat/entry.S	Thu May 22 10:40:40 2008 +0100
     2.2 +++ b/xen/arch/x86/x86_64/compat/entry.S	Thu May 22 10:41:49 2008 +0100
     2.3 @@ -59,7 +59,7 @@ ENTRY(compat_hypercall)
     2.4  #define SHADOW_BYTES 0  /* No on-stack shadow state */
     2.5  #endif
     2.6          cmpb  $0,tb_init_done(%rip)
     2.7 -        je    compat_tracing_off
     2.8 +        je    1f
     2.9          call  trace_hypercall
    2.10          /* Now restore all the registers that trace_hypercall clobbered */
    2.11          movl  UREGS_rax+SHADOW_BYTES(%rsp),%eax   /* Hypercall #  */
    2.12 @@ -70,8 +70,7 @@ ENTRY(compat_hypercall)
    2.13          movl  UREGS_rdi+SHADOW_BYTES(%rsp),%r8d   /* Arg 5        */
    2.14          movl  UREGS_rbp+SHADOW_BYTES(%rsp),%r9d   /* Arg 6        */
    2.15  #undef SHADOW_BYTES
    2.16 -compat_tracing_off:
    2.17 -        leaq  compat_hypercall_table(%rip),%r10
    2.18 +1:      leaq  compat_hypercall_table(%rip),%r10
    2.19          PERFC_INCR(PERFC_hypercalls, %rax, %rbx)
    2.20          callq *(%r10,%rax,8)
    2.21  #ifndef NDEBUG
     3.1 --- a/xen/arch/x86/x86_64/entry.S	Thu May 22 10:40:40 2008 +0100
     3.2 +++ b/xen/arch/x86/x86_64/entry.S	Thu May 22 10:41:49 2008 +0100
     3.3 @@ -163,7 +163,7 @@ ENTRY(syscall_enter)
     3.4  #define SHADOW_BYTES 0  /* No on-stack shadow state */
     3.5  #endif
     3.6          cmpb  $0,tb_init_done(%rip)
     3.7 -        je    tracing_off
     3.8 +        je    1f
     3.9          call  trace_hypercall
    3.10          /* Now restore all the registers that trace_hypercall clobbered */
    3.11          movq  UREGS_rax+SHADOW_BYTES(%rsp),%rax   /* Hypercall #  */
    3.12 @@ -174,8 +174,7 @@ ENTRY(syscall_enter)
    3.13          movq  UREGS_rdi+SHADOW_BYTES(%rsp),%r8    /* Arg 5        */
    3.14          movq  UREGS_rbp+SHADOW_BYTES(%rsp),%r9    /* Arg 6        */
    3.15  #undef SHADOW_BYTES
    3.16 -tracing_off:
    3.17 -        leaq  hypercall_table(%rip),%r10
    3.18 +1:      leaq  hypercall_table(%rip),%r10
    3.19          PERFC_INCR(PERFC_hypercalls, %rax, %rbx)
    3.20          callq *(%r10,%rax,8)
    3.21  #ifndef NDEBUG