PERFORCE change 29954 for review

[Juli Mallett]

http://perforce.freebsd.org/chv.cgi?CH=29954

Change 29954 by jmallett at jmallett_dalek on 2003/04/28 11:10:23

	Add header for register number definitions from NBSD.

Affected files ...

.. //depot/projects/mips/sys/mips/include/frame.h#3 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/frame.h#3 (text+ko) ====

@@ -28,17 +28,55 @@
 #ifndef	_MACHINE_FRAME_H_
 #define	_MACHINE_FRAME_H_
 
-struct frame {
-	__register_t	fr_regs[38];
+#include <machine/regnum.h>
+
+/*
+ * trapframe argument passed to trap()
+ */
+
+#define	TF_AST		0
+#define	TF_V0		1
+#define	TF_V1		2
+#define	TF_A0		3
+#define	TF_A1		4
+#define	TF_A2		5
+#define	TF_A3		6
+#define	TF_T0		7
+#define	TF_T1		8
+#define	TF_T2		9
+#define	TF_T3		10
+
+#define	TF_A4		11
+#define	TF_A5		12
+#define	TF_A6		13
+#define	TF_A7		14
+
+#define	TF_TA0		11
+#define	TF_TA1		12
+#define	TF_TA2		13
+#define	TF_TA3		14
+
+#define	TF_T8		15
+#define	TF_T9		16
+
+#define	TF_RA		17
+#define	TF_SR		18
+#define	TF_MULLO	19
+#define	TF_MULHI	20
+#define	TF_EPC		21		/* may be changed by trap() call */
+
+#define	TF_NREGS	22
+
+struct trapframe {
+	__register_t	tf_regs[TF_NREGS];
+	u_int32_t	tf_ppl;		/* previous priority level */
+	int32_t		tf_pad;		/* for 8 byte aligned */
 };
 
-struct trapframe {
-	__register_t	tf_regs[17];	/* 17 Saved GP registers. */
-	__register_t	tf_ra;		/* Return address. */
-	__register_t	tf_sr;
-	__register_t	tf_mullo;	/* Low-bits of multiply register. */
-	__register_t	tf_mulhi;	/* High-bits of multiply register. */
-	__register_t	tf_epc;		/* Exception program counter. */
+struct frame {
+	__register_t	f_regs[38];
+	u_int32_t	f_ppl;		/* previous priority level */
+	int32_t		f_pad;		/* for 8 byte aligned */
 };
 
 #endif /* !_MACHINE_FRAME_H_ */