From 9022de500d6f952d18054396dafc8e02cab220f1 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 5 Mar 2014 12:53:32 -0800 Subject: [PATCH] SCP: Removed the irrelevant sim_deb_PC variable since it duplicates the role sim_PC simulator variable. --- scp.c | 7 +++---- scp.h | 1 - sim_console.c | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/scp.c b/scp.c index fa7f1238..1122e901 100644 --- a/scp.c +++ b/scp.c @@ -484,7 +484,6 @@ FILEREF *sim_log_ref = NULL; /* log file file referen FILE *sim_deb = NULL; /* debug file */ FILEREF *sim_deb_ref = NULL; /* debug file file reference */ int32 sim_deb_switches = 0; /* debug switches */ -REG *sim_deb_PC = NULL; /* debug PC register pointer */ struct timespec sim_deb_basetime; /* debug timestamp relative base time */ char *sim_prompt = NULL; /* prompt string */ static FILE *sim_gotofile; /* the currently open do file */ @@ -7826,9 +7825,9 @@ if (sim_deb_switches & SWMASK ('P')) { if (sim_vm_pc_value) val = (*sim_vm_pc_value)(); else - val = get_rval (sim_deb_PC, 0); - sprintf(pc_s, "-%s:", sim_deb_PC->name); - sprint_val (&pc_s[strlen(pc_s)], val, sim_deb_PC->radix, sim_deb_PC->width, sim_deb_PC->flags & REG_FMT); + val = get_rval (sim_PC, 0); + sprintf(pc_s, "-%s:", sim_PC->name); + sprint_val (&pc_s[strlen(pc_s)], val, sim_PC->radix, sim_PC->width, sim_PC->flags & REG_FMT); } sprintf(debug_line_prefix, "DBG(%s%s%.0f%s)%s> %s %s: ", tim_t, tim_a, sim_gtime(), pc_s, AIO_MAIN_THREAD ? "" : "+", dptr->name, debug_type); return debug_line_prefix; diff --git a/scp.h b/scp.h index 1ab76aa8..fbd28c4b 100644 --- a/scp.h +++ b/scp.h @@ -180,7 +180,6 @@ extern FILE *sim_deb; /* debug file */ extern FILEREF *sim_deb_ref; /* debug file file reference */ extern int32 sim_deb_switches; /* debug display flags */ extern struct timespec sim_deb_basetime; /* debug base time for relative time output */ -extern REG *sim_deb_PC; /* debug PC register */ extern UNIT *sim_clock_queue; extern int32 sim_is_running; extern char *sim_prompt; /* prompt string */ diff --git a/sim_console.c b/sim_console.c index c393a7f2..28eaa7a1 100644 --- a/sim_console.c +++ b/sim_console.c @@ -1063,8 +1063,6 @@ if (sim_deb_switches & SWMASK ('R')) { if (!(sim_deb_switches & (SWMASK ('A') | SWMASK ('T')))) sim_deb_switches |= SWMASK ('T'); } -if (sim_deb_switches & SWMASK ('P')) - sim_deb_PC = find_reg ("PC", NULL, sim_dflt_dev); if (!sim_quiet) { printf ("Debug output to \"%s\"\n", sim_logfile_name (sim_deb, sim_deb_ref)); @@ -1126,7 +1124,6 @@ if (sim_deb == NULL) /* no debug? */ sim_close_logfile (&sim_deb_ref); sim_deb = NULL; sim_deb_switches = 0; -sim_deb_PC = NULL; if (!sim_quiet) { printf ("Debug output disabled\n"); if (sim_log)