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

VAX: Parse for switches in BOOT command implementations

Browse source
This commit is contained in:
Mark Pizzolato 2018-09-27 06:35:31 -07:00
parent 928193d463
commit 0ca011cd46
7 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VAX/vax610_sysdev.c
View file

@ -363,6 +363,8 @@ t_stat vax610_boot (int32 flag, CONST char *ptr)
{ {
t_stat r; t_stat r;
if ((ptr = get_sim_sw (ptr)) == NULL) /* get switches */
return SCPE_INVSW;
r = vax610_boot_parse (flag, ptr); /* parse the boot cmd */ r = vax610_boot_parse (flag, ptr); /* parse the boot cmd */
if (r != SCPE_OK) { /* error? */ if (r != SCPE_OK) { /* error? */
if (r >= SCPE_BASE) { /* message available? */ if (r >= SCPE_BASE) { /* message available? */

2
VAX/vax630_sysdev.c
View file

@ -905,6 +905,8 @@ t_stat vax630_boot (int32 flag, CONST char *ptr)
{ {
char gbuf[CBUFSIZE]; char gbuf[CBUFSIZE];
if ((ptr = get_sim_sw (ptr)) == NULL) /* get switches */
return SCPE_INVSW;
get_glyph (ptr, gbuf, 0); /* get glyph */ get_glyph (ptr, gbuf, 0); /* get glyph */
if (gbuf[0] && strcmp (gbuf, "CPU")) if (gbuf[0] && strcmp (gbuf, "CPU"))
return SCPE_ARG; /* Only can specify CPU device */ return SCPE_ARG; /* Only can specify CPU device */

2
VAX/vax730_sys.c
View file

@ -470,6 +470,8 @@ t_stat vax730_boot (int32 flag, CONST char *ptr)
{ {
t_stat r; t_stat r;
if ((ptr = get_sim_sw (ptr)) == NULL) /* get switches */
return SCPE_INVSW;
r = vax730_boot_parse (flag, ptr); /* parse the boot cmd */ r = vax730_boot_parse (flag, ptr); /* parse the boot cmd */
if (r != SCPE_OK) { /* error? */ if (r != SCPE_OK) { /* error? */
if (r >= SCPE_BASE) { /* message available? */ if (r >= SCPE_BASE) { /* message available? */

2
VAX/vax750_cmi.c
View file

@ -609,6 +609,8 @@ t_stat vax750_boot (int32 flag, CONST char *ptr)
{ {
t_stat r; t_stat r;
if ((ptr = get_sim_sw (ptr)) == NULL) /* get switches */
return SCPE_INVSW;
r = vax750_boot_parse (flag, ptr); /* parse the boot cmd */ r = vax750_boot_parse (flag, ptr); /* parse the boot cmd */
if (r != SCPE_OK) { /* error? */ if (r != SCPE_OK) { /* error? */
if (r >= SCPE_BASE) { /* message available? */ if (r >= SCPE_BASE) { /* message available? */

2
VAX/vax780_sbi.c
View file

@ -650,6 +650,8 @@ t_stat r;
if (!ptr || !*ptr) if (!ptr || !*ptr)
return SCPE_2FARG; return SCPE_2FARG;
if ((ptr = get_sim_sw (ptr)) == NULL) /* get switches */
return SCPE_INVSW;
regptr = get_glyph (ptr, gbuf, 0); /* get glyph */ regptr = get_glyph (ptr, gbuf, 0); /* get glyph */
if ((slptr = strchr (gbuf, '/'))) { /* found slash? */ if ((slptr = strchr (gbuf, '/'))) { /* found slash? */
regptr = strchr (ptr, '/'); /* locate orig */ regptr = strchr (ptr, '/'); /* locate orig */

2
VAX/vax860_abus.c
View file

@ -686,6 +686,8 @@ t_stat vax860_boot (int32 flag, CONST char *ptr)
{ {
t_stat r; t_stat r;
if ((ptr = get_sim_sw (ptr)) == NULL) /* get switches */
return SCPE_INVSW;
r = vax860_boot_parse (flag, ptr); /* parse the boot cmd */ r = vax860_boot_parse (flag, ptr); /* parse the boot cmd */
if (r != SCPE_OK) { /* error? */ if (r != SCPE_OK) { /* error? */
if (r >= SCPE_BASE) { /* message available? */ if (r >= SCPE_BASE) { /* message available? */

2
VAX/vax_sysdev.c
View file

@ -1704,6 +1704,8 @@ t_stat vax_boot (int32 flag, CONST char *ptr)
{ {
char gbuf[CBUFSIZE]; char gbuf[CBUFSIZE];
if ((ptr = get_sim_sw (ptr)) == NULL) /* get switches */
return SCPE_INVSW;
get_glyph (ptr, gbuf, 0); /* get glyph */ get_glyph (ptr, gbuf, 0); /* get glyph */
if (gbuf[0] && strcmp (gbuf, "CPU")) if (gbuf[0] && strcmp (gbuf, "CPU"))
return SCPE_ARG; /* Only can specify CPU device */ return SCPE_ARG; /* Only can specify CPU device */