Module Name: src
Committed By: maxv
Date: Sat Mar 14 04:55:15 UTC 2020
Modified Files:
src/sys/arch/x86/include: pte.h trap.h
Log Message:
style
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/include/pte.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/include/trap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/pte.h
diff -u src/sys/arch/x86/include/pte.h:1.3 src/sys/arch/x86/include/pte.h:1.4
--- src/sys/arch/x86/include/pte.h:1.3 Wed Oct 9 17:28:46 2019
+++ src/sys/arch/x86/include/pte.h Sat Mar 14 04:55:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.3 2019/10/09 17:28:46 maxv Exp $ */
+/* $NetBSD: pte.h,v 1.4 2020/03/14 04:55:14 maxv Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#define PGC_UC (PTE_PWT | PTE_PCD) /* hard UC */
/*
- * Page protection exception bits
+ * #PF exception bits
*/
#define PGEX_P 0x0001 /* the page was present */
#define PGEX_W 0x0002 /* exception during a write cycle */
Index: src/sys/arch/x86/include/trap.h
diff -u src/sys/arch/x86/include/trap.h:1.2 src/sys/arch/x86/include/trap.h:1.3
--- src/sys/arch/x86/include/trap.h:1.2 Thu Aug 7 16:30:33 2003
+++ src/sys/arch/x86/include/trap.h Sat Mar 14 04:55:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.2 2003/08/07 16:30:33 agc Exp $ */
+/* $NetBSD: trap.h,v 1.3 2020/03/14 04:55:14 maxv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -34,35 +34,30 @@
* @(#)trap.h 5.4 (Berkeley) 5/9/91
*/
-/*
- * Trap type values
- * also known in trap.c for name strings
- */
-
-#define T_PRIVINFLT 0 /* privileged instruction */
-#define T_BPTFLT 1 /* breakpoint trap */
-#define T_ARITHTRAP 2 /* arithmetic trap */
-#define T_ASTFLT 3 /* asynchronous system trap */
-#define T_PROTFLT 4 /* protection fault */
-#define T_TRCTRAP 5 /* trace trap */
-#define T_PAGEFLT 6 /* page fault */
-#define T_ALIGNFLT 7 /* alignment fault */
-#define T_DIVIDE 8 /* integer divide fault */
-#define T_NMI 9 /* non-maskable interrupt */
-#define T_OFLOW 10 /* overflow trap */
-#define T_BOUND 11 /* bounds check fault */
-#define T_DNA 12 /* device not available fault */
-#define T_DOUBLEFLT 13 /* double fault */
-#define T_FPOPFLT 14 /* fp coprocessor operand fetch fault */
-#define T_TSSFLT 15 /* invalid tss fault */
-#define T_SEGNPFLT 16 /* segment not present fault */
-#define T_STKFLT 17 /* stack fault */
-#define T_MCA 18 /* machine check */
+#define T_PRIVINFLT 0 /* privileged instruction */
+#define T_BPTFLT 1 /* breakpoint trap */
+#define T_ARITHTRAP 2 /* arithmetic trap */
+#define T_ASTFLT 3 /* asynchronous system trap */
+#define T_PROTFLT 4 /* protection fault */
+#define T_TRCTRAP 5 /* trace trap */
+#define T_PAGEFLT 6 /* page fault */
+#define T_ALIGNFLT 7 /* alignment fault */
+#define T_DIVIDE 8 /* integer divide fault */
+#define T_NMI 9 /* non-maskable interrupt */
+#define T_OFLOW 10 /* overflow trap */
+#define T_BOUND 11 /* bounds check fault */
+#define T_DNA 12 /* device not available fault */
+#define T_DOUBLEFLT 13 /* double fault */
+#define T_FPOPFLT 14 /* fp coprocessor operand fetch fault */
+#define T_TSSFLT 15 /* invalid tss fault */
+#define T_SEGNPFLT 16 /* segment not present fault */
+#define T_STKFLT 17 /* stack fault */
+#define T_MCA 18 /* machine check */
#define T_XMM 19 /* SSE FP exception */
#define T_RESERVED 20 /* reserved fault base */
/* Trap's coming from user mode */
-#define T_USER 0x100
+#define T_USER 0x100
/* Flags kludged into the trap code */
