folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Fix various missing log output

Browse source
This commit is contained in:
Mark Pizzolato 2013-11-20 15:09:43 -08:00
parent 00b77c8533
commit e65aa904e7
3 changed files with 53 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
scp.c
View file

@ -2247,7 +2247,7 @@ DEVICE *dptr;
UNIT *uptr; UNIT *uptr;
MTAB *mptr; MTAB *mptr;
CTAB *gcmdp; CTAB *gcmdp;
C1TAB *ctbr, *glbr; C1TAB *ctbr = NULL, *glbr;
static CTAB set_glob_tab[] = { static CTAB set_glob_tab[] = {
{ "CONSOLE", &sim_set_console, 0 }, { "CONSOLE", &sim_set_console, 0 },
@ -3731,16 +3731,22 @@ if (sim_switches & SWMASK ('R')) { /* read only? */
if (uptr->fileref == NULL) /* open fail? */ if (uptr->fileref == NULL) /* open fail? */
return attach_err (uptr, SCPE_OPENERR); /* yes, error */ return attach_err (uptr, SCPE_OPENERR); /* yes, error */
uptr->flags = uptr->flags | UNIT_RO; /* set rd only */ uptr->flags = uptr->flags | UNIT_RO; /* set rd only */
if (!sim_quiet) if (!sim_quiet) {
printf ("%s: unit is read only\n", sim_dname (dptr)); printf ("%s: unit is read only\n", sim_dname (dptr));
if (sim_log)
fprintf (sim_log, "%s: unit is read only\n", sim_dname (dptr));
}
} }
else { else {
if (sim_switches & SWMASK ('N')) { /* new file only? */ if (sim_switches & SWMASK ('N')) { /* new file only? */
uptr->fileref = sim_fopen (cptr, "wb+"); /* open new file */ uptr->fileref = sim_fopen (cptr, "wb+"); /* open new file */
if (uptr->fileref == NULL) /* open fail? */ if (uptr->fileref == NULL) /* open fail? */
return attach_err (uptr, SCPE_OPENERR); /* yes, error */ return attach_err (uptr, SCPE_OPENERR); /* yes, error */
if (!sim_quiet) if (!sim_quiet) {
printf ("%s: creating new file\n", sim_dname (dptr)); printf ("%s: creating new file\n", sim_dname (dptr));
if (sim_log)
fprintf (sim_log, "%s: creating new file\n", sim_dname (dptr));
}
} }
else { /* normal */ else { /* normal */
uptr->fileref = sim_fopen (cptr, "rb+"); /* open r/w */ uptr->fileref = sim_fopen (cptr, "rb+"); /* open r/w */
@ -3756,8 +3762,11 @@ else {
if (uptr->fileref == NULL) /* open fail? */ if (uptr->fileref == NULL) /* open fail? */
return attach_err (uptr, SCPE_OPENERR); /* yes, error */ return attach_err (uptr, SCPE_OPENERR); /* yes, error */
uptr->flags = uptr->flags | UNIT_RO; /* set rd only */ uptr->flags = uptr->flags | UNIT_RO; /* set rd only */
if (!sim_quiet) if (!sim_quiet) {
printf ("%s: unit is read only\n", sim_dname (dptr)); printf ("%s: unit is read only\n", sim_dname (dptr));
if (sim_log)
fprintf (sim_log, "%s: unit is read only\n", sim_dname (dptr));
}
} }
else { /* doesn't exist */ else { /* doesn't exist */
if (sim_switches & SWMASK ('E')) /* must exist? */ if (sim_switches & SWMASK ('E')) /* must exist? */
@ -3765,8 +3774,11 @@ else {
uptr->fileref = sim_fopen (cptr, "wb+");/* open new file */ uptr->fileref = sim_fopen (cptr, "wb+");/* open new file */
if (uptr->fileref == NULL) /* open fail? */ if (uptr->fileref == NULL) /* open fail? */
return attach_err (uptr, SCPE_OPENERR); /* yes, error */ return attach_err (uptr, SCPE_OPENERR); /* yes, error */
if (!sim_quiet) if (!sim_quiet) {
printf ("%s: creating new file\n", sim_dname (dptr)); printf ("%s: creating new file\n", sim_dname (dptr));
if (sim_log)
fprintf (sim_log, "%s: creating new file\n", sim_dname (dptr));
}
} }
} /* end if null */ } /* end if null */
} /* end else */ } /* end else */
@ -3777,7 +3789,11 @@ if (uptr->flags & UNIT_BUFABLE) { /* buffer? */
uptr->filebuf = calloc (cap, SZ_D (dptr)); /* allocate */ uptr->filebuf = calloc (cap, SZ_D (dptr)); /* allocate */
if (uptr->filebuf == NULL) /* no buffer? */ if (uptr->filebuf == NULL) /* no buffer? */
return attach_err (uptr, SCPE_MEM); /* error */ return attach_err (uptr, SCPE_MEM); /* error */
if (!sim_quiet) printf ("%s: buffering file in memory\n", sim_dname (dptr)); if (!sim_quiet) {
printf ("%s: buffering file in memory\n", sim_dname (dptr));
if (sim_log)
fprintf (sim_log, "%s: buffering file in memory\n", sim_dname (dptr));
}
uptr->hwmark = (uint32)sim_fread (uptr->filebuf, /* read file */ uptr->hwmark = (uint32)sim_fread (uptr->filebuf, /* read file */
SZ_D (dptr), cap, uptr->fileref); SZ_D (dptr), cap, uptr->fileref);
uptr->flags = uptr->flags | UNIT_BUF; /* set buffered */ uptr->flags = uptr->flags | UNIT_BUF; /* set buffered */
@ -3891,8 +3907,11 @@ if ((dptr = find_dev_from_unit (uptr)) == NULL)
if (uptr->flags & UNIT_BUF) { if (uptr->flags & UNIT_BUF) {
uint32 cap = (uptr->hwmark + dptr->aincr - 1) / dptr->aincr; uint32 cap = (uptr->hwmark + dptr->aincr - 1) / dptr->aincr;
if (uptr->hwmark && ((uptr->flags & UNIT_RO) == 0)) { if (uptr->hwmark && ((uptr->flags & UNIT_RO) == 0)) {
if (!sim_quiet) if (!sim_quiet) {
printf ("%s: writing buffer to file\n", sim_dname (dptr)); printf ("%s: writing buffer to file\n", sim_dname (dptr));
if (sim_log)
fprintf (sim_log, "%s: writing buffer to file\n", sim_dname (dptr));
}
rewind (uptr->fileref); rewind (uptr->fileref);
sim_fwrite (uptr->filebuf, SZ_D (dptr), cap, uptr->fileref); sim_fwrite (uptr->filebuf, SZ_D (dptr), cap, uptr->fileref);
if (ferror (uptr->fileref)) if (ferror (uptr->fileref))
@ -4713,7 +4732,7 @@ return;
t_stat exdep_cmd (int32 flag, char *cptr) t_stat exdep_cmd (int32 flag, char *cptr)
{ {
char gbuf[CBUFSIZE], *gptr, *tptr; char gbuf[CBUFSIZE], *gptr, *tptr = NULL;
int32 opt; int32 opt;
t_addr low, high; t_addr low, high;
t_stat reason; t_stat reason;
@ -5663,6 +5682,7 @@ DEVICE *dptr;
if (uptr == NULL) /* arg error? */ if (uptr == NULL) /* arg error? */
return NULL; return NULL;
*uptr = NULL;
if ((dptr = find_dev (cptr))) { /* exact match? */ if ((dptr = find_dev (cptr))) { /* exact match? */
if (qdisable (dptr)) /* disabled? */ if (qdisable (dptr)) /* disabled? */
return NULL; return NULL;
@ -5770,6 +5790,7 @@ int32 i;
DEVICE *dptr; DEVICE *dptr;
REG *rptr, *srptr = NULL; REG *rptr, *srptr = NULL;
*gdptr = NULL;
for (i = 0; (dptr = sim_devices[i]) != 0; i++) { /* all dev */ for (i = 0; (dptr = sim_devices[i]) != 0; i++) { /* all dev */
if (dptr->flags & DEV_DIS) /* skip disabled */ if (dptr->flags & DEV_DIS) /* skip disabled */
continue; continue;
@ -5985,13 +6006,14 @@ SCHTAB *get_search (char *cptr, int32 radix, SCHTAB *schptr)
{ {
int32 c, logop, cmpop; int32 c, logop, cmpop;
t_value logval, cmpval; t_value logval, cmpval;
char *sptr, *tptr; const char *sptr;
char *tptr;
const char logstr[] = "|&^", cmpstr[] = "=!><"; const char logstr[] = "|&^", cmpstr[] = "=!><";
logval = cmpval = 0; logval = cmpval = 0;
if (*cptr == 0) /* check for clause */ if (*cptr == 0) /* check for clause */
return NULL; return NULL;
for (logop = cmpop = -1; (c = *cptr++); ) { /* loop thru clauses */ for (logop = cmpop = -1; (c = *cptr++); ) { /* loop thru clauses */
if ((sptr = strchr (logstr, c))) { /* check for mask */ if ((sptr = strchr (logstr, c))) { /* check for mask */
logop = (int32)(sptr - logstr); logop = (int32)(sptr - logstr);
logval = strtotv (cptr, &tptr, radix); logval = strtotv (cptr, &tptr, radix);
@ -6203,13 +6225,12 @@ t_stat fprint_val (FILE *stream, t_value val, uint32 radix,
uint32 width, uint32 format) uint32 width, uint32 format)
{ {
char dbuf[MAX_WIDTH + 1]; char dbuf[MAX_WIDTH + 1];
t_stat r;
if (!stream) if (!stream)
return sprint_val (NULL, val, radix, width, format); return sprint_val (NULL, val, radix, width, format);
if (width > MAX_WIDTH) if (width > MAX_WIDTH)
width = MAX_WIDTH; width = MAX_WIDTH;
r = sprint_val (dbuf, val, radix, width, format); sprint_val (dbuf, val, radix, width, format);
if (fputs (dbuf, stream) == EOF) if (fputs (dbuf, stream) == EOF)
return SCPE_IOERR; return SCPE_IOERR;
return SCPE_OK; return SCPE_OK;
@ -6922,7 +6943,6 @@ return debtab_nomatch;
static const char *sim_debug_prefix (uint32 dbits, DEVICE* dptr) static const char *sim_debug_prefix (uint32 dbits, DEVICE* dptr)
{ {
char* debug_type = get_dbg_verb (dbits, dptr); char* debug_type = get_dbg_verb (dbits, dptr);
static const char* debug_fmt = "DBG(%.0f)%s> %s %s: ";
char tim_t[32] = ""; char tim_t[32] = "";
char tim_a[32] = ""; char tim_a[32] = "";
char pc_s[64] = ""; char pc_s[64] = "";
@ -6940,7 +6960,7 @@ if (sim_deb_switches & SWMASK ('T')) {
sprintf(tim_t, "%02d:%02d:%02d.%03d ", now->tm_hour, now->tm_min, now->tm_sec, (int)(time_now.tv_nsec/1000000)); sprintf(tim_t, "%02d:%02d:%02d.%03d ", now->tm_hour, now->tm_min, now->tm_sec, (int)(time_now.tv_nsec/1000000));
} }
if (sim_deb_switches & SWMASK ('A')) { if (sim_deb_switches & SWMASK ('A')) {
sprintf(tim_t, "%lld.%03d ", (long long)(time_now.tv_sec), (int)(time_now.tv_nsec/1000000)); sprintf(tim_t, "%" LL_FMT "d.%03d ", (long long)(time_now.tv_sec), (int)(time_now.tv_nsec/1000000));
} }
if (sim_deb_switches & SWMASK ('P')) { if (sim_deb_switches & SWMASK ('P')) {
t_value val; t_value val;
@ -7032,7 +7052,6 @@ if (sim_deb && (dptr->dctrl & dbits)) {
char *buf = stackbuf; char *buf = stackbuf;
va_list arglist; va_list arglist;
int32 i, j, len; int32 i, j, len;
char* debug_type = get_dbg_verb (dbits, dptr);
const char* debug_prefix = sim_debug_prefix(dbits, dptr); /* prefix to print if required */ const char* debug_prefix = sim_debug_prefix(dbits, dptr); /* prefix to print if required */
buf[bufsize-1] = '\0'; buf[bufsize-1] = '\0';

26
sim_console.c
View file

@ -515,7 +515,7 @@ return SCPE_OK;
t_stat sim_rem_con_data_svc (UNIT *uptr) t_stat sim_rem_con_data_svc (UNIT *uptr)
{ {
int32 i, j, c; int32 i, j, c = 0;
t_stat stat, stat_nomessage; t_stat stat, stat_nomessage;
t_bool stepping = FALSE; t_bool stepping = FALSE;
int32 steps = 1; int32 steps = 1;
@ -525,7 +525,7 @@ t_bool close_session = FALSE;
TMLN *lp; TMLN *lp;
char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], *cptr, *argv[1] = {NULL}; char cbuf[4*CBUFSIZE], gbuf[CBUFSIZE], *cptr, *argv[1] = {NULL};
CTAB *cmdp = NULL; CTAB *cmdp = NULL;
uint32 read_start_time; uint32 read_start_time = 0;
t_offset cmd_log_start; t_offset cmd_log_start;
tmxr_poll_rx (&sim_rem_con_tmxr); /* poll input */ tmxr_poll_rx (&sim_rem_con_tmxr); /* poll input */
@ -686,7 +686,7 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
} }
sim_rem_buf[i][sim_rem_buf_ptr[i]++] = c; sim_rem_buf[i][sim_rem_buf_ptr[i]++] = c;
sim_rem_buf[i][sim_rem_buf_ptr[i]] = '\0'; sim_rem_buf[i][sim_rem_buf_ptr[i]] = '\0';
if (sim_rem_buf_ptr[i] >= sizeof(cbuf)) if (((size_t)sim_rem_buf_ptr[i]) >= sizeof(cbuf))
got_command = TRUE; /* command too long */ got_command = TRUE; /* command too long */
break; break;
} }
@ -1073,16 +1073,16 @@ if (!sim_quiet) {
printf (" Debug messages display time of day as hh:mm:ss.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : ""); printf (" Debug messages display time of day as hh:mm:ss.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : "");
if (sim_deb_switches & SWMASK ('A')) if (sim_deb_switches & SWMASK ('A'))
printf (" Debug messages display time of day as seconds.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : ""); printf (" Debug messages display time of day as seconds.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : "");
} if (sim_log) {
if (sim_log) { fprintf (sim_log, "Debug output to \"%s\"\n",
fprintf (sim_log, "Debug output to \"%s\"\n", sim_logfile_name (sim_deb, sim_deb_ref));
sim_logfile_name (sim_deb, sim_deb_ref)); if (sim_deb_switches & SWMASK ('P'))
if (sim_deb_switches & SWMASK ('P')) fprintf (sim_log, " Debug messages contain current PC value\n");
fprintf (sim_log, " Debug messages contain current PC value\n"); if (sim_deb_switches & SWMASK ('T'))
if (sim_deb_switches & SWMASK ('T')) fprintf (sim_log, " Debug messages display time of day as hh:mm:ss.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : "");
fprintf (sim_log, " Debug messages display time of day as hh:mm:ss.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : ""); if (sim_deb_switches & SWMASK ('A'))
if (sim_deb_switches & SWMASK ('A')) fprintf (sim_log, " Debug messages display time of day as seconds.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : "");
fprintf (sim_log, " Debug messages display time of day as seconds.msec%s\n", sim_deb_switches & SWMASK ('R') ? " relative to the start of debugging" : ""); }
} }
time(&now); time(&now);
fprintf (sim_deb, "Debug output to \"%s\" at %s", sim_logfile_name (sim_deb, sim_deb_ref), ctime(&now)); fprintf (sim_deb, "Debug output to \"%s\" at %s", sim_logfile_name (sim_deb, sim_deb_ref), ctime(&now));

6
sim_defs.h
View file

@ -209,6 +209,12 @@ typedef uint32 t_addr;
#define STACKBUFSIZE 2048 #define STACKBUFSIZE 2048
#endif #endif
#if defined (_WIN32) /* Actually, a GCC issue */
#define LL_FMT "I64"
#else
#define LL_FMT "ll"
#endif
#if defined (VMS) && (defined (__ia64) || defined (__ALPHA)) #if defined (VMS) && (defined (__ia64) || defined (__ALPHA))
#define HAVE_GLOB #define HAVE_GLOB
#endif #endif