Merge with /home/git/u-boot

[karo-tx-uboot.git] / lib_ppc / extable.c

diff --git a/lib_ppc/extable.c b/lib_ppc/extable.c
index 34b5d460cf54c1318d3676b987d00d0235c58a77..fe856ffbb527a4e5dd62d1925d39f0fe14fc8ada 100644 (file)
--- a/lib_ppc/extable.c
+++ b/lib_ppc/extable.c
@@ -37,6 +37,8 @@
  * on our cache or tlb entries.
  */
 
+DECLARE_GLOBAL_DATA_PTR;
+
 struct exception_table_entry
 {
        unsigned long insn, fixup;
@@ -50,23 +52,27 @@ search_one_table(const struct exception_table_entry *first,
                 const struct exception_table_entry *last,
                 unsigned long value)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        while (first <= last) {
                const struct exception_table_entry *mid;
                long diff;
 
                mid = (last - first) / 2 + first;
-#ifdef CFG_EXCEPTION_AFTER_RELOCATE
-               diff = (mid->insn + gd->reloc_off) - value;
-               if (diff == 0)
-                       return (mid->fixup + gd->reloc_off);
-#else
-               diff = mid->insn - value;
-               if (diff == 0)
-                       return mid->fixup;
-#endif
-               else if (diff < 0)
+               if (mid > CFG_MONITOR_BASE) {
+               /* exception occurs in FLASH, before u-boot relocation.
+                * No relocation offset is needed.
+                */
+                       diff = mid->insn - value;
+                       if (diff == 0)
+                               return mid->fixup;
+               } else {
+               /* exception occurs in RAM, after u-boot relocation.
+                * A relocation offset should be added.
+                */
+                       diff = (mid->insn + gd->reloc_off) - value;
+                       if (diff == 0)
+                               return (mid->fixup + gd->reloc_off);
+               }
+               if (diff < 0)
                        first = mid+1;
                else
                        last = mid-1;
@@ -83,6 +89,7 @@ search_exception_table(unsigned long addr)
 
        /* There is only the kernel to search.  */
        ret = search_one_table(__start___ex_table, __stop___ex_table-1, addr);
+       /* if the serial port does not hang in exception, printf can be used */
 #if !defined(CFG_SERIAL_HANG_IN_EXCEPTION)
        if (ex_tab_message)
                printf("Bus Fault @ 0x%08lx, fixup 0x%08lx\n", addr, ret);