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

VAX, MicroVAX2: Add display of ROM and NVR address ranges

Browse source
This commit is contained in:
Mark Pizzolato 2017-12-18 05:10:27 -08:00
parent 51700bc139
commit bdddcb4004
4 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
PDP11/pdp11_io_lib.c
View file

@ -169,6 +169,16 @@ if (dptr == NULL)
return auto_config (NULL, 0); /* autoconfigure */ return auto_config (NULL, 0); /* autoconfigure */
} }
/* Show device address */
t_stat show_mapped_addr (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
uint32 base = (uint32)desc;
fprintf (st, "address=%08X-%08X", base, (int)(base + uptr->capac - 1));
return SCPE_OK;
}
/* Change device vector */ /* Change device vector */
t_stat set_vec (UNIT *uptr, int32 arg, CONST char *cptr, void *desc) t_stat set_vec (UNIT *uptr, int32 arg, CONST char *cptr, void *desc)

1
PDP11/pdp11_io_lib.h
View file

@ -31,6 +31,7 @@ t_stat set_autocon (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat show_autocon (FILE *st, UNIT *uptr, int32 val, CONST void *desc); t_stat show_autocon (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat set_addr (UNIT *uptr, int32 val, CONST char *cptr, void *desc); t_stat set_addr (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat show_addr (FILE *st, UNIT *uptr, int32 val, CONST void *desc); t_stat show_addr (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat show_mapped_addr (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat set_addr_flt (UNIT *uptr, int32 val, CONST char *cptr, void *desc); t_stat set_addr_flt (UNIT *uptr, int32 val, CONST char *cptr, void *desc);
t_stat set_vec (UNIT *uptr, int32 arg, CONST char *cptr, void *desc); t_stat set_vec (UNIT *uptr, int32 arg, CONST char *cptr, void *desc);
t_stat show_vec (FILE *st, UNIT *uptr, int32 arg, CONST void *desc); t_stat show_vec (FILE *st, UNIT *uptr, int32 arg, CONST void *desc);

8
VAX/vax630_sysdev.c
View file

@ -206,6 +206,7 @@ REG rom_reg[] = {
}; };
MTAB rom_mod[] = { MTAB rom_mod[] = {
{ MTAB_XTD|MTAB_VDV, 0, "ADDRESS", NULL, NULL, &show_mapped_addr, (void *)ROMBASE, "Display base address" },
{ UNIT_NODELAY, UNIT_NODELAY, "fast access", "NODELAY", NULL, NULL, NULL, "Disable calibrated ROM access speed" }, { UNIT_NODELAY, UNIT_NODELAY, "fast access", "NODELAY", NULL, NULL, NULL, "Disable calibrated ROM access speed" },
{ UNIT_NODELAY, 0, "1usec calibrated access", "DELAY", NULL, NULL, NULL, "Enable calibrated ROM access speed" }, { UNIT_NODELAY, 0, "1usec calibrated access", "DELAY", NULL, NULL, NULL, "Enable calibrated ROM access speed" },
{ 0 } { 0 }
@ -234,8 +235,13 @@ REG nvr_reg[] = {
{ NULL } { NULL }
}; };
MTAB nvr_mod[] = {
{ MTAB_XTD|MTAB_VDV, 0, "ADDRESS", NULL, NULL, &show_mapped_addr, (void *)NVRBASE, "Display base address" },
{ 0 }
};
DEVICE nvr_dev = { DEVICE nvr_dev = {
"NVR", &nvr_unit, nvr_reg, NULL, "NVR", &nvr_unit, nvr_reg, nvr_mod,
1, 16, NVRAWIDTH, 4, 16, 32, 1, 16, NVRAWIDTH, 4, 16, 32,
&nvr_ex, &nvr_dep, &nvr_reset, &nvr_ex, &nvr_dep, &nvr_reset,
NULL, &nvr_attach, &nvr_detach, NULL, &nvr_attach, &nvr_detach,

8
VAX/vax_sysdev.c
View file

@ -337,6 +337,7 @@ REG rom_reg[] = {
}; };
MTAB rom_mod[] = { MTAB rom_mod[] = {
{ MTAB_XTD|MTAB_VDV, 0, "ADDRESS", NULL, NULL, &show_mapped_addr, (void *)ROMBASE, "Display base address" },
{ UNIT_NODELAY, UNIT_NODELAY, "fast access", "NODELAY", NULL, NULL, NULL, "Disable calibrated delay - ROM runs like RAM" }, { UNIT_NODELAY, UNIT_NODELAY, "fast access", "NODELAY", NULL, NULL, NULL, "Disable calibrated delay - ROM runs like RAM" },
{ UNIT_NODELAY, 0, "1usec calibrated access", "DELAY", NULL, NULL, NULL, "Enable calibrated ROM delay - ROM runs slowly" }, { UNIT_NODELAY, 0, "1usec calibrated access", "DELAY", NULL, NULL, NULL, "Enable calibrated ROM delay - ROM runs slowly" },
{ 0 } { 0 }
@ -365,8 +366,13 @@ REG nvr_reg[] = {
{ NULL } { NULL }
}; };
MTAB nvr_mod[] = {
{ MTAB_XTD|MTAB_VDV, 0, "ADDRESS", NULL, NULL, &show_mapped_addr, (void *)NVRBASE, "Display base address" },
{ 0 }
};
DEVICE nvr_dev = { DEVICE nvr_dev = {
"NVR", &nvr_unit, nvr_reg, NULL, "NVR", &nvr_unit, nvr_reg, nvr_mod,
1, 16, NVRAWIDTH, 4, 16, 32, 1, 16, NVRAWIDTH, 4, 16, 32,
&nvr_ex, &nvr_dep, &nvr_reset, &nvr_ex, &nvr_dep, &nvr_reset,
NULL, &nvr_attach, &nvr_detach, NULL, &nvr_attach, &nvr_detach,