diff options
author | Wolfgang Denk <wd@denx.de> | 2007-07-03 15:07:56 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-07-03 15:07:56 +0200 |
commit | 98c440bee623ecdd5322852732b883e696fb2140 (patch) | |
tree | ad8b06bc01822cfff8dc53d6651c59c24ac1babe /lib_ppc | |
parent | e4feb7638ca0a2138973f14456424acbc332ae43 (diff) | |
parent | 1f2a05898658900dc5717761e27abf2052e67e13 (diff) |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'lib_ppc')
-rw-r--r-- | lib_ppc/extable.c | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/lib_ppc/extable.c b/lib_ppc/extable.c index b14d661bbe..8354411f01 100644 --- a/lib_ppc/extable.c +++ b/lib_ppc/extable.c @@ -52,30 +52,27 @@ search_one_table(const struct exception_table_entry *first, const struct exception_table_entry *last, unsigned long value) { - while (first <= last) { - const struct exception_table_entry *mid; - long diff; - - mid = (last - first) / 2 + first; - if ((ulong) mid > CFG_MONITOR_BASE) { - /* exception occurs in FLASH, before u-boot relocation. - * No relocation offset is needed. - */ - diff = mid->insn - value; + long diff; + if ((ulong) first > CFG_MONITOR_BASE) { + /* exception occurs in FLASH, before u-boot relocation. + * No relocation offset is needed. + */ + while (first <= last) { + diff = first->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; + return first->fixup; + first++; + } + } else { + /* exception occurs in RAM, after u-boot relocation. + * A relocation offset should be added. + */ + while (first <= last) { + diff = (first->insn + gd->reloc_off) - value; if (diff == 0) - return (mid->fixup + gd->reloc_off); + return (first->fixup + gd->reloc_off); + first++; } - if (diff < 0) - first = mid + 1; - else - last = mid - 1; } return 0; } |