summaryrefslogtreecommitdiff
path: root/cpu/microblaze/exception.c
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2007-05-29 16:37:57 +0200
committerMarkus Klotzbuecher <mk@pollux.denx.de>2007-05-29 16:37:57 +0200
commit51d8e813222fa3063d423220f6ff1146df58a471 (patch)
treea4951077af841bd87a90854b7fb390d12e37b851 /cpu/microblaze/exception.c
parent3a619dd7bed03e8b4d22a3911f90fd12af5376c2 (diff)
parent19bf91f9628f80a55d4f171df71041574882b3d6 (diff)
downloadu-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.zip
u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.tar.gz
u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.tar.bz2
Merge git://www.denx.de/git/u-boot into 2007_05_15-testing
Diffstat (limited to 'cpu/microblaze/exception.c')
-rw-r--r--cpu/microblaze/exception.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/cpu/microblaze/exception.c b/cpu/microblaze/exception.c
index b135acb..d76b05a 100644
--- a/cpu/microblaze/exception.c
+++ b/cpu/microblaze/exception.c
@@ -23,15 +23,16 @@
*/
#include <common.h>
+#include <asm/asm.h>
void _hw_exception_handler (void)
{
int address = 0;
int state = 0;
/* loading address of exception EAR */
- __asm__ __volatile ("mfs %0,rear"::"r" (address):"memory");
+ MFS (address, rear);
/* loading excetpion state register ESR */
- __asm__ __volatile ("mfs %0,resr"::"r" (state):"memory");
+ MFS (state, resr);
printf ("Hardware exception at 0x%x address\n", address);
switch (state & 0x1f) { /* mask on exception cause */
case 0x1:
@@ -49,6 +50,11 @@ void _hw_exception_handler (void)
case 0x5:
puts ("Divide by zero exception\n");
break;
+#ifdef MICROBLAZE_V5
+ case 0x1000:
+ puts ("Exception in delay slot\n");
+ break;
+#endif
default:
puts ("Undefined cause\n");
break;