From 4070883293a637743655e9c7d654ca1b90304eb5 Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@twiddle.net>
Date: Thu, 14 Apr 2011 18:37:56 -0700
Subject: Fix typos in rti implementation.

---
 pal.S | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pal.S')

diff --git a/pal.S b/pal.S
index e1256e7..033abd1 100644
--- a/pal.S
+++ b/pal.S
@@ -1298,11 +1298,11 @@ CallPal_Rti:
 	ldq	p5, FRM_Q_PC($sp)	// Get the return PC
 	ldq	$gp, FRM_Q_GP($sp)	// Get gp
 	ldq	a0, FRM_Q_A0($sp)	// Get a0
-
-	ldq	a1, FRM_Q_A1(p7)	// Get a1
-	ldq	a2, FRM_Q_A2(p7)	// Get a2
+	ldq	a1, FRM_Q_A1($sp)	// Get a1
+	ldq	a2, FRM_Q_A2($sp)	// Get a2
 	lda	$sp, FRM_K_SIZE($sp)	// Pop the stack
-	bic	p5, 3, p5		// Clean return PC<1:0>
+
+	andnot	p5, 3, p5		// Clean return PC<1:0>
 
 	and	p4, PS_M_CM, p3
 	bne	p3, CallPal_Rti_ToUser
@@ -1314,13 +1314,12 @@ ENDFN	CallPal_Rti
 
 	.text	1
 CallPal_Rti_ToUser:
-	mtpr	p4, qemu_ps
+	mtpr	p3, qemu_ps
 	mtpr	$sp, ptKsp
 	mfpr	$sp, ptUsp
 	hw_ret	(p5)
 ENDFN	CallPal_Rti_ToUser
 	.previous
-
 
 /*
  * OSF/1 Unprivileged CALL_PAL Entry Points
-- 
cgit v1.1