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

VAX: Add IDLE names which align with various BSD Version names

Browse source 
Fix #294
This commit is contained in:
Mark Pizzolato 2016-03-25 09:32:36 -07:00
parent bfe87ed1c5
commit 126032428c
4 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
VAX/vax_cpu.c
View file

@ -3608,17 +3608,23 @@ struct os_idle {
}; };
static struct os_idle os_tab[] = { static struct os_idle os_tab[] = {
{ "VMS", VAX_IDLE_VMS }, { "VMS", VAX_IDLE_VMS },
{ "NETBSDOLD", VAX_IDLE_ULTOLD }, { "ULTRIX", VAX_IDLE_ULT },
{ "NETBSD", VAX_IDLE_BSDNEW }, { "ULTRIXOLD", VAX_IDLE_ULTOLD },
{ "ULTRIX", VAX_IDLE_ULT }, { "ULTRIX-1.X", VAX_IDLE_ULT1X },
{ "ULTRIXOLD", VAX_IDLE_ULTOLD }, { "3BSD", VAX_IDLE_ULT1X },
{ "ULTRIX-1.X", VAX_IDLE_ULT1X }, { "4.0BSD", VAX_IDLE_ULT1X },
{ "OPENBSDOLD", VAX_IDLE_QUAD }, { "4.1BSD", VAX_IDLE_ULT1X },
{ "OPENBSD", VAX_IDLE_BSDNEW }, { "4.2BSD", VAX_IDLE_ULT1X },
{ "QUASIJARUS", VAX_IDLE_QUAD }, { "QUASIJARUS", VAX_IDLE_QUAD },
{ "32V", VAX_IDLE_VMS }, { "4.3BSD", VAX_IDLE_QUAD },
{ "ELN", VAX_IDLE_ELN }, { "4.4BSD-Reno", VAX_IDLE_QUAD },
{ "NETBSD", VAX_IDLE_BSDNEW },
{ "NETBSDOLD", VAX_IDLE_ULTOLD },
{ "OPENBSD", VAX_IDLE_BSDNEW },
{ "OPENBSDOLD", VAX_IDLE_QUAD },
{ "32V", VAX_IDLE_VMS },
{ "ELN", VAX_IDLE_ELN },
{ NULL, 0 } { NULL, 0 }
}; };
@ -3715,7 +3721,9 @@ fprintf (st, " -u interpret address as virtual, user mode\n\n");
fprintf (st, "The CPU attempts to detect when the simulator is idle. When idle, the\n"); fprintf (st, "The CPU attempts to detect when the simulator is idle. When idle, the\n");
fprintf (st, "simulator does not use any resources on the host system. Idle detection is\n"); fprintf (st, "simulator does not use any resources on the host system. Idle detection is\n");
fprintf (st, "controlled by the SET IDLE and SET NOIDLE commands:\n\n"); fprintf (st, "controlled by the SET IDLE and SET NOIDLE commands:\n\n");
fprintf (st, " sim> SET CPU IDLE{=VMS|ULTRIX|ULTRIX-1.X|ULTRIXOLD|NETBSD|NETBSDOLD|OPENBSD|OPENBSDOLD|QUASIJARUS|32V|ELN}{:n}\n"); fprintf (st, " sim> SET CPU IDLE{=VMS|ULTRIX|ULTRIXOLD|ULTRIX-1.X|\n");
fprintf (st, " 3BSD|4.0BSD|4.1BSD|4.2BSD|QUASIJARUS|\n);
fprintf (st, " NETBSD|NETBSDOLD|OPENBSD|OPENBSDOLD|32V|ELN}{:n}\n");
fprintf (st, " enable idle detection\n"); fprintf (st, " enable idle detection\n");
fprintf (st, " sim> SET CPU NOIDLE disable idle detection\n\n"); fprintf (st, " sim> SET CPU NOIDLE disable idle detection\n\n");
fprintf (st, "Idle detection is disabled by default. If idle detection is enabled with\n"); fprintf (st, "Idle detection is disabled by default. If idle detection is enabled with\n");

2
VAX/vax_defs.h
View file

@ -755,7 +755,7 @@ enum opcodes {
#define VAX_IDLE_QUAD 0x10 #define VAX_IDLE_QUAD 0x10
#define VAX_IDLE_BSDNEW 0x20 #define VAX_IDLE_BSDNEW 0x20
#define VAX_IDLE_SYSV 0x40 #define VAX_IDLE_SYSV 0x40
#define VAX_IDLE_ELN 0x80 /* VAXELN */ #define VAX_IDLE_ELN 0x40 /* VAXELN */
extern uint32 cpu_idle_mask; /* idle mask */ extern uint32 cpu_idle_mask; /* idle mask */
void cpu_idle (void); void cpu_idle (void);

BIN
doc/vax780_doc.doc
View file

Binary file not shown.

BIN
doc/vax_doc.doc
View file

Binary file not shown.