* Re-apply changes from rev 1.6 of sys/arch/mips/include/reg.h accidentally

undone by rev 1.7:
  >redo pmax/include/reg.h
  >so that the definitions needed by locore.S are in a separate file,
  >pmax/include/regnum.h.

* Add explicit `#include <mips/regnum.h>'  where symbolic offsets
  into a mips trapframe or struct reg are used..
This commit is contained in:
jonathan 1997-07-19 09:54:23 +00:00
parent d2bdd55b3a
commit ccf3801c92
7 changed files with 18 additions and 53 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: db_machdep.h,v 1.2 1997/07/07 03:57:55 jonathan Exp $ */
/* $NetBSD: db_machdep.h,v 1.3 1997/07/19 09:54:25 jonathan Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@ -36,7 +36,8 @@
#include <vm/vm_param.h> /* XXX boolean_t */
#include <mips/trap.h> /* T_BREAK */
#include <mips/reg.h> /* register names */
#include <mips/reg.h> /* register state */
#include <mips/regnum.h> /* symbolic register indices */
#include <mips/proc.h> /* register state */

View File

@ -1,4 +1,4 @@
/* $NetBSD: reg.h,v 1.7 1997/06/15 17:37:45 mhitch Exp $ */
/* $NetBSD: reg.h,v 1.8 1997/07/19 09:54:23 jonathan Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -53,44 +53,4 @@ struct fpreg {
int r_regs[33];
};
#define ZERO 0
#define AST 1
#define V0 2
#define V1 3
#define A0 4
#define A1 5
#define A2 6
#define A3 7
#define T0 8
#define T1 9
#define T2 10
#define T3 11
#define T4 12
#define T5 13
#define T6 14
#define T7 15
#define S0 16
#define S1 17
#define S2 18
#define S3 19
#define S4 20
#define S5 21
#define S6 22
#define S7 23
#define T8 24
#define T9 25
#define K0 26
#define K1 27
#define GP 28
#define SP 29
#define S8 30
#define RA 31
#define SR 32
#define PS SR /* alias for SR */
#define MULLO 33
#define MULHI 34
#define BADVADDR 35
#define CAUSE 36
#define PC 37
#endif /*_MACHINE_REG_H_*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu_exec.c,v 1.12 1996/11/11 20:23:39 jonathan Exp $ */
/* $NetBSD: cpu_exec.c,v 1.13 1997/07/19 09:54:33 jonathan Exp $ */
/*
* Copyright (c) 1992, 1993
@ -53,6 +53,7 @@
#include <machine/bsd-aout.h>
#endif
#include <machine/reg.h>
#include <mips/regnum.h> /* symbolic register indices */
#include <machine/elf.h>
/*XXX*/

View File

@ -1,4 +1,4 @@
/* $NetBSD: minidebug.c,v 1.2 1997/06/30 14:42:34 jonathan Exp $ */
/* $NetBSD: minidebug.c,v 1.3 1997/07/19 09:54:38 jonathan Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -52,6 +52,7 @@
#include <machine/trap.h>
#include <machine/reg.h>
#include <mips/regnum.h> /* symbolic register indices */
#include <machine/cpu.h>
#include <machine/pte.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: mips_machdep.c,v 1.17 1997/07/01 09:32:13 jonathan Exp $ */
/* $NetBSD: mips_machdep.c,v 1.18 1997/07/19 09:54:37 jonathan Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@ -25,7 +25,7 @@
#include <sys/user.h>
#include <mips/cpu.h> /* declaration of of cpu_id */
#include <mips/reg.h> /* register names */
#include <mips/regnum.h> /* symbolic register indices */
#include <mips/locore.h>
#include <mips/vmparam.h> /* USRSTACK */
#include <mips/psl.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: process_machdep.c,v 1.6 1997/05/25 09:56:45 jonathan Exp $ */
/* $NetBSD: process_machdep.c,v 1.7 1997/07/19 09:54:35 jonathan Exp $ */
/*
* Copyright (c) 1994 Adam Glass
@ -71,6 +71,7 @@
#include <sys/user.h>
#include <sys/vnode.h>
#include <sys/ptrace.h>
#include <mips/regnum.h> /* symbolic register indices */
#include <machine/psl.h>
#include <machine/reg.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.69 1997/07/07 03:54:38 jonathan Exp $ */
/* $NetBSD: trap.c,v 1.70 1997/07/19 09:54:29 jonathan Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -62,11 +62,12 @@
#include <mips/locore.h>
#include <mips/mips_opcode.h>
#include <machine/trap.h>
#include <machine/psl.h>
#include <machine/reg.h>
#include <machine/cpu.h>
#include <machine/pte.h>
#include <mips/trap.h>
#include <machine/psl.h>
#include <mips/reg.h>
#include <mips/regnum.h> /* symbolic register indices */
#include <mips/pte.h>
#include <vm/vm.h>
#include <vm/vm_kern.h>