Cleaned up #includes.
Ifdefed conditionally used includes. Finished changing indentation of per-statement comments to 40.
This commit is contained in:
parent
521166c5b2
commit
ba21341dfd
@ -30,22 +30,26 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: exception.s,v 1.44 1997/09/07 22:03:37 fsmp Exp $
|
* $Id: exception.s,v 1.45 1997/10/10 09:43:57 peter Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "npx.h"
|
||||||
#include "npx.h" /* NNPX */
|
|
||||||
#include "opt_vm86.h"
|
#include "opt_vm86.h"
|
||||||
|
|
||||||
#include "assym.s" /* system defines */
|
|
||||||
#include <machine/ipl.h> /* SWI_AST_MASK ... */
|
|
||||||
#include <machine/psl.h> /* PSL_I */
|
|
||||||
#include <machine/trap.h> /* trap codes */
|
|
||||||
#include <machine/asmacros.h>
|
#include <machine/asmacros.h>
|
||||||
|
#include <machine/ipl.h>
|
||||||
|
#include <machine/lock.h>
|
||||||
|
#ifdef VM86
|
||||||
|
#include <machine/psl.h>
|
||||||
|
#endif
|
||||||
|
#include <machine/trap.h>
|
||||||
#ifdef SMP
|
#ifdef SMP
|
||||||
#include <machine/smptests.h> /** CPL_AND_CML, REAL_ */
|
#include <machine/smptests.h> /** CPL_AND_CML, REAL_ */
|
||||||
#else
|
#endif
|
||||||
|
|
||||||
|
#include "assym.s"
|
||||||
|
|
||||||
|
#ifndef SMP
|
||||||
#define ECPL_LOCK /* make these nops */
|
#define ECPL_LOCK /* make these nops */
|
||||||
#define ECPL_UNLOCK
|
#define ECPL_UNLOCK
|
||||||
#define ICPL_LOCK
|
#define ICPL_LOCK
|
||||||
@ -57,9 +61,6 @@
|
|||||||
#define AVCPL_UNLOCK
|
#define AVCPL_UNLOCK
|
||||||
#endif /* SMP */
|
#endif /* SMP */
|
||||||
|
|
||||||
#include <machine/lock.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define KCSEL 0x08 /* kernel code selector */
|
#define KCSEL 0x08 /* kernel code selector */
|
||||||
#define KDSEL 0x10 /* kernel data selector */
|
#define KDSEL 0x10 /* kernel data selector */
|
||||||
#define SEL_RPL_MASK 0x0003
|
#define SEL_RPL_MASK 0x0003
|
||||||
|
@ -30,22 +30,26 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: exception.s,v 1.44 1997/09/07 22:03:37 fsmp Exp $
|
* $Id: exception.s,v 1.45 1997/10/10 09:43:57 peter Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "npx.h"
|
||||||
#include "npx.h" /* NNPX */
|
|
||||||
#include "opt_vm86.h"
|
#include "opt_vm86.h"
|
||||||
|
|
||||||
#include "assym.s" /* system defines */
|
|
||||||
#include <machine/ipl.h> /* SWI_AST_MASK ... */
|
|
||||||
#include <machine/psl.h> /* PSL_I */
|
|
||||||
#include <machine/trap.h> /* trap codes */
|
|
||||||
#include <machine/asmacros.h>
|
#include <machine/asmacros.h>
|
||||||
|
#include <machine/ipl.h>
|
||||||
|
#include <machine/lock.h>
|
||||||
|
#ifdef VM86
|
||||||
|
#include <machine/psl.h>
|
||||||
|
#endif
|
||||||
|
#include <machine/trap.h>
|
||||||
#ifdef SMP
|
#ifdef SMP
|
||||||
#include <machine/smptests.h> /** CPL_AND_CML, REAL_ */
|
#include <machine/smptests.h> /** CPL_AND_CML, REAL_ */
|
||||||
#else
|
#endif
|
||||||
|
|
||||||
|
#include "assym.s"
|
||||||
|
|
||||||
|
#ifndef SMP
|
||||||
#define ECPL_LOCK /* make these nops */
|
#define ECPL_LOCK /* make these nops */
|
||||||
#define ECPL_UNLOCK
|
#define ECPL_UNLOCK
|
||||||
#define ICPL_LOCK
|
#define ICPL_LOCK
|
||||||
@ -57,9 +61,6 @@
|
|||||||
#define AVCPL_UNLOCK
|
#define AVCPL_UNLOCK
|
||||||
#endif /* SMP */
|
#endif /* SMP */
|
||||||
|
|
||||||
#include <machine/lock.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define KCSEL 0x08 /* kernel code selector */
|
#define KCSEL 0x08 /* kernel code selector */
|
||||||
#define KDSEL 0x10 /* kernel data selector */
|
#define KDSEL 0x10 /* kernel data selector */
|
||||||
#define SEL_RPL_MASK 0x0003
|
#define SEL_RPL_MASK 0x0003
|
||||||
|
@ -30,22 +30,26 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: exception.s,v 1.44 1997/09/07 22:03:37 fsmp Exp $
|
* $Id: exception.s,v 1.45 1997/10/10 09:43:57 peter Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "npx.h"
|
||||||
#include "npx.h" /* NNPX */
|
|
||||||
#include "opt_vm86.h"
|
#include "opt_vm86.h"
|
||||||
|
|
||||||
#include "assym.s" /* system defines */
|
|
||||||
#include <machine/ipl.h> /* SWI_AST_MASK ... */
|
|
||||||
#include <machine/psl.h> /* PSL_I */
|
|
||||||
#include <machine/trap.h> /* trap codes */
|
|
||||||
#include <machine/asmacros.h>
|
#include <machine/asmacros.h>
|
||||||
|
#include <machine/ipl.h>
|
||||||
|
#include <machine/lock.h>
|
||||||
|
#ifdef VM86
|
||||||
|
#include <machine/psl.h>
|
||||||
|
#endif
|
||||||
|
#include <machine/trap.h>
|
||||||
#ifdef SMP
|
#ifdef SMP
|
||||||
#include <machine/smptests.h> /** CPL_AND_CML, REAL_ */
|
#include <machine/smptests.h> /** CPL_AND_CML, REAL_ */
|
||||||
#else
|
#endif
|
||||||
|
|
||||||
|
#include "assym.s"
|
||||||
|
|
||||||
|
#ifndef SMP
|
||||||
#define ECPL_LOCK /* make these nops */
|
#define ECPL_LOCK /* make these nops */
|
||||||
#define ECPL_UNLOCK
|
#define ECPL_UNLOCK
|
||||||
#define ICPL_LOCK
|
#define ICPL_LOCK
|
||||||
@ -57,9 +61,6 @@
|
|||||||
#define AVCPL_UNLOCK
|
#define AVCPL_UNLOCK
|
||||||
#endif /* SMP */
|
#endif /* SMP */
|
||||||
|
|
||||||
#include <machine/lock.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define KCSEL 0x08 /* kernel code selector */
|
#define KCSEL 0x08 /* kernel code selector */
|
||||||
#define KDSEL 0x10 /* kernel data selector */
|
#define KDSEL 0x10 /* kernel data selector */
|
||||||
#define SEL_RPL_MASK 0x0003
|
#define SEL_RPL_MASK 0x0003
|
||||||
|
Loading…
x
Reference in New Issue
Block a user