vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix a mismerge

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-11-14 14:27:52 +01:00
parent 245f4582f9
commit c1677cfccf
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
grub-core/Makefile.core.def
View file

@ -1711,8 +1711,9 @@ module = {
module = { module = {
name = backtrace; name = backtrace;
common = lib/i386/backtrace.c lib/i386/backtrace_int.S; common = lib/i386/backtrace.c;
enable = i386; common = lib/i386/backtrace_int.S;
enable = x86;
}; };
module = { module = {

23
grub-core/lib/i386/backtrace.c
View file

@ -26,6 +26,8 @@
#define MAX_STACK_FRAME 102400 #define MAX_STACK_FRAME 102400
GRUB_MOD_LICENSE ("GPLv3+");
struct idt_descriptor struct idt_descriptor
{ {
grub_uint16_t limit; grub_uint16_t limit;
@ -51,30 +53,21 @@ void grub_interrupt_handler_real (void *ret, void *ebp);
static void static void
print_address (void *addr) print_address (void *addr)
{ {
const char *name; grub_dl_t mod;
int section;
grub_off_t off; FOR_DL_MODULES (mod)
auto int hook (grub_dl_t mod);
int hook (grub_dl_t mod)
{ {
grub_dl_segment_t segment; grub_dl_segment_t segment;
for (segment = mod->segment; segment; segment = segment->next) for (segment = mod->segment; segment; segment = segment->next)
if (segment->addr <= addr && (grub_uint8_t *) segment->addr if (segment->addr <= addr && (grub_uint8_t *) segment->addr
+ segment->size > (grub_uint8_t *) addr) + segment->size > (grub_uint8_t *) addr)
{ {
name = mod->name; grub_printf ("%s.%x+%" PRIxGRUB_SIZE, mod->name, segment->section,
section = segment->section; (grub_uint8_t *) addr - (grub_uint8_t *) segment->addr);
off = (grub_uint8_t *) addr - (grub_uint8_t *) segment->addr; return;
return 1;
} }
return 0;
} }
name = NULL;
grub_dl_iterate (hook);
if (name)
grub_printf ("%s.%x+%lx", name, section, (unsigned long) off);
else
grub_printf ("%p", addr); grub_printf ("%p", addr);
} }