ChangeSet 1.1398, 2005/04/28 22:35:49+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx
Remove unnecessary SYMBOL_NAME* macros.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
arch/x86/boot/x86_32.S | 24 ++--
arch/x86/boot/x86_64.S | 20 +--
arch/x86/trampoline.S | 5
arch/x86/x86_32/entry.S | 138 ++++++++++++-------------
arch/x86/x86_64/entry.S | 122 +++++++++++-----------
include/asm-x86/config.h | 11 --
include/asm-x86/x86_32/asm_defns.h | 178 ++++++++++++++++-----------------
include/asm-x86/x86_64/asm_defns.h | 198 ++++++++++++++++++-------------------
8 files changed, 346 insertions(+), 350 deletions(-)
diff -Nru a/xen/arch/x86/boot/x86_32.S b/xen/arch/x86/boot/x86_32.S
--- a/xen/arch/x86/boot/x86_32.S 2005-04-28 18:04:27 -04:00
+++ b/xen/arch/x86/boot/x86_32.S 2005-04-28 18:04:27 -04:00
@@ -24,10 +24,10 @@
not_multiboot_msg:
.asciz "ERR: Not a Multiboot bootloader!"
bad_cpu:
- mov $SYMBOL_NAME(bad_cpu_msg)-__PAGE_OFFSET,%esi
+ mov $bad_cpu_msg-__PAGE_OFFSET,%esi
jmp print_err
not_multiboot:
- mov $SYMBOL_NAME(not_multiboot_msg)-__PAGE_OFFSET,%esi
+ mov $not_multiboot_msg-__PAGE_OFFSET,%esi
print_err:
mov $0xB8000,%edi # VGA framebuffer
1: mov (%esi),%bl
@@ -118,7 +118,7 @@
mov $(__HYPERVISOR_CS << 16),%eax
mov %dx,%ax /* selector = 0x0010 = cs */
mov $0x8E00,%dx /* interrupt gate - dpl=0, present */
- lea SYMBOL_NAME(idt_table)-__PAGE_OFFSET,%edi
+ lea idt_table-__PAGE_OFFSET,%edi
mov $256,%ecx
1: mov %eax,(%edi)
mov %edx,4(%edi)
@@ -163,38 +163,38 @@
mov %eax,%ds
mov %eax,%es
pushl $int_msg
- call SYMBOL_NAME(printf)
+ call printf
1: jmp 1b
/*** STACK LOCATION ***/
ENTRY(stack_start)
- .long SYMBOL_NAME(cpu0_stack) + STACK_SIZE - 200 - __PAGE_OFFSET
+ .long cpu0_stack + STACK_SIZE - 200 - __PAGE_OFFSET
.long __HYPERVISOR_DS
/*** DESCRIPTOR TABLES ***/
-.globl SYMBOL_NAME(idt)
-.globl SYMBOL_NAME(gdt)
+.globl idt
+.globl gdt
ALIGN
.word 0
idt_descr:
.word 256*8-1
-SYMBOL_NAME(idt):
- .long SYMBOL_NAME(idt_table)
+idt:
+ .long idt_table
.word 0
gdt_descr:
.word (LAST_RESERVED_GDT_ENTRY*8)+7
-SYMBOL_NAME(gdt):
- .long SYMBOL_NAME(gdt_table) /* gdt base */
+gdt:
+ .long gdt_table /* gdt base */
.word 0
nopaging_gdt_descr:
.word (LAST_RESERVED_GDT_ENTRY*8)+7
- .long SYMBOL_NAME(gdt_table)-__PAGE_OFFSET
+ .long gdt_table-__PAGE_OFFSET
ALIGN
/* NB. Rings != 0 get access up to 0xFC400000. This allows access to the */
diff -Nru a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S
--- a/xen/arch/x86/boot/x86_64.S 2005-04-28 18:04:27 -04:00
+++ b/xen/arch/x86/boot/x86_64.S 2005-04-28 18:04:27 -04:00
@@ -7,10 +7,10 @@
.text
.code32
-
+
ENTRY(start)
jmp __start
-
+
.org 0x004
/*** MULTIBOOT HEADER ****/
/* Magic number indicating a Multiboot header. */
@@ -180,8 +180,8 @@
/*** DESCRIPTOR TABLES ***/
-.globl SYMBOL_NAME(idt)
-.globl SYMBOL_NAME(gdt)
+.globl idt
+.globl gdt
.org 0x1f0
.word (LAST_RESERVED_GDT_ENTRY*8)+7
@@ -203,17 +203,17 @@
.word 0
gdt_descr:
.word (LAST_RESERVED_GDT_ENTRY*8)+7
-SYMBOL_NAME(gdt):
- .quad SYMBOL_NAME(gdt_table)
+gdt:
+ .quad gdt_table
.word 0
idt_descr:
.word 256*16-1
-SYMBOL_NAME(idt):
- .quad SYMBOL_NAME(idt_table)
+idt:
+ .quad idt_table
ENTRY(stack_start)
- .quad SYMBOL_NAME(cpu0_stack) + STACK_SIZE - 200
+ .quad cpu0_stack + STACK_SIZE - 200
high_start:
.quad __high_start
@@ -258,6 +258,6 @@
ignore_int:
cld
leaq int_msg(%rip),%rdi
- call SYMBOL_NAME(printf)
+ call printf
1: jmp 1b
diff -Nru a/xen/arch/x86/trampoline.S b/xen/arch/x86/trampoline.S
--- a/xen/arch/x86/trampoline.S 2005-04-28 18:04:27 -04:00
+++ b/xen/arch/x86/trampoline.S 2005-04-28 18:04:27 -04:00
@@ -60,8 +60,7 @@
#else
.long 0x100200 # gdt_table
#endif
-
-.globl SYMBOL_NAME(trampoline_end)
-SYMBOL_NAME_LABEL(trampoline_end)
+
+ENTRY(trampoline_end)
#endif /* CONFIG_SMP */
diff -Nru a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S 2005-04-28 18:04:27 -04:00
+++ b/xen/arch/x86/x86_32/entry.S 2005-04-28 18:04:27 -04:00
@@ -111,7 +111,7 @@
ENTRY(vmx_asm_vmexit_handler)
/* selectors are restored/saved by VMX */
VMX_SAVE_ALL_NOSEGREGS
- call SYMBOL_NAME(vmx_vmexit_handler)
+ call vmx_vmexit_handler
jmp vmx_asm_do_resume
ENTRY(vmx_asm_do_launch)
@@ -126,7 +126,7 @@
/* VMLUANCH */
.byte 0x0f,0x01,0xc2
pushf
- call SYMBOL_NAME(vm_launch_fail)
+ call vm_launch_fail
hlt
ALIGN
@@ -141,11 +141,11 @@
/*test_softirqs:*/
movl EDOMAIN_processor(%ebx),%eax
shl $IRQSTAT_shift,%eax
- test %ecx,SYMBOL_NAME(irq_stat)(%eax,1)
+ test %ecx,irq_stat(%eax,1)
jnz vmx_process_softirqs
vmx_restore_all_guest:
- call SYMBOL_NAME(load_cr2)
+ call load_cr2
/*
* Check if we are going back to VMX-based VM
* By this time, all the setups in the VMCS must be complete.
@@ -161,14 +161,14 @@
/* VMRESUME */
.byte 0x0f,0x01,0xc3
pushf
- call SYMBOL_NAME(vm_resume_fail)
+ call vm_resume_fail
/* Should never reach here */
hlt
ALIGN
vmx_process_softirqs:
sti
- call SYMBOL_NAME(do_softirq)
+ call do_softirq
jmp vmx_test_all_events
#endif
@@ -261,7 +261,7 @@
GET_CURRENT(%ebx)
andl $(NR_hypercalls-1),%eax
PERFC_INCR(PERFC_hypercalls, %eax)
- call *SYMBOL_NAME(hypercall_table)(,%eax,4)
+ call *hypercall_table(,%eax,4)
movl %eax,UREGS_eax(%esp) # save the return value
test_all_events:
@@ -271,7 +271,7 @@
/*test_softirqs:*/
movl EDOMAIN_processor(%ebx),%eax
shl $IRQSTAT_shift,%eax
- test %ecx,SYMBOL_NAME(irq_stat)(%eax,1)
+ test %ecx,irq_stat(%eax,1)
jnz process_softirqs
/*test_guest_events:*/
movl EDOMAIN_vcpu_info(%ebx),%eax
@@ -295,7 +295,7 @@
ALIGN
process_softirqs:
sti
- call SYMBOL_NAME(do_softirq)
+ call do_softirq
jmp test_all_events
/* CREATE A BASIC EXCEPTION FRAME ON GUEST OS (RING-1) STACK: */
@@ -431,7 +431,7 @@
pushl %edx # push the cpu_user_regs pointer
GET_CURRENT(%ebx)
PERFC_INCR(PERFC_exceptions, %eax)
- call *SYMBOL_NAME(exception_table)(,%eax,4)
+ call *exception_table(,%eax,4)
addl $4,%esp
movl UREGS_eflags(%esp),%eax
movb UREGS_cs(%esp),%al
@@ -465,7 +465,7 @@
movl %esp,%edx
pushl %edx # push the cpu_user_regs pointer
pushl %esi # push the trapnr (entry vector)
- call SYMBOL_NAME(fatal_trap)
+ call fatal_trap
ud2
ENTRY(coprocessor_error)
@@ -575,7 +575,7 @@
movl %esp,%edx
pushl %ebx # reason
pushl %edx # regs
- call SYMBOL_NAME(do_nmi)
+ call do_nmi
addl $8,%esp
jmp ret_from_intr
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home