--- cci/d/event/prvreg.s	2019/07/28 12:24:19	1.1
+++ cci/d/event/prvreg.s	2019/07/28 12:30:54	1.1.1.2
@@ -222,6 +222,8 @@ _prvreg:
 /*LET US HOPE WE DON'T GET EXCEPTION DURING THIS TEST			*/
 
 2:
+	mfpr	$ISP,_savvec0		/* save value of ISP	*/
+	mtpr	$0x1f,$IPL		/* Set IPL to high	*/
 	movl	$0x55555554,r2			/*int stck ptr register	*/
 	mtpr	r2,$ISP
 	mfpr	$ISP,r3
@@ -240,6 +242,7 @@ _prvreg:
 	jmp    *badrtn			/***** - r2 & r3 contains exp	*/
 				/*and observed values; r4 = prv reg no.	*/
 2:
+	mtpr	_savvec0,$ISP	/* Restore ISP			*/
 	movl	$0xaaaa,r2	/* Soft int summary register	*/
 	movl	r2,*$SSR	/* is a read only register	*/
 	mfpr	$SISR,r3	/* funtional test no comparison	*/
@@ -270,6 +273,7 @@ _prvreg:
 	jmp     *badrtn			/***** - r2 & r3 contains exp	*/
 				/*and observed values; r4 = prv reg no.	*/
 2:
+	mfpr	$KSP,_savvec9		/* Save KSP	*/
 	movl	$0xffe000,r2
 	mtpr	r2,$KSP
 	mfpr	$KSP,r3
@@ -279,6 +283,7 @@ _prvreg:
 	jmp     *badrtn			/***** - r2 & r3 contains exp	*/
 				/*and observed values; r4 = prv reg no.	*/
 2:
+	mtpr	_savvec9,$KSP	/* Restore KSP	*/
 	movl	*$0x414,r12	/* Save original SCB value in R12	*/
 	movl	$0xeee000,r2
 	mtpr	r2,$SCBB
@@ -320,17 +325,6 @@ _prvreg:
 	jmp     *badrtn			/***** - r2 & r3 contains exp	*/
 				/*and observed values; r4 = prv reg no.	*/
 2:
-	mtpr	$0x1f,$IPL
-	movl	$0x150010,r2
-	movl	r2,*$HSR	/* Set HISR in processor storage */
-	mfpr	$HISR,r3
-	cmpl	r2,r3
-	beql	2f
-	movl    $26,r4				/*reg no.		*/
-	jmp     *badrtn			/***** - r2 & r3 contains exp	*/
-				/*and observed values; r4 = prv reg no.	*/
-2:
-	clrl	*$HSR		/* Clear HISR in PSA */
 
 	movl	$0xffe000,r2
 	movl	$KSP,_cache1
@@ -369,6 +363,7 @@ _prvreg:
 	movl    $30,r4			/* R4 = which part of the test */
 	jmp     *badrtn			/***** - r2 & r3 contains exp	*/
 2:
+	mtpr	$KSP,_savvec9	/* Restore KSP				*/
 	mfpr	$MME,r9		/* The following MTPR/MFPR just to see  */
 	mtpr	$1,$TBIA	/* if control return to program !!	*/
 	mtpr	$_iob4,$TBIS