This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [rfc]: Replace current_gdbarch in hppa
- From: Markus Deuling <deuling at de dot ibm dot com>
- To: Ulrich Weigand <uweigand at de dot ibm dot com>
- Cc: GDB Patches <gdb-patches at sourceware dot org>
- Date: Mon, 18 Feb 2008 15:25:36 +0100
- Subject: Re: [rfc]: Replace current_gdbarch in hppa
- References: <200802151838.m1FIcnFC028614@d12av02.megacenter.de.ibm.com>
Hi Uli,
This is really the wrong check. It should really just verify that
no out-of-bounds access to u_offsets happens, so the line should
just be something like:
if ((unsigned) regno >= ARRAY_SIZE (u_offsets))
yes, you're right. This check is much better :-)
I changed the patch. Ok to commit?
ChangeLog:
* hppa-tdep.h (find_global_pointer): Add gdbarch as parameter.
* hppa-hpux-tdep.c (hppa32_hpux_find_global_pointer): Likewise. Replace
current_gdbarch by gdbarch.
(hppa64_hpux_find_global_pointer): Likewise.
* hppa-tdep.c (hppa_find_global_pointer): Likewise.
(hppa32_push_dummy_call, hppa64_push_dummy_call): Update call for
find_global_pointer.
* hppabsd-tdep.c (hppabsd_find_global_pointer): Add gdbarch as
parameter.
* hppa-linux-tdep.c (hppa_linux_find_global_pointer): Likewise.
* hppa-linux-nat.c (hppa_linux_register_addr): Add gdbarch as parameter.
(fetch_register, store_register): Update call for
hppa_linux_register_addr.
* hppa-hpux-tdep.c (hppa_hpux_sr_for_addr): Add gdbarch as parameter and
replace current_gdbarch by gdbarch.
(hppa_hpux_push_dummy_code): Update call for hppa_hpux_sr_for_addr.
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
diff -urpN src/gdb/hppabsd-tdep.c dev/gdb/hppabsd-tdep.c
--- src/gdb/hppabsd-tdep.c 2008-01-21 06:48:46.000000000 +0100
+++ dev/gdb/hppabsd-tdep.c 2008-02-18 15:15:18.000000000 +0100
@@ -28,7 +28,7 @@
#include "solib-svr4.h"
CORE_ADDR
-hppabsd_find_global_pointer (struct value *function)
+hppabsd_find_global_pointer (struct gdbarch *gdbarch, struct value *function)
{
CORE_ADDR faddr = value_as_address (function);
struct obj_section *faddr_sec;
diff -urpN src/gdb/hppa-hpux-tdep.c dev/gdb/hppa-hpux-tdep.c
--- src/gdb/hppa-hpux-tdep.c 2008-01-16 12:21:15.000000000 +0100
+++ dev/gdb/hppa-hpux-tdep.c 2008-02-18 15:15:18.000000000 +0100
@@ -741,7 +741,8 @@ hppa_hpux_sigtramp_unwind_sniffer (struc
}
static CORE_ADDR
-hppa32_hpux_find_global_pointer (struct value *function)
+hppa32_hpux_find_global_pointer (struct gdbarch *gdbarch,
+ struct value *function)
{
CORE_ADDR faddr;
@@ -760,11 +761,12 @@ hppa32_hpux_find_global_pointer (struct
return extract_unsigned_integer (buf, sizeof (buf));
}
- return gdbarch_tdep (current_gdbarch)->solib_get_got_by_pc (faddr);
+ return gdbarch_tdep (gdbarch)->solib_get_got_by_pc (faddr);
}
static CORE_ADDR
-hppa64_hpux_find_global_pointer (struct value *function)
+hppa64_hpux_find_global_pointer (struct gdbarch *gdbarch,
+ struct value *function)
{
CORE_ADDR faddr;
char buf[32];
@@ -778,7 +780,7 @@ hppa64_hpux_find_global_pointer (struct
}
else
{
- return gdbarch_tdep (current_gdbarch)->solib_get_got_by_pc (faddr);
+ return gdbarch_tdep (gdbarch)->solib_get_got_by_pc (faddr);
}
}
@@ -1031,11 +1033,11 @@ hppa_hpux_find_import_stub_for_addr (COR
}
static int
-hppa_hpux_sr_for_addr (CORE_ADDR addr)
+hppa_hpux_sr_for_addr (struct gdbarch *gdbarch, CORE_ADDR addr)
{
int sr;
/* The space register to use is encoded in the top 2 bits of the address. */
- sr = addr >> (gdbarch_tdep (current_gdbarch)->bytes_per_address * 8 - 2);
+ sr = addr >> (gdbarch_tdep (gdbarch)->bytes_per_address * 8 - 2);
return sr + 4;
}
@@ -1112,7 +1114,8 @@ hppa_hpux_push_dummy_code (struct gdbarc
/* The simple case is where we call a function in the same space that we are
currently in; in that case we don't really need to do anything. */
- if (hppa_hpux_sr_for_addr (pc) == hppa_hpux_sr_for_addr (funcaddr))
+ if (hppa_hpux_sr_for_addr (gdbarch, pc)
+ == hppa_hpux_sr_for_addr (gdbarch, funcaddr))
{
/* Intraspace call. */
*bp_addr = hppa_hpux_find_dummy_bpaddr (pc);
diff -urpN src/gdb/hppa-linux-nat.c dev/gdb/hppa-linux-nat.c
--- src/gdb/hppa-linux-nat.c 2008-01-01 23:53:10.000000000 +0100
+++ dev/gdb/hppa-linux-nat.c 2008-02-18 15:20:51.000000000 +0100
@@ -149,11 +149,12 @@ static const int u_offsets[] =
};
static CORE_ADDR
-hppa_linux_register_addr (int regno, CORE_ADDR blockend)
+hppa_linux_register_addr (struct gdbarch *gdbarch, int regno,
+ CORE_ADDR blockend)
{
CORE_ADDR addr;
- if ((unsigned) regno >= gdbarch_num_regs (current_gdbarch))
+ if ((unsigned) regno >= ARRAY_SIZE (u_offsets))
error (_("Invalid register number %d."), regno);
if (u_offsets[regno] == -1)
@@ -229,7 +230,8 @@ fetch_register (struct regcache *regcach
tid = PIDGET (inferior_ptid); /* Not a threaded program. */
errno = 0;
- val = ptrace (PTRACE_PEEKUSER, tid, hppa_linux_register_addr (regno, 0), 0);
+ val = ptrace (PTRACE_PEEKUSER, tid,
+ hppa_linux_register_addr (gdbarch, regno, 0), 0);
if (errno != 0)
error (_("Couldn't read register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regno),
@@ -257,7 +259,8 @@ store_register (const struct regcache *r
errno = 0;
regcache_raw_collect (regcache, regno, &val);
- ptrace (PTRACE_POKEUSER, tid, hppa_linux_register_addr (regno, 0), val);
+ ptrace (PTRACE_POKEUSER, tid,
+ hppa_linux_register_addr (gdbarch, regno, 0), val);
if (errno != 0)
error (_("Couldn't write register %s (#%d): %s."),
gdbarch_register_name (gdbarch, regno),
diff -urpN src/gdb/hppa-linux-tdep.c dev/gdb/hppa-linux-tdep.c
--- src/gdb/hppa-linux-tdep.c 2008-01-01 23:53:10.000000000 +0100
+++ dev/gdb/hppa-linux-tdep.c 2008-02-18 15:15:18.000000000 +0100
@@ -325,7 +325,7 @@ hppa_linux_sigtramp_unwind_sniffer (stru
d_un.d_ptr value is the global pointer. */
static CORE_ADDR
-hppa_linux_find_global_pointer (struct value *function)
+hppa_linux_find_global_pointer (struct gdbarch *gdbarch, struct value *function)
{
struct obj_section *faddr_sect;
CORE_ADDR faddr;
diff -urpN src/gdb/hppa-tdep.c dev/gdb/hppa-tdep.c
--- src/gdb/hppa-tdep.c 2008-01-11 15:42:52.000000000 +0100
+++ dev/gdb/hppa-tdep.c 2008-02-18 15:15:18.000000000 +0100
@@ -828,7 +828,7 @@ hppa32_push_dummy_call (struct gdbarch *
if (struct_return)
regcache_cooked_write_unsigned (regcache, 28, struct_addr);
- gp = tdep->find_global_pointer (function);
+ gp = tdep->find_global_pointer (gdbarch, function);
if (gp != 0)
regcache_cooked_write_unsigned (regcache, 19, gp);
@@ -1087,7 +1087,7 @@ hppa64_push_dummy_call (struct gdbarch *
regcache_cooked_write_unsigned (regcache, HPPA_RET0_REGNUM, struct_addr);
/* Set up GR27 (%dp) to hold the global pointer (gp). */
- gp = tdep->find_global_pointer (function);
+ gp = tdep->find_global_pointer (gdbarch, function);
if (gp != 0)
regcache_cooked_write_unsigned (regcache, HPPA_DP_REGNUM, gp);
@@ -2705,7 +2705,7 @@ hppa_pseudo_register_read (struct gdbarc
}
static CORE_ADDR
-hppa_find_global_pointer (struct value *function)
+hppa_find_global_pointer (struct gdbarch *gdbarch, struct value *function)
{
return 0;
}
diff -urpN src/gdb/hppa-tdep.h dev/gdb/hppa-tdep.h
--- src/gdb/hppa-tdep.h 2008-01-01 23:53:10.000000000 +0100
+++ dev/gdb/hppa-tdep.h 2008-02-18 15:15:18.000000000 +0100
@@ -87,7 +87,7 @@ struct gdbarch_tdep
/* Given a function address, try to find the global pointer for the
corresponding shared object. */
- CORE_ADDR (*find_global_pointer) (struct value *);
+ CORE_ADDR (*find_global_pointer) (struct gdbarch *, struct value *);
/* For shared libraries, each call goes through a small piece of
trampoline code in the ".plt", or equivalent, section.