From 3f3a2d0f8d8e2feb2fee77db0f9c6ea04b992a83 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Sun, 13 May 2018 20:10:02 +0000 Subject: [PATCH] Fix PMC_IN_TRAP_HANDLER() for i386 after the 4/4 split. Sponsored by: The FreeBSD Foundation --- sys/i386/include/pmc_mdep.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h index 0f52cc6fcfe..9b874ebabcf 100644 --- a/sys/i386/include/pmc_mdep.h +++ b/sys/i386/include/pmc_mdep.h @@ -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 */