From 3951ad243208e97d9d41631c835d88f54b3fdfcd Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Fri, 10 Oct 2014 08:18:15 -0700 Subject: [PATCH] Cleanup of unneeded global extern declarations --- AltairZ80/altairz80_cpu.c | 3 --- H316/h316_cpu.c | 1 - H316/h316_hi.c | 1 - H316/h316_mi.c | 1 - I1401/i1401_cpu.c | 1 - Ibm1130/ibm1130_defs.h | 1 - LGP/lgp_cpu.c | 2 -- PDP10/pdp10_defs.h | 3 --- PDP11/pdp11_rs.c | 1 - PDQ-3/pdq3_stddev.c | 1 - SAGE/chip_defs.h | 1 - SAGE/m68k_cpu.h | 1 - SSEM/ssem_cpu.c | 4 ---- TX-0/tx0_sys.c | 1 - VAX/vax_sysdev.c | 1 - alpha/alpha_sys.c | 1 - scp.h | 2 ++ sim_timer.c | 1 - sim_video.c | 2 -- 19 files changed, 2 insertions(+), 27 deletions(-) diff --git a/AltairZ80/altairz80_cpu.c b/AltairZ80/altairz80_cpu.c index 1716bf64..7b529617 100644 --- a/AltairZ80/altairz80_cpu.c +++ b/AltairZ80/altairz80_cpu.c @@ -1940,8 +1940,6 @@ void PutByteDMA(const uint32 Addr, const uint32 Value) { 2) it returns MASK_BRK if a breakpoint is found but should be ignored */ static int32 sim_brk_lookup (const t_addr loc, const int32 btyp) { - extern t_bool sim_brk_pend[SIM_BKPT_N_SPC]; - extern t_addr sim_brk_ploc[SIM_BKPT_N_SPC]; BRKTAB *bp; if ((bp = sim_brk_fnd (loc)) && /* entry in table? */ (btyp & bp -> typ) && /* type match? */ @@ -2050,7 +2048,6 @@ void setClockFrequency(const uint32 Value) { } static t_stat sim_instr_mmu (void) { - extern t_bool sim_brk_pend[SIM_BKPT_N_SPC]; extern int32 timerInterrupt; extern int32 timerInterruptHandler; extern int32 keyboardInterrupt; diff --git a/H316/h316_cpu.c b/H316/h316_cpu.c index 835bfb4c..969bd64c 100644 --- a/H316/h316_cpu.c +++ b/H316/h316_cpu.c @@ -296,7 +296,6 @@ int32 hst_p = 0; /* history pointer */ int32 hst_lnt = 0; /* history length */ InstHistory *hst = NULL; /* instruction history */ -extern int32 sim_int_char; extern DEVICE *sim_devices[]; t_bool devtab_init (void); diff --git a/H316/h316_hi.c b/H316/h316_hi.c index a0ff5fb2..6ef81e56 100644 --- a/H316/h316_hi.c +++ b/H316/h316_hi.c @@ -58,7 +58,6 @@ extern uint16 dev_ext_int, dev_ext_enb; // current IRQ and IEN bit vectors extern int32 PC; // current PC (for debug messages) extern int32 stop_inst; // needed by IOBADFNC() -extern int32 sim_switches; // option bitmap for ATTACH/DETACH extern uint16 M[]; // main memory (for DMC access) // Forward declarations ... diff --git a/H316/h316_mi.c b/H316/h316_mi.c index 34c20cff..ae4371f4 100644 --- a/H316/h316_mi.c +++ b/H316/h316_mi.c @@ -175,7 +175,6 @@ extern uint16 dev_ext_int, dev_ext_enb; // current IRQ and IEN bit vectors extern int32 PC; // current PC (for debug messages) extern int32 stop_inst; // needed by IOBADFNC() -extern int32 sim_switches; // option bitmap for ATTACH/DETACH extern uint16 M[]; // main memory (for DMC access) // Forward declarations ... diff --git a/I1401/i1401_cpu.c b/I1401/i1401_cpu.c index dcdce7be..b964b2bb 100644 --- a/I1401/i1401_cpu.c +++ b/I1401/i1401_cpu.c @@ -521,7 +521,6 @@ static const int32 mtf_mod[] = { t_stat sim_instr (void) { -extern int32 sim_interval; int32 IS, ilnt, flags; int32 op, xa, t, wm, ioind, dev, unit; int32 a, b, i, k, asave, bsave; diff --git a/Ibm1130/ibm1130_defs.h b/Ibm1130/ibm1130_defs.h index f8f32df8..8a6a635e 100644 --- a/Ibm1130/ibm1130_defs.h +++ b/Ibm1130/ibm1130_defs.h @@ -70,7 +70,6 @@ extern int32 int_lamps; /* accumulated version of int_req - gives lamp pers extern int32 int_mask; /* current active interrupt mask (ipl sensitive) */ extern int32 mem_mask; extern int32 cpu_dsw; /* CPU device status word */ -extern int32 sim_int_char; /* interrupt character */ extern int32 con_dsw; /* has program stop and int run bits */ extern t_bool running; extern t_bool power; diff --git a/LGP/lgp_cpu.c b/LGP/lgp_cpu.c index 083625a0..b91d6b82 100644 --- a/LGP/lgp_cpu.c +++ b/LGP/lgp_cpu.c @@ -147,8 +147,6 @@ int16 pcq[PCQ_SIZE] = { 0 }; /* PC queue */ int32 pcq_p = 0; /* PC queue ptr */ REG *pcq_r = NULL; /* PC queue reg ptr */ -extern int32 sim_step; - t_stat cpu_ex (t_value *vptr, t_addr addr, UNIT *uptr, int32 sw); t_stat cpu_dep (t_value val, t_addr addr, UNIT *uptr, int32 sw); t_stat cpu_reset (DEVICE *dptr); diff --git a/PDP10/pdp10_defs.h b/PDP10/pdp10_defs.h index 736ecc2c..cc2fd9f3 100644 --- a/PDP10/pdp10_defs.h +++ b/PDP10/pdp10_defs.h @@ -781,8 +781,5 @@ t_stat show_vec (FILE *st, UNIT *uptr, int32 val, void *desc); t_stat show_vec_mux (FILE *st, UNIT *uptr, int32 val, void *desc); t_stat auto_config (char *name, int32 num); -/* Global data */ - -extern t_bool sim_idle_enab; #endif diff --git a/PDP11/pdp11_rs.c b/PDP11/pdp11_rs.c index 32e53940..8cc5b86c 100644 --- a/PDP11/pdp11_rs.c +++ b/PDP11/pdp11_rs.c @@ -632,7 +632,6 @@ return SCPE_OK; t_stat rs_detach (UNIT *uptr) { int32 drv; -extern int32 sim_is_running; if (!(uptr->flags & UNIT_ATT)) /* attached? */ return SCPE_OK; diff --git a/PDQ-3/pdq3_stddev.c b/PDQ-3/pdq3_stddev.c index d6fa6bcc..ea0a2ebf 100644 --- a/PDQ-3/pdq3_stddev.c +++ b/PDQ-3/pdq3_stddev.c @@ -35,7 +35,6 @@ #include extern UNIT cpu_unit; -extern int32 sim_switches; extern UNIT con_unit[]; static t_stat con_termsvc(UNIT *uptr); diff --git a/SAGE/chip_defs.h b/SAGE/chip_defs.h index 443106fa..0f068537 100644 --- a/SAGE/chip_defs.h +++ b/SAGE/chip_defs.h @@ -54,7 +54,6 @@ /* generic debug tracing support */ #if DBG_MSG==1 -extern FILE* sim_deb; #define ADDRESS_FORMAT "[0x%08x]" #if UNIX_PLATFORM diff --git a/SAGE/m68k_cpu.h b/SAGE/m68k_cpu.h index 4474d6cf..4c7a6666 100644 --- a/SAGE/m68k_cpu.h +++ b/SAGE/m68k_cpu.h @@ -53,7 +53,6 @@ extern REG m68kcpu_reg[]; #define DBG_CPU_BTRACE (1 << 4) #define DBG_CPU_CUSTOM1 (1 << 5) /* reserved for custom debugging */ #define DBG_CPU_CUSTOM2 (1 << 6) /* reserved for custom debugging */ -extern FILE* sim_deb; extern DEBTAB m68kcpu_dt[]; #if DBG_MSG==1 #define IFDEBUG(flag,func) if ((m68kcpu_dev->dctrl & flag) && sim_deb) { (void)(func); fflush(sim_deb); } diff --git a/SSEM/ssem_cpu.c b/SSEM/ssem_cpu.c index 87bba4be..09f9a43c 100644 --- a/SSEM/ssem_cpu.c +++ b/SSEM/ssem_cpu.c @@ -88,10 +88,6 @@ uint32 C[MEMSIZE] = { 0, 0 }; /* C[0] current instruction */ /* C[1] present instruction */ uint32 Staticisor = 0; -extern int32 sim_interval; -extern uint32 sim_brk_types, sim_brk_dflt, sim_brk_summ; /* breakpoint info */ -extern int32 sim_step; - t_stat cpu_ex (t_value *vptr, t_addr addr, UNIT *uptr, int32 sw); t_stat cpu_dep (t_value val, t_addr addr, UNIT *uptr, int32 sw); t_stat cpu_reset (DEVICE *dptr); diff --git a/TX-0/tx0_sys.c b/TX-0/tx0_sys.c index b7f967c4..0a2721f7 100644 --- a/TX-0/tx0_sys.c +++ b/TX-0/tx0_sys.c @@ -58,7 +58,6 @@ extern int32 M[]; extern int32 PC; extern int32 ascii_to_flexo[], flexo_to_ascii[]; extern int32 sc_map[]; -extern int32 sim_switches; /* SCP data structures and interface routines diff --git a/VAX/vax_sysdev.c b/VAX/vax_sysdev.c index 0894bedb..a3622841 100644 --- a/VAX/vax_sysdev.c +++ b/VAX/vax_sysdev.c @@ -305,7 +305,6 @@ extern void rxcs_wr (int32 dat); extern void txcs_wr (int32 dat); extern void txdb_wr (int32 dat); extern void ioreset_wr (int32 dat); -extern uint32 sim_os_msec(); extern void cpu_idle (void); /* ROM data structures diff --git a/alpha/alpha_sys.c b/alpha/alpha_sys.c index 630f9df5..6d84f75a 100644 --- a/alpha/alpha_sys.c +++ b/alpha/alpha_sys.c @@ -29,7 +29,6 @@ extern UNIT cpu_unit; extern REG cpu_reg[]; -extern int32 sim_switches; extern uint32 pal_type; t_stat fprint_sym_m (FILE *of, t_addr addr, uint32 inst); diff --git a/scp.h b/scp.h index 23fc9ed3..83a57379 100644 --- a/scp.h +++ b/scp.h @@ -195,6 +195,8 @@ extern volatile int32 stop_cpu; extern uint32 sim_brk_types; /* breakpoint info */ extern uint32 sim_brk_dflt; extern uint32 sim_brk_summ; +extern t_bool sim_brk_pend[SIM_BKPT_N_SPC]; +extern t_addr sim_brk_ploc[SIM_BKPT_N_SPC]; extern FILE *stdnul; extern t_bool sim_asynch_enabled; diff --git a/sim_timer.c b/sim_timer.c index de940e70..b2b2569c 100644 --- a/sim_timer.c +++ b/sim_timer.c @@ -1155,7 +1155,6 @@ clock_gettime(CLOCK_REALTIME, &now); return _timespec_to_double (&now); } -extern int32 sim_is_running; extern UNIT * volatile sim_wallclock_queue; extern UNIT * volatile sim_wallclock_entry; diff --git a/sim_video.c b/sim_video.c index 3cbc551c..41bb0c00 100644 --- a/sim_video.c +++ b/sim_video.c @@ -42,8 +42,6 @@ t_bool vid_mouse_b3 = FALSE; #include #include -extern int32 sim_is_running; - #define EVENT_REDRAW 1 /* redraw event for SDL */ #define EVENT_CLOSE 2 /* close event for SDL */ #define MAX_EVENTS 20 /* max events in queue */