From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23769 invoked by alias); 6 Apr 2009 06:49:35 -0000 Received: (qmail 23760 invoked by uid 22791); 6 Apr 2009 06:49:34 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00,SPF_PASS X-Spam-Check-By: sourceware.org Received: from wa-out-1112.google.com (HELO wa-out-1112.google.com) (209.85.146.182) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 06 Apr 2009 06:49:29 +0000 Received: by wa-out-1112.google.com with SMTP id l35so1014080waf.24 for ; Sun, 05 Apr 2009 23:49:27 -0700 (PDT) Received: by 10.114.191.1 with SMTP id o1mr2094243waf.209.1239000567009; Sun, 05 Apr 2009 23:49:27 -0700 (PDT) Received: from dd_xps.caveonetworks.com (adsl-67-124-151-45.dsl.pltn13.pacbell.net [67.124.151.45]) by mx.google.com with ESMTPS id l38sm5205947waf.68.2009.04.05.23.49.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 05 Apr 2009 23:49:26 -0700 (PDT) Message-ID: <49D9A5E7.3000003@gmail.com> Date: Mon, 06 Apr 2009 06:49:00 -0000 From: David Daney User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: gdb-patches@sourceware.org CC: David Daney Subject: [Patch 1/2] infrun.c support for MIPS hardware watchpoints. Content-Type: multipart/mixed; boundary="------------080806080208020106000601" Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-04/txt/msg00102.txt.bz2 This is a multi-part message in MIME format. --------------080806080208020106000601 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 571 For targets that are gdbarch_software_single_step_p (like MIPS), we need to use software single stepping when stepping over a watchpoint. The existing code that sets up software single step was in resume(). This patch factors the software single step code into a new function, set_for_singlestep(), and then calls it from handle_inferior_event() when we need to step over a watchpoint. This is a prerequisite for the following patch that adds MIPS hardware watchpoint support. Tested on x86_64-unknown-linux-gnu (Fedora 10) with no regressions found. OK to commit? --------------080806080208020106000601 Content-Type: text/plain; name="infrun.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="infrun.patch" Content-length: 2892 2009-04-05 David Daney * infrun.c (set_for_singlestep): New function. (resume): Call set_for_singlestep. (handle_inferior_event): Same. Index: infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.367 diff -u -p -r1.367 infrun.c --- infrun.c 25 Mar 2009 21:53:10 -0000 1.367 +++ infrun.c 6 Apr 2009 05:45:38 -0000 @@ -950,6 +950,28 @@ set_schedlock_func (char *args, int from } } +/* Try to setup for software single stepping over the specified location. + Return 1 if target_resume() should use hardware single step. + + GDBARCH the current gdbarch. + PC the location to step over. */ +static int +set_for_singlestep (struct gdbarch *gdbarch, CORE_ADDR pc) +{ + int step = 1; + + if (gdbarch_software_single_step_p (gdbarch) + && gdbarch_software_single_step (gdbarch, get_current_frame ())) + { + step = 0; + /* Do not pull these breakpoints until after a `wait' in + `wait_for_inferior' */ + singlestep_breakpoints_inserted_p = 1; + singlestep_ptid = inferior_ptid; + singlestep_pc = pc; + } + return step; +} /* Resume the inferior, but allow a QUIT. This is useful if the user wants to interrupt some lengthy single-stepping operation @@ -1031,20 +1053,9 @@ a command like `return' or `jump' to con } } - if (step && gdbarch_software_single_step_p (gdbarch)) - { - /* Do it the hard way, w/temp breakpoints */ - if (gdbarch_software_single_step (gdbarch, get_current_frame ())) - { - /* ...and don't ask hardware to do it. */ - step = 0; - /* and do not pull these breakpoints until after a `wait' in - `wait_for_inferior' */ - singlestep_breakpoints_inserted_p = 1; - singlestep_ptid = inferior_ptid; - singlestep_pc = pc; - } - } + /* Do we need to do it the hard way, w/temp breakpoints? */ + if (step) + step = set_for_singlestep (gdbarch, pc); /* If there were any forks/vforks/execs that were caught and are now to be followed, then do so. */ @@ -2826,11 +2837,14 @@ targets should add new threads to the th the inferior over it. If we have non-steppable watchpoints, we must disable the current watchpoint; it's simplest to disable all watchpoints and breakpoints. */ - + int step_over_watchpoint = 1; + if (!HAVE_STEPPABLE_WATCHPOINT) remove_breakpoints (); registers_changed (); - target_resume (ecs->ptid, 1, TARGET_SIGNAL_0); /* Single step */ + /* Single step */ + step_over_watchpoint = set_for_singlestep (current_gdbarch, read_pc ()); + target_resume (ecs->ptid, step_over_watchpoint, TARGET_SIGNAL_0); waiton_ptid = ecs->ptid; if (HAVE_STEPPABLE_WATCHPOINT) infwait_state = infwait_step_watch_state; --------------080806080208020106000601--