1
0
mirror of https://github.com/rcornwell/sims.git synced 2026-05-04 23:16:48 +00:00

Merge current simh maste components and APIs

This commit is contained in:
Mark Pizzolato
2016-05-15 23:13:25 -07:00
parent 2dec7fd802
commit 88a9f5daa9
145 changed files with 38083 additions and 793 deletions

View File

@@ -176,9 +176,9 @@ InstHistory *hst = NULL; /* instruction history *
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);
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat cpu_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag,
const char *cptr);
const char *cpu_description (DEVICE *dptr);
@@ -2801,7 +2801,7 @@ return SCPE_OK;
/* Memory size change */
t_stat cpu_set_size (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_size (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
uint64 mc = 0;
uint32 i;
@@ -2857,7 +2857,7 @@ return FALSE;
/* Set history */
t_stat cpu_set_hist (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_hist (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int32 i, lnt;
t_stat r;
@@ -2888,7 +2888,7 @@ return SCPE_OK;
/* Show history */
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
int32 k, di, lnt;
char *cptr = (char *) desc;

View File

@@ -33,8 +33,8 @@ extern int32 tmxr_poll;
t_stat ctyi_svc (UNIT *uptr);
t_stat ctyo_svc (UNIT *uptr);
t_stat cty_reset (DEVICE *dptr);
t_stat cty_stop_os (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat tty_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat cty_stop_os (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat tty_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat cty_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
const char *cty_description (DEVICE *dptr);
@@ -166,13 +166,13 @@ return SCPE_OK;
/* Stop operating system */
t_stat cty_stop_os (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cty_stop_os (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
M[CTY_SWITCH] = 1; /* tell OS to stop */
return SCPE_OK;
}
t_stat tty_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat tty_set_mode (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
cty_unit[0].flags = (cty_unit[0].flags & ~TT_MODE) | val;
cty_unit[1].flags = (cty_unit[1].flags & ~TT_MODE) | val;

View File

@@ -80,7 +80,7 @@ t_stat dc_devio(uint32 dev, uint64 *data);
t_stat dc_svc (UNIT *uptr);
t_stat dc_doscan (UNIT *uptr);
t_stat dc_reset (DEVICE *dptr);
t_stat dc_attach (UNIT *uptr, char *cptr);
t_stat dc_attach (UNIT *uptr, CONST char *cptr);
t_stat dc_detach (UNIT *uptr);
t_stat dc_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag,
const char *cptr);
@@ -297,7 +297,7 @@ return SCPE_OK;
/* Attach routine */
t_stat dc_attach (UNIT *uptr, char *cptr)
t_stat dc_attach (UNIT *uptr, CONST char *cptr)
{
t_stat reason;

View File

@@ -162,9 +162,9 @@ t_stat dp_svc(UNIT *);
t_stat dp_boot(int32, DEVICE *);
void dp_ini(UNIT *, t_bool);
t_stat dp_reset(DEVICE *);
t_stat dp_attach(UNIT *, char *);
t_stat dp_attach(UNIT *, CONST char *);
t_stat dp_detach(UNIT *);
t_stat dp_set_type(UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat dp_set_type(UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat dp_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag,
const char *cptr);
const char *dp_description (DEVICE *dptr);
@@ -625,7 +625,7 @@ t_stat dp_svc (UNIT *uptr)
t_stat
dp_set_type(UNIT *uptr, int32 val, char *cptr, void *desc)
dp_set_type(UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int i;
if (uptr == NULL) return SCPE_IERR;
@@ -684,7 +684,7 @@ dp_boot(int32 unit_num, DEVICE * dptr)
/* Device attach */
t_stat dp_attach (UNIT *uptr, char *cptr)
t_stat dp_attach (UNIT *uptr, CONST char *cptr)
{
int32 drv, i, p;
t_stat r;

View File

@@ -367,7 +367,7 @@ t_stat dt_devio(uint32 dev, uint64 *data);
int32 dt_iors (void);
t_stat dt_svc (UNIT *uptr);
t_stat dt_reset (DEVICE *dptr);
t_stat dt_attach (UNIT *uptr, char *cptr);
t_stat dt_attach (UNIT *uptr, CONST char *cptr);
t_stat dt_detach (UNIT *uptr);
void dt_deselect (int32 oldf);
void dt_newsa (int32 newf);
@@ -1438,7 +1438,7 @@ return 0;
If 18b/36b, read data into buffer
*/
t_stat dt_attach (UNIT *uptr, char *cptr)
t_stat dt_attach (UNIT *uptr, CONST char *cptr)
{
#if 0
uint16 pdp8b[D8_NBSIZE];

View File

@@ -59,7 +59,7 @@ DEVICE lpt_dev;
t_stat lpt_devio(uint32 dev, uint64 *data);
t_stat lpt_svc (UNIT *uptr);
t_stat lpt_reset (DEVICE *dptr);
t_stat lpt_attach (UNIT *uptr, char *cptr);
t_stat lpt_attach (UNIT *uptr, CONST char *cptr);
t_stat lpt_detach (UNIT *uptr);
t_stat lpt_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag,
const char *cptr);
@@ -211,7 +211,7 @@ return SCPE_OK;
/* Attach routine */
t_stat lpt_attach (UNIT *uptr, char *cptr)
t_stat lpt_attach (UNIT *uptr, CONST char *cptr)
{
t_stat reason;

View File

@@ -135,10 +135,10 @@ t_stat mt_devio(uint32 dev, uint64 *data);
t_stat mt_srv(UNIT *);
t_stat mt_boot(int32, DEVICE *);
void mt_ini(UNIT *, t_bool);
t_stat set_mta (UNIT *uptr, int32 val, char *cptr, void *desc) ;
t_stat show_mta (FILE *st, UNIT *uptr, int32 val, void *desc);
t_stat set_mta (UNIT *uptr, int32 val, CONST char *cptr, void *desc) ;
t_stat show_mta (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat mt_reset(DEVICE *);
t_stat mt_attach(UNIT *, char *);
t_stat mt_attach(UNIT *, CONST char *);
t_stat mt_detach(UNIT *);
t_stat mt_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag,
const char *cptr);
@@ -745,7 +745,7 @@ mt_boot(int32 unit_num, DEVICE * dptr)
return SCPE_OK;
}
t_stat set_mta (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat set_mta (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
DEVICE *dptr;
dptr = find_dev_from_unit (uptr);
@@ -759,7 +759,7 @@ t_stat set_mta (UNIT *uptr, int32 val, char *cptr, void *desc)
return SCPE_OK;
}
t_stat show_mta (FILE *st, UNIT *uptr, int32 val, void *desc)
t_stat show_mta (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
DEVICE *dptr;
@@ -793,7 +793,7 @@ mt_reset(DEVICE * dptr)
}
t_stat
mt_attach(UNIT * uptr, char *file)
mt_attach(UNIT * uptr, CONST char *file)
{
return sim_tape_attach(uptr, file);
}

View File

@@ -57,7 +57,7 @@ DEVICE ptp_dev;
t_stat ptp_devio(uint32 dev, uint64 *data);
t_stat ptp_svc (UNIT *uptr);
t_stat ptp_reset (DEVICE *dptr);
t_stat ptp_attach (UNIT *uptr, char *cptr);
t_stat ptp_attach (UNIT *uptr, CONST char *cptr);
t_stat ptp_detach (UNIT *uptr);
t_stat ptp_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
const char *ptp_description (DEVICE *dptr);
@@ -67,7 +67,7 @@ DEVICE ptr_dev;
t_stat ptr_devio(uint32 dev, uint64 *data);
t_stat ptr_svc (UNIT *uptr);
t_stat ptr_reset (DEVICE *dptr);
t_stat ptr_attach (UNIT *uptr, char *cptr);
t_stat ptr_attach (UNIT *uptr, CONST char *cptr);
t_stat ptr_detach (UNIT *uptr);
t_stat ptr_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
const char *ptr_description (DEVICE *dptr);
@@ -207,7 +207,7 @@ return SCPE_OK;
/* Attach routine */
t_stat ptp_attach (UNIT *uptr, char *cptr)
t_stat ptp_attach (UNIT *uptr, CONST char *cptr)
{
t_stat reason;
@@ -318,7 +318,7 @@ return SCPE_OK;
/* Attach routine */
t_stat ptr_attach (UNIT *uptr, char *cptr)
t_stat ptr_attach (UNIT *uptr, CONST char *cptr)
{
t_stat reason;

View File

@@ -123,9 +123,9 @@ t_stat rc_svc(UNIT *);
t_stat rc_boot(int32, DEVICE *);
void rc_ini(UNIT *, t_bool);
t_stat rc_reset(DEVICE *);
t_stat rc_attach(UNIT *, char *);
t_stat rc_attach(UNIT *, CONST char *);
t_stat rc_detach(UNIT *);
t_stat rc_set_type(UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat rc_set_type(UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat rc_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag,
const char *cptr);
const char *rc_description (DEVICE *dptr);
@@ -391,7 +391,7 @@ t_stat rc_svc (UNIT *uptr)
t_stat
rc_set_type(UNIT *uptr, int32 val, char *cptr, void *desc)
rc_set_type(UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int i;
if (uptr == NULL) return SCPE_IERR;
@@ -454,7 +454,7 @@ rc_boot(int32 unit_num, DEVICE * dptr)
/* Device attach */
t_stat rc_attach (UNIT *uptr, char *cptr)
t_stat rc_attach (UNIT *uptr, CONST char *cptr)
{
int32 drv, i, p;
t_stat r;

View File

@@ -299,9 +299,9 @@ t_stat rp_svc(UNIT *);
t_stat rp_boot(int32, DEVICE *);
void rp_ini(UNIT *, t_bool);
t_stat rp_reset(DEVICE *);
t_stat rp_attach(UNIT *, char *);
t_stat rp_attach(UNIT *, CONST char *);
t_stat rp_detach(UNIT *);
t_stat rp_set_type(UNIT *uptr, int32 val, char *cptr, void *desc);
t_stat rp_set_type(UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat rp_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag,
const char *cptr);
const char *rp_description (DEVICE *dptr);
@@ -862,7 +862,7 @@ t_stat rp_svc (UNIT *uptr)
t_stat
rp_set_type(UNIT *uptr, int32 val, char *cptr, void *desc)
rp_set_type(UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
int i;
if (uptr == NULL) return SCPE_IERR;
@@ -915,7 +915,7 @@ rp_boot(int32 unit_num, DEVICE * rptr)
/* Device attach */
t_stat rp_attach (UNIT *uptr, char *cptr)
t_stat rp_attach (UNIT *uptr, CONST char *cptr)
{
int32 drv, i, p;
t_stat r;

View File

@@ -359,7 +359,7 @@ return SCPE_OK;
/* Master loader */
t_stat sim_load (FILE *fileref, char *cptr, char *fnam, int flag)
t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag)
{
uint64 data;
int32 wc, fmt;
@@ -779,21 +779,18 @@ return (ind | (xr << 18) | val);
status = error status
*/
t_stat parse_sym (char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
t_stat parse_sym (CONST char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 sw)
{
int32 cflag, i, j;
t_value ac, dev;
t_stat r;
char gbuf[CBUFSIZE];
char gbuf[CBUFSIZE], cbuf[2*CBUFSIZE];
cflag = (uptr == NULL) || (uptr == &cpu_unit);
while (isspace (*cptr)) cptr++;
for (i = 0; i < 6; i++) {
if (cptr[i] == 0) {
for (j = i + 1; j <= 6; j++) cptr[j] = 0;
break;
}
}
memset (cbuf, '\0', sizeof(cbuf));
strncpy (cbuf, cptr, sizeof(cbuf)-7);
cptr = cbuf;
if ((sw & SWMASK ('A')) || ((*cptr == '\'') && cptr++)) { /* ASCII char? */
if (cptr[0] == 0) /* must have 1 char */
return SCPE_ARG;