svn commit: r334042 - head/sys/i386/include

[Konstantin Belousov]

Author: kib
Date: Tue May 22 13:45:40 2018
New Revision: 334042
URL: https://svnweb.freebsd.org/changeset/base/334042

Log:
  Use local unique labels inside most often used macros.
  
  Discussed with:	bde
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week

Modified:
  head/sys/i386/include/asmacros.h

Modified: head/sys/i386/include/asmacros.h
==============================================================================
--- head/sys/i386/include/asmacros.h	Tue May 22 13:45:24 2018	(r334041)
+++ head/sys/i386/include/asmacros.h	Tue May 22 13:45:40 2018	(r334042)
@@ -189,9 +189,9 @@
 	movl	PCPU(KESP0), %edx
 	movl	$TF_SZ, %ecx
 	testl	$PSL_VM, TF_EFLAGS(%esp)
-	jz	1001f
+	jz	.L\@.1
 	addl	$VM86_STACK_SPACE, %ecx
-1001:	subl	%ecx, %edx
+.L\@.1:	subl	%ecx, %edx
 	movl	%edx, %edi
 	movl	%esp, %esi
 	rep; movsb
@@ -199,9 +199,9 @@
 	.endm
 
 	.macro	LOAD_KCR3
-	call	1000f
-1000:	popl	%eax
-	movl	(tramp_idleptd - 1000b)(%eax), %eax
+	call	.L\@.1
+.L\@.1:	popl	%eax
+	movl	(tramp_idleptd - .L\@.1)(%eax), %eax
 	movl	%eax, %cr3
 	.endm
 
@@ -212,17 +212,17 @@
 
 	.macro	KENTER
 	testl	$PSL_VM, TF_EFLAGS(%esp)
-	jz	1f
+	jz	.L\@.1
 	LOAD_KCR3
 	movl	PCPU(CURPCB), %eax
 	testl	$PCB_VM86CALL, PCB_FLAGS(%eax)
-	jnz	3f
+	jnz	.L\@.3
 	NMOVE_STACKS
-	jmp	3f
-1:	testb	$SEL_RPL_MASK, TF_CS(%esp)
-	jz	3f
-2:	MOVE_STACKS
-3:
+	jmp	.L\@.3
+.L\@.1:	testb	$SEL_RPL_MASK, TF_CS(%esp)
+	jz	.L\@.3
+.L\@.2:	MOVE_STACKS
+.L\@.3:
 	.endm
 
 #endif /* LOCORE */