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

[Konstantin Belousov]

Author: kib
Date: Sun May 13 20:10:02 2018
New Revision: 333587
URL: https://svnweb.freebsd.org/changeset/base/333587

Log:
  Fix PMC_IN_TRAP_HANDLER() for i386 after the 4/4 split.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/sys/i386/include/pmc_mdep.h
==============================================================================
--- head/sys/i386/include/pmc_mdep.h	Sun May 13 19:48:30 2018	(r333586)
+++ head/sys/i386/include/pmc_mdep.h	Sun May 13 20:10:02 2018	(r333587)
@@ -145,8 +145,8 @@ struct pmc_mdep;
 #define	PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS)
 
 #define	PMC_IN_TRAP_HANDLER(PC) 			\
-	((PC) >= (uintptr_t) start_exceptions &&	\
-	 (PC) < (uintptr_t) end_exceptions)
+	((PC) >= (uintptr_t)start_exceptions + setidt_disp &&	\
+	 (PC) < (uintptr_t) end_exceptions + setidt_disp)
 
 #define	PMC_AT_FUNCTION_PROLOGUE_PUSH_BP(I)		\
 	(((I) & 0x00ffffff) == 0xe58955) /* pushl %ebp; movl %esp,%ebp */