From ad422571bdd50bca8c3d6923f3ac507fd738860c Mon Sep 17 00:00:00 2001 From: Thiago Jung Bauermann Date: Wed, 12 Jan 2011 20:09:53 +0000 Subject: [PATCH] 2011-01-12 Thiago Jung Bauermann * ppc-linux-nat.c (booke_cmp_hw_point): Fix whitespace. (ppc_linux_insert_hw_breakpoint): Likewise. (ppc_linux_remove_hw_breakpoint): Likewise. (ppc_linux_insert_watchpoint): Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/ppc-linux-nat.c | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 89ea6ac240..fd9abca233 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2011-01-12 Thiago Jung Bauermann + + * ppc-linux-nat.c (booke_cmp_hw_point): Fix whitespace. + (ppc_linux_insert_hw_breakpoint): Likewise. + (ppc_linux_remove_hw_breakpoint): Likewise. + (ppc_linux_insert_watchpoint): Likewise. + 2011-01-12 Andrew Burgess Jan Kratochvil diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index a86f9b602c..0c5563ee39 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -1526,11 +1526,11 @@ ppc_linux_region_ok_for_hw_watchpoint (CORE_ADDR addr, int len) static int booke_cmp_hw_point (struct ppc_hw_breakpoint *a, struct ppc_hw_breakpoint *b) { - return (a->trigger_type == b->trigger_type - && a->addr_mode == b->addr_mode - && a->condition_mode == b->condition_mode - && a->addr == b->addr - && a->addr2 == b->addr2 + return (a->trigger_type == b->trigger_type + && a->addr_mode == b->addr_mode + && a->condition_mode == b->condition_mode + && a->addr == b->addr + && a->addr2 == b->addr2 && a->condition_value == b->condition_value); } @@ -1648,12 +1648,12 @@ ppc_linux_insert_hw_breakpoint (struct gdbarch *gdbarch, if (!have_ptrace_booke_interface ()) return -1; - p.version = PPC_DEBUG_CURRENT_VERSION; - p.trigger_type = PPC_BREAKPOINT_TRIGGER_EXECUTE; - p.addr_mode = PPC_BREAKPOINT_MODE_EXACT; - p.condition_mode = PPC_BREAKPOINT_CONDITION_NONE; - p.addr = (uint64_t) bp_tgt->placed_address; - p.addr2 = 0; + p.version = PPC_DEBUG_CURRENT_VERSION; + p.trigger_type = PPC_BREAKPOINT_TRIGGER_EXECUTE; + p.addr_mode = PPC_BREAKPOINT_MODE_EXACT; + p.condition_mode = PPC_BREAKPOINT_CONDITION_NONE; + p.addr = (uint64_t) bp_tgt->placed_address; + p.addr2 = 0; p.condition_value = 0; ALL_LWPS (lp, ptid) @@ -1673,12 +1673,12 @@ ppc_linux_remove_hw_breakpoint (struct gdbarch *gdbarch, if (!have_ptrace_booke_interface ()) return -1; - p.version = PPC_DEBUG_CURRENT_VERSION; - p.trigger_type = PPC_BREAKPOINT_TRIGGER_EXECUTE; - p.addr_mode = PPC_BREAKPOINT_MODE_EXACT; - p.condition_mode = PPC_BREAKPOINT_CONDITION_NONE; - p.addr = (uint64_t) bp_tgt->placed_address; - p.addr2 = 0; + p.version = PPC_DEBUG_CURRENT_VERSION; + p.trigger_type = PPC_BREAKPOINT_TRIGGER_EXECUTE; + p.addr_mode = PPC_BREAKPOINT_MODE_EXACT; + p.condition_mode = PPC_BREAKPOINT_CONDITION_NONE; + p.addr = (uint64_t) bp_tgt->placed_address; + p.addr2 = 0; p.condition_value = 0; ALL_LWPS (lp, ptid) @@ -1973,14 +1973,14 @@ ppc_linux_insert_watchpoint (CORE_ADDR addr, int len, int rw, { /* PowerPC 440 requires only the read/write flags to be passed to the kernel. */ - read_mode = 1; + read_mode = 1; write_mode = 2; } else { /* PowerPC 970 and other DABR-based processors are required to pass the Breakpoint Translation bit together with the flags. */ - read_mode = 5; + read_mode = 5; write_mode = 6; } -- 2.34.1