From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12949 invoked by alias); 14 Feb 2013 16:30:27 -0000 Received: (qmail 12883 invoked by uid 22791); 14 Feb 2013 16:30:24 -0000 X-SWARE-Spam-Status: No, hits=-7.8 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 14 Feb 2013 16:30:16 +0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 14 Feb 2013 08:30:04 -0800 X-ExtLoop1: 1 Received: from swsutil001.isw.intel.com ([10.237.237.11]) by azsmga001.ch.intel.com with ESMTP; 14 Feb 2013 08:29:51 -0800 Received: from ulslx001.iul.intel.com (ulslx001.iul.intel.com [172.28.207.63]) by swsutil001.isw.intel.com (8.13.6/8.13.6/MailSET/Hub) with ESMTP id r1EGTLkb019676; Thu, 14 Feb 2013 16:29:26 GMT Received: from ulslx001.iul.intel.com (localhost [127.0.0.1]) by ulslx001.iul.intel.com with ESMTP id r1EGTLIA030676; Thu, 14 Feb 2013 17:29:21 +0100 Received: (from mmetzger@localhost) by ulslx001.iul.intel.com with id r1EGTLtc030672; Thu, 14 Feb 2013 17:29:21 +0100 From: markus.t.metzger@intel.com To: jan.kratochvil@redhat.com Cc: gdb-patches@sourceware.org, markus.t.metzger@gmail.com, Markus Metzger Subject: [rfc 4/8] record: default target methods. Date: Thu, 14 Feb 2013 16:30:00 -0000 Message-Id: <1360859352-30399-5-git-send-email-markus.t.metzger@intel.com> In-Reply-To: <1360859352-30399-1-git-send-email-markus.t.metzger@intel.com> References: <1360859352-30399-1-git-send-email-markus.t.metzger@intel.com> X-IsSubscribed: yes 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: 2013-02/txt/msg00354.txt.bz2 From: Markus Metzger Provide default target methods for record targets that are likely to be shared between different record targets. 2013-02-14 Markus Metzger * record.h (record_disconnect): New. (record_detach): New. (record_mourn_inferior): New. (record_kill): New. * record-full.c (record_disconnect, record_detach, record_mourn_inferior, record_kill): Move to... * record.c: ...here. (DEBUG): New. (record_unpush): New. (cmd_record_stop): Use record_unpush. (record_disconnect, record_detach, record_mourn_inferior, record_kill): Use record_unpush and DEBUG. --- gdb/record-full.c | 58 +++--------------------------------------- gdb/record.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++--- gdb/record.h | 12 +++++++++ 3 files changed, 84 insertions(+), 58 deletions(-) diff --git a/gdb/record-full.c b/gdb/record-full.c index 351b1e8..e5f7c62 100644 --- a/gdb/record-full.c +++ b/gdb/record-full.c @@ -1526,56 +1526,6 @@ record_full_stopped_by_watchpoint (void) return record_full_beneath_to_stopped_by_watchpoint (); } -/* "to_disconnect" method for process record target. */ - -static void -record_full_disconnect (struct target_ops *target, char *args, int from_tty) -{ - if (record_debug) - fprintf_unfiltered (gdb_stdlog, - "Process record: record_full_disconnect\n"); - - unpush_target (&record_full_ops); - target_disconnect (args, from_tty); -} - -/* "to_detach" method for process record target. */ - -static void -record_full_detach (struct target_ops *ops, char *args, int from_tty) -{ - if (record_debug) - fprintf_unfiltered (gdb_stdlog, "Process record: record_full_detach\n"); - - unpush_target (&record_full_ops); - target_detach (args, from_tty); -} - -/* "to_mourn_inferior" method for process record target. */ - -static void -record_full_mourn_inferior (struct target_ops *ops) -{ - if (record_debug) - fprintf_unfiltered (gdb_stdlog, "Process record: " - "record_full_mourn_inferior\n"); - - unpush_target (&record_full_ops); - target_mourn_inferior (); -} - -/* Close process record target before killing the inferior process. */ - -static void -record_full_kill (struct target_ops *ops) -{ - if (record_debug) - fprintf_unfiltered (gdb_stdlog, "Process record: record_full_kill\n"); - - unpush_target (&record_full_ops); - target_kill (); -} - static int record_full_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p) { @@ -2120,10 +2070,10 @@ init_record_full_ops (void) record_full_ops.to_close = record_full_close; record_full_ops.to_resume = record_full_resume; record_full_ops.to_wait = record_full_wait; - record_full_ops.to_disconnect = record_full_disconnect; - record_full_ops.to_detach = record_full_detach; - record_full_ops.to_mourn_inferior = record_full_mourn_inferior; - record_full_ops.to_kill = record_full_kill; + record_full_ops.to_disconnect = record_disconnect; + record_full_ops.to_detach = record_detach; + record_full_ops.to_mourn_inferior = record_mourn_inferior; + record_full_ops.to_kill = record_kill; record_full_ops.to_create_inferior = find_default_create_inferior; record_full_ops.to_store_registers = record_full_store_registers; record_full_ops.to_xfer_partial = record_full_xfer_partial; diff --git a/gdb/record.c b/gdb/record.c index 8b44717..abd8216 100644 --- a/gdb/record.c +++ b/gdb/record.c @@ -33,6 +33,10 @@ struct cmd_list_element *set_record_cmdlist = NULL; struct cmd_list_element *show_record_cmdlist = NULL; struct cmd_list_element *info_record_cmdlist = NULL; +#define DEBUG(msg, args...) \ + if (record_debug) \ + fprintf_unfiltered (gdb_stdlog, "record: " msg "\n", ##args) + /* Find the record target in the target stack. */ static struct target_ops * @@ -71,13 +75,73 @@ record_read_memory (struct gdbarch *gdbarch, { int ret = target_read_memory (memaddr, myaddr, len); - if (ret && record_debug) - printf_unfiltered (_("Process record: error reading memory " - "at addr %s len = %ld.\n"), - paddress (gdbarch, memaddr), (long) len); + if (ret != 0) + DEBUG ("error reading memory at addr %s len = %ld.\n", + paddress (gdbarch, memaddr), (long) len); + return ret; } +/* Unpush the record target. */ + +static void +record_unpush (void) +{ + struct target_ops *t; + + t = find_record_target (); + if (t == NULL) + internal_error (__FILE__, __LINE__, _("Couldn't find record target.")); + + DEBUG ("unpush %s", t->to_shortname); + + unpush_target (t); +} + +/* See record.h. */ + +void +record_disconnect (struct target_ops *target, char *args, int from_tty) +{ + DEBUG ("disconnect"); + + record_unpush (); + target_disconnect (args, from_tty); +} + +/* See record.h. */ + +void +record_detach (struct target_ops *ops, char *args, int from_tty) +{ + DEBUG ("detach"); + + record_unpush (); + target_detach (args, from_tty); +} + +/* See record.h. */ + +void +record_mourn_inferior (struct target_ops *ops) +{ + DEBUG ("mourn_inferior"); + + record_unpush (); + target_mourn_inferior (); +} + +/* See record.h. */ + +void +record_kill (struct target_ops *ops) +{ + DEBUG ("kill"); + + record_unpush (); + target_kill (); +} + /* Implement "show record debug" command. */ static void diff --git a/gdb/record.h b/gdb/record.h index b428eaf..04d6b4a 100644 --- a/gdb/record.h +++ b/gdb/record.h @@ -41,4 +41,16 @@ extern int record_read_memory (struct gdbarch *gdbarch, /* The "record goto" command. */ extern void cmd_record_goto (char *arg, int from_tty); +/* The default "to_disconnect" target method for record targets. */ +extern void record_disconnect (struct target_ops *, char *, int); + +/* The default "to_detach" target method for record targets. */ +extern void record_detach (struct target_ops *, char *, int); + +/* The default "to_mourn_inferior" target method for record targets. */ +extern void record_mourn_inferior (struct target_ops *); + +/* The default "to_kill" target method for record targets. */ +extern void record_kill (struct target_ops *); + #endif /* _RECORD_H_ */ -- 1.7.1