privatize spin label (rust-osdev#41)

strake · phil-opp · commit 644809e20596 · 2018-12-09T12:31:51.000+01:00
diff --git a/src/main.rs b/src/main.rs
@@ -37,7 +37,8 @@ global_asm!(include_str!("video_mode/vga_320x200.s"));
 global_asm!(include_str!("video_mode/vga_text_80x25.s"));
 
 unsafe fn context_switch(boot_info: VirtAddr, entry_point: VirtAddr, stack_pointer: VirtAddr) -> ! {
-    asm!("jmp $1; context_switch_spin: jmp context_switch_spin" :: "{rsp}"(stack_pointer), "r"(entry_point), "{rdi}"(boot_info) :: "intel");
+    asm!("jmp $1; ${:private}.spin.${:uid}: jmp ${:private}.spin.${:uid}" ::
+         "{rsp}"(stack_pointer), "r"(entry_point), "{rdi}"(boot_info) :: "intel");
     ::core::hint::unreachable_unchecked()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ global_asm!(include_str!("video_mode/vga_320x200.s"));`
`37`	`37`	`global_asm!(include_str!("video_mode/vga_text_80x25.s"));`
`38`	`38`
`39`	`39`	`unsafe fn context_switch(boot_info: VirtAddr, entry_point: VirtAddr, stack_pointer: VirtAddr) -> ! {`
`40`		`- asm!("jmp $1; context_switch_spin: jmp context_switch_spin" :: "{rsp}"(stack_pointer), "r"(entry_point), "{rdi}"(boot_info) :: "intel");`
	`40`	`+ asm!("jmp $1; ${:private}.spin.${:uid}: jmp ${:private}.spin.${:uid}" ::`
	`41`	`+ "{rsp}"(stack_pointer), "r"(entry_point), "{rdi}"(boot_info) :: "intel");`
`41`	`42`	`::core::hint::unreachable_unchecked()`
`42`	`43`	`}`
`43`	`44`