From 4e906f53ab20520b00e7480b73c83435b7f7fb7a Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 11 Sep 2008 14:29:53 +0000 Subject: [PATCH] * procfs.c (procfs_address_to_host_pointer): Use target_gdbarch and its associated types to perform pointer conversion. (procfs_can_use_hw_breakpoint): Likewise. (procfs_auxv_parse): Remove unused variable. --- gdb/ChangeLog | 7 +++++++ gdb/procfs.c | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 455ab59dcd3..520ad044b84 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2008-09-11 Ulrich Weigand + + * procfs.c (procfs_address_to_host_pointer): Use target_gdbarch + and its associated types to perform pointer conversion. + (procfs_can_use_hw_breakpoint): Likewise. + (procfs_auxv_parse): Remove unused variable. + 2008-09-11 Ulrich Weigand * auxv.c (default_auxv_parse): Use gdbarch_ptr_bit (target_gdbarch) diff --git a/gdb/procfs.c b/gdb/procfs.c index e8cd6d94bfc..703415c98f7 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -160,7 +160,6 @@ static int procfs_auxv_parse (struct target_ops *ops, gdb_byte **readptr, gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp) { - const int pointer_size = TYPE_LENGTH (builtin_type_void_data_ptr); gdb_byte *ptr = *readptr; if (endptr == ptr) @@ -2899,11 +2898,11 @@ proc_parent_pid (procinfo *pi) static void * procfs_address_to_host_pointer (CORE_ADDR addr) { + struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr; void *ptr; - gdb_assert (sizeof (ptr) == TYPE_LENGTH (builtin_type_void_data_ptr)); - gdbarch_address_to_pointer (current_gdbarch, builtin_type_void_data_ptr, - &ptr, addr); + gdb_assert (sizeof (ptr) == TYPE_LENGTH (ptr_type)); + gdbarch_address_to_pointer (target_gdbarch, ptr_type, &ptr, addr); return ptr; } @@ -5352,7 +5351,8 @@ procfs_can_use_hw_breakpoint (int type, int cnt, int othertype) procfs_address_to_host_pointer will reveal that an internal error will be generated when the host and target pointer sizes are different. */ - if (sizeof (void *) != TYPE_LENGTH (builtin_type_void_data_ptr)) + struct type *ptr_type = builtin_type (target_gdbarch)->builtin_data_ptr; + if (sizeof (void *) != TYPE_LENGTH (ptr_type)) return 0; /* Other tests here??? */ -- 2.39.2