From 7d432406b6cb426dc71d93a74166b4a8ba12b6a9 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sat, 4 Feb 2017 19:37:20 -0800 Subject: [PATCH] PDP11, PDP10, all VAX: General extern cleanup. Remove explicit redundant extern declarations in source files that are defined in processor include files. --- PDP10/pdp10_cpu.c | 8 -------- PDP10/pdp10_defs.h | 17 +++++++++++++++++ PDP10/pdp10_fe.c | 2 -- PDP10/pdp10_ksio.c | 5 ----- PDP10/pdp10_lp20.c | 2 -- PDP10/pdp10_mdfp.c | 1 - PDP10/pdp10_pag.c | 7 ------- PDP10/pdp10_rp.c | 3 --- PDP10/pdp10_sys.c | 2 -- PDP10/pdp10_tim.c | 7 ------- PDP10/pdp10_tu.c | 3 --- PDP10/pdp10_xtnd.c | 1 - PDP11/pdp11_cis.c | 1 - PDP11/pdp11_cpumod.c | 1 - PDP11/pdp11_cr.c | 3 --- PDP11/pdp11_dc.c | 1 - PDP11/pdp11_defs.h | 18 +++++++++++------- PDP11/pdp11_dl.c | 1 - PDP11/pdp11_dz.c | 3 --- PDP11/pdp11_hk.c | 4 ---- PDP11/pdp11_io.c | 2 -- PDP11/pdp11_io_lib.c | 1 - PDP11/pdp11_lp.c | 2 -- PDP11/pdp11_pclk.c | 2 -- PDP11/pdp11_pt.c | 3 --- PDP11/pdp11_rc.c | 1 - PDP11/pdp11_rf.c | 3 --- PDP11/pdp11_rh.c | 3 --- PDP11/pdp11_rk.c | 3 --- PDP11/pdp11_rl.c | 3 --- PDP11/pdp11_rp.c | 1 - PDP11/pdp11_rq.c | 4 ---- PDP11/pdp11_rs.c | 1 - PDP11/pdp11_rx.c | 3 --- PDP11/pdp11_ry.c | 4 ---- PDP11/pdp11_stddev.c | 3 --- PDP11/pdp11_sys.c | 1 - PDP11/pdp11_ta.c | 3 --- PDP11/pdp11_tc.c | 3 --- PDP11/pdp11_td.c | 5 +---- PDP11/pdp11_tm.c | 3 --- PDP11/pdp11_tq.c | 4 ---- PDP11/pdp11_ts.c | 4 ---- PDP11/pdp11_tu.c | 1 - PDP11/pdp11_vh.c | 3 --- PDP11/pdp11_vt.c | 2 -- PDP11/pdp11_xq.c | 1 - PDP11/pdp11_xq.h | 4 ---- PDP11/pdp11_xu.h | 3 --- VAX/vax630_defs.h | 1 - VAX/vax730_defs.h | 1 - VAX/vax730_uba.c | 2 -- VAX/vax750_defs.h | 1 - VAX/vax750_uba.c | 1 - VAX/vax780_defs.h | 1 - VAX/vax780_uba.c | 1 - VAX/vax860_defs.h | 1 - VAX/vax_defs.h | 5 +++++ VAX/vax_mmu.h | 2 +- VAX/vaxmod_defs.h | 1 - 60 files changed, 35 insertions(+), 148 deletions(-) diff --git a/PDP10/pdp10_cpu.c b/PDP10/pdp10_cpu.c index d6c82852..f63c2d40 100644 --- a/PDP10/pdp10_cpu.c +++ b/PDP10/pdp10_cpu.c @@ -254,14 +254,6 @@ void set_ac_display (d10 *acbase); extern t_stat build_dib_tab (void); extern t_stat show_iospace (FILE *st, UNIT *uptr, int32 val, CONST void *desc); -extern d10 Read (a10 ea, int32 prv); /* read, read check */ -extern d10 ReadM (a10 ea, int32 prv); /* read, write check */ -extern d10 ReadE (a10 ea); /* read, exec */ -extern d10 ReadP (a10 ea); /* read, physical */ -extern void Write (a10 ea, d10 val, int32 prv); /* write */ -extern void WriteE (a10 ea, d10 val); /* write, exec */ -extern void WriteP (a10 ea, d10 val); /* write, physical */ -extern t_bool AccViol (a10 ea, int32 prv, int32 mode); /* access check */ extern void set_dyn_ptrs (void); extern a10 conmap (a10 ea, int32 mode, int32 sw); extern void fe_intr (); diff --git a/PDP10/pdp10_defs.h b/PDP10/pdp10_defs.h index e6a86309..56bb4180 100644 --- a/PDP10/pdp10_defs.h +++ b/PDP10/pdp10_defs.h @@ -49,6 +49,7 @@ #endif #include "sim_defs.h" /* simulator defns */ +#include #if defined(USE_ADDR64) #error "PDP-10 does not support 64b addresses!" @@ -772,6 +773,15 @@ void uba_debug_dma_in (uint32 ba, a10 pa_start, a10 pa_end); void uba_debug_dma_out (uint32 ba, a10 pa_start, a10 pa_end); void uba_debug_dma_nxm (const char *msg, a10 pa10, uint32 ba, int32 bc); +extern d10 Read (a10 ea, int32 prv); /* read, read check */ +extern d10 ReadM (a10 ea, int32 prv); /* read, write check */ +extern d10 ReadE (a10 ea); /* read, exec */ +extern d10 ReadP (a10 ea); /* read, physical */ +extern void Write (a10 ea, d10 val, int32 prv); /* write */ +extern void WriteE (a10 ea, d10 val); /* write, exec */ +extern void WriteP (a10 ea, d10 val); /* write, physical */ +extern t_bool AccViol (a10 ea, int32 prv, int32 mode); /* access check */ + t_stat set_addr (UNIT *uptr, int32 val, CONST char *cptr, void *desc); t_stat set_addr_flt (UNIT *uptr, int32 val, CONST char *cptr, void *desc); t_stat show_addr (FILE *st, UNIT *uptr, int32 val, CONST void *desc); @@ -784,5 +794,12 @@ extern d10 *ac_cur; /* current AC block */ extern int32 flags; /* flags */ extern const int32 pi_l2bit[8]; extern const d10 bytemask[64]; +extern int32 int_req; +extern d10 *M; /* memory */ +extern a10 pager_PC; /* pager: saved PC */ +extern d10 pager_word; /* pager: error word */ +extern UNIT cpu_unit; +extern int32 apr_flg; +extern jmp_buf save_env; #endif diff --git a/PDP10/pdp10_fe.c b/PDP10/pdp10_fe.c index 603b2877..cb03d6e3 100644 --- a/PDP10/pdp10_fe.c +++ b/PDP10/pdp10_fe.c @@ -42,8 +42,6 @@ #include "sim_tmxr.h" #define UNIT_DUMMY (1 << UNIT_V_UF) -extern d10 *M; -extern int32 apr_flg; extern int32 tmxr_poll; t_stat fei_svc (UNIT *uptr); t_stat feo_svc (UNIT *uptr); diff --git a/PDP10/pdp10_ksio.c b/PDP10/pdp10_ksio.c index 5b911b33..e00b9260 100644 --- a/PDP10/pdp10_ksio.c +++ b/PDP10/pdp10_ksio.c @@ -149,11 +149,6 @@ static const int32 ubabr54[UBANUM] = { #define M_WORD0 (~INT64_C (0777777000000)) /* Clear word 0 + XX */ #define M_WORD1 (~INT64_C (0000000777777)) /* Clear word 1 + XX */ -extern d10 *M; /* main memory */ -extern d10 pager_word; -extern UNIT cpu_unit; -extern jmp_buf save_env; - extern int32 pi_eval (void); t_stat ubmap_rd (int32 *data, int32 addr, int32 access); diff --git a/PDP10/pdp10_lp20.c b/PDP10/pdp10_lp20.c index 912a7017..0ad49ea3 100644 --- a/PDP10/pdp10_lp20.c +++ b/PDP10/pdp10_lp20.c @@ -171,8 +171,6 @@ /* LPCSUM/LPPDAT (765516) */ -extern int32 int_req; - static int32 lpcsa = 0; /* control/status A */ static int32 lpcsb = CSB_DVOF; /* control/status B */ static int32 lpba = 0; /* bus address */ diff --git a/PDP10/pdp10_mdfp.c b/PDP10/pdp10_mdfp.c index ae5cae4d..a4429b80 100644 --- a/PDP10/pdp10_mdfp.c +++ b/PDP10/pdp10_mdfp.c @@ -752,7 +752,6 @@ static t_uint64 normmask[6] = { 0x7FFF800000000000, 0x7FFFFFFF80000000, 0x7FFFFFFFFFFFFFFF }; static int32 normtab[7] = { 1, 2, 4, 8, 16, 32, 63 }; -extern a10 pager_PC; if (a->fhi & FP_UCRY) { /* carry set? */ sim_printf ("%%PDP-10 FP: carry bit set at normalization, PC = %o\n", pager_PC); diff --git a/PDP10/pdp10_pag.c b/PDP10/pdp10_pag.c index 68ed0ef6..ac65d869 100644 --- a/PDP10/pdp10_pag.c +++ b/PDP10/pdp10_pag.c @@ -77,7 +77,6 @@ */ #include "pdp10_defs.h" -#include /* Page table (contains expanded pte's) */ @@ -95,19 +94,13 @@ #define PF_OK 0 /* pfail ok */ #define PF_TR 1 /* pfail trap */ -extern d10 *M; extern d10 acs[AC_NBLK * AC_NUM]; extern d10 *ac_prv, *last_pa; extern a10 epta, upta; -extern d10 pager_word; -extern int32 apr_flg; extern d10 ebr, ubr, hsb; extern d10 spt, cst, cstm, pur; extern a10 dbr1, dbr2, dbr3, dbr4; extern d10 pcst, quant; -extern t_bool paging; -extern UNIT cpu_unit; -extern jmp_buf save_env; extern int32 test_int (void); extern int32 pi_eval (void); diff --git a/PDP10/pdp10_rp.c b/PDP10/pdp10_rp.c index 40701b99..be73cce7 100644 --- a/PDP10/pdp10_rp.c +++ b/PDP10/pdp10_rp.c @@ -330,11 +330,8 @@ struct drvtyp drv_tab[] = { { 0 } }; -extern d10 *M; /* memory */ -extern int32 int_req; extern int32 ubmap[UBANUM][UMAP_MEMSIZE]; /* Unibus maps */ extern int32 ubcs[UBANUM]; -extern UNIT cpu_unit; extern uint32 fe_bootrh; extern int32 fe_bootunit; diff --git a/PDP10/pdp10_sys.c b/PDP10/pdp10_sys.c index 0a669c1d..e2a3503e 100644 --- a/PDP10/pdp10_sys.c +++ b/PDP10/pdp10_sys.c @@ -60,9 +60,7 @@ extern DEVICE xu_dev; extern DEVICE dup_dev; extern DEVICE kmc_dev; extern DEVICE dmc_dev; -extern UNIT cpu_unit; extern REG cpu_reg[]; -extern d10 *M; extern a10 saved_PC; /* SCP data structures and interface routines diff --git a/PDP10/pdp10_tim.c b/PDP10/pdp10_tim.c index 708bfc00..f2329632 100644 --- a/PDP10/pdp10_tim.c +++ b/PDP10/pdp10_tim.c @@ -140,9 +140,7 @@ int32 tmr_poll; /* SimH instructions/clo int32 tmxr_poll; /* SimH instructions/term mux poll */ extern int32 apr_flg, pi_act; -extern UNIT cpu_unit; extern d10 pcst; -extern a10 pager_PC; static t_stat tcu_rd (int32 *data, int32 PA, int32 access); static t_stat tim_svc (UNIT *uptr); @@ -150,11 +148,6 @@ static t_stat tim_reset (DEVICE *dptr); static t_bool update_interval (d10 new_interval); static void tim_incr_base (d10 *base, d10 incr); -extern d10 Read (a10 ea, int32 prv); -extern d10 ReadM (a10 ea, int32 prv); -extern void Write (a10 ea, d10 val, int32 prv); -extern void WriteP (a10 ea, d10 val); -extern int32 pi_eval (void); extern t_stat wr_nop (int32 data, int32 PA, int32 access); /* TIM data structures diff --git a/PDP10/pdp10_tu.c b/PDP10/pdp10_tu.c index 4b57d1df..254f974e 100644 --- a/PDP10/pdp10_tu.c +++ b/PDP10/pdp10_tu.c @@ -296,11 +296,8 @@ break; \ } -extern d10 *M; /* memory */ -extern int32 int_req; extern int32 ubmap[UBANUM][UMAP_MEMSIZE]; /* Unibus map */ extern int32 ubcs[UBANUM]; -extern UNIT cpu_unit; int32 tucs1 = 0; /* control/status 1 */ int32 tuwc = 0; /* word count */ diff --git a/PDP10/pdp10_xtnd.c b/PDP10/pdp10_xtnd.c index 5b60d7f1..bc0e6611 100644 --- a/PDP10/pdp10_xtnd.c +++ b/PDP10/pdp10_xtnd.c @@ -140,7 +140,6 @@ #define ED_SKPA 0700 /* skip always */ extern int32 rlog; -extern jmp_buf save_env; extern d10 Read (int32 ea, int32 prv); extern void Write (int32 ea, d10 val, int32 prv); diff --git a/PDP11/pdp11_cis.c b/PDP11/pdp11_cis.c index 67d355a2..4ec7fb09 100644 --- a/PDP11/pdp11_cis.c +++ b/PDP11/pdp11_cis.c @@ -175,7 +175,6 @@ static DSTR Dstr0 = { 0, {0, 0, 0, 0} }; extern int32 isenable, dsenable; extern int32 N, Z, V, C, fpd, ipl; extern int32 R[8], trap_req; -extern uint32 cpu_type; int32 ReadDstr (int32 *dscr, DSTR *dec, int32 flag); void WriteDstr (int32 *dscr, DSTR *dec, int32 flag); diff --git a/PDP11/pdp11_cpumod.c b/PDP11/pdp11_cpumod.c index 84dd3c90..b2379b93 100644 --- a/PDP11/pdp11_cpumod.c +++ b/PDP11/pdp11_cpumod.c @@ -85,7 +85,6 @@ int32 toy_state = 0; uint8 toy_data[TOY_LNT] = { 0 }; static int32 clk_tps_map[4] = { 60, 60, 50, 800 }; -extern uint16 *M; extern int32 R[8]; extern int32 STKLIM, PIRQ; extern int32 clk_fie, clk_fnxm, clk_tps, clk_default; diff --git a/PDP11/pdp11_cr.c b/PDP11/pdp11_cr.c index 3511261d..169e0f5d 100644 --- a/PDP11/pdp11_cr.c +++ b/PDP11/pdp11_cr.c @@ -203,7 +203,6 @@ #if defined (VM_PDP10) /* PDP10 version */ #include "pdp10_defs.h" -extern int32 int_req; #define DFLT_DIS (DEV_DIS) #define DFLT_TYPE (UNIT_CD20) /* CD20 (CD11) only */ #define CD20_ONLY (1) @@ -211,14 +210,12 @@ extern int32 int_req; #define AIECO_REQ (1) /* Requires Augmented Image ECO */ #elif defined (VM_VAX) /* VAX version */ #include "vax_defs.h" -extern int32 int_req[IPL_HLVL]; #define DFLT_DIS (DEV_QBUS) /* CR11 is programmed I/O only, Qbus OK */ #define DFLT_TYPE (UNIT_CR11) /* CR11 only */ #define CR11_ONLY (1) #define DFLT_CPM 285 #else /* PDP-11 version */ #include "pdp11_defs.h" -extern int32 int_req[IPL_HLVL]; #define DFLT_DIS (DEV_QBUS) /* CR11 is programmed I/O only, Qbus OK */ #define DFLT_TYPE (UNIT_CR11) /* Default, but changable */ #define DFLT_CPM 285 diff --git a/PDP11/pdp11_dc.c b/PDP11/pdp11_dc.c index b74d75cd..5c69839b 100644 --- a/PDP11/pdp11_dc.c +++ b/PDP11/pdp11_dc.c @@ -78,7 +78,6 @@ #define DCOCSR_CTS 0000002 /* clr to send (RO) */ #define DCOCSR_MNT 0000004 /* maint (RWNI) */ -extern int32 int_req[IPL_HLVL]; extern int32 tmxr_poll; uint16 dci_csr[DCX_LINES] = { 0 }; /* control/status */ diff --git a/PDP11/pdp11_defs.h b/PDP11/pdp11_defs.h index 4d5055ca..7d867c2b 100644 --- a/PDP11/pdp11_defs.h +++ b/PDP11/pdp11_defs.h @@ -180,13 +180,6 @@ #define CPUT(x) ((cpu_type & (x)) != 0) #define CPUO(x) ((cpu_opt & (x)) != 0) #define UNIBUS (cpu_opt & BUS_U) -extern int32 cpu_bme; /* bus map enable */ -extern uint32 cpu_model; /* CPU model */ -extern uint32 cpu_type; /* model as bit mask */ -extern uint32 cpu_opt; /* CPU options */ - -extern DEVICE cpu_dev; -extern UNIT cpu_unit; /* Feature sets @@ -868,6 +861,17 @@ void cpu_set_boot (int32 pc); #include "pdp11_io_lib.h" +extern int32 cpu_bme; /* bus map enable */ +extern uint32 cpu_model; /* CPU model */ +extern uint32 cpu_type; /* model as bit mask */ +extern uint32 cpu_opt; /* CPU options */ +extern int32 autcon_enb; /* autoconfig enable */ +extern int32 int_req[IPL_HLVL]; /* interrupt requests */ +extern uint16 *M; /* Memory */ + +extern DEVICE cpu_dev; +extern UNIT cpu_unit; + #if defined (UC15) /* UC15 */ #define INIMODEL MOD_1105 #define INIOPTNS SOP_1105 diff --git a/PDP11/pdp11_dl.c b/PDP11/pdp11_dl.c index 11670af9..08d089c0 100644 --- a/PDP11/pdp11_dl.c +++ b/PDP11/pdp11_dl.c @@ -79,7 +79,6 @@ #define DLOCSR_RD (CSR_DONE|CSR_IE|DLOCSR_MNT|DLOCSR_XBR) #define DLOCSR_WR (CSR_IE|DLOCSR_MNT|DLOCSR_XBR) -extern int32 int_req[IPL_HLVL]; extern int32 tmxr_poll; uint16 dli_csr[DLX_LINES] = { 0 }; /* control/status */ diff --git a/PDP11/pdp11_dz.c b/PDP11/pdp11_dz.c index ca22c466..49dea673 100644 --- a/PDP11/pdp11_dz.c +++ b/PDP11/pdp11_dz.c @@ -62,17 +62,14 @@ #include "pdp10_defs.h" #define RANK_DZ 0 /* no autoconfig */ #define DZ_8B_DFLT 0 -extern int32 int_req; #elif defined (VM_VAX) /* VAX version */ #include "vax_defs.h" #define DZ_8B_DFLT TT_MODE_8B -extern int32 int_req[IPL_HLVL]; #else /* PDP-11 version */ #include "pdp11_defs.h" #define DZ_8B_DFLT TT_MODE_8B -extern int32 int_req[IPL_HLVL]; #endif #include "sim_sock.h" diff --git a/PDP11/pdp11_hk.c b/PDP11/pdp11_hk.c index a6bb4a86..d4035265 100644 --- a/PDP11/pdp11_hk.c +++ b/PDP11/pdp11_hk.c @@ -525,8 +525,6 @@ BITFIELD *hk_reg_bits[] = { #define HKDEB_TRC 010 /* trace */ #define HKDEB_INT 020 /* interrupts */ -extern int32 int_req[IPL_HLVL]; - uint16 *hkxb = NULL; /* xfer buffer */ int32 hkcs1 = 0; /* control/status 1 */ int32 hkwc = 0; /* word count */ @@ -1566,8 +1564,6 @@ return pdp11_bad_block (uptr, HK_NUMSC, HK_NUMWD); #if defined (VM_PDP11) -extern uint16 *M; - /* Device bootstrap - does not clear CSR when done */ #define BOOT_START 02000 /* start */ diff --git a/PDP11/pdp11_io.c b/PDP11/pdp11_io.c index 1f54889f..d6ce2ee7 100644 --- a/PDP11/pdp11_io.c +++ b/PDP11/pdp11_io.c @@ -51,8 +51,6 @@ #include "pdp11_defs.h" -extern uint16 *M; -extern int32 int_req[IPL_HLVL]; extern int32 ub_map[UBM_LNT_LW]; extern int32 trap_req, ipl; extern int32 uba_last; diff --git a/PDP11/pdp11_io_lib.c b/PDP11/pdp11_io_lib.c index fbaf8c10..2323be92 100644 --- a/PDP11/pdp11_io_lib.c +++ b/PDP11/pdp11_io_lib.c @@ -37,7 +37,6 @@ #include "sim_tmxr.h" #include "sim_ether.h" -extern int32 autcon_enb; extern int32 int_vec[IPL_HLVL][32]; #if !defined(VEC_SET) #define VEC_SET 0 diff --git a/PDP11/pdp11_lp.c b/PDP11/pdp11_lp.c index 9180598c..23920715 100644 --- a/PDP11/pdp11_lp.c +++ b/PDP11/pdp11_lp.c @@ -51,8 +51,6 @@ #define LPTCSR_IMP (CSR_ERR + CSR_DONE + CSR_IE) /* implemented */ #define LPTCSR_RW (CSR_IE) /* read/write */ -extern int32 int_req[IPL_HLVL]; - int32 lpt_csr = 0; /* control/status */ int32 lpt_stopioe = 0; /* stop on error */ diff --git a/PDP11/pdp11_pclk.c b/PDP11/pdp11_pclk.c index af94075e..3ab570b0 100644 --- a/PDP11/pdp11_pclk.c +++ b/PDP11/pdp11_pclk.c @@ -167,8 +167,6 @@ BITFIELD pclk_notused_bits[] = { static BITFIELD* bitdefs[] = {pclk_csr_bits, pclk_buf_bits, pclk_ctr_bits, pclk_notused_bits}; -extern int32 int_req[IPL_HLVL]; - uint32 pclk_csr = 0; /* control/status */ uint32 pclk_csb = 0; /* count set buffer */ uint32 pclk_ctr = 0; /* counter */ diff --git a/PDP11/pdp11_pt.c b/PDP11/pdp11_pt.c index 67beb22c..a488ee94 100644 --- a/PDP11/pdp11_pt.c +++ b/PDP11/pdp11_pt.c @@ -35,17 +35,14 @@ #if defined (VM_PDP10) /* PDP10 version */ #include "pdp10_defs.h" #define PT_DIS DEV_DIS -extern int32 int_req; #elif defined (VM_VAX) /* VAX version */ #include "vax_defs.h" #define PT_DIS DEV_DIS -extern int32 int_req[IPL_HLVL]; #else /* PDP-11 version */ #include "pdp11_defs.h" #define PT_DIS 0 -extern int32 int_req[IPL_HLVL]; #endif #define PTRCSR_IMP (CSR_ERR+CSR_BUSY+CSR_DONE+CSR_IE) /* paper tape reader */ diff --git a/PDP11/pdp11_rc.c b/PDP11/pdp11_rc.c index d4f62f10..99158437 100644 --- a/PDP11/pdp11_rc.c +++ b/PDP11/pdp11_rc.c @@ -147,7 +147,6 @@ #define GET_POS(x) ((int) fmod (sim_gtime() / ((double) (x)), \ ((double) RC_NUMWD))) -extern int32 int_req[IPL_HLVL]; extern int32 R[]; static uint32 rc_la = 0; /* look-ahead */ diff --git a/PDP11/pdp11_rf.c b/PDP11/pdp11_rf.c index 0c561ee8..d334d1f4 100644 --- a/PDP11/pdp11_rf.c +++ b/PDP11/pdp11_rf.c @@ -110,9 +110,6 @@ #define GET_POS(x) ((int) fmod (sim_gtime() / ((double) (x)), \ ((double) RF_NUMWD))) -extern uint16 *M; -extern int32 int_req[IPL_HLVL]; - uint32 rf_cs = 0; /* status register */ uint32 rf_cma = 0; uint32 rf_wc = 0; diff --git a/PDP11/pdp11_rh.c b/PDP11/pdp11_rh.c index bb67ae4d..5a675922 100644 --- a/PDP11/pdp11_rh.c +++ b/PDP11/pdp11_rh.c @@ -160,9 +160,6 @@ typedef struct { MBACTX massbus[MBA_NUM]; -extern uint16 *M; -extern int32 int_req[IPL_HLVL]; - t_stat mba_reset (DEVICE *dptr); t_stat mba_rd (int32 *val, int32 pa, int32 access); t_stat mba_wr (int32 val, int32 pa, int32 access); diff --git a/PDP11/pdp11_rk.c b/PDP11/pdp11_rk.c index 59d8e5e7..46201672 100644 --- a/PDP11/pdp11_rk.c +++ b/PDP11/pdp11_rk.c @@ -69,13 +69,11 @@ #if defined (VM_VAX) /* VAX version */ #include "vax_defs.h" -extern int32 int_req[IPL_HLVL]; #define DMASK 0xFFFF #define RK_DIS DEV_DIS #else /* PDP-11 version */ #include "pdp11_defs.h" -extern int32 int_req[IPL_HLVL]; #define RK_DIS 0 #endif @@ -931,7 +929,6 @@ static const uint16 boot_rom[] = { t_stat rk_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; /* memory */ for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_rl.c b/PDP11/pdp11_rl.c index c40fce30..6b2bf50c 100644 --- a/PDP11/pdp11_rl.c +++ b/PDP11/pdp11_rl.c @@ -225,8 +225,6 @@ #define RLBAE_IMP (0000077) /* implemented */ -extern int32 int_req[IPL_HLVL]; - uint16 *rlxb = NULL; /* xfer buffer */ int32 rlcs = 0; /* control/status */ int32 rlba = 0; /* memory address */ @@ -1209,7 +1207,6 @@ static const uint16 boot_rom[] = { t_stat rl_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_rp.c b/PDP11/pdp11_rp.c index 79ba69b0..ffa9d002 100644 --- a/PDP11/pdp11_rp.c +++ b/PDP11/pdp11_rp.c @@ -1472,7 +1472,6 @@ static const uint16 boot_rom[] = { t_stat rp_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; UNIT *uptr = dptr->units + unitno; for (i = 0; i < BOOT_LEN; i++) diff --git a/PDP11/pdp11_rq.c b/PDP11/pdp11_rq.c index e16c6863..628dc38c 100644 --- a/PDP11/pdp11_rq.c +++ b/PDP11/pdp11_rq.c @@ -114,7 +114,6 @@ extern int32 fault_PC; #define RQ_XTIME 500 #define OLDPC MMR2 extern int32 MMR2; -extern uint32 cpu_opt; #endif #if !defined (RQ_NUMCT) @@ -752,8 +751,6 @@ static struct ctlrtyp ctlr_tab[] = { { 0 } }; -extern int32 int_req[IPL_HLVL]; - int32 rq_itime = 450; /* init time, except */ int32 rq_itime4 = 10; /* stage 4 */ int32 rq_qtime = RQ_QTIME; /* queue time */ @@ -2994,7 +2991,6 @@ static const uint16 boot_rom[] = { t_stat rq_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; DIB *dibp = (DIB *) dptr->ctxt; for (i = 0; i < BOOT_LEN; i++) diff --git a/PDP11/pdp11_rs.c b/PDP11/pdp11_rs.c index 75b26f72..4fdae35d 100644 --- a/PDP11/pdp11_rs.c +++ b/PDP11/pdp11_rs.c @@ -685,7 +685,6 @@ static const uint16 boot_rom[] = { t_stat rs_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_rx.c b/PDP11/pdp11_rx.c index eee674bc..6ecc1dfe 100644 --- a/PDP11/pdp11_rx.c +++ b/PDP11/pdp11_rx.c @@ -109,8 +109,6 @@ #define TRACK u3 /* current track */ #define CALC_DA(t,s) (((t) * RX_NUMSC) + ((s) - 1)) * RX_NUMBY -extern int32 int_req[IPL_HLVL]; - int32 rx_csr = 0; /* control/status */ int32 rx_dbr = 0; /* data buffer */ int32 rx_esr = 0; /* error status */ @@ -526,7 +524,6 @@ static const uint16 boot_rom[] = { t_stat rx_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_ry.c b/PDP11/pdp11_ry.c index 5a14efac..c27c18f9 100644 --- a/PDP11/pdp11_ry.c +++ b/PDP11/pdp11_ry.c @@ -45,17 +45,14 @@ #if defined (VM_PDP10) /* PDP10 version */ #include "pdp10_defs.h" -extern int32 int_req; #define DEV_DISI DEV_DIS #elif defined (VM_VAX) /* VAX version */ #include "vax_defs.h" -extern int32 int_req[IPL_HLVL]; #define DEV_DISI 0 #else /* PDP-11 version */ #include "pdp11_defs.h" -extern int32 int_req[IPL_HLVL]; #define DEV_DISI DEV_DIS #endif @@ -692,7 +689,6 @@ static const uint16 boot_rom[] = { t_stat ry_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; if ((ry_unit[unitno & RX_M_NUMDR].flags & UNIT_DEN) == 0) return SCPE_NOFNC; diff --git a/PDP11/pdp11_stddev.c b/PDP11/pdp11_stddev.c index aa0e4450..7b5b8e39 100644 --- a/PDP11/pdp11_stddev.c +++ b/PDP11/pdp11_stddev.c @@ -72,9 +72,6 @@ #define CLKCSR_RW (CSR_IE) #define CLK_DELAY 16667 -extern int32 int_req[IPL_HLVL]; -extern uint32 cpu_type; - int32 tti_csr = 0; /* control/status */ uint32 tti_buftime; /* time input character arrived */ int32 tto_csr = 0; /* control/status */ diff --git a/PDP11/pdp11_sys.c b/PDP11/pdp11_sys.c index d4307326..36ec9abb 100644 --- a/PDP11/pdp11_sys.c +++ b/PDP11/pdp11_sys.c @@ -116,7 +116,6 @@ extern DEVICE dpv_dev; extern DEVICE kmc_dev; extern DEVICE uca_dev, ucb_dev; extern REG cpu_reg[]; -extern uint16 *M; extern int32 saved_PC; /* SCP data structures and interface routines diff --git a/PDP11/pdp11_ta.c b/PDP11/pdp11_ta.c index 4303206f..2915c933 100644 --- a/PDP11/pdp11_ta.c +++ b/PDP11/pdp11_ta.c @@ -108,8 +108,6 @@ #define UST_REV (OP_REV) /* last op was rev */ #define UST_GAP 01 /* last op hit gap */ -extern int32 int_req[IPL_HLVL]; - uint32 ta_cs = 0; /* control/status */ uint32 ta_idb = 0; /* input data buf */ uint32 ta_odb = 0; /* output data buf */ @@ -661,7 +659,6 @@ static const uint16 boot_rom[] = { t_stat ta_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_tc.c b/PDP11/pdp11_tc.c index fe9a2f5e..0686929f 100644 --- a/PDP11/pdp11_tc.c +++ b/PDP11/pdp11_tc.c @@ -108,12 +108,10 @@ #if defined (VM_VAX) /* VAX version */ #include "vax_defs.h" -extern int32 int_req[IPL_HLVL]; #define DMASK 0xFFFF #else /* PDP-11 version */ #include "pdp11_defs.h" -extern int32 int_req[IPL_HLVL]; #endif #define DT_NUMDR 8 /* #drives */ @@ -1229,7 +1227,6 @@ static const uint16 boot_rom[] = { t_stat dt_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; /* memory */ dt_unit[unitno].pos = DT_EZLIN; for (i = 0; i < BOOT_LEN; i++) diff --git a/PDP11/pdp11_td.c b/PDP11/pdp11_td.c index 194c4411..a778a6e4 100644 --- a/PDP11/pdp11_td.c +++ b/PDP11/pdp11_td.c @@ -447,13 +447,11 @@ OP CODE 11 (Resened) */ -#if defined (VM_VAX) /* VAX version */ +#if defined (VM_VAX) /* VAX version */ #include "vax_defs.h" -extern int32 int_req[IPL_HLVL]; #else /* PDP-11 version */ #include "pdp11_defs.h" -extern int32 int_req[IPL_HLVL]; #endif #include "pdp11_td.h" @@ -1588,7 +1586,6 @@ return td_reset_ctlr (ctlr); static t_stat td_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; /* memory */ for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_tm.c b/PDP11/pdp11_tm.c index adb815bb..cb4a82e8 100644 --- a/PDP11/pdp11_tm.c +++ b/PDP11/pdp11_tm.c @@ -153,9 +153,6 @@ #define RDL_CLK 0100000 /* 10 Khz clock */ -extern uint16 *M; /* memory */ -extern int32 int_req[IPL_HLVL]; - uint8 *tmxb = NULL; /* xfer buffer */ int32 tm_sta = 0; /* status register */ int32 tm_cmd = 0; /* command register */ diff --git a/PDP11/pdp11_tq.c b/PDP11/pdp11_tq.c index 41dddeb7..88a5c0cb 100644 --- a/PDP11/pdp11_tq.c +++ b/PDP11/pdp11_tq.c @@ -84,7 +84,6 @@ #include "pdp11_defs.h" #define INIT_TYPE TQ5_TYPE #define INIT_CAP TQ5_CAP -extern uint32 cpu_opt; #endif #include "pdp11_uqssp.h" @@ -245,8 +244,6 @@ static struct drvtyp drv_tab[] = { /* Data */ -extern int32 int_req[IPL_HLVL]; - uint32 tq_sa = 0; /* status, addr */ uint32 tq_saw = 0; /* written data */ uint32 tq_s1dat = 0; /* S1 data */ @@ -2210,7 +2207,6 @@ static const uint16 boot_rom[] = { t_stat tq_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_ts.c b/PDP11/pdp11_ts.c index efcdb765..80976265 100644 --- a/PDP11/pdp11_ts.c +++ b/PDP11/pdp11_ts.c @@ -99,7 +99,6 @@ #else /* PDP-11 version */ #include "pdp11_defs.h" #define TS_DIS DEV_DIS /* off by default */ -extern uint32 cpu_opt; #endif #include "sim_tape.h" @@ -268,8 +267,6 @@ extern uint32 cpu_opt; #define MAX(a,b) (((a) >= (b))? (a): (b)) #define MAX_PLNT 8 /* max pkt length */ -extern int32 int_req[IPL_HLVL]; - uint8 *tsxb = NULL; /* xfer buffer */ int32 tssr = 0; /* status register */ int32 tsba = 0; /* mem addr */ @@ -1170,7 +1167,6 @@ static const uint16 boot_rom[] = { t_stat ts_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; sim_tape_rewind (&ts_unit); for (i = 0; i < BOOT_LEN; i++) diff --git a/PDP11/pdp11_tu.c b/PDP11/pdp11_tu.c index 067389af..01442285 100644 --- a/PDP11/pdp11_tu.c +++ b/PDP11/pdp11_tu.c @@ -1046,7 +1046,6 @@ static const uint16 boot_rom[] = { t_stat tu_boot (int32 unitno, DEVICE *dptr) { size_t i; -extern uint16 *M; for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_vh.c b/PDP11/pdp11_vh.c index 4d6e1375..05a4221b 100644 --- a/PDP11/pdp11_vh.c +++ b/PDP11/pdp11_vh.c @@ -74,13 +74,10 @@ Rank: 32 #if defined (VM_VAX) #include "vax_defs.h" -extern int32 int_req[IPL_HLVL]; #endif #if defined (VM_PDP11) #include "pdp11_defs.h" -extern int32 int_req[IPL_HLVL]; -extern uint32 cpu_opt; #endif #include "sim_tmxr.h" diff --git a/PDP11/pdp11_vt.c b/PDP11/pdp11_vt.c index 9309ecc8..920dd996 100644 --- a/PDP11/pdp11_vt.c +++ b/PDP11/pdp11_vt.c @@ -81,7 +81,6 @@ */ #define CYCLE_US (MEMORY_CYCLE*(VT11_DELAY*2+1)) -extern int32 int_req[IPL_HLVL]; extern int32 int_vec[IPL_HLVL][32]; t_stat vt_rd(int32 *data, int32 PA, int32 access); @@ -348,7 +347,6 @@ vt_boot(int32 unit, DEVICE *dptr) t_stat r; char stability[32]; extern int32 saved_PC; - extern uint16 *M; /* XXX should do something like vt11_set_dpc(&appropriate_ROM_image) */ diff --git a/PDP11/pdp11_xq.c b/PDP11/pdp11_xq.c index 55b8f1f8..8fc50f4d 100644 --- a/PDP11/pdp11_xq.c +++ b/PDP11/pdp11_xq.c @@ -3115,7 +3115,6 @@ t_stat xq_boot (int32 unitno, DEVICE *dptr) size_t i; DIB *dib = (DIB *)dptr->ctxt; extern int32 REGFILE[6][2]; /* R0-R5, two sets */ -extern uint16 *M; /* Memory */ for (i = 0; i < BOOT_LEN; i++) M[(BOOT_START >> 1) + i] = boot_rom[i]; diff --git a/PDP11/pdp11_xq.h b/PDP11/pdp11_xq.h index baaa52f6..2152c877 100644 --- a/PDP11/pdp11_xq.h +++ b/PDP11/pdp11_xq.h @@ -72,15 +72,11 @@ #include "vax_defs.h" #define XQ_RDX 16 #define XQ_WID 32 -extern int32 PSL; /* PSL */ -extern int32 fault_PC; /* fault PC */ -extern int32 int_req[IPL_HLVL]; #define ULTRIX1X ((cpu_idle_mask&VAX_IDLE_ULT1X) && ((cpu_idle_mask & ~VAX_IDLE_ULT1X) == 0)) #else /* PDP-11 version */ #include "pdp11_defs.h" #define XQ_RDX 8 #define XQ_WID 16 -extern int32 int_req[IPL_HLVL]; #define ULTRIX1X 0 #endif diff --git a/PDP11/pdp11_xu.h b/PDP11/pdp11_xu.h index 1a67d2af..9fe21104 100644 --- a/PDP11/pdp11_xu.h +++ b/PDP11/pdp11_xu.h @@ -50,19 +50,16 @@ #include "pdp10_defs.h" #define XU_RDX 8 #define XU_WID 16 -extern int32 int_req; #elif defined (VM_VAX) /* VAX version */ #include "vax_defs.h" #define XU_RDX 16 #define XU_WID 32 -extern int32 int_req[IPL_HLVL]; #else /* PDP-11 version */ #include "pdp11_defs.h" #define XU_RDX 8 #define XU_WID 16 -extern int32 int_req[IPL_HLVL]; #endif /* VM_PDP10 */ #include "sim_ether.h" diff --git a/VAX/vax630_defs.h b/VAX/vax630_defs.h index d17ac5e2..39ea5770 100644 --- a/VAX/vax630_defs.h +++ b/VAX/vax630_defs.h @@ -381,7 +381,6 @@ typedef struct { #define SET_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] | (INT_##dv) #define CLR_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] & ~(INT_##dv) #define IORETURN(f,v) ((f)? (v): SCPE_OK) /* cond error return */ -extern int32 int_req[IPL_HLVL]; /* intr, IPL 14-17 */ /* Logging */ diff --git a/VAX/vax730_defs.h b/VAX/vax730_defs.h index 136599f0..3946f4c3 100644 --- a/VAX/vax730_defs.h +++ b/VAX/vax730_defs.h @@ -349,7 +349,6 @@ typedef struct { #define SET_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] | (INT_##dv) #define CLR_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] & ~(INT_##dv) #define IORETURN(f,v) ((f)? (v): SCPE_OK) /* cond error return */ -extern int32 int_req[IPL_HLVL]; /* intr, IPL 14-17 */ /* Logging */ diff --git a/VAX/vax730_uba.c b/VAX/vax730_uba.c index f34a4526..b47f8e75 100644 --- a/VAX/vax730_uba.c +++ b/VAX/vax730_uba.c @@ -93,8 +93,6 @@ uint32 uba_fmer = 0; /* failing map reg */ uint32 uba_map[UBA_NMAPR] = { 0 }; /* map registers */ int32 autcon_enb = 1; /* autoconfig enable */ -extern int32 autcon_enb; - t_stat uba_reset (DEVICE *dptr); const char *uba_description (DEVICE *dptr); t_stat uba_ex (t_value *vptr, t_addr exta, UNIT *uptr, int32 sw); diff --git a/VAX/vax750_defs.h b/VAX/vax750_defs.h index bd94124b..6bce6e23 100644 --- a/VAX/vax750_defs.h +++ b/VAX/vax750_defs.h @@ -389,7 +389,6 @@ typedef struct { #define SET_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] | (INT_##dv) #define CLR_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] & ~(INT_##dv) #define IORETURN(f,v) ((f)? (v): SCPE_OK) /* cond error return */ -extern int32 int_req[IPL_HLVL]; /* intr, IPL 14-17 */ /* Logging */ diff --git a/VAX/vax750_uba.c b/VAX/vax750_uba.c index 58c6e40f..16779b2c 100644 --- a/VAX/vax750_uba.c +++ b/VAX/vax750_uba.c @@ -98,7 +98,6 @@ uint32 uba_dpr[UBA_NDPATH] = { 0 }; /* number data paths */ uint32 uba_map[UBA_NMAPR] = { 0 }; /* map registers */ int32 autcon_enb = 1; /* autoconfig enable */ -extern int32 autcon_enb; extern uint32 nexus_req[NEXUS_HLVL]; t_stat uba_reset (DEVICE *dptr); diff --git a/VAX/vax780_defs.h b/VAX/vax780_defs.h index 0a3bbfe5..3768bf38 100644 --- a/VAX/vax780_defs.h +++ b/VAX/vax780_defs.h @@ -403,7 +403,6 @@ typedef struct { #define SET_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] | (INT_##dv) #define CLR_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] & ~(INT_##dv) #define IORETURN(f,v) ((f)? (v): SCPE_OK) /* cond error return */ -extern int32 int_req[IPL_HLVL]; /* intr, IPL 14-17 */ /* Logging */ diff --git a/VAX/vax780_uba.c b/VAX/vax780_uba.c index 7997b75f..7d032fe1 100644 --- a/VAX/vax780_uba.c +++ b/VAX/vax780_uba.c @@ -177,7 +177,6 @@ uint32 uba_aitime = 250; /* adapter init time */ uint32 uba_uitime = 12250; /* Unibus init time */ int32 autcon_enb = 1; /* autoconfig enable */ -extern int32 autcon_enb; extern uint32 nexus_req[NEXUS_HLVL]; t_stat uba_svc (UNIT *uptr); diff --git a/VAX/vax860_defs.h b/VAX/vax860_defs.h index 167f2457..5a7d312b 100644 --- a/VAX/vax860_defs.h +++ b/VAX/vax860_defs.h @@ -432,7 +432,6 @@ typedef struct { #define SET_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] | (INT_##dv) #define CLR_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] & ~(INT_##dv) #define IORETURN(f,v) ((f)? (v): SCPE_OK) /* cond error return */ -extern int32 int_req[IPL_HLVL]; /* intr, IPL 14-17 */ /* Logging */ diff --git a/VAX/vax_defs.h b/VAX/vax_defs.h index 7b7cd6e1..47a9aa18 100644 --- a/VAX/vax_defs.h +++ b/VAX/vax_defs.h @@ -923,5 +923,10 @@ extern t_stat cpu_set_model (UNIT *uptr, int32 val, CONST char *cptr, void *desc extern t_stat cpu_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr); extern t_stat cpu_model_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr); extern const uint32 byte_mask[33]; +extern int32 autcon_enb; /* autoconfig enable */ +extern int32 int_req[IPL_HLVL]; /* intr, IPL 14-17 */ +extern uint32 *M; /* Memory */ +extern DEVICE cpu_dev; /* CPU */ +extern UNIT cpu_unit; /* CPU */ #endif /* _VAX_DEFS_H */ diff --git a/VAX/vax_mmu.h b/VAX/vax_mmu.h index 25e7051d..1ebc7a77 100644 --- a/VAX/vax_mmu.h +++ b/VAX/vax_mmu.h @@ -57,9 +57,9 @@ typedef struct { } TLBENT; extern uint32 *M; -extern int32 mapen; /* map enable */ extern UNIT cpu_unit; extern DEVICE cpu_dev; +extern int32 mapen; /* map enable */ extern int32 mchk_va, mchk_ref; /* for mcheck */ extern TLBENT stlb[VA_TBSIZE], ptlb[VA_TBSIZE]; diff --git a/VAX/vaxmod_defs.h b/VAX/vaxmod_defs.h index da46ca4d..46544a46 100644 --- a/VAX/vaxmod_defs.h +++ b/VAX/vaxmod_defs.h @@ -431,7 +431,6 @@ typedef struct { #define SET_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] | (INT_##dv) #define CLR_INT(dv) int_req[IPL_##dv] = int_req[IPL_##dv] & ~(INT_##dv) #define IORETURN(f,v) ((f)? (v): SCPE_OK) /* cond error return */ -extern int32 int_req[IPL_HLVL]; /* intr, IPL 14-17 */ /* Logging */