mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-02-17 13:10:12 +08:00
Unbreak PPC gdb builds
Commit f486487f55
(Mostly trivial enum fixes) missed updating
ppc-linux-nat.c, resulting in:
../../src/gdb/ppc-linux-nat.c: In function ‘_initialize_ppc_linux_nat’:
../../src/gdb/ppc-linux-nat.c:2503:27: error: assignment from incompatible pointer type [-Werror]
../../src/gdb/ppc-linux-nat.c:2504:27: error: assignment from incompatible pointer type [-Werror]
gdb/ChangeLog
2015-08-02 Pedro Alves <palves@redhat.com>
* ppc-linux-nat.c (get_trigger_type, create_watchpoint_request)
(ppc_linux_insert_watchpoint, ppc_linux_remove_watchpoint): Change
parameter 'rw's type to enum target_hw_bp_type and rename to
'type'.
This commit is contained in:
parent
835a09d99d
commit
e76460dbb9
@ -1699,13 +1699,13 @@ ppc_linux_remove_hw_breakpoint (struct target_ops *self,
|
||||
}
|
||||
|
||||
static int
|
||||
get_trigger_type (int rw)
|
||||
get_trigger_type (enum target_hw_bp_type type)
|
||||
{
|
||||
int t;
|
||||
|
||||
if (rw == hw_read)
|
||||
if (type == hw_read)
|
||||
t = PPC_BREAKPOINT_TRIGGER_READ;
|
||||
else if (rw == hw_write)
|
||||
else if (type == hw_write)
|
||||
t = PPC_BREAKPOINT_TRIGGER_WRITE;
|
||||
else
|
||||
t = PPC_BREAKPOINT_TRIGGER_READ | PPC_BREAKPOINT_TRIGGER_WRITE;
|
||||
@ -1984,8 +1984,8 @@ ppc_linux_can_accel_watchpoint_condition (struct target_ops *self,
|
||||
|
||||
static void
|
||||
create_watchpoint_request (struct ppc_hw_breakpoint *p, CORE_ADDR addr,
|
||||
int len, int rw, struct expression *cond,
|
||||
int insert)
|
||||
int len, enum target_hw_bp_type type,
|
||||
struct expression *cond, int insert)
|
||||
{
|
||||
if (len == 1
|
||||
|| !(hwdebug_info.features & PPC_DEBUG_FEATURE_DATA_BP_RANGE))
|
||||
@ -2024,13 +2024,13 @@ create_watchpoint_request (struct ppc_hw_breakpoint *p, CORE_ADDR addr,
|
||||
}
|
||||
|
||||
p->version = PPC_DEBUG_CURRENT_VERSION;
|
||||
p->trigger_type = get_trigger_type (rw);
|
||||
p->trigger_type = get_trigger_type (type);
|
||||
p->addr = (uint64_t) addr;
|
||||
}
|
||||
|
||||
static int
|
||||
ppc_linux_insert_watchpoint (struct target_ops *self,
|
||||
CORE_ADDR addr, int len, int rw,
|
||||
ppc_linux_insert_watchpoint (struct target_ops *self, CORE_ADDR addr, int len,
|
||||
enum target_hw_bp_type type,
|
||||
struct expression *cond)
|
||||
{
|
||||
struct lwp_info *lp;
|
||||
@ -2040,7 +2040,7 @@ ppc_linux_insert_watchpoint (struct target_ops *self,
|
||||
{
|
||||
struct ppc_hw_breakpoint p;
|
||||
|
||||
create_watchpoint_request (&p, addr, len, rw, cond, 1);
|
||||
create_watchpoint_request (&p, addr, len, type, cond, 1);
|
||||
|
||||
ALL_LWPS (lp)
|
||||
hwdebug_insert_point (&p, ptid_get_lwp (lp->ptid));
|
||||
@ -2068,7 +2068,7 @@ ppc_linux_insert_watchpoint (struct target_ops *self,
|
||||
}
|
||||
|
||||
dabr_value = addr & ~(read_mode | write_mode);
|
||||
switch (rw)
|
||||
switch (type)
|
||||
{
|
||||
case hw_read:
|
||||
/* Set read and translate bits. */
|
||||
@ -2098,8 +2098,8 @@ ppc_linux_insert_watchpoint (struct target_ops *self,
|
||||
}
|
||||
|
||||
static int
|
||||
ppc_linux_remove_watchpoint (struct target_ops *self,
|
||||
CORE_ADDR addr, int len, int rw,
|
||||
ppc_linux_remove_watchpoint (struct target_ops *self, CORE_ADDR addr, int len,
|
||||
enum target_hw_bp_type type,
|
||||
struct expression *cond)
|
||||
{
|
||||
struct lwp_info *lp;
|
||||
@ -2109,7 +2109,7 @@ ppc_linux_remove_watchpoint (struct target_ops *self,
|
||||
{
|
||||
struct ppc_hw_breakpoint p;
|
||||
|
||||
create_watchpoint_request (&p, addr, len, rw, cond, 0);
|
||||
create_watchpoint_request (&p, addr, len, type, cond, 0);
|
||||
|
||||
ALL_LWPS (lp)
|
||||
hwdebug_remove_point (&p, ptid_get_lwp (lp->ptid));
|
||||
|
Loading…
Reference in New Issue
Block a user