From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30982 invoked by alias); 7 Jun 2013 12:43:05 -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 30945 invoked by uid 89); 7 Jun 2013 12:43:01 -0000 X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_EG autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 07 Jun 2013 12:42:33 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Ukw00-0005R7-Ab from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Fri, 07 Jun 2013 05:42:32 -0700 Received: from SVR-ORW-FEM-05.mgc.mentorg.com ([147.34.97.43]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 7 Jun 2013 05:42:32 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.2.247.3; Fri, 7 Jun 2013 05:42:31 -0700 From: Yao Qi To: Subject: [PATCH] Move some code into get_register. Date: Fri, 07 Jun 2013 12:43:00 -0000 Message-ID: <1370608997-20957-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-06/txt/msg00142.txt.bz2 Hi, This is a refactor patch. This patch moves some common code in caller of get_register into get_register, and rename it to output_register. With this patch, the caller of output_register can be simplified to some extent. gdb: 2013-06-07 Pedro Alves Yao Qi * mi/mi-main.c (get_register): Remove declaration. (output_register): Declare. (mi_cmd_data_list_register_values): Remove local variable 'tuple_cleanup'. Move some code into output_register. (get_register): Renamed to ... (output_register): ... it. --- gdb/mi/mi-main.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index f69cd8d..454198b 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -103,7 +103,7 @@ static void mi_execute_async_cli_command (char *cli_command, char **argv, int argc); static int register_changed_p (int regnum, struct regcache *, struct regcache *); -static void get_register (struct frame_info *, int regnum, int format); +static void output_register (struct frame_info *, int regnum, int format); /* Command implementations. FIXME: Is this libgdb? No. This is the MI layer that calls libgdb. Any operation used in the below should be @@ -1072,7 +1072,7 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) struct gdbarch *gdbarch; int regnum, numregs, format; int i; - struct cleanup *list_cleanup, *tuple_cleanup; + struct cleanup *list_cleanup; /* Note that the test for a valid register must include checking the gdbarch_register_name because gdbarch_num_regs may be allocated @@ -1103,10 +1103,8 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) if (gdbarch_register_name (gdbarch, regnum) == NULL || *(gdbarch_register_name (gdbarch, regnum)) == '\0') continue; - tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_int (uiout, "number", regnum); - get_register (frame, regnum, format); - do_cleanups (tuple_cleanup); + + output_register (frame, regnum, format); } } @@ -1119,26 +1117,25 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) && regnum < numregs && gdbarch_register_name (gdbarch, regnum) != NULL && *gdbarch_register_name (gdbarch, regnum) != '\000') - { - tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - ui_out_field_int (uiout, "number", regnum); - get_register (frame, regnum, format); - do_cleanups (tuple_cleanup); - } + output_register (frame, regnum, format); else error (_("bad register number")); } do_cleanups (list_cleanup); } -/* Output one register's contents in the desired format. */ +/* Output one register REGNUM's contents in the desired FORMAT. */ static void -get_register (struct frame_info *frame, int regnum, int format) +output_register (struct frame_info *frame, int regnum, int format) { struct gdbarch *gdbarch = get_frame_arch (frame); struct ui_out *uiout = current_uiout; struct value *val; + struct cleanup *tuple_cleanup; + + tuple_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + ui_out_field_int (uiout, "number", regnum); if (format == 'N') format = 0; @@ -1184,6 +1181,8 @@ get_register (struct frame_info *frame, int regnum, int format) ui_out_field_stream (uiout, "value", stb); do_cleanups (old_chain); } + + do_cleanups (tuple_cleanup); } /* Write given values into registers. The registers and values are -- 1.7.7.6