[xtensa-cvscommit] linux/arch/xtensa/kernel traps.c,1.7,1.8 vectors.S,1.5,1.6

[<ma...@us...>]

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

Modified Files:
	traps.c vectors.S 
Log Message:
Add missing coprocessor exception names.
Plus minor fix to critical panic code for non-XT2000 targets.



Index: traps.c
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/traps.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** traps.c	7 Feb 2003 02:03:35 -0000	1.7
--- traps.c	11 Feb 2003 07:22:25 -0000	1.8
***************
*** 106,109 ****
--- 106,117 ----
  	{ XCHAL_EXCCAUSE_LOAD_CACHE_ATTRIBUTE, "Load Cache Attribute Exception" },
  	{ XCHAL_EXCCAUSE_STORE_CACHE_ATTRIBUTE, "Store Cache Attribute Exception" },
+ 	{ 32+0, "Coprocessor 0 Disabled Exception" },
+ 	{ 32+1, "Coprocessor 1 Disabled Exception" },
+ 	{ 32+2, "Coprocessor 2 Disabled Exception" },
+ 	{ 32+3, "Coprocessor 3 Disabled Exception" },
+ 	{ 32+4, "Coprocessor 4 Disabled Exception" },
+ 	{ 32+5, "Coprocessor 5 Disabled Exception" },
+ 	{ 32+6, "Coprocessor 6 Disabled Exception" },
+ 	{ 32+7, "Coprocessor 7 Disabled Exception" },
  	{ XCHAL_EXCCAUSE_FLOATING_POINT, "Floating Point Exception" }
  };
***************
*** 129,133 ****
  
  	panic("Caught unhandled exception - should not happen.\n"
! 	      "\tEXCCAUSE is %x, %s", regs->exccause, str);
  }
  
--- 137,141 ----
  
  	panic("Caught unhandled exception - should not happen.\n"
! 	      "\tEXCCAUSE is %d, %s", regs->exccause, str);
  }
  

Index: vectors.S
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/kernel/vectors.S,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** vectors.S	30 Jan 2003 23:55:26 -0000	1.5
--- vectors.S	11 Feb 2003 07:22:25 -0000	1.6
***************
*** 11,15 ****
   * for more details.
   *
!  * Copyright (C) 2001 - 2002 Tensilica, Inc.
   *      Authors:        Marc Gauthier <ma...@te...> <ma...@al...>
   *			Joe Taylor <jo...@te..., jo...@ya...>
--- 11,15 ----
   * for more details.
   *
!  * Copyright (C) 2001 - 2003 Tensilica, Inc.
   *      Authors:        Marc Gauthier <ma...@te...> <ma...@al...>
   *			Joe Taylor <jo...@te..., jo...@ya...>
***************
*** 290,296 ****
          addi    a3, a3, 4
          bnez    a4, 4b
- 9:
- 	j	9b		/* loop forever */
  #endif  /* XT2000_SYSRST_VADDR */
  	
  	
--- 290,296 ----
          addi    a3, a3, 4
          bnez    a4, 4b
  #endif  /* XT2000_SYSRST_VADDR */
+ 
+ 9:	j	9b		/* loop forever */