[xtensa-cvscommit] linux/arch/xtensa/kernel sys.S,1.4,1.5

[<joe...@us...>]

Update of /cvsroot/xtensa/linux/arch/xtensa/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv15522/arch/xtensa/kernel

Modified Files:
	sys.S 
Log Message:

Correct a false assumption in a fixup routine.
Load original WB/WS values for improved error reporting.



Index: sys.S
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/sys.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sys.S	21 Mar 2003 18:11:53 -0000	1.4
--- sys.S	3 Apr 2003 04:12:36 -0000	1.5
***************
*** 628,632 ****
  	 * When the double exception occurs:
  	 *	- WB/WS are inconsistent
! 	 *	- WB is unmodified since .Lspill_loop
  	 *	- a2 is the loop-control value of .Lspill_loop
  	 *	- The .Lspill12 case of the .Lspill_loop presents a
--- 628,632 ----
  	 * When the double exception occurs:
  	 *	- WB/WS are inconsistent
! 	 *	- WB is unmodified since the exception in .Lspill_loop
  	 *	- a2 is the loop-control value of .Lspill_loop
  	 *	- The .Lspill12 case of the .Lspill_loop presents a
***************
*** 634,638 ****
  	 *
  	 * On Entry:
! 	 *	a0 contains DEPC
  	 *	[EXCSAVE_1 + TABLE_SAVEA0] contains DEPC (same as a0)
  	 *	DEPC contains a0
--- 634,638 ----
  	 *
  	 * On Entry:
! 	 *	a0 is undefined
  	 *	[EXCSAVE_1 + TABLE_SAVEA0] contains DEPC (same as a0)
  	 *	DEPC contains a0
***************
*** 665,668 ****
--- 665,669 ----
  
  	movi	a2, .Lspill12
+ 	l32i	a0, a1, TABLE_SAVEA0
  	/* slot */
  	bltu	a0, a2, 1f		// branch if no adjustment needed
***************
*** 853,861 ****
  	movi	a0, .Linvalid_window_string
  
! 1:	rsr	a4, WINDOWBASE  // remember original WB in a4
! 	rsr	a3, WINDOWSTART // remember faulty WS in a3
  
! 	/* First, ensure we have a valid WINDOWSTART value. */
! 	rsr	a2, WINDOWBASE	// get (original) window base
  	ssl	a2		// setup for shift left by WINDOWBASE
  	movi	a2, 1
--- 854,863 ----
  	movi	a0, .Linvalid_window_string
  
! 1:	movi	a2, quick_save_area
! 	l32i	a4, a2, SAVE_WB // original WB
! 	l32i	a3, a2, SAVE_WS // original WS
  
! 	/* Ensure we have a valid WINDOWSTART value. */
! 	rsr	a2, WINDOWBASE	// get current window base
  	ssl	a2		// setup for shift left by WINDOWBASE
  	movi	a2, 1