From: Gary Benson <gbenson@redhat.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 4/4 v2] Directly call i386-dregs functions
Date: Wed, 18 Jun 2014 15:23:00 -0000 [thread overview]
Message-ID: <1403104976-2492-5-git-send-email-gbenson@redhat.com> (raw)
In-Reply-To: <1403104976-2492-1-git-send-email-gbenson@redhat.com>
Three target_ops functions in i386-nat.c call other local target_ops
functions. This commit changes those functions to call the functions
in i386-dregs.c directly.
gdb/
2014-06-18 Gary Benson <gbenson@redhat.com>
* i386-nat.c (i386_stopped_by_watchpoint):
Use i386_dr_stopped_by_watchpoint.
(i386_insert_hw_breakpoint): Use i386_dr_insert_watchpoint.
(i386_remove_hw_breakpoint): Use i386_dr_remove_watchpoint.
---
gdb/ChangeLog | 7 +++++++
gdb/i386-nat.c | 20 ++++++++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
index 750b878..499fffb 100644
--- a/gdb/i386-nat.c
+++ b/gdb/i386-nat.c
@@ -208,8 +208,10 @@ i386_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
static int
i386_stopped_by_watchpoint (struct target_ops *ops)
{
- CORE_ADDR addr = 0;
- return i386_stopped_data_address (ops, &addr);
+ struct i386_debug_reg_state *state
+ = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+ return i386_dr_stopped_by_watchpoint (state);
}
/* Insert a hardware-assisted breakpoint at BP_TGT->placed_address.
@@ -219,8 +221,11 @@ static int
i386_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
struct bp_target_info *bp_tgt)
{
- return i386_insert_watchpoint (self, bp_tgt->placed_address, 1,
- hw_execute, NULL) ? EBUSY : 0;
+ struct i386_debug_reg_state *state
+ = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+ return i386_dr_insert_watchpoint (state, hw_execute,
+ bp_tgt->placed_address, 1) ? EBUSY : 0;
}
/* Remove a hardware-assisted breakpoint at BP_TGT->placed_address.
@@ -230,8 +235,11 @@ static int
i386_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
struct bp_target_info *bp_tgt)
{
- return i386_remove_watchpoint (self, bp_tgt->placed_address, 1,
- hw_execute, NULL);
+ struct i386_debug_reg_state *state
+ = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+ return i386_dr_remove_watchpoint (state, hw_execute,
+ bp_tgt->placed_address, 1);
}
/* Returns the number of hardware watchpoints of type TYPE that we can
--
1.7.1
next prev parent reply other threads:[~2014-06-18 15:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-18 15:23 [PATCH 0/4 v2] Refactor shared code in i386-{nat,low}.[ch] Gary Benson
2014-06-18 15:23 ` Gary Benson [this message]
2014-06-19 9:11 ` [PATCH 4/4 v2] Directly call i386-dregs functions Pedro Alves
2014-06-18 15:23 ` [PATCH 1/4 v2] Partially revert 4be83cc2b28ea09aa8ff789839e6520df60836f8 Gary Benson
2014-06-19 9:10 ` Pedro Alves
2014-06-18 15:23 ` [PATCH 2/4 v2] Refactor i386_{insert,remove}_hw_breakpoint Gary Benson
2014-06-19 9:10 ` Pedro Alves
2014-06-18 15:53 ` [PATCH 3/4 v2] Create nat/i386-dregs.c Gary Benson
2014-06-19 9:11 ` Pedro Alves
2014-06-18 16:06 ` [PATCH 0/4 v2] Refactor shared code in i386-{nat,low}.[ch] Mark Kettenis
2014-06-18 16:10 ` Pedro Alves
2014-06-18 17:48 ` Mark Kettenis
2014-06-18 18:01 ` Pedro Alves
2014-06-19 10:45 ` Pedro Alves
2014-06-19 10:07 ` [COMMITTED PATCH " Gary Benson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403104976-2492-5-git-send-email-gbenson@redhat.com \
--to=gbenson@redhat.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).