tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

debuggerd: Fix missing include.

Browse source 
The structure user_vfp is incorrectly defined in bionic/libc/kernel/arch-arm/asm/ptrace.h
at the moment, while it should be under bionic/libc/kernel/arch-arm/asm/user.h instead.

Before moving its definition in the corresponding source files, we need to fix its users.
It happens that debuggerd is the only one for now, so fix this by including <linux/user.h>
instead (which will include <asm/user.h> and <asm/ptrace.h>).

Also, make the debug output less chatty by specifying all symbols to be listed
through XLOG2 instead of XLOG.

Change-Id: I16e0fa700945d86efd44ee885a84ad609c0a9b58
This commit is contained in:
David 'Digit' Turner 2011-01-26 15:11:04 +01:00
parent 305b4b0f60
commit 2c259914a0
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
debuggerd/arm/machine.c
View file

@ -32,6 +32,7 @@
#include <cutils/properties.h>
#include <linux/input.h>
#include <linux/user.h>
#include "utility.h"

10
debuggerd/symbol_table.c
View file

@ -50,7 +50,7 @@ struct symbol_table *symbol_table_create(const char *filename)
int length;
char *base;
XLOG("Creating symbol table for %s\n", filename);
XLOG2("Creating symbol table for %s\n", filename);
int fd = open(filename, O_RDONLY);
if(fd < 0) {
@ -126,7 +126,7 @@ struct symbol_table *symbol_table_create(const char *filename)
dynsymbol_count++;
}
}
XLOG("Dynamic Symbol count: %d\n", dynsymbol_count);
XLOG2("Dynamic Symbol count: %d\n", dynsymbol_count);
}
if (sym_idx != -1) {
@ -139,7 +139,7 @@ struct symbol_table *symbol_table_create(const char *filename)
symbol_count++;
}
}
XLOG("Symbol count: %d\n", symbol_count);
XLOG2("Symbol count: %d\n", symbol_count);
}
// Now, create an entry in our symbol table structure for each symbol...
@ -160,7 +160,7 @@ struct symbol_table *symbol_table_create(const char *filename)
table->symbols[j].name = strdup(dynstr + dynsyms[i].st_name);
table->symbols[j].addr = dynsyms[i].st_value;
table->symbols[j].size = dynsyms[i].st_size;
XLOG("name: %s, addr: %x, size: %x\n",
XLOG2("name: %s, addr: %x, size: %x\n",
table->symbols[j].name, table->symbols[j].addr, table->symbols[j].size);
j++;
}
@ -176,7 +176,7 @@ struct symbol_table *symbol_table_create(const char *filename)
table->symbols[j].name = strdup(str + syms[i].st_name);
table->symbols[j].addr = syms[i].st_value;
table->symbols[j].size = syms[i].st_size;
XLOG("name: %s, addr: %x, size: %x\n",
XLOG2("name: %s, addr: %x, size: %x\n",
table->symbols[j].name, table->symbols[j].addr, table->symbols[j].size);
j++;
}

9
debuggerd/utility.h
View file

@ -57,10 +57,19 @@ const char *map_to_name(mapinfo *mi, unsigned pc, const char* def);
extern void _LOG(int tfd, bool in_tombstone_only, const char *fmt, ...);
#define LOG(fmt...) _LOG(-1, 0, fmt)
/* Set to 1 for normal debug traces */
#if 0
#define XLOG(fmt...) _LOG(-1, 0, fmt)
#else
#define XLOG(fmt...) do {} while(0)
#endif
/* Set to 1 for chatty debug traces. Includes all resolved dynamic symbols */
#if 0
#define XLOG2(fmt...) _LOG(-1, 0, fmt)
#else
#define XLOG2(fmt...) do {} while(0)
#endif
#endif