[xtensa-cvscommit] linux/arch/xtensa/kernel vectors.S,1.9,1.10 handlers.S,1.20,1.21

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

Update of /cvsroot/xtensa/linux/arch/xtensa/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24932

Modified Files:
	vectors.S handlers.S 
Log Message:
Handle debug exceptions properly:
1. vectors.S: Change the debug-vector register usage to match RedBoot's.
2. handlers.S: Check PS.EXCM *before* clobbering DEPC.


Index: handlers.S
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/handlers.S,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** handlers.S	12 Apr 2004 22:07:18 -0000	1.20
--- handlers.S	21 May 2004 19:03:12 -0000	1.21
***************
*** 2842,2847 ****
  
  	rsr	a0, EPS + XCHAL_DEBUGLEVEL	// Check exception vs. user vs. kernel mode
- 	wsr	a2, DEPC		// preserve a2 so we can use it
  	bbsi.l	a0, PS_EXCM_SHIFT, 3f	// jump if in exception mode
  	bbsi.l	a0, PS_UM_SHIFT, 1f	// jump if in user mode
  
--- 2842,2847 ----
  
  	rsr	a0, EPS + XCHAL_DEBUGLEVEL	// Check exception vs. user vs. kernel mode
  	bbsi.l	a0, PS_EXCM_SHIFT, 3f	// jump if in exception mode
+ 	wsr	a2, DEPC		// preserve a2 so we can use it
  	bbsi.l	a0, PS_UM_SHIFT, 1f	// jump if in user mode
  

Index: vectors.S
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/vectors.S,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** vectors.S	9 May 2003 20:28:39 -0000	1.9
--- vectors.S	21 May 2004 19:03:12 -0000	1.10
***************
*** 597,603 ****
  _DebugInterruptVector:
  
! 	wsr	a3, EXCSAVE + XCHAL_DEBUGLEVEL
! 	movi	a3, xthal_debugexc_defhndlr_nw
! 	jx	a3
  
  	.endfunc	// _DebugInterruptVector
--- 597,602 ----
  _DebugInterruptVector:
  
! 	xsr	a0, EXCSAVE + XCHAL_DEBUGLEVEL
! 	jx	a0
  
  	.endfunc	// _DebugInterruptVector