VAX: Make sure that Ultrix 1.X specific behaviors are only in effect with that OS

This commit is contained in:
Mark Pizzolato 2014-07-17 10:04:40 -07:00
parent 6d64924685
commit 4c55f1af0c
2 changed files with 3 additions and 2 deletions

View file

@ -76,7 +76,7 @@ extern int32 PSL; /* PSL */
extern int32 fault_PC; /* fault PC */
extern int32 int_req[IPL_HLVL];
uint32 cpu_idle_mask; /* idle mask (OS type) */
#define ULTRIX1X (cpu_idle_mask&VAX_IDLE_ULT1X)
#define ULTRIX1X ((cpu_idle_mask&VAX_IDLE_ULT1X) && ((cpu_idle_mask & ~VAX_IDLE_ULT1X) == 0))
#else /* PDP-11 version */
#include "pdp11_defs.h"
#define XQ_RDX 8

View file

@ -2544,7 +2544,8 @@ for ( ;; ) {
if ((cc == CC_Z) && /* No set bits found? */
(cpu_idle_mask & VAX_IDLE_ULT1X) && /* running Ultrix 1.X" */
(PSL_GETIPL (PSL) == 0x0) && /* at IPL 0? */
(fault_PC & 0x80000000)) /* in system space? */
(fault_PC & 0x80000000) && /* in system space? */
((fault_PC & 0x7fffffff) < 0x3000)) /* in low system space? */
cpu_idle(); /* idle loop */
break;