ALL: Merge with Supnik-Current
This commit is contained in:
parent
3b8c318b17
commit
230e588b5d
10 changed files with 9 additions and 14 deletions
|
@ -296,8 +296,6 @@ int32 hst_p = 0; /* history pointer */
|
|||
int32 hst_lnt = 0; /* history length */
|
||||
InstHistory *hst = NULL; /* instruction history */
|
||||
|
||||
extern DEVICE *sim_devices[];
|
||||
|
||||
t_bool devtab_init (void);
|
||||
int32 dmaio (int32 inst, int32 fnc, int32 dat, int32 dev);
|
||||
int32 undio (int32 inst, int32 fnc, int32 dat, int32 dev);
|
||||
|
|
|
@ -258,7 +258,7 @@ struct rqpkt {
|
|||
RD52 17 8 512 8 1 4*8 60480
|
||||
RD32 17 6 820 6 1 4*8 83204
|
||||
x RD33 17 7 1170 ? ? ? 138565
|
||||
RD53 17 7 1024 7 1 5*8 138672
|
||||
RD53 17 8 1024 8 1 5*8 138672
|
||||
RD54 17 15 1225 15 1 7*8 311200
|
||||
|
||||
The simulator also supports larger drives that only existed
|
||||
|
|
|
@ -339,7 +339,6 @@ typedef struct {
|
|||
#define BOOT_RL 2 /* for VMB */
|
||||
#define BOOT_RB 3
|
||||
#define BOOT_UDA 17
|
||||
#define BOOT_TK 18
|
||||
#define BOOT_TD 64
|
||||
|
||||
/* Function prototypes for I/O */
|
||||
|
|
|
@ -63,7 +63,6 @@ static struct boot_dev boot_tab[] = {
|
|||
{ "RQB", BOOT_UDA, 1 << 24 },
|
||||
{ "RQC", BOOT_UDA, 1 << 24 },
|
||||
{ "RQD", BOOT_UDA, 1 << 24 },
|
||||
{ "TQ", BOOT_TK, 1 << 24 },
|
||||
{ "TD", BOOT_TD, 0 },
|
||||
{ "RB", BOOT_RB, 0 },
|
||||
{ NULL }
|
||||
|
|
|
@ -84,7 +84,6 @@ static struct boot_dev boot_tab[] = {
|
|||
{ "RQB", BOOT_UDA, 1 << 24 },
|
||||
{ "RQC", BOOT_UDA, 1 << 24 },
|
||||
{ "RQD", BOOT_UDA, 1 << 24 },
|
||||
{ "TQ", BOOT_TK, 1 << 24 },
|
||||
{ "TD", BOOT_TD, 0 },
|
||||
{ NULL }
|
||||
};
|
||||
|
|
|
@ -384,7 +384,6 @@ typedef struct {
|
|||
#define BOOT_HK 1 /* for VMB */
|
||||
#define BOOT_RL 2
|
||||
#define BOOT_UDA 17
|
||||
#define BOOT_TK 18
|
||||
#define BOOT_CI 32
|
||||
#define BOOT_TD 64
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* vax780_defs.h: VAX 780 model-specific definitions file
|
||||
|
||||
Copyright (c) 2004-2013, Robert M Supnik
|
||||
Copyright (c) 2004-2015, 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,9 @@
|
|||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from Robert M Supnik.
|
||||
|
||||
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)
|
||||
29-Nov-13 RMS Added system-specific unaligned routines
|
||||
12-Dec-12 RMS Fixed IO base address for RQB, RQC, RQD
|
||||
05-Nov-11 RMS Added VEC_QMODE definition
|
||||
|
@ -398,7 +401,6 @@ typedef struct {
|
|||
#define BOOT_HK 1 /* for VMB */
|
||||
#define BOOT_RL 2
|
||||
#define BOOT_UDA 17
|
||||
#define BOOT_TK 18
|
||||
#define BOOT_CS 64
|
||||
|
||||
/* Function prototypes for I/O */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* vax780_sbi.c: VAX 11/780 SBI
|
||||
|
||||
Copyright (c) 2004-2011, Robert M Supnik
|
||||
Copyright (c) 2004-2015, 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"),
|
||||
|
@ -27,7 +27,9 @@
|
|||
|
||||
sbi bus controller
|
||||
|
||||
21-Mar-2011 RMS Added autoreboot capability (Mark Pizzalato)
|
||||
29-Mar-2015 RMS Added in-exception test to machine check
|
||||
16-Dec-2014 RMS Removed TQ boot entry (VMB doesn't support tape boot)
|
||||
21-Mar-2011 RMS Added autoreboot capability (Mark Pizzolato)
|
||||
04-Feb-2011 MP Added RQB, RQC, and RQD as bootable controllers
|
||||
31-May-2008 RMS Fixed machine_check calling sequence (Peter Schorn)
|
||||
03-May-2006 RMS Fixed writes to ACCS
|
||||
|
@ -122,7 +124,6 @@ static struct boot_dev boot_tab[] = {
|
|||
{ "RQB", BOOT_UDA, 1 << 24 },
|
||||
{ "RQC", BOOT_UDA, 1 << 24 },
|
||||
{ "RQD", BOOT_UDA, 1 << 24 },
|
||||
{ "TQ", BOOT_TK, 1 << 24 },
|
||||
{ "CS", BOOT_CS, 0 },
|
||||
{ NULL }
|
||||
};
|
||||
|
|
|
@ -103,7 +103,6 @@ static struct boot_dev boot_tab[] = {
|
|||
{ "RQB", BOOT_UDA, 1 << 24 },
|
||||
{ "RQC", BOOT_UDA, 1 << 24 },
|
||||
{ "RQD", BOOT_UDA, 1 << 24 },
|
||||
{ "TQ", BOOT_TK, 1 << 24 },
|
||||
{ "CS", BOOT_CS, 0 },
|
||||
{ NULL }
|
||||
};
|
||||
|
|
|
@ -431,7 +431,6 @@ typedef struct {
|
|||
#define BOOT_HK 1 /* for VMB */
|
||||
#define BOOT_RL 2
|
||||
#define BOOT_UDA 17
|
||||
#define BOOT_TK 18
|
||||
#define BOOT_CS 64
|
||||
|
||||
/* Function prototypes for I/O */
|
||||
|
|
Loading…
Add table
Reference in a new issue