1
0
mirror of https://github.com/simh/simh.git synced 2026-04-13 15:34:35 +00:00

PDP11, PDP10, all VAX: General extern cleanup.

Remove explicit redundant extern declarations in source files that are
defined in processor include files.
This commit is contained in:
Mark Pizzolato
2017-02-04 19:37:20 -08:00
parent 5dc6d9a487
commit 7d432406b6
60 changed files with 35 additions and 148 deletions

View File

@@ -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 ();

View File

@@ -49,6 +49,7 @@
#endif
#include "sim_defs.h" /* simulator defns */
#include <setjmp.h>
#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

View File

@@ -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);

View File

@@ -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);

View File

@@ -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 */

View File

@@ -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);

View File

@@ -77,7 +77,6 @@
*/
#include "pdp10_defs.h"
#include <setjmp.h>
/* 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);

View File

@@ -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;

View File

@@ -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

View File

@@ -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

View File

@@ -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 */

View File

@@ -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);