diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-04-06 15:31:23 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-04-06 15:31:23 -0700 |
| commit | a68049a8cc3f1eacda1e27b2040af73f6faa42ab (patch) | |
| tree | 31082e1546f81eb8be2380deab97c59ac51914b8 /debuggerd/debuggerd.c | |
| parent | b99a099cad7066274b25de9d603e7ced37d20e19 (diff) | |
| parent | 7c19bbe086b3cd81499829c0a79ed0ed0ae4fb16 (diff) | |
| download | system_core-a68049a8cc3f1eacda1e27b2040af73f6faa42ab.tar.gz system_core-a68049a8cc3f1eacda1e27b2040af73f6faa42ab.tar.bz2 system_core-a68049a8cc3f1eacda1e27b2040af73f6faa42ab.zip | |
Merge remote branch 'goog/froyo' into mm
Diffstat (limited to 'debuggerd/debuggerd.c')
| -rw-r--r-- | debuggerd/debuggerd.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c index 7b987cf9..e850a2e6 100644 --- a/debuggerd/debuggerd.c +++ b/debuggerd/debuggerd.c @@ -42,6 +42,14 @@ #include "utility.h" +#ifdef WITH_VFP +#ifdef WITH_VFP_D32 +#define NUM_VFP_REGS 32 +#else +#define NUM_VFP_REGS 16 +#endif +#endif + /* Main entry point to get the backtrace from the crashing process */ extern int unwind_backtrace_with_ptrace(int tfd, pid_t pid, mapinfo *map, unsigned int sp_list[], @@ -278,7 +286,7 @@ void dump_registers(int tfd, int pid, bool at_fault) " ip %08x sp %08x lr %08x pc %08x cpsr %08x\n", r.ARM_ip, r.ARM_sp, r.ARM_lr, r.ARM_pc, r.ARM_cpsr); -#if __ARM_NEON__ +#ifdef WITH_VFP struct user_vfp vfp_regs; int i; @@ -288,7 +296,7 @@ void dump_registers(int tfd, int pid, bool at_fault) return; } - for (i = 0; i < 32; i += 2) { + for (i = 0; i < NUM_VFP_REGS; i += 2) { _LOG(tfd, only_in_tombstone, " d%-2d %016llx d%-2d %016llx\n", i, vfp_regs.fpregs[i], i+1, vfp_regs.fpregs[i+1]); |