Merge "Adding Texas Instruments to the VID list."
diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index ccc001b..752c953 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -1,11 +1,15 @@
# Copyright 2005 The Android Open Source Project
-ifeq ($(TARGET_ARCH),arm)
+ifneq ($(filter arm x86,$(TARGET_ARCH)),)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= debuggerd.c getevent.c unwind-arm.c pr-support.c utility.c symbol_table.c
+LOCAL_SRC_FILES:= debuggerd.c utility.c getevent.c $(TARGET_ARCH)/machine.c $(TARGET_ARCH)/unwind.c symbol_table.c
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_SRC_FILES += $(TARGET_ARCH)/pr-support.c
+endif
+
LOCAL_CFLAGS := -Wall
LOCAL_MODULE := debuggerd
@@ -22,7 +26,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := crasher.c
-LOCAL_SRC_FILES += crashglue.S
+LOCAL_SRC_FILES += $(TARGET_ARCH)/crashglue.S
LOCAL_MODULE := crasher
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -46,4 +50,4 @@
include $(BUILD_EXECUTABLE)
endif # ARCH_ARM_HAVE_VFP == true
-endif # TARGET_ARCH == arm
+endif # arm or x86 in TARGET_ARCH
diff --git a/debuggerd/crashglue.S b/debuggerd/arm/crashglue.S
similarity index 99%
rename from debuggerd/crashglue.S
rename to debuggerd/arm/crashglue.S
index 0c1fd9b..eb9d0e3 100644
--- a/debuggerd/crashglue.S
+++ b/debuggerd/arm/crashglue.S
@@ -2,7 +2,7 @@
.type crash1, %function
.globl crashnostack
.type crashnostack, %function
-
+
crash1:
ldr r0, =0xa5a50000
ldr r1, =0xa5a50001
diff --git a/debuggerd/arm/machine.c b/debuggerd/arm/machine.c
new file mode 100644
index 0000000..ccd0baf
--- /dev/null
+++ b/debuggerd/arm/machine.c
@@ -0,0 +1,229 @@
+/* system/debuggerd/debuggerd.c
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+#include <stdio.h>
+#include <errno.h>
+#include <signal.h>
+#include <pthread.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+#include <sys/exec_elf.h>
+#include <sys/stat.h>
+
+#include <cutils/sockets.h>
+#include <cutils/properties.h>
+
+#include <linux/input.h>
+
+#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[],
+ int *frame0_pc_sane,
+ bool at_fault);
+
+void dump_stack_and_code(int tfd, int pid, mapinfo *map,
+ int unwind_depth, unsigned int sp_list[],
+ bool at_fault)
+{
+ unsigned int sp, pc, p, end, data;
+ struct pt_regs r;
+ int sp_depth;
+ bool only_in_tombstone = !at_fault;
+ char code_buffer[80];
+
+ if(ptrace(PTRACE_GETREGS, pid, 0, &r)) return;
+ sp = r.ARM_sp;
+ pc = r.ARM_pc;
+
+ _LOG(tfd, only_in_tombstone, "\ncode around pc:\n");
+
+ end = p = pc & ~3;
+ p -= 32;
+ end += 32;
+
+ /* Dump the code around PC as:
+ * addr contents
+ * 00008d34 fffffcd0 4c0eb530 b0934a0e 1c05447c
+ * 00008d44 f7ff18a0 490ced94 68035860 d0012b00
+ */
+ while (p <= end) {
+ int i;
+
+ sprintf(code_buffer, "%08x ", p);
+ for (i = 0; i < 4; i++) {
+ data = ptrace(PTRACE_PEEKTEXT, pid, (void*)p, NULL);
+ sprintf(code_buffer + strlen(code_buffer), "%08x ", data);
+ p += 4;
+ }
+ _LOG(tfd, only_in_tombstone, "%s\n", code_buffer);
+ }
+
+ if ((unsigned) r.ARM_lr != pc) {
+ _LOG(tfd, only_in_tombstone, "\ncode around lr:\n");
+
+ end = p = r.ARM_lr & ~3;
+ p -= 32;
+ end += 32;
+
+ /* Dump the code around LR as:
+ * addr contents
+ * 00008d34 fffffcd0 4c0eb530 b0934a0e 1c05447c
+ * 00008d44 f7ff18a0 490ced94 68035860 d0012b00
+ */
+ while (p <= end) {
+ int i;
+
+ sprintf(code_buffer, "%08x ", p);
+ for (i = 0; i < 4; i++) {
+ data = ptrace(PTRACE_PEEKTEXT, pid, (void*)p, NULL);
+ sprintf(code_buffer + strlen(code_buffer), "%08x ", data);
+ p += 4;
+ }
+ _LOG(tfd, only_in_tombstone, "%s\n", code_buffer);
+ }
+ }
+
+ p = sp - 64;
+ p &= ~3;
+ if (unwind_depth != 0) {
+ if (unwind_depth < STACK_CONTENT_DEPTH) {
+ end = sp_list[unwind_depth-1];
+ }
+ else {
+ end = sp_list[STACK_CONTENT_DEPTH-1];
+ }
+ }
+ else {
+ end = sp | 0x000000ff;
+ end += 0xff;
+ }
+
+ _LOG(tfd, only_in_tombstone, "\nstack:\n");
+
+ /* If the crash is due to PC == 0, there will be two frames that
+ * have identical SP value.
+ */
+ if (sp_list[0] == sp_list[1]) {
+ sp_depth = 1;
+ }
+ else {
+ sp_depth = 0;
+ }
+
+ while (p <= end) {
+ char *prompt;
+ char level[16];
+ data = ptrace(PTRACE_PEEKTEXT, pid, (void*)p, NULL);
+ if (p == sp_list[sp_depth]) {
+ sprintf(level, "#%02d", sp_depth++);
+ prompt = level;
+ }
+ else {
+ prompt = " ";
+ }
+
+ /* Print the stack content in the log for the first 3 frames. For the
+ * rest only print them in the tombstone file.
+ */
+ _LOG(tfd, (sp_depth > 2) || only_in_tombstone,
+ "%s %08x %08x %s\n", prompt, p, data,
+ map_to_name(map, data, ""));
+ p += 4;
+ }
+ /* print another 64-byte of stack data after the last frame */
+
+ end = p+64;
+ while (p <= end) {
+ data = ptrace(PTRACE_PEEKTEXT, pid, (void*)p, NULL);
+ _LOG(tfd, (sp_depth > 2) || only_in_tombstone,
+ " %08x %08x %s\n", p, data,
+ map_to_name(map, data, ""));
+ p += 4;
+ }
+}
+
+void dump_pc_and_lr(int tfd, int pid, mapinfo *map, int unwound_level,
+ bool at_fault)
+{
+ struct pt_regs r;
+
+ if(ptrace(PTRACE_GETREGS, pid, 0, &r)) {
+ _LOG(tfd, !at_fault, "tid %d not responding!\n", pid);
+ return;
+ }
+
+ if (unwound_level == 0) {
+ _LOG(tfd, !at_fault, " #%02d pc %08x %s\n", 0, r.ARM_pc,
+ map_to_name(map, r.ARM_pc, "<unknown>"));
+ }
+ _LOG(tfd, !at_fault, " #%02d lr %08x %s\n", 1, r.ARM_lr,
+ map_to_name(map, r.ARM_lr, "<unknown>"));
+}
+
+void dump_registers(int tfd, int pid, bool at_fault)
+{
+ struct pt_regs r;
+ bool only_in_tombstone = !at_fault;
+
+ if(ptrace(PTRACE_GETREGS, pid, 0, &r)) {
+ _LOG(tfd, only_in_tombstone,
+ "cannot get registers: %s\n", strerror(errno));
+ return;
+ }
+
+ _LOG(tfd, only_in_tombstone, " r0 %08x r1 %08x r2 %08x r3 %08x\n",
+ r.ARM_r0, r.ARM_r1, r.ARM_r2, r.ARM_r3);
+ _LOG(tfd, only_in_tombstone, " r4 %08x r5 %08x r6 %08x r7 %08x\n",
+ r.ARM_r4, r.ARM_r5, r.ARM_r6, r.ARM_r7);
+ _LOG(tfd, only_in_tombstone, " r8 %08x r9 %08x 10 %08x fp %08x\n",
+ r.ARM_r8, r.ARM_r9, r.ARM_r10, r.ARM_fp);
+ _LOG(tfd, only_in_tombstone,
+ " 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);
+
+#ifdef WITH_VFP
+ struct user_vfp vfp_regs;
+ int i;
+
+ if(ptrace(PTRACE_GETVFPREGS, pid, 0, &vfp_regs)) {
+ _LOG(tfd, only_in_tombstone,
+ "cannot get registers: %s\n", strerror(errno));
+ return;
+ }
+
+ 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]);
+ }
+ _LOG(tfd, only_in_tombstone, " scr %08lx\n\n", vfp_regs.fpscr);
+#endif
+}
diff --git a/debuggerd/pr-support.c b/debuggerd/arm/pr-support.c
similarity index 100%
rename from debuggerd/pr-support.c
rename to debuggerd/arm/pr-support.c
diff --git a/debuggerd/unwind-arm.c b/debuggerd/arm/unwind.c
similarity index 98%
rename from debuggerd/unwind-arm.c
rename to debuggerd/arm/unwind.c
index b081161..d9600b7 100644
--- a/debuggerd/unwind-arm.c
+++ b/debuggerd/arm/unwind.c
@@ -430,7 +430,7 @@
if (pc & 1) {
_uw prev_word;
pc = (pc & ~1);
- prev_word = get_remote_word(pid, (void *) pc-4);
+ prev_word = get_remote_word(pid, (char *) pc-4);
// Long offset
if ((prev_word & 0xf0000000) == 0xf0000000 &&
(prev_word & 0x0000e000) == 0x0000e000) {
@@ -451,7 +451,6 @@
* 1MB boundaries, and the library may be larger than 1MB. So for .so
* addresses we print the relative offset in back trace.
*/
- rel_pc = pc;
mi = pc_to_mapinfo(map, pc, &rel_pc);
/* See if we can determine what symbol this stack frame resides in */
diff --git a/debuggerd/crasher.c b/debuggerd/crasher.c
index f4a5a62..00652e9 100644
--- a/debuggerd/crasher.c
+++ b/debuggerd/crasher.c
@@ -19,6 +19,7 @@
void crash1(void);
void crashnostack(void);
+void maybeabort(void);
static void debuggerd_connect()
{
diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c
index 248bc9a..5fa4442 100644
--- a/debuggerd/debuggerd.c
+++ b/debuggerd/debuggerd.c
@@ -16,8 +16,6 @@
*/
#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <errno.h>
#include <signal.h>
#include <pthread.h>
@@ -33,7 +31,6 @@
#include <cutils/sockets.h>
#include <cutils/logd.h>
-#include <cutils/sockets.h>
#include <cutils/properties.h>
#include <linux/input.h>
@@ -41,24 +38,9 @@
#include <private/android_filesystem_config.h>
#include <byteswap.h>
+#include "debuggerd.h"
#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[],
- int *frame0_pc_sane,
- bool at_fault);
-
-static int logsocket = -1;
-
#define ANDROID_LOG_INFO 4
/* Log information onto the tombstone */
@@ -80,13 +62,6 @@
__android_log_vprint(ANDROID_LOG_INFO, "DEBUG", fmt, ap);
}
-#define LOG(fmt...) _LOG(-1, 0, fmt)
-#if 0
-#define XLOG(fmt...) _LOG(-1, 0, fmt)
-#else
-#define XLOG(fmt...) do {} while(0)
-#endif
-
// 6f000000-6f01e000 rwxp 00000000 00:0c 16389419 /system/lib/libcomposer.so
// 012345678901234567890123456789012345678901234567890123456789
// 0 1 2 3 4 5
@@ -127,186 +102,6 @@
_LOG(tfd, false, "Build fingerprint: '%s'\n", fingerprint);
}
-
-void dump_stack_and_code(int tfd, int pid, mapinfo *map,
- int unwind_depth, unsigned int sp_list[],
- bool at_fault)
-{
- unsigned int sp, pc, p, end, data;
- struct pt_regs r;
- int sp_depth;
- bool only_in_tombstone = !at_fault;
- char code_buffer[80];
-
- if(ptrace(PTRACE_GETREGS, pid, 0, &r)) return;
- sp = r.ARM_sp;
- pc = r.ARM_pc;
-
- _LOG(tfd, only_in_tombstone, "\ncode around pc:\n");
-
- end = p = pc & ~3;
- p -= 32;
- end += 32;
-
- /* Dump the code around PC as:
- * addr contents
- * 00008d34 fffffcd0 4c0eb530 b0934a0e 1c05447c
- * 00008d44 f7ff18a0 490ced94 68035860 d0012b00
- */
- while (p <= end) {
- int i;
-
- sprintf(code_buffer, "%08x ", p);
- for (i = 0; i < 4; i++) {
- data = ptrace(PTRACE_PEEKTEXT, pid, (void*)p, NULL);
- sprintf(code_buffer + strlen(code_buffer), "%08x ", data);
- p += 4;
- }
- _LOG(tfd, only_in_tombstone, "%s\n", code_buffer);
- }
-
- if ((unsigned) r.ARM_lr != pc) {
- _LOG(tfd, only_in_tombstone, "\ncode around lr:\n");
-
- end = p = r.ARM_lr & ~3;
- p -= 32;
- end += 32;
-
- /* Dump the code around LR as:
- * addr contents
- * 00008d34 fffffcd0 4c0eb530 b0934a0e 1c05447c
- * 00008d44 f7ff18a0 490ced94 68035860 d0012b00
- */
- while (p <= end) {
- int i;
-
- sprintf(code_buffer, "%08x ", p);
- for (i = 0; i < 4; i++) {
- data = ptrace(PTRACE_PEEKTEXT, pid, (void*)p, NULL);
- sprintf(code_buffer + strlen(code_buffer), "%08x ", data);
- p += 4;
- }
- _LOG(tfd, only_in_tombstone, "%s\n", code_buffer);
- }
- }
-
- p = sp - 64;
- p &= ~3;
- if (unwind_depth != 0) {
- if (unwind_depth < STACK_CONTENT_DEPTH) {
- end = sp_list[unwind_depth-1];
- }
- else {
- end = sp_list[STACK_CONTENT_DEPTH-1];
- }
- }
- else {
- end = sp | 0x000000ff;
- end += 0xff;
- }
-
- _LOG(tfd, only_in_tombstone, "\nstack:\n");
-
- /* If the crash is due to PC == 0, there will be two frames that
- * have identical SP value.
- */
- if (sp_list[0] == sp_list[1]) {
- sp_depth = 1;
- }
- else {
- sp_depth = 0;
- }
-
- while (p <= end) {
- char *prompt;
- char level[16];
- data = ptrace(PTRACE_PEEKTEXT, pid, (void*)p, NULL);
- if (p == sp_list[sp_depth]) {
- sprintf(level, "#%02d", sp_depth++);
- prompt = level;
- }
- else {
- prompt = " ";
- }
-
- /* Print the stack content in the log for the first 3 frames. For the
- * rest only print them in the tombstone file.
- */
- _LOG(tfd, (sp_depth > 2) || only_in_tombstone,
- "%s %08x %08x %s\n", prompt, p, data,
- map_to_name(map, data, ""));
- p += 4;
- }
- /* print another 64-byte of stack data after the last frame */
-
- end = p+64;
- while (p <= end) {
- data = ptrace(PTRACE_PEEKTEXT, pid, (void*)p, NULL);
- _LOG(tfd, (sp_depth > 2) || only_in_tombstone,
- " %08x %08x %s\n", p, data,
- map_to_name(map, data, ""));
- p += 4;
- }
-}
-
-void dump_pc_and_lr(int tfd, int pid, mapinfo *map, int unwound_level,
- bool at_fault)
-{
- struct pt_regs r;
-
- if(ptrace(PTRACE_GETREGS, pid, 0, &r)) {
- _LOG(tfd, !at_fault, "tid %d not responding!\n", pid);
- return;
- }
-
- if (unwound_level == 0) {
- _LOG(tfd, !at_fault, " #%02d pc %08x %s\n", 0, r.ARM_pc,
- map_to_name(map, r.ARM_pc, "<unknown>"));
- }
- _LOG(tfd, !at_fault, " #%02d lr %08x %s\n", 1, r.ARM_lr,
- map_to_name(map, r.ARM_lr, "<unknown>"));
-}
-
-void dump_registers(int tfd, int pid, bool at_fault)
-{
- struct pt_regs r;
- bool only_in_tombstone = !at_fault;
-
- if(ptrace(PTRACE_GETREGS, pid, 0, &r)) {
- _LOG(tfd, only_in_tombstone,
- "cannot get registers: %s\n", strerror(errno));
- return;
- }
-
- _LOG(tfd, only_in_tombstone, " r0 %08x r1 %08x r2 %08x r3 %08x\n",
- r.ARM_r0, r.ARM_r1, r.ARM_r2, r.ARM_r3);
- _LOG(tfd, only_in_tombstone, " r4 %08x r5 %08x r6 %08x r7 %08x\n",
- r.ARM_r4, r.ARM_r5, r.ARM_r6, r.ARM_r7);
- _LOG(tfd, only_in_tombstone, " r8 %08x r9 %08x 10 %08x fp %08x\n",
- r.ARM_r8, r.ARM_r9, r.ARM_r10, r.ARM_fp);
- _LOG(tfd, only_in_tombstone,
- " 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);
-
-#ifdef WITH_VFP
- struct user_vfp vfp_regs;
- int i;
-
- if(ptrace(PTRACE_GETVFPREGS, pid, 0, &vfp_regs)) {
- _LOG(tfd, only_in_tombstone,
- "cannot get registers: %s\n", strerror(errno));
- return;
- }
-
- 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]);
- }
- _LOG(tfd, only_in_tombstone, " scr %08lx\n\n", vfp_regs.fpscr);
-#endif
-}
-
const char *get_signame(int sig)
{
switch(sig) {
@@ -491,12 +286,14 @@
/* Parse the program header */
get_remote_struct(pid, (char *) (ptr+i), &phdr,
sizeof(Elf32_Phdr));
+#ifdef __arm__
/* Found a EXIDX segment? */
if (phdr.p_type == PT_ARM_EXIDX) {
mi->exidx_start = mi->start + phdr.p_offset;
mi->exidx_end = mi->exidx_start + phdr.p_filesz;
break;
}
+#endif
}
/* Try to load symbols from this file */
@@ -512,7 +309,9 @@
mapinfo *milist = 0;
unsigned int sp_list[STACK_CONTENT_DEPTH];
int stack_depth;
+#ifdef __arm__
int frame0_pc_sane = 1;
+#endif
if (!at_fault) {
_LOG(tfd, true,
@@ -540,6 +339,7 @@
parse_elf_info(milist, tid);
+#if __arm__
/* If stack unwinder fails, use the default solution to dump the stack
* content.
*/
@@ -555,6 +355,14 @@
dump_randomization_base(tfd, at_fault);
dump_stack_and_code(tfd, tid, milist, stack_depth, sp_list, at_fault);
+#elif __i386__
+ /* If stack unwinder fails, use the default solution to dump the stack
+ * content.
+ */
+ stack_depth = unwind_backtrace_with_ptrace_x86(tfd, tid, milist,at_fault);
+#else
+#error "Unsupported architecture"
+#endif
while(milist) {
mapinfo *next = milist->next;
@@ -937,10 +745,12 @@
if(fd != -1) close(fd);
}
+
int main()
{
int s;
struct sigaction act;
+ int logsocket = -1;
logsocket = socket_local_client("logd",
ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_DGRAM);
diff --git a/debuggerd/debuggerd.h b/debuggerd/debuggerd.h
new file mode 100644
index 0000000..e3cdc7c
--- /dev/null
+++ b/debuggerd/debuggerd.h
@@ -0,0 +1,39 @@
+/* system/debuggerd/debuggerd.h
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+#include <cutils/logd.h>
+#include <sys/ptrace.h>
+#include <unwind.h>
+#include "utility.h"
+#include "symbol_table.h"
+
+
+/* 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[],
+ int *frame0_pc_sane,
+ bool at_fault);
+
+extern void dump_registers(int tfd, int pid, bool at_fault);
+
+extern int unwind_backtrace_with_ptrace_x86(int tfd, pid_t pid, mapinfo *map, bool at_fault);
+
+void dump_pc_and_lr(int tfd, int pid, mapinfo *map, int unwound_level, bool at_fault);
+
+void dump_stack_and_code(int tfd, int pid, mapinfo *map,
+ int unwind_depth, unsigned int sp_list[],
+ bool at_fault);
diff --git a/debuggerd/symbol_table.c b/debuggerd/symbol_table.c
index 150c058..e76df33 100644
--- a/debuggerd/symbol_table.c
+++ b/debuggerd/symbol_table.c
@@ -5,6 +5,7 @@
#include <sys/mman.h>
#include "symbol_table.h"
+#include "utility.h"
#include <linux/elf.h>
@@ -49,6 +50,7 @@
int length;
char *base;
+ XLOG("Creating symbol table for %s\n", filename);
int fd = open(filename, O_RDONLY);
if(fd < 0) {
@@ -69,40 +71,70 @@
Elf32_Shdr *shdr = (Elf32_Shdr*)(base + hdr->e_shoff);
// Search for the dynamic symbols section
+ int sym_idx = -1;
int dynsym_idx = -1;
int i;
for(i = 0; i < hdr->e_shnum; i++) {
+ if(shdr[i].sh_type == SHT_SYMTAB ) {
+ sym_idx = i;
+ }
if(shdr[i].sh_type == SHT_DYNSYM ) {
dynsym_idx = i;
}
}
-
- if(dynsym_idx == -1) {
+ if ((dynsym_idx == -1) && (sym_idx == -1)) {
goto out_unmap;
}
- Elf32_Sym *dynsyms = (Elf32_Sym*)(base + shdr[dynsym_idx].sh_offset);
- int numsyms = shdr[dynsym_idx].sh_size / shdr[dynsym_idx].sh_entsize;
-
table = malloc(sizeof(struct symbol_table));
if(!table) {
goto out_unmap;
}
+ table->name = strdup(filename);
table->num_symbols = 0;
- // Iterate through the dynamic symbol table, and count how many symbols
- // are actually defined
- for(i = 0; i < numsyms; i++) {
- if(dynsyms[i].st_shndx != SHN_UNDEF) {
- table->num_symbols++;
- }
- }
+ Elf32_Sym *dynsyms = (Elf32_Sym*)(base + shdr[dynsym_idx].sh_offset);
+ Elf32_Sym *syms = (Elf32_Sym*)(base + shdr[sym_idx].sh_offset);
+
+ int dynnumsyms = shdr[dynsym_idx].sh_size / shdr[dynsym_idx].sh_entsize;
+ int numsyms = shdr[sym_idx].sh_size / shdr[sym_idx].sh_entsize;
int dynstr_idx = shdr[dynsym_idx].sh_link;
+ int str_idx = shdr[sym_idx].sh_link;
+
char *dynstr = base + shdr[dynstr_idx].sh_offset;
+ char *str = base + shdr[str_idx].sh_offset;
+
+ int symbol_count = 0;
+ int dynsymbol_count = 0;
+
+ if (dynsym_idx != -1) {
+ // Iterate through the dynamic symbol table, and count how many symbols
+ // are actually defined
+ for(i = 0; i < dynnumsyms; i++) {
+ if(dynsyms[i].st_shndx != SHN_UNDEF) {
+ dynsymbol_count++;
+ }
+ }
+ XLOG("Dynamic Symbol count: %d\n", dynsymbol_count);
+ }
+
+ if (sym_idx != -1) {
+ // Iterate through the symbol table, and count how many symbols
+ // are actually defined
+ for(i = 0; i < numsyms; i++) {
+ if((syms[i].st_shndx != SHN_UNDEF) &&
+ (strlen(str+syms[i].st_name)) &&
+ (syms[i].st_value != 0) && (syms[i].st_size != 0)) {
+ symbol_count++;
+ }
+ }
+ XLOG("Symbol count: %d\n", symbol_count);
+ }
// Now, create an entry in our symbol table structure for each symbol...
+ table->num_symbols += symbol_count + dynsymbol_count;;
table->symbols = malloc(table->num_symbols * sizeof(struct symbol));
if(!table->symbols) {
free(table);
@@ -110,14 +142,35 @@
goto out_unmap;
}
- // ...and populate them
+
int j = 0;
- for(i = 0; i < numsyms; i++) {
- if(dynsyms[i].st_shndx != SHN_UNDEF) {
- 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;
- j++;
+ if (dynsym_idx != -1) {
+ // ...and populate them
+ for(i = 0; i < dynnumsyms; i++) {
+ if(dynsyms[i].st_shndx != SHN_UNDEF) {
+ 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",
+ table->symbols[j].name, table->symbols[j].addr, table->symbols[j].size);
+ j++;
+ }
+ }
+ }
+
+ if (sym_idx != -1) {
+ // ...and populate them
+ for(i = 0; i < numsyms; i++) {
+ if((syms[i].st_shndx != SHN_UNDEF) &&
+ (strlen(str+syms[i].st_name)) &&
+ (syms[i].st_value != 0) && (syms[i].st_size != 0)) {
+ 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",
+ table->symbols[j].name, table->symbols[j].addr, table->symbols[j].size);
+ j++;
+ }
}
}
diff --git a/debuggerd/symbol_table.h b/debuggerd/symbol_table.h
index d9d2520..7f41f91 100644
--- a/debuggerd/symbol_table.h
+++ b/debuggerd/symbol_table.h
@@ -10,6 +10,7 @@
struct symbol_table {
struct symbol *symbols;
int num_symbols;
+ char *name;
};
struct symbol_table *symbol_table_create(const char *filename);
diff --git a/debuggerd/utility.c b/debuggerd/utility.c
index 8f3931c..2afdb46 100644
--- a/debuggerd/utility.c
+++ b/debuggerd/utility.c
@@ -38,14 +38,14 @@
unsigned int i;
for (i = 0; i+4 <= size; i+=4) {
- *(int *)(dst+i) = ptrace(PTRACE_PEEKTEXT, pid, src+i, NULL);
+ *(int *)((char *)dst+i) = ptrace(PTRACE_PEEKTEXT, pid, (char *)src+i, NULL);
}
if (i < size) {
int val;
assert((size - i) < 4);
- val = ptrace(PTRACE_PEEKTEXT, pid, src+i, NULL);
+ val = ptrace(PTRACE_PEEKTEXT, pid, (char *)src+i, NULL);
while (i < size) {
((unsigned char *)dst)[i] = val & 0xff;
i++;
@@ -69,11 +69,12 @@
/* Find the containing map info for the pc */
const mapinfo *pc_to_mapinfo(mapinfo *mi, unsigned pc, unsigned *rel_pc)
{
+ *rel_pc = pc;
while(mi) {
if((pc >= mi->start) && (pc < mi->end)){
// Only calculate the relative offset for shared libraries
if (strstr(mi->name, ".so")) {
- *rel_pc = pc - mi->start;
+ *rel_pc -= mi->start;
}
return mi;
}
diff --git a/debuggerd/utility.h b/debuggerd/utility.h
index 2ffdf56..0682b85 100644
--- a/debuggerd/utility.h
+++ b/debuggerd/utility.h
@@ -56,4 +56,11 @@
/* Log information onto the tombstone */
extern void _LOG(int tfd, bool in_tombstone_only, const char *fmt, ...);
+#define LOG(fmt...) _LOG(-1, 0, fmt)
+#if 0
+#define XLOG(fmt...) _LOG(-1, 0, fmt)
+#else
+#define XLOG(fmt...) do {} while(0)
+#endif
+
#endif
diff --git a/debuggerd/x86/crashglue.S b/debuggerd/x86/crashglue.S
new file mode 100644
index 0000000..59df432
--- /dev/null
+++ b/debuggerd/x86/crashglue.S
@@ -0,0 +1,15 @@
+.globl crash1
+.globl crashnostack
+
+crash1:
+ movl $0xa5a50000, %eax
+ movl $0xa5a50001, %ebx
+ movl $0xa5a50002, %ecx
+
+ movl $0, %edx
+ jmp *%edx
+
+
+crashnostack:
+ movl $0, %ebp
+ jmp *%ebp
diff --git a/debuggerd/x86/machine.c b/debuggerd/x86/machine.c
new file mode 100644
index 0000000..9d418cf
--- /dev/null
+++ b/debuggerd/x86/machine.c
@@ -0,0 +1,61 @@
+/* system/debuggerd/debuggerd.c
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+#include <stdio.h>
+#include <errno.h>
+#include <signal.h>
+#include <pthread.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+#include <sys/exec_elf.h>
+#include <sys/stat.h>
+
+#include <cutils/sockets.h>
+#include <cutils/properties.h>
+
+#include <linux/input.h>
+
+#include "../utility.h"
+#include "x86_utility.h"
+
+void dump_registers(int tfd, int pid, bool at_fault)
+{
+ struct pt_regs_x86 r;
+ bool only_in_tombstone = !at_fault;
+
+ if(ptrace(PTRACE_GETREGS, pid, 0, &r)) {
+ _LOG(tfd, only_in_tombstone,
+ "cannot get registers: %s\n", strerror(errno));
+ return;
+ }
+//if there is no stack, no print just like arm
+ if(!r.ebp)
+ return;
+ _LOG(tfd, only_in_tombstone, " eax %08x ebx %08x ecx %08x edx %08x\n",
+ r.eax, r.ebx, r.ecx, r.edx);
+ _LOG(tfd, only_in_tombstone, " esi %08x edi %08x\n",
+ r.esi, r.edi);
+ _LOG(tfd, only_in_tombstone, " xcs %08x xds %08x xes %08x xfs %08x xss %08x\n",
+ r.xcs, r.xds, r.xes, r.xfs, r.xss);
+ _LOG(tfd, only_in_tombstone,
+ " eip %08x ebp %08x esp %08x flags %08x\n",
+ r.eip, r.ebp, r.esp, r.eflags);
+}
diff --git a/debuggerd/x86/unwind.c b/debuggerd/x86/unwind.c
new file mode 100644
index 0000000..8f84e01
--- /dev/null
+++ b/debuggerd/x86/unwind.c
@@ -0,0 +1,85 @@
+#include <cutils/logd.h>
+#include <sys/ptrace.h>
+#include "../utility.h"
+#include "x86_utility.h"
+
+
+int unwind_backtrace_with_ptrace_x86(int tfd, pid_t pid, mapinfo *map,
+ bool at_fault)
+{
+ struct pt_regs_x86 r;
+ unsigned int stack_level = 0;
+ unsigned int stack_depth = 0;
+ unsigned int rel_pc;
+ unsigned int stack_ptr;
+ unsigned int stack_content;
+
+ if(ptrace(PTRACE_GETREGS, pid, 0, &r)) return 0;
+ unsigned int eip = (unsigned int)r.eip;
+ unsigned int ebp = (unsigned int)r.ebp;
+ unsigned int cur_sp = (unsigned int)r.esp;
+ const mapinfo *mi;
+ const struct symbol* sym = 0;
+
+
+//ebp==0, it indicates that the stack is poped to the bottom or there is no stack at all.
+ while (ebp) {
+ _LOG(tfd, !at_fault, "#0%d ",stack_level);
+ mi = pc_to_mapinfo(map, eip, &rel_pc);
+
+ /* See if we can determine what symbol this stack frame resides in */
+ if (mi != 0 && mi->symbols != 0) {
+ sym = symbol_table_lookup(mi->symbols, rel_pc);
+ }
+ if (sym) {
+ _LOG(tfd, !at_fault, " eip: %08x %s (%s)\n", eip, mi ? mi->name : "", sym->name);
+ } else {
+ _LOG(tfd, !at_fault, " eip: %08x %s\n", eip, mi ? mi->name : "");
+ }
+
+ stack_level++;
+ if (stack_level >= STACK_DEPTH || eip == 0)
+ break;
+ eip = ptrace(PTRACE_PEEKTEXT, pid, (void*)(ebp + 4), NULL);
+ ebp = ptrace(PTRACE_PEEKTEXT, pid, (void*)ebp, NULL);
+ }
+ ebp = (unsigned int)r.ebp;
+ stack_depth = stack_level;
+ stack_level = 0;
+ if (ebp)
+ _LOG(tfd, !at_fault, "stack: \n");
+ while (ebp) {
+ _LOG(tfd, !at_fault, "#0%d \n",stack_level);
+ stack_ptr = cur_sp;
+ while((int)(ebp - stack_ptr) >= 0) {
+ stack_content = ptrace(PTRACE_PEEKTEXT, pid, (void*)stack_ptr, NULL);
+ mi = pc_to_mapinfo(map, stack_content, &rel_pc);
+
+ /* See if we can determine what symbol this stack frame resides in */
+ if (mi != 0 && mi->symbols != 0) {
+ sym = symbol_table_lookup(mi->symbols, rel_pc);
+ }
+ if (sym) {
+ _LOG(tfd, !at_fault, " %08x %08x %s (%s)\n",
+ stack_ptr, stack_content, mi ? mi->name : "", sym->name);
+ } else {
+ _LOG(tfd, !at_fault, " %08x %08x %s\n", stack_ptr, stack_content, mi ? mi->name : "");
+ }
+
+ stack_ptr = stack_ptr + 4;
+ //the stack frame may be very deep.
+ if((int)(stack_ptr - cur_sp) >= STACK_FRAME_DEPTH) {
+ _LOG(tfd, !at_fault, " ...... ...... \n");
+ break;
+ }
+ }
+ cur_sp = ebp + 4;
+ stack_level++;
+ if (stack_level >= STACK_DEPTH || stack_level >= stack_depth)
+ break;
+ ebp = ptrace(PTRACE_PEEKTEXT, pid, (void*)ebp, NULL);
+ }
+
+ return stack_depth;
+}
+
diff --git a/debuggerd/x86/x86_utility.h b/debuggerd/x86/x86_utility.h
new file mode 100644
index 0000000..ac6a885
--- /dev/null
+++ b/debuggerd/x86/x86_utility.h
@@ -0,0 +1,40 @@
+/*
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+#define STACK_DEPTH 8
+#define STACK_FRAME_DEPTH 64
+
+typedef struct pt_regs_x86 {
+ long ebx;
+ long ecx;
+ long edx;
+ long esi;
+ long edi;
+ long ebp;
+ long eax;
+ int xds;
+ int xes;
+ int xfs;
+ int xgs;
+ long orig_eax;
+ long eip;
+ int xcs;
+ long eflags;
+ long esp;
+ int xss;
+}pt_regs_x86;
+
diff --git a/rootdir/init.rc b/rootdir/init.rc
index a6ce529..8753617 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -363,30 +363,6 @@
group bluetooth net_bt_admin misc
disabled
-service hfag /system/bin/sdptool add --channel=10 HFAG
- user bluetooth
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service hsag /system/bin/sdptool add --channel=11 HSAG
- user bluetooth
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service opush /system/bin/sdptool add --channel=12 OPUSH
- user bluetooth
- group bluetooth net_bt_admin
- disabled
- oneshot
-
-service pbap /system/bin/sdptool add --channel=19 PBAP
- user bluetooth
- group bluetooth net_bt_admin
- disabled
- oneshot
-
service installd /system/bin/installd
socket installd stream 600 system system