Thu Sep 18 21:09:18 2008 UTC ()
Remove PSL_MBO (the bits that Must Be One) from PSL_USER - which are the
bits that the 'user' can change.
Who knows what the effect of a user signal handler (which I think might have
access to the bits) changing these bits might be!


(dsl)
diff -r1.5 -r1.6 src/sys/arch/x86/include/psl.h
cvs diff -r1.5 -r1.6 src/sys/arch/x86/include/psl.h (switch to unified diff)

--- src/sys/arch/x86/include/psl.h 2008/09/18 15:57:04 1.5
+++ src/sys/arch/x86/include/psl.h 2008/09/18 21:09:18 1.6
@@ -1,85 +1,85 @@ @@ -1,85 +1,85 @@
1/* $NetBSD: psl.h,v 1.5 2008/09/18 15:57:04 christos Exp $ */ 1/* $NetBSD: psl.h,v 1.6 2008/09/18 21:09:18 dsl Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1990 The Regents of the University of California. 4 * Copyright (c) 1990 The Regents of the University of California.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * William Jolitz. 8 * William Jolitz.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the 16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 3. Neither the name of the University nor the names of its contributors 18 * 3. Neither the name of the University nor the names of its contributors
19 * may be used to endorse or promote products derived from this software 19 * may be used to endorse or promote products derived from this software
20 * without specific prior written permission. 20 * without specific prior written permission.
21 * 21 *
22 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 22 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
23 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 23 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 24 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 25 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 * 33 *
34 * @(#)psl.h 5.2 (Berkeley) 1/18/91 34 * @(#)psl.h 5.2 (Berkeley) 1/18/91
35 */ 35 */
36 36
37#ifndef _X86_PSL_H_ 37#ifndef _X86_PSL_H_
38#define _X86_PSL_H_ 38#define _X86_PSL_H_
39 39
40/* 40/*
41 * 386 processor status longword. 41 * 386 processor status longword.
42 */ 42 */
43#define PSL_C 0x00000001 /* carry flag */ 43#define PSL_C 0x00000001 /* carry flag */
44#define PSL_PF 0x00000004 /* parity flag */ 44#define PSL_PF 0x00000004 /* parity flag */
45#define PSL_AF 0x00000010 /* auxiliary carry flag */ 45#define PSL_AF 0x00000010 /* auxiliary carry flag */
46#define PSL_Z 0x00000040 /* zero flag */ 46#define PSL_Z 0x00000040 /* zero flag */
47#define PSL_N 0x00000080 /* sign flag */ 47#define PSL_N 0x00000080 /* sign flag */
48#define PSL_T 0x00000100 /* trap flag */ 48#define PSL_T 0x00000100 /* trap flag */
49#define PSL_I 0x00000200 /* interrupt enable flag */ 49#define PSL_I 0x00000200 /* interrupt enable flag */
50#define PSL_D 0x00000400 /* direction flag */ 50#define PSL_D 0x00000400 /* direction flag */
51#define PSL_V 0x00000800 /* overflow flag */ 51#define PSL_V 0x00000800 /* overflow flag */
52#define PSL_IOPL 0x00003000 /* i/o privilege level */ 52#define PSL_IOPL 0x00003000 /* i/o privilege level */
53#define PSL_NT 0x00004000 /* nested task */ 53#define PSL_NT 0x00004000 /* nested task */
54#define PSL_RF 0x00010000 /* resume flag */ 54#define PSL_RF 0x00010000 /* resume flag */
55#define PSL_VM 0x00020000 /* virtual 8086 mode */ 55#define PSL_VM 0x00020000 /* virtual 8086 mode */
56#define PSL_AC 0x00040000 /* alignment check flag */ 56#define PSL_AC 0x00040000 /* alignment check flag */
57#define PSL_VIF 0x00080000 /* virtual interrupt enable flag */ 57#define PSL_VIF 0x00080000 /* virtual interrupt enable flag */
58#define PSL_VIP 0x00100000 /* virtual interrupt pending flag */ 58#define PSL_VIP 0x00100000 /* virtual interrupt pending flag */
59#define PSL_ID 0x00200000 /* identification flag */ 59#define PSL_ID 0x00200000 /* identification flag */
60 60
61#define PSL_MBO 0x00000002 /* must be one bits */ 61#define PSL_MBO 0x00000002 /* must be one bits */
62#define PSL_MBZ 0xffc08028 /* must be zero bits */ 62#define PSL_MBZ 0xffc08028 /* must be zero bits */
63 63
64#define PSL_USERSET (PSL_MBO | PSL_I) 64#define PSL_USERSET (PSL_MBO | PSL_I)
65#if defined(_KERNEL_OPT) 65#if defined(_KERNEL_OPT)
66#include "opt_vm86.h" 66#include "opt_vm86.h"
67#endif 67#endif
68#ifdef VM86 68#ifdef VM86
69#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VIF | PSL_VIP) 69#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VIF | PSL_VIP)
70#else 70#else
71#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VM | PSL_VIF | PSL_VIP) 71#define PSL_USERSTATIC (PSL_MBO | PSL_MBZ | PSL_I | PSL_IOPL | PSL_NT | PSL_VM | PSL_VIF | PSL_VIP)
72#endif 72#endif
73#define PSL_USER (PSL_C | PSL_MBO | PSL_PF | PSL_AF | PSL_Z | PSL_N | \ 73#define PSL_USER (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | \
74 PSL_T | PSL_V | PSL_D) 74 PSL_T | PSL_V | PSL_D)
75#define PSL_CLEARSIG (PSL_T | PSL_VM | PSL_AC | PSL_D) 75#define PSL_CLEARSIG (PSL_T | PSL_VM | PSL_AC | PSL_D)
76 76
77 77
78/* 78/*
79 * ??? 79 * ???
80 */ 80 */
81#ifdef _KERNEL 81#ifdef _KERNEL
82#include <machine/intr.h> 82#include <machine/intr.h>
83#endif 83#endif
84 84
85#endif /* !_X86_PSL_H_ */ 85#endif /* !_X86_PSL_H_ */