merge latest Utah hp300 code including 68040 support

[unix-history] / usr / src / sys / hp300 / include / frame.h

diff --git a/usr/src/sys/hp300/include/frame.h b/usr/src/sys/hp300/include/frame.h
index 45a0e47..53d5529 100644 (file)
--- a/usr/src/sys/hp300/include/frame.h
+++ b/usr/src/sys/hp300/include/frame.h
@@ -9,9 +9,9 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- * from: Utah $Hdr: frame.h 1.1 90/07/09$
+ * from: Utah $Hdr: frame.h 1.7 91/03/25$

  *
  *

- *     @(#)frame.h     7.2 (Berkeley) %G%
+ *     @(#)frame.h     7.3 (Berkeley) %G%

  */
 
 struct frame {
  */
 
 struct frame {


@@ -26,6 +26,22 @@ struct frame {
                        u_int   f_iaddr;
                } F_fmt2;
 
                        u_int   f_iaddr;
                } F_fmt2;
 

+               struct fmt3 {
+                       u_int   f_ea;
+               } F_fmt3;
+
+               struct fmt7 {
+                       u_int   f_ea;
+                       u_short f_ssw;
+                       u_short f_wb3s, f_wb2s, f_wb1s;
+                       u_int   f_fa;
+                       u_int   f_wb3a, f_wb3d;
+                       u_int   f_wb2a, f_wb2d;
+                       u_int   f_wb1a, f_wb1d;
+#define                                f_pd0 f_wb1d
+                       u_int   f_pd1, f_pd2, f_pd3;
+               } F_fmt7;
+

                struct fmt9 {
                        u_int   f_iaddr;
                        u_short f_iregs[4];
                struct fmt9 {
                        u_int   f_iaddr;
                        u_short f_iregs[4];


@@ -61,6 +77,9 @@ struct frame {
 };
 
 #define        f_fmt2          F_u.F_fmt2
 };
 
 #define        f_fmt2          F_u.F_fmt2

+#define        f_fmt3          F_u.F_fmt3
+#define        f_fmt7          F_u.F_fmt7
+#define        f_fmt9          F_u.F_fmt9

 #define        f_fmtA          F_u.F_fmtA
 #define        f_fmtB          F_u.F_fmtB
 
 #define        f_fmtA          F_u.F_fmtA
 #define        f_fmtB          F_u.F_fmtB
 


@@ -71,6 +90,8 @@ struct frame {
 #define        FMT0            0x0
 #define        FMT1            0x1
 #define        FMT2            0x2
 #define        FMT0            0x0
 #define        FMT1            0x1
 #define        FMT2            0x2

+#define        FMT3            0x3
+#define        FMT7            0x7

 #define        FMT9            0x9
 #define        FMTA            0xA
 #define        FMTB            0xB
 #define        FMT9            0x9
 #define        FMTA            0xA
 #define        FMTB            0xB


@@ -79,6 +100,8 @@ struct frame {
 #define        FMT0SIZE        0
 #define        FMT1SIZE        0
 #define        FMT2SIZE        sizeof(struct fmt2)
 #define        FMT0SIZE        0
 #define        FMT1SIZE        0
 #define        FMT2SIZE        sizeof(struct fmt2)

+#define        FMT3SIZE        sizeof(struct fmt3)
+#define        FMT7SIZE        sizeof(struct fmt7)

 #define        FMT9SIZE        sizeof(struct fmt9)
 #define        FMTASIZE        sizeof(struct fmtA)
 #define        FMTBSIZE        sizeof(struct fmtB)
 #define        FMT9SIZE        sizeof(struct fmt9)
 #define        FMTASIZE        sizeof(struct fmtA)
 #define        FMTBSIZE        sizeof(struct fmtB)


@@ -87,6 +110,7 @@ struct frame {
 #define        V_ADDRERR       0x00C
 #define        V_TRAP1         0x084
 
 #define        V_ADDRERR       0x00C
 #define        V_TRAP1         0x084
 

+/* 68020/68030 SSW bits */

 #define        SSW_RC          0x2000
 #define        SSW_RB          0x1000
 #define        SSW_DF          0x0100
 #define        SSW_RC          0x2000
 #define        SSW_RB          0x1000
 #define        SSW_DF          0x0100


@@ -94,6 +118,31 @@ struct frame {
 #define        SSW_RW          0x0040
 #define        SSW_FCMASK      0x0007
 
 #define        SSW_RW          0x0040
 #define        SSW_FCMASK      0x0007
 

+/* 68040 SSW bits */
+#define        SSW4_CP         0x8000
+#define        SSW4_CU         0x4000
+#define        SSW4_CT         0x2000
+#define        SSW4_CM         0x1000
+#define        SSW4_MA         0x0800
+#define        SSW4_ATC        0x0400
+#define        SSW4_LK         0x0200
+#define        SSW4_RW         0x0100
+#define SSW4_WBSV      0x0080  /* really in WB status, not SSW */
+#define        SSW4_SZMASK     0x0060
+#define        SSW4_SZLW       0x0000
+#define        SSW4_SZB        0x0020
+#define        SSW4_SZW        0x0040
+#define        SSW4_SZLN       0x0060
+#define        SSW4_TTMASK     0x0018
+#define        SSW4_TTNOR      0x0000
+#define        SSW4_TTM16      0x0008
+#define        SSW4_TMMASK     0x0007
+#define        SSW4_TMDCP      0x0000
+#define        SSW4_TMUD       0x0001
+#define        SSW4_TMUC       0x0002
+#define        SSW4_TMKD       0x0005
+#define        SSW4_TMKC       0x0006
+

 struct fpframe {
        union FPF_u1 {
                u_int   FPF_null;
 struct fpframe {
        union FPF_u1 {
                u_int   FPF_null;


@@ -116,6 +165,10 @@ struct fpframe {
                struct fpbusy {
                        u_int   fpf_iregs[53];
                } FPF_busy;
                struct fpbusy {
                        u_int   fpf_iregs[53];
                } FPF_busy;

+
+               struct fpunimp {
+                       u_int   fpf_state[10];
+               } FPF_unimp;

        } FPF_u2;
        u_int   fpf_regs[8*3];
        u_int   fpf_fpcr;
        } FPF_u2;
        u_int   fpf_regs[8*3];
        u_int   fpf_fpcr;


@@ -129,3 +182,4 @@ struct fpframe {
 #define fpf_res1       FPF_u1.FPF_nonnull.FPF_res1
 #define fpf_idle       FPF_u2.FPF_idle
 #define fpf_busy       FPF_u2.FPF_busy
 #define fpf_res1       FPF_u1.FPF_nonnull.FPF_res1
 #define fpf_idle       FPF_u2.FPF_idle
 #define fpf_busy       FPF_u2.FPF_busy

+#define fpf_unimp      FPF_u2.FPF_unimp