Skip to contentSkip to conversation

x86: hide assembly labels

PATCH New Jan Beulich 1 participant 1 message Feb 7, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: hide assembly labels

Prevent the fault recovery labels to clutter the symbol table and the disassembly.

xen/arch/x86/x86_32/entry.S +55 -52
Index: 2007-02-07/xen/arch/x86/x86_32/entry.S
===================================================================
@@ -84,10 +84,10 @@ restore_all_guest:
         jmp   restore_all_vm86
 1:
 #endif
-FLT1:   mov  UREGS_ds(%esp),%ds
-FLT2:   mov  UREGS_es(%esp),%es
-FLT3:   mov  UREGS_fs(%esp),%fs
-FLT4:   mov  UREGS_gs(%esp),%gs
+.LFT1:  mov  UREGS_ds(%esp),%ds
+.LFT2:  mov  UREGS_es(%esp),%es
+.LFT3:  mov  UREGS_fs(%esp),%fs
+.LFT4:  mov  UREGS_gs(%esp),%gs
 restore_all_vm86:
         popl %ebx
         popl %ecx
@@ -97,9 +97,9 @@ restore_all_vm86:
         popl %ebp
         popl %eax
         addl $4,%esp
-FLT5:   iret
+.LFT5:  iret
 .section .fixup,"ax"
-FIX5:   subl  $28,%esp
+.LFX5:  subl  $28,%esp
         pushl 28(%esp)                 # error_code/entry_vector
         movl  %eax,UREGS_eax+4(%esp)
         movl  %ebp,UREGS_ebp+4(%esp)
@@ -108,7 +108,7 @@ FIX5:   subl  $28,%esp
         movl  %edx,UREGS_edx+4(%esp)
         movl  %ecx,UREGS_ecx+4(%esp)
         movl  %ebx,UREGS_ebx+4(%esp)
-FIX1:   SET_XEN_SEGMENTS(a)
+.LFX1:  SET_XEN_SEGMENTS(a)
         movl  %eax,%fs
         movl  %eax,%gs
         sti
@@ -116,11 +116,11 @@ FIX1:   SET_XEN_SEGMENTS(a)
         pushfl                         # EFLAGS
         movl  $__HYPERVISOR_CS,%eax
         pushl %eax                     # CS
-        movl  $DBLFLT1,%eax
+        movl  $.LDF1,%eax
         pushl %eax                     # EIP
         pushl %esi                     # error_code/entry_vector
         jmp   handle_exception
-DBLFLT1:GET_CURRENT(%ebx)
+.LDF1:  GET_CURRENT(%ebx)
         jmp   test_all_events
 failsafe_callback:
         GET_CURRENT(%ebx)
@@ -142,14 +142,14 @@ failsafe_callback:
         jmp   test_all_events
 .previous
 .section __pre_ex_table,"a"
-        .long FLT1,FIX1
-        .long FLT2,FIX1
-        .long FLT3,FIX1
-        .long FLT4,FIX1
-        .long FLT5,FIX5
+        .long .LFT1,.LFX1
+        .long .LFT2,.LFX1
+        .long .LFT3,.LFX1
+        .long .LFT4,.LFX1
+        .long .LFT5,.LFX5
 .previous
 .section __ex_table,"a"
-        .long DBLFLT1,failsafe_callback
+        .long .LDF1,failsafe_callback
 .previous
 
         ALIGN
@@ -288,32 +288,33 @@ create_bounce_frame:
         testl $(2|X86_EFLAGS_VM),%ecx
         jz   ring1 /* jump if returning to an existing ring-1 activation */
         movl VCPU_kernel_sp(%ebx),%esi
-FLT6:   mov  VCPU_kernel_ss(%ebx),%gs
+.LFT6:  mov  VCPU_kernel_ss(%ebx),%gs
         testl $X86_EFLAGS_VM,UREGS_eflags+4(%esp)
-        jz   nvm86_1
+        jz   .Lnvm86_1
         subl $16,%esi       /* push ES/DS/FS/GS (VM86 stack frame) */
         movl UREGS_es+4(%esp),%eax
-FLT7:   movl %eax,%gs:(%esi)
+.LFT7:  movl %eax,%gs:(%esi)
         movl UREGS_ds+4(%esp),%eax
-FLT8:   movl %eax,%gs:4(%esi)
+.LFT8:  movl %eax,%gs:4(%esi)
         movl UREGS_fs+4(%esp),%eax
-FLT9:   movl %eax,%gs:8(%esi)
+.LFT9:  movl %eax,%gs:8(%esi)
         movl UREGS_gs+4(%esp),%eax
-FLT10:  movl %eax,%gs:12(%esi)
-nvm86_1:subl $8,%esi        /* push SS/ESP (inter-priv iret) */
+.LFT10: movl %eax,%gs:12(%esi)
+.Lnvm86_1:
+        subl $8,%esi        /* push SS/ESP (inter-priv iret) */
         movl UREGS_esp+4(%esp),%eax
-FLT11:  movl %eax,%gs:(%esi) 
+.LFT11: movl %eax,%gs:(%esi)
         movl UREGS_ss+4(%esp),%eax
-FLT12:  movl %eax,%gs:4(%esi) 
+.LFT12: movl %eax,%gs:4(%esi)
         jmp 1f
 ring1:  /* obtain ss/esp from oldss/oldesp -- a ring-1 activation exists */
         movl UREGS_esp+4(%esp),%esi
-FLT13:  mov  UREGS_ss+4(%esp),%gs 
+.LFT13: mov  UREGS_ss+4(%esp),%gs
 1:      /* Construct a stack frame: EFLAGS, CS/EIP */
         movb TRAPBOUNCE_flags(%edx),%cl
         subl $12,%esi
         movl UREGS_eip+4(%esp),%eax
-FLT14:  movl %eax,%gs:(%esi) 
+.LFT14: movl %eax,%gs:(%esi)
         movl VCPU_vcpu_info(%ebx),%eax
         pushl VCPUINFO_upcall_mask(%eax)
         testb $TBF_INTERRUPT,%cl
@@ -324,49 +325,51 @@ FLT14:  movl %eax,%gs:(%esi) 
         movw UREGS_cs+4(%esp),%ax        # Bits  0-15: CS
 #ifdef CONFIG_X86_SUPERVISOR_MODE_KERNEL
         testw $2,%ax
-        jnz  FLT15
+        jnz  .LFT15
         and  $~3,%ax                     # RPL 1 -> RPL 0
 #endif
-FLT15:  movl %eax,%gs:4(%esi) 
+.LFT15: movl %eax,%gs:4(%esi)
         test $0x00FF0000,%eax            # Bits 16-23: saved_upcall_mask
         setz %ch                         # %ch == !saved_upcall_mask
         movl UREGS_eflags+4(%esp),%eax
         andl $~X86_EFLAGS_IF,%eax
         shlb $1,%ch                      # Bit 9 (EFLAGS.IF)
         orb  %ch,%ah                     # Fold EFLAGS.IF into %eax
-FLT16:  movl %eax,%gs:8(%esi)
+.LFT16: movl %eax,%gs:8(%esi)
         test $TBF_EXCEPTION_ERRCODE,%cl
         jz   1f
         subl $4,%esi                    # push error_code onto guest frame
         movl TRAPBOUNCE_error_code(%edx),%eax
-FLT17:  movl %eax,%gs:(%esi)
+.LFT17: movl %eax,%gs:(%esi)
 1:      testb $TBF_FAILSAFE,%cl
         jz   2f
         subl $16,%esi                # add DS/ES/FS/GS to failsafe stack frame
         testl $X86_EFLAGS_VM,UREGS_eflags+4(%esp)
-        jz   nvm86_2
+        jz   .Lnvm86_2
         xorl %eax,%eax               # VM86: we write zero selector values
-FLT18:  movl %eax,%gs:(%esi) 
-FLT19:  movl %eax,%gs:4(%esi)
-FLT20:  movl %eax,%gs:8(%esi) 
-FLT21:  movl %eax,%gs:12(%esi)
+.LFT18: movl %eax,%gs:(%esi)
+.LFT19: movl %eax,%gs:4(%esi)
+.LFT20: movl %eax,%gs:8(%esi)
+.LFT21: movl %eax,%gs:12(%esi)
         jmp  2f
-nvm86_2:movl UREGS_ds+4(%esp),%eax   # non-VM86: write real selector values
-FLT22:  movl %eax,%gs:(%esi) 
+.Lnvm86_2:
+        movl UREGS_ds+4(%esp),%eax   # non-VM86: write real selector values
+.LFT22: movl %eax,%gs:(%esi)
         movl UREGS_es+4(%esp),%eax
-FLT23:  movl %eax,%gs:4(%esi)
+.LFT23: movl %eax,%gs:4(%esi)
         movl UREGS_fs+4(%esp),%eax
-FLT24:  movl %eax,%gs:8(%esi) 
+.LFT24: movl %eax,%gs:8(%esi)
         movl UREGS_gs+4(%esp),%eax
-FLT25:  movl %eax,%gs:12(%esi)
+.LFT25: movl %eax,%gs:12(%esi)
 2:      testl $X86_EFLAGS_VM,UREGS_eflags+4(%esp)
-        jz   nvm86_3
+        jz   .Lnvm86_3
         xorl %eax,%eax      /* zero DS-GS, just as a real CPU would */
         movl %eax,UREGS_ds+4(%esp)
         movl %eax,UREGS_es+4(%esp)
         movl %eax,UREGS_fs+4(%esp)
         movl %eax,UREGS_gs+4(%esp)
-nvm86_3:/* Rewrite our stack frame and return to ring 1. */
+.Lnvm86_3:
+        /* Rewrite our stack frame and return to ring 1. */
         /* IA32 Ref. Vol. 3: TF, VM, RF and NT flags are cleared on trap. */
         andl $~(X86_EFLAGS_VM|X86_EFLAGS_RF|\
                 X86_EFLAGS_NT|X86_EFLAGS_TF),UREGS_eflags+4(%esp)
@@ -382,16 +385,16 @@ nvm86_3:/* Rewrite our stack frame and r
         movb $0,TRAPBOUNCE_flags(%edx)
         ret
 .section __ex_table,"a"
-        .long  FLT6,domain_crash_synchronous ,  FLT7,domain_crash_synchronous
-        .long  FLT8,domain_crash_synchronous ,  FLT9,domain_crash_synchronous
-        .long FLT10,domain_crash_synchronous , FLT11,domain_crash_synchronous
-        .long FLT12,domain_crash_synchronous , FLT13,domain_crash_synchronous
-        .long FLT14,domain_crash_synchronous , FLT15,domain_crash_synchronous
-        .long FLT16,domain_crash_synchronous , FLT17,domain_crash_synchronous
-        .long FLT18,domain_crash_synchronous , FLT19,domain_crash_synchronous
-        .long FLT20,domain_crash_synchronous , FLT21,domain_crash_synchronous
-        .long FLT22,domain_crash_synchronous , FLT23,domain_crash_synchronous
-        .long FLT24,domain_crash_synchronous , FLT25,domain_crash_synchronous
+        .long  .LFT6,domain_crash_synchronous ,  .LFT7,domain_crash_synchronous
+        .long  .LFT8,domain_crash_synchronous ,  .LFT9,domain_crash_synchronous
+        .long .LFT10,domain_crash_synchronous , .LFT11,domain_crash_synchronous
+        .long .LFT12,domain_crash_synchronous , .LFT13,domain_crash_synchronous
+        .long .LFT14,domain_crash_synchronous , .LFT15,domain_crash_synchronous
+        .long .LFT16,domain_crash_synchronous , .LFT17,domain_crash_synchronous
+        .long .LFT18,domain_crash_synchronous , .LFT19,domain_crash_synchronous
+        .long .LFT20,domain_crash_synchronous , .LFT21,domain_crash_synchronous
+        .long .LFT22,domain_crash_synchronous , .LFT23,domain_crash_synchronous
+        .long .LFT24,domain_crash_synchronous , .LFT25,domain_crash_synchronous
 .previous
 
 domain_crash_synchronous_string:
xen/arch/x86/x86_64/compat/entry.S +32 -32

153 lines not on this page · raw message

xen/arch/x86/x86_64/entry.S +24 -24

113 lines not on this page · raw message