aboutsummaryrefslogtreecommitdiffstats
path: root/hw/android_arm.c
diff options
context:
space:
mode:
authorJack Veenstra <veenstra@android.com>2009-05-05 10:35:03 -0700
committerJack Veenstra <veenstra@android.com>2009-05-06 11:37:48 -0700
commit9980bbb9965ee2df42f94aafa817e91835dad406 (patch)
tree0aaf7dd450026225c8cd59c69651711bb83edef6 /hw/android_arm.c
parentab42ada6ecfb81d6e231d5997b5892efd0fde5ad (diff)
downloadexternal_qemu-9980bbb9965ee2df42f94aafa817e91835dad406.zip
external_qemu-9980bbb9965ee2df42f94aafa817e91835dad406.tar.gz
external_qemu-9980bbb9965ee2df42f94aafa817e91835dad406.tar.bz2
Add support for tracing Java method entry/exit to qemu.
This is part of a larger change to add support for tracing Java methods. There is also a kernel change and a small change to the Dalvik interpreter that will be checked in separately. There used to be support for tracing Java methods but it relied on trapping every store and checking if the store address matched a special "magic" region (and that stopped working because we can no longer trap on loads and stores). The new approach uses a memory-mapped page to catch stores to just that page.
Diffstat (limited to 'hw/android_arm.c')
-rw-r--r--hw/android_arm.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/hw/android_arm.c b/hw/android_arm.c
index ae21be8..b178dad 100644
--- a/hw/android_arm.c
+++ b/hw/android_arm.c
@@ -39,12 +39,6 @@ static struct goldfish_device nand_device = {
.size = 0x1000
};
-static struct goldfish_device trace_device = {
- .name = "qemu_trace",
- .id = -1,
- .size = 0x1000
-};
-
/* Board init. */
#define TEST_SWITCH 1
@@ -138,9 +132,8 @@ static void android_arm_init(ram_addr_t ram_size, int vga_ram_size,
#endif
#ifdef CONFIG_TRACE
extern const char *trace_filename;
- if(trace_filename != NULL) {
- goldfish_add_device_no_io(&trace_device);
- trace_dev_init(trace_device.base);
+ if (trace_filename != NULL) {
+ trace_dev_init();
}
#endif