svn commit: r333606 - head/sys/amd64/include

[John Baldwin]

Author: jhb
Date: Mon May 14 17:27:53 2018
New Revision: 333606
URL: https://svnweb.freebsd.org/changeset/base/333606

Log:
  Make the common interrupt entry point labels local labels.
  
  Kernel debuggers depend on symbol names to find stack frames with a
  trapframe rather than a normal stack frame.  The labels used for the
  shared interrupt entry point for the PTI and non-PTI cases did not
  match the existing patterns confusing debuggers.  Add the '.L' prefix
  to mark these symbols as local so they are not visible in the symbol
  table.
  
  Reviewed by:	kib
  MFC after:	1 week
  Sponsored by:	Chelsio Communications

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

Modified: head/sys/amd64/include/asmacros.h
==============================================================================
--- head/sys/amd64/include/asmacros.h	Mon May 14 15:35:54 2018	(r333605)
+++ head/sys/amd64/include/asmacros.h	Mon May 14 17:27:53 2018	(r333606)
@@ -223,9 +223,9 @@ X\name\()_pti:
 	.type	X\vec_name\()_pti, at function
 X\vec_name\()_pti:
 	testb	$SEL_RPL_MASK,PTI_CS-3*8(%rsp) /* err, %rax, %rdx not pushed */
-	jz	\vec_name\()_u
+	jz	.L\vec_name\()_u
 	PTI_UENTRY has_err=0
-	jmp	\vec_name\()_u
+	jmp	.L\vec_name\()_u
 	.endm
 
 	.macro	INTR_PUSH_FRAME vec_name
@@ -234,9 +234,9 @@ X\vec_name\()_pti:
 	.type	X\vec_name, at function
 X\vec_name:
 	testb	$SEL_RPL_MASK,PTI_CS-3*8(%rsp) /* come from kernel? */
-	jz	\vec_name\()_u		/* Yes, dont swapgs again */
+	jz	.L\vec_name\()_u		/* Yes, dont swapgs again */
 	swapgs
-\vec_name\()_u:
+.L\vec_name\()_u:
 	subq	$TF_RIP,%rsp	/* skip dummy tf_err and tf_trapno */
 	movq	%rdi,TF_RDI(%rsp)
 	movq	%rsi,TF_RSI(%rsp)