From b414f54fd42be58e1adba4aaf196dca83606a2a9 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Fri, 6 Jan 2017 12:33:59 -0800 Subject: [PATCH] PDP11, VAX780: Moved CR11/CD11 from BR4 to BR6 --- PDP11/pdp11_defs.h | 18 ++++++++++-------- VAX/vax780_defs.h | 10 ++++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/PDP11/pdp11_defs.h b/PDP11/pdp11_defs.h index c67af429..79f4db6d 100644 --- a/PDP11/pdp11_defs.h +++ b/PDP11/pdp11_defs.h @@ -1,6 +1,6 @@ /* pdp11_defs.h: PDP-11 simulator definitions - Copyright (c) 1993-2016, Robert M Supnik + Copyright (c) 1993-2017, Robert M Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -26,6 +26,7 @@ The author gratefully acknowledges the help of Max Burnet, Megan Gentry, and John Wilson in resolving questions about the PDP-11 + 06-Jan-17 RMS Moved CR11/CD11 to BR6 (Mark Pizzolato) 10-Mar-16 RMS Added UC15 support 30-Dec-15 RMS Added NOBVT option 23-Oct-13 RMS Added cpu_set_boot prototype @@ -35,14 +36,14 @@ 22-May-10 RMS Added check for 64b definitions 19-Nov-08 RMS Moved I/O support routines to I/O library 16-May-08 RMS Added KE11A, DC11 support - 02-Feb-08 RMS Fixed DMA memory address limit test (found by John Dundas) - 25-Jan-08 RMS Added RC11, KG11A support (from John Dundas) + 02-Feb-08 RMS Fixed DMA memory address limit test (John Dundas) + 25-Jan-08 RMS Added RC11, KG11A support (John Dundas) 16-Dec-06 RMS Added TA11 support 29-Oct-06 RMS Added clock coscheduling 06-Jul-06 RMS Added multiple KL11/DL11 support 26-Jun-06 RMS Added RF11 support - 24-May-06 RMS Added 11/44 DR support (from CIS diagnostic) - 17-May-06 RMS Added CR11/CD11 support (from John Dundas) + 24-May-06 RMS Added 11/44 DR support (CIS diagnostic) + 17-May-06 RMS Added CR11/CD11 support (John Dundas) 30-Sep-04 RMS Added Massbus support Removed Map_Addr prototype Removed map argument from Unibus routines @@ -52,7 +53,7 @@ 22-Dec-03 RMS Added second DEUNA/DELUA support 18-Oct-03 RMS Added DECtape off reel message 19-May-03 RMS Revised for new conditional compilation - 05-Apr-03 RMS Fixed bug in MMR1 update (found by Tim Stark) + 05-Apr-03 RMS Fixed bug in MMR1 update (Tim Stark) 28-Feb-03 RMS Added TM logging support 19-Jan-03 RMS Changed mode definitions for Apple Dev Kit conflict 11-Nov-02 RMS Changed log definitions to be VAX compatible @@ -654,6 +655,7 @@ typedef struct pdp_dib DIB; #define INT_V_PCLK 2 #define INT_V_DTA 3 #define INT_V_TA 4 +#define INT_V_CR 5 #define INT_V_PIR5 0 /* BR5 */ #define INT_V_RK 1 @@ -684,7 +686,7 @@ typedef struct pdp_dib DIB; #define INT_V_LPT 5 #define INT_V_VHRX 6 #define INT_V_VHTX 7 -#define INT_V_CR 8 +// #define XXX 8 /* former CR */ #define INT_V_DLI 9 #define INT_V_DLO 10 #define INT_V_DCI 11 @@ -751,6 +753,7 @@ typedef struct pdp_dib DIB; #define IPL_PCLK 6 #define IPL_DTA 6 #define IPL_TA 6 +#define IPL_CR 6 #define IPL_RK 5 #define IPL_RL 5 #define IPL_RX 5 @@ -777,7 +780,6 @@ typedef struct pdp_dib DIB; #define IPL_LPT 4 #define IPL_VHRX 4 #define IPL_VHTX 4 -#define IPL_CR 4 #define IPL_DLI 4 #define IPL_DLO 4 #define IPL_DCI 4 diff --git a/VAX/vax780_defs.h b/VAX/vax780_defs.h index 62abae1b..f549c916 100644 --- a/VAX/vax780_defs.h +++ b/VAX/vax780_defs.h @@ -1,6 +1,6 @@ /* vax780_defs.h: VAX 780 model-specific definitions file - Copyright (c) 2004-2015, Robert M Supnik + Copyright (c) 2004-2017, Robert M Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -23,6 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Robert M Supnik. + 06-Jan-17 RMS Moved CR to BR6 (Mark Pizzolato) 29-Mar-15 RMS Added model specific IPR max 16-Dec-14 RMS Removed TQ boot code (780 VMB doesn't support tape boot) 05-Sep-14 RMS Fixed SBR test (found by Mark Pizzolato) @@ -320,6 +321,8 @@ typedef struct { /* Interrupt assignments; within each level, priority is right to left */ +#define INT_V_CR 0 /* BR6 */ + #define INT_V_DZRX 0 /* BR5 */ #define INT_V_DZTX 1 #define INT_V_HK 2 @@ -333,8 +336,8 @@ typedef struct { #define INT_V_LPT 0 /* BR4 */ #define INT_V_PTR 1 #define INT_V_PTP 2 -#define INT_V_CR 3 +#define INT_CR (1u << INT_V_CR) #define INT_DZRX (1u << INT_V_DZRX) #define INT_DZTX (1u << INT_V_DZTX) #define INT_HK (1u << INT_V_HK) @@ -347,8 +350,8 @@ typedef struct { #define INT_LPT (1u << INT_V_LPT) #define INT_PTR (1u << INT_V_PTR) #define INT_PTP (1u << INT_V_PTP) -#define INT_CR (1u << INT_V_CR) +#define IPL_CR (0x16 - IPL_HMIN) #define IPL_DZRX (0x15 - IPL_HMIN) #define IPL_DZTX (0x15 - IPL_HMIN) #define IPL_HK (0x15 - IPL_HMIN) @@ -361,7 +364,6 @@ typedef struct { #define IPL_LPT (0x14 - IPL_HMIN) #define IPL_PTR (0x14 - IPL_HMIN) #define IPL_PTP (0x14 - IPL_HMIN) -#define IPL_CR (0x14 - IPL_HMIN) /* Device vectors */