arm: print unrelocated PC value for easier reference to object code

[karo-tx-uboot.git] / arch / arm / lib / interrupts.c

diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c
index 04b70f6cc86d83c99e3d3f52fcc66faffb68f706..787dceb93d0841ea8b407777eefb60ee64405f30 100644 (file)
--- a/arch/arm/lib/interrupts.c
+++ b/arch/arm/lib/interrupts.c
@@ -107,11 +107,12 @@ void show_regs (struct pt_regs *regs)
        "UK12_32",      "UK13_32",      "UK14_32",      "SYS_32",
        };
 
-       flags = condition_codes (regs);
+       flags = condition_codes(regs);
 
-       printf ("pc : [<%08lx>]    lr : [<%08lx>]\n"
+       printf ("pc : [<%08lx>] (pre-reloc: [<%08lx>]) lr : [<%08lx>]\n"
                "sp : %08lx  ip : %08lx  fp : %08lx\n",
-               instruction_pointer (regs),
+               instruction_pointer(regs),
+               instruction_pointer(regs) - gd->reloc_off,
                regs->ARM_lr, regs->ARM_sp, regs->ARM_ip, regs->ARM_fp);
        printf ("r10: %08lx  r9 : %08lx  r8 : %08lx\n",
                regs->ARM_r10, regs->ARM_r9, regs->ARM_r8);
@@ -153,7 +154,14 @@ void do_prefetch_abort (struct pt_regs *pt_regs)
 
 void do_data_abort (struct pt_regs *pt_regs)
 {
-       printf ("data abort\n\n    MAYBE you should read doc/README.arm-unaligned-accesses\n\n");
+       unsigned long fsr;
+
+       /* Read Fault Status Register */
+       asm volatile ("mrc p15, 0, %0, c5, c0, 0" : "=r"(fsr));
+
+       printf ("data abort\n\n");
+       if (fsr & 1)
+               printf ("MAYBE you should read doc/README.arm-unaligned-accesses\n\n");
        show_regs (pt_regs);
        bad_mode ();
 }