[Midnightbsd-cvs] src [9788] trunk/sys: assert that interrupts are enabled in the trap handlers on x86

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Feb 24 14:23:44 EST 2018


Revision: 9788
          http://svnweb.midnightbsd.org/src/?rev=9788
Author:   laffer1
Date:     2018-02-24 14:23:44 -0500 (Sat, 24 Feb 2018)
Log Message:
-----------
assert that interrupts are enabled in the trap handlers on x86

Modified Paths:
--------------
    trunk/sys/amd64/amd64/trap.c
    trunk/sys/i386/i386/trap.c

Modified: trunk/sys/amd64/amd64/trap.c
===================================================================
--- trunk/sys/amd64/amd64/trap.c	2018-02-24 19:23:01 UTC (rev 9787)
+++ trunk/sys/amd64/amd64/trap.c	2018-02-24 19:23:44 UTC (rev 9788)
@@ -628,6 +628,7 @@
 		    fubyte((void *)(frame->tf_rip + 6)),
 		    fubyte((void *)(frame->tf_rip + 7)));
 	}
+	KASSERT((read_rflags() & PSL_I) != 0, ("interrupts disabled"));
 	trapsignal(td, &ksi);
 
 user:

Modified: trunk/sys/i386/i386/trap.c
===================================================================
--- trunk/sys/i386/i386/trap.c	2018-02-24 19:23:01 UTC (rev 9787)
+++ trunk/sys/i386/i386/trap.c	2018-02-24 19:23:44 UTC (rev 9788)
@@ -779,6 +779,7 @@
 		    fubyte((void *)(frame->tf_eip + 6)),
 		    fubyte((void *)(frame->tf_eip + 7)));
 	}
+	KASSERT((read_eflags() & PSL_I) != 0, ("interrupts disabled"));
 	trapsignal(td, &ksi);
 
 #ifdef DEBUG



More information about the Midnightbsd-cvs mailing list