From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 70925 invoked by alias); 18 Aug 2015 15:53:46 -0000 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 Received: (qmail 70225 invoked by uid 89); 18 Aug 2015 15:53:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f48.google.com Received: from mail-pa0-f48.google.com (HELO mail-pa0-f48.google.com) (209.85.220.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 18 Aug 2015 15:53:37 +0000 Received: by paccq16 with SMTP id cq16so91842078pac.1 for ; Tue, 18 Aug 2015 08:53:35 -0700 (PDT) X-Received: by 10.66.55.66 with SMTP id q2mr14700195pap.94.1439913215619; Tue, 18 Aug 2015 08:53:35 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by smtp.gmail.com with ESMTPSA id fn15sm18590925pdb.50.2015.08.18.08.53.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Aug 2015 08:53:35 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 10/13] Add pid argument in aarch64_get_debug_reg_state Date: Tue, 18 Aug 2015 15:53:00 -0000 Message-Id: <1439913199-22882-11-git-send-email-yao.qi@linaro.org> In-Reply-To: <1439913199-22882-1-git-send-email-yao.qi@linaro.org> References: <1439913199-22882-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes X-SW-Source: 2015-08/txt/msg00472.txt.bz2 This patch addes argument pid in aarch64_get_debug_reg_state, so that its interface is the same on both GDB and GDBserver. gdb/gdbserver: 2015-018-18 Yao Qi * linux-aarch64-low.c (aarch64_get_debug_reg_state): Add argument pid. Find proc_info by find_process_pid. All callers updated. --- gdb/gdbserver/linux-aarch64-low.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 3968aee..421dcb9 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -238,11 +238,10 @@ aarch64_init_debug_reg_state (struct aarch64_debug_reg_state *state) current process' arch-specific data area. */ static struct aarch64_debug_reg_state * -aarch64_get_debug_reg_state () +aarch64_get_debug_reg_state (pid_t pid) { - struct process_info *proc; + struct process_info *proc = find_process_pid (pid); - proc = current_process (); return &proc->priv->arch_private->debug_reg_state; } @@ -291,7 +290,8 @@ aarch64_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, { int ret; enum target_hw_bp_type targ_type; - struct aarch64_debug_reg_state *state = aarch64_get_debug_reg_state (); + struct aarch64_debug_reg_state *state + = aarch64_get_debug_reg_state (pid_of (current_thread)); if (show_debug_regs) fprintf (stderr, "insert_point on entry (addr=0x%08lx, len=%d)\n", @@ -310,8 +310,8 @@ aarch64_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, state); if (show_debug_regs) - aarch64_show_debug_reg_state (aarch64_get_debug_reg_state (), - "insert_point", addr, len, targ_type); + aarch64_show_debug_reg_state (state, "insert_point", addr, len, + targ_type); return ret; } @@ -327,7 +327,8 @@ aarch64_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, { int ret; enum target_hw_bp_type targ_type; - struct aarch64_debug_reg_state *state = aarch64_get_debug_reg_state (); + struct aarch64_debug_reg_state *state + = aarch64_get_debug_reg_state (pid_of (current_thread)); if (show_debug_regs) fprintf (stderr, "remove_point on entry (addr=0x%08lx, len=%d)\n", @@ -347,8 +348,8 @@ aarch64_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, state); if (show_debug_regs) - aarch64_show_debug_reg_state (aarch64_get_debug_reg_state (), - "remove_point", addr, len, targ_type); + aarch64_show_debug_reg_state (state, "remove_point", addr, len, + targ_type); return ret; } @@ -374,7 +375,7 @@ aarch64_stopped_data_address (void) return (CORE_ADDR) 0; /* Check if the address matches any watched address. */ - state = aarch64_get_debug_reg_state (); + state = aarch64_get_debug_reg_state (pid_of (current_thread)); for (i = aarch64_num_wp_regs - 1; i >= 0; --i) { const unsigned int len = aarch64_watchpoint_length (state->dr_ctrl_wp[i]); -- 1.9.1