diff options
author | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 14:34:19 +0100 |
---|---|---|
committer | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 14:34:19 +0100 |
commit | 879027daa838d245bf433ca2bb446bedace724f0 (patch) | |
tree | 663792e944d667843d77f81dd3d5ab56ffa7f098 /cpu/microblaze/exception.c | |
parent | 93ef45c9ddfdd9fc17c4e74bd8e2f2456580eb72 (diff) | |
parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/microblaze/exception.c')
-rw-r--r-- | cpu/microblaze/exception.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpu/microblaze/exception.c b/cpu/microblaze/exception.c index b135acbad9..d76b05a526 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; |