From patchwork Tue Oct 13 16:01:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Ristovski X-Patchwork-Id: 9085 Received: (qmail 40054 invoked by alias); 13 Oct 2015 16:01:27 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 39974 invoked by uid 89); 13 Oct 2015 16:01:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_SOFTFAIL autolearn=no version=3.3.2 X-HELO: smtp-a02.blackberry.com Received: from smtp-a02.blackberry.com (HELO smtp-a02.blackberry.com) (208.65.78.91) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 13 Oct 2015 16:01:24 +0000 Received: from mhs102cnc.rim.net ([10.65.141.76]) by mhs215cnc-app.rim.net with ESMTP; 13 Oct 2015 12:01:17 -0400 Received: from unknown (HELO qnxws9580.ott.qnx.com) ([10.65.140.254]) by mhs102cnc.rim.net with ESMTP; 13 Oct 2015 16:01:16 +0000 From: Aleksandar Ristovski To: gdb-patches@sourceware.org Cc: Aleksandar Ristovski Subject: [PATCH 1/4] [nto] Fix nto build. Date: Tue, 13 Oct 2015 12:01:11 -0400 Message-Id: <1444752074-878-2-git-send-email-aristovski@qnx.com> In-Reply-To: <1444752074-878-1-git-send-email-aristovski@qnx.com> References: <1444752074-878-1-git-send-email-aristovski@qnx.com> gdb/gdbserver/ChangeLog: * gdbserver/nto-low.c (nto_insert_point, nto_remove_point): Fix variable name. gdb/ChangeLog: * nto-procfs.c (common/filestuff.h): Include. (procfs_can_use_hw_breakpoint): Fix enum name. (procfs_open_1): Fix compiler warning. (procfs_pidlist): Make static. (procfs_meminfo): Make static, fix type name, add missing argument. (procfs_store_registers): Make static. (procfs_thread_info): Remove unused function. (_initialize_procfs): Forward declare. --- gdb/ChangeLog | 11 +++++++++++ gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/nto-low.c | 4 ++-- gdb/nto-procfs.c | 25 +++++++++++-------------- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dca7f28..3bd7d7d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +<2015-1> Aleksandar Ristovski + + * nto-procfs.c (common/filestuff.h): Include. + (procfs_can_use_hw_breakpoint): Fix enum name. + (procfs_open_1): Fix compiler warning. + (procfs_pidlist): Make static. + (procfs_meminfo): Make static, fix type name, add missing argument. + (procfs_store_registers): Make static. + (procfs_thread_info): Remove unused function. + (_initialize_procfs): Forward declare. + Aleksandar Ristovski * solib-svr4.c (init_lmo): New function. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index b631894..195dbda 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ + Aleksandar Ristovski + + * gdbserver/nto-low.c (nto_insert_point, nto_remove_point): Fix + variable name. + 2015-09-30 Yao Qi * linux-aarch64-low.c (emit_movk): Shorten a long line. diff --git a/gdb/gdbserver/nto-low.c b/gdb/gdbserver/nto-low.c index fa216a9..97bd1e9 100644 --- a/gdb/gdbserver/nto-low.c +++ b/gdb/gdbserver/nto-low.c @@ -794,7 +794,7 @@ nto_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, { int wtype = _DEBUG_BREAK_HW; /* Always request HW. */ - TRACE ("%s type:%c addr: 0x%08lx len:%d\n", __func__, (int)type, addr, len); + TRACE ("%s type:%c addr: 0x%08lx len:%d\n", __func__, (int)type, addr, size); switch (type) { case raw_bkpt_type_sw: @@ -826,7 +826,7 @@ nto_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, { int wtype = _DEBUG_BREAK_HW; /* Always request HW. */ - TRACE ("%s type:%c addr: 0x%08lx len:%d\n", __func__, (int)type, addr, len); + TRACE ("%s type:%c addr: 0x%08lx len:%d\n", __func__, (int)type, addr, size); switch (type) { case raw_bkpt_type_sw: diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index 20b05be..d659f79 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -40,6 +40,7 @@ #include "regcache.h" #include "solib.h" #include "inf-child.h" +#include "common/filestuff.h" #define NULL_PID 0 #define _DEBUG_FLAG_TRACE (_DEBUG_FLAG_TRACE_EXEC|_DEBUG_FLAG_TRACE_RD|\ @@ -54,7 +55,7 @@ static procfs_run run; static ptid_t do_attach (ptid_t ptid); static int procfs_can_use_hw_breakpoint (struct target_ops *self, - enum target_hw_bp_type, int, int); + enum bptype, int, int); static int procfs_insert_hw_watchpoint (struct target_ops *self, CORE_ADDR addr, int len, @@ -123,7 +124,7 @@ procfs_open_1 (struct target_ops *ops, const char *arg, int from_tty) and only override it if there is a valid arg. */ nto_procfs_node = ND_LOCAL_NODE; - nodestr = arg ? xstrdup (arg) : arg; + nodestr = arg ? xstrdup (arg) : NULL; init_thread_list (); @@ -353,7 +354,7 @@ do_closedir_cleanup (void *dir) closedir (dir); } -void +static void procfs_pidlist (char *args, int from_tty) { DIR *dp = NULL; @@ -445,7 +446,7 @@ procfs_pidlist (char *args, int from_tty) return; } -void +static void procfs_meminfo (char *args, int from_tty) { procfs_mapinfo *mapinfos = NULL; @@ -486,7 +487,7 @@ procfs_meminfo (char *args, int from_tty) return; } - mapinfos = XNEWVEC (procfs_mapping, num); + mapinfos = XNEWVEC (procfs_mapinfo, num); num_mapinfos = num; mapinfo_p = mapinfos; @@ -873,7 +874,8 @@ procfs_xfer_partial (struct target_ops *ops, enum target_object object, return procfs_xfer_memory (readbuf, writebuf, offset, len, xfered_len); default: return ops->beneath->to_xfer_partial (ops->beneath, object, annex, - readbuf, writebuf, offset, len); + readbuf, writebuf, offset, len, + xfered_len); } } @@ -1267,7 +1269,7 @@ get_regset (int regset, char *buf, int bufsize, int *regsize) return dev_set; } -void +static void procfs_store_registers (struct target_ops *ops, struct regcache *regcache, int regno) { @@ -1349,13 +1351,6 @@ procfs_pass_signals (struct target_ops *self, } } -static struct tidinfo * -procfs_thread_info (pid_t pid, short tid) -{ -/* NYI */ - return NULL; -} - static char * procfs_pid_to_str (struct target_ops *ops, ptid_t ptid) { @@ -1468,6 +1463,8 @@ init_procfs_targets (void) #define OSTYPE_NTO 1 +extern initialize_file_ftype _initialize_procfs; + void _initialize_procfs (void) {