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

SIGMA: Add LOAD support for Carriage Control Tape

Browse source
This commit is contained in:
Bob Supnik 2017-03-09 08:33:07 -08:00 • committed by Mark Pizzolato
parent 35c42bbcc2
commit 15b19193ed
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sigma/sigma_lp.c
View file

@ -1,6 +1,6 @@
/* sigma_lp.c: Sigma 7440/7450 line printer /* sigma_lp.c: Sigma 7440/7450 line printer
Copyright (c) 2007-2008, Robert M. Supnik Copyright (c) 2007-2017, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -24,6 +24,8 @@
in this Software without prior written authorization from Robert M Supnik. in this Software without prior written authorization from Robert M Supnik.
lp 7440/7445 or 7450 line printer lp 7440/7445 or 7450 line printer
09-Mar-2017 RMS Fixed unclosed file returns in CCT load (COVERITY)
*/ */
#include "sigma_io_defs.h" #include "sigma_io_defs.h"
@ -107,6 +109,7 @@ t_stat lp_attach (UNIT *uptr, CONST char *cptr);
t_stat lp_settype (UNIT *uptr, int32 val, CONST char *cptr, void *desc); t_stat lp_settype (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat lp_showtype (FILE *st, UNIT *uptr, int32 val, CONST void *desc); t_stat lp_showtype (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat lp_load_cct (UNIT *uptr, int32 val, CONST char *cptr, void *desc); t_stat lp_load_cct (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat lp_read_cct (FILE *cfile);
uint32 lp_fmt (UNIT *uptr); uint32 lp_fmt (UNIT *uptr);
uint32 lp_skip (UNIT *uptr, uint32 ch); uint32 lp_skip (UNIT *uptr, uint32 ch);
uint32 lp_space (UNIT *uptr, uint32 lines, t_bool skp); uint32 lp_space (UNIT *uptr, uint32 lines, t_bool skp);
@ -466,19 +469,32 @@ lp_pass = 0;
return attach_unit (uptr, cptr); return attach_unit (uptr, cptr);
} }
/* Set carriage control tape */ /* Set handler for carriage control tape */
t_stat lp_load_cct (UNIT *uptr, int32 val, CONST char *cptr, void *desc) t_stat lp_load_cct (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{ {
uint32 col, rpt, ptr, mask;
uint8 cctbuf[CCT_LNT];
t_stat r;
char cbuf[CBUFSIZE], gbuf[CBUFSIZE];
FILE *cfile; FILE *cfile;
t_stat r;
if ((cptr == NULL) || (*cptr == 0)) return SCPE_ARG; if ((cptr == NULL) || (*cptr == 0))
return SCPE_ARG;
if ((cfile = fopen (cptr, "r")) == NULL) if ((cfile = fopen (cptr, "r")) == NULL)
return SCPE_OPENERR; return SCPE_OPENERR;
r = lp_read_cct (cfile);
fclose (cfile);
return r;
}
/* Read carriage control tape - used by SET and LOAD */
t_stat lp_read_cct (FILE *cfile)
{
uint32 col, rpt, ptr, mask;
uint8 cctbuf[CCT_LNT];
char *cptr;
t_stat r;
char cbuf[CBUFSIZE], gbuf[CBUFSIZE];
ptr = 0; ptr = 0;
for ( ; (cptr = fgets (cbuf, CBUFSIZE, cfile)) != NULL; ) { for ( ; (cptr = fgets (cbuf, CBUFSIZE, cfile)) != NULL; ) {
mask = 0; mask = 0;
@ -508,7 +524,6 @@ lp_cctl = ptr;
lp_cctp = 0; lp_cctp = 0;
for (rpt = 0; rpt < lp_cctl; rpt++) for (rpt = 0; rpt < lp_cctl; rpt++)
lp_cct[rpt] = cctbuf[rpt]; lp_cct[rpt] = cctbuf[rpt];
fclose (cfile);
return SCPE_OK; return SCPE_OK;
} }

8
sigma/sigma_sys.c
View file

@ -1,6 +1,6 @@
/* sigma_sys.c: Sigma system interface /* sigma_sys.c: Sigma system interface
Copyright (c) 2007-2008, Robert M Supnik Copyright (c) 2007-2017, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -22,6 +22,8 @@
Except as contained in this notice, the name of Robert M Supnik shall not be Except as contained in this notice, the name of Robert M Supnik shall not be
used in advertising or otherwise to promote the sale, use or other dealings used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik. in this Software without prior written authorization from Robert M Supnik.
09-Mar-2017 RMS Added LOAD processor for CCT
*/ */
#include "sigma_defs.h" #include "sigma_defs.h"
@ -50,6 +52,8 @@ t_stat fprint_sym_m (FILE *of, uint32 inst);
t_stat parse_sym_m (const char *cptr, t_value *val); t_stat parse_sym_m (const char *cptr, t_value *val);
void fprint_ebcdic (FILE *of, uint32 c); void fprint_ebcdic (FILE *of, uint32 c);
extern t_stat lp_read_cct (FILE *cfile);
/* SCP data structures and interface routines /* SCP data structures and interface routines
sim_name simulator name string sim_name simulator name string
@ -166,7 +170,7 @@ uint8 ebcdic_to_ascii[256] = {
t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag) t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag)
{ {
return SCPE_NOFNC; return lp_read_cct (fileref);
} }
/* Symbol and format tables */ /* Symbol and format tables */