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

VAX: Fix inconsistencies in setting CPU model for simulators that have different models

Browse source
This commit is contained in:
Mark Pizzolato 2016-01-22 08:44:09 -08:00
parent e7d379a862
commit ed64606ea3
5 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
VAX/vax780_defs.h
View file

@ -174,8 +174,8 @@
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, 0, "MEMORY", NULL, NULL, &cpu_show_memory, NULL, "Display memory configuration" } { MTAB_XTD|MTAB_VDV|MTAB_NMO, 0, "MEMORY", NULL, NULL, &cpu_show_memory, NULL, "Display memory configuration" }
extern t_stat cpu_show_memory (FILE* st, UNIT* uptr, int32 val, void* desc); extern t_stat cpu_show_memory (FILE* st, UNIT* uptr, int32 val, void* desc);
#define CPU_MODEL_MODIFIERS \ #define CPU_MODEL_MODIFIERS \
{ MTAB_XTD|MTAB_VDV, 0, "MODEL", NULL, \ { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={780|785}", \
NULL, &cpu_show_model, NULL, "Display the simulator CPU Model" } &cpu_set_model, &cpu_show_model, NULL, "Set/Show the simulator CPU Model" }
/* Unibus I/O registers */ /* Unibus I/O registers */

8
VAX/vax780_sbi.c
View file

@ -836,10 +836,14 @@ return SCPE_OK;
t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc) t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc)
{ {
if (cptr == NULL) return SCPE_ARG; if (cptr == NULL) return SCPE_ARG;
if (strcmp(cptr, "780") == 0) if (strcmp(cptr, "780") == 0) {
sys_model = 0; sys_model = 0;
else if (strcmp(cptr, "785") == 0) strcpy (sim_name, "VAX 11/780");
}
else if (strcmp(cptr, "785") == 0) {
sys_model = 1; sys_model = 1;
strcpy (sim_name, "VAX 11/785");
}
else else
return SCPE_ARG; return SCPE_ARG;
return SCPE_OK; return SCPE_OK;

8
VAX/vax860_abus.c
View file

@ -841,10 +841,14 @@ return SCPE_OK;
t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc) t_stat cpu_set_model (UNIT *uptr, int32 val, char *cptr, void *desc)
{ {
if (cptr == NULL) return SCPE_ARG; if (cptr == NULL) return SCPE_ARG;
if (strcmp(cptr, "8600") == 0) if (strcmp(cptr, "8600") == 0) {
sys_model = 0; sys_model = 0;
else if (strcmp(cptr, "8650") == 0) strcpy (sim_name, "VAX 8600");
}
else if (strcmp(cptr, "8650") == 0) {
sys_model = 1; sys_model = 1;
strcpy (sim_name, "VAX 8650");
}
else else
return SCPE_ARG; return SCPE_ARG;
return SCPE_OK; return SCPE_OK;

2
VAX/vax860_defs.h
View file

@ -197,7 +197,7 @@
extern t_stat cpu_show_memory (FILE* st, UNIT* uptr, int32 val, void* desc); extern t_stat cpu_show_memory (FILE* st, UNIT* uptr, int32 val, void* desc);
#define CPU_MODEL_MODIFIERS \ #define CPU_MODEL_MODIFIERS \
{ MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL=8600|8650", \ { MTAB_XTD|MTAB_VDV, 0, "MODEL", "MODEL={8600|8650}", \
&cpu_set_model, &cpu_show_model, NULL, "Set/Display processor model" } &cpu_set_model, &cpu_show_model, NULL, "Set/Display processor model" }
/* Unibus I/O registers */ /* Unibus I/O registers */

2
VAX/vax_sysdev.c
View file

@ -1822,7 +1822,7 @@ char gbuf[CBUFSIZE];
if ((cptr == NULL) || (!*cptr)) if ((cptr == NULL) || (!*cptr))
return SCPE_ARG; return SCPE_ARG;
cptr = get_glyph (cptr, gbuf, 0); cptr = get_glyph (cptr, gbuf, 0);
if (MATCH_CMD(cptr, "VAXSERVER") == 0) { if (MATCH_CMD(gbuf, "VAXSERVER") == 0) {
sys_model = 0; sys_model = 0;
strcpy (sim_name, "VAXServer 3900 (KA655)"); strcpy (sim_name, "VAXServer 3900 (KA655)");
} }