From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14854 invoked by alias); 19 May 2008 08:48:39 -0000 Received: (qmail 14843 invoked by uid 22791); 19 May 2008 08:48:38 -0000 X-Spam-Check-By: sourceware.org Received: from mtagate1.de.ibm.com (HELO mtagate1.de.ibm.com) (195.212.29.150) by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 19 May 2008 08:48:16 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate1.de.ibm.com (8.13.8/8.13.8) with ESMTP id m4J8mDOZ076214 for ; Mon, 19 May 2008 08:48:13 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id m4J8mCUx3481692 for ; Mon, 19 May 2008 10:48:12 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m4J8mC3l004830 for ; Mon, 19 May 2008 10:48:12 +0200 Received: from bbkeks.de.ibm.com (dyn-9-152-248-39.boeblingen.de.ibm.com [9.152.248.39]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id m4J8mBsg004808 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 19 May 2008 10:48:12 +0200 Message-ID: <48313ECB.4040105@de.ibm.com> Date: Mon, 19 May 2008 15:18:00 -0000 From: Markus Deuling User-Agent: Thunderbird 2.0.0.14 (X11/20080421) MIME-Version: 1.0 To: GDB Patches CC: Ulrich Weigand Subject: [patch]: Get rid of deprecated_print_address_numeric Content-Type: multipart/mixed; boundary="------------060205010702030900020408" 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: 2008-05/txt/msg00549.txt.bz2 This is a multi-part message in MIME format. --------------060205010702030900020408 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Content-length: 709 Hi, this patch gets completely rid of deprecated_print_address_numeric. Tested on x86_64 without regression. This patch breaks Insight. I'll come up with a patch to fix it on the Insight ml. Ok to commit? ChangeLog: * annotate.c (annotate_source, annotate_frame_begin): Replace deprecated_print_address_numeric with paddress. * cli/cli-cmds.c (list_command, edit_command): Likewise. * tui/tui-stack.c (tui_make_status_line): Likewise. * defs.h (deprecated_print_address_numeric): Remove. * printcmd.c (deprecated_print_address_numeric): Remove. * maint.c (maint_print_section_info): Fix comment. Regards, Markus -- Markus Deuling GNU Toolchain for Linux on Cell BE deuling@de.ibm.com --------------060205010702030900020408 Content-Type: text/plain; name="diff-deprecated_print_address_numeric" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diff-deprecated_print_address_numeric" Content-length: 5098 diff -urpN src/gdb/annotate.c dev/gdb/annotate.c --- src/gdb/annotate.c 2008-01-01 23:53:09.000000000 +0100 +++ dev/gdb/annotate.c 2008-05-19 10:27:14.000000000 +0200 @@ -418,10 +418,9 @@ annotate_source (char *filename, int lin else printf_filtered (("\032\032")); - printf_filtered (("%s:%d:%d:%s:0x"), filename, - line, character, + printf_filtered (("%s:%d:%d:%s:"), filename, line, character, mid ? "middle" : "beg"); - deprecated_print_address_numeric (pc, 0, gdb_stdout); + fputs_filtered (paddress (pc), gdb_stdout); printf_filtered (("\n")); } @@ -430,8 +429,8 @@ annotate_frame_begin (int level, CORE_AD { if (annotation_level > 1) { - printf_filtered (("\n\032\032frame-begin %d 0x"), level); - deprecated_print_address_numeric (pc, 0, gdb_stdout); + printf_filtered (("\n\032\032frame-begin %d "), level); + fputs_filtered (paddress (pc), gdb_stdout); printf_filtered (("\n")); } } diff -urpN src/gdb/cli/cli-cmds.c dev/gdb/cli/cli-cmds.c --- src/gdb/cli/cli-cmds.c 2008-05-09 11:34:58.000000000 +0200 +++ dev/gdb/cli/cli-cmds.c 2008-05-19 09:28:51.000000000 +0200 @@ -669,14 +669,14 @@ edit_command (char *arg, int from_tty) sym = find_pc_function (sal.pc); if (sym) { - deprecated_print_address_numeric (sal.pc, 1, gdb_stdout); + fputs_filtered (paddress (sal.pc), gdb_stdout); printf_filtered (" is in "); fputs_filtered (SYMBOL_PRINT_NAME (sym), gdb_stdout); printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line); } else { - deprecated_print_address_numeric (sal.pc, 1, gdb_stdout); + fputs_filtered (paddress (sal.pc), gdb_stdout); printf_filtered (" is at %s:%d.\n", sal.symtab->filename, sal.line); } @@ -839,14 +839,14 @@ list_command (char *arg, int from_tty) sym = find_pc_function (sal.pc); if (sym) { - deprecated_print_address_numeric (sal.pc, 1, gdb_stdout); + fputs_filtered (paddress (sal.pc), gdb_stdout); printf_filtered (" is in "); fputs_filtered (SYMBOL_PRINT_NAME (sym), gdb_stdout); printf_filtered (" (%s:%d).\n", sal.symtab->filename, sal.line); } else { - deprecated_print_address_numeric (sal.pc, 1, gdb_stdout); + fputs_filtered (paddress (sal.pc), gdb_stdout); printf_filtered (" is at %s:%d.\n", sal.symtab->filename, sal.line); } diff -urpN src/gdb/defs.h dev/gdb/defs.h --- src/gdb/defs.h 2008-05-05 05:50:36.000000000 +0200 +++ dev/gdb/defs.h 2008-05-19 08:56:37.000000000 +0200 @@ -479,7 +479,7 @@ extern char *paddr_nz (CORE_ADDR addr); extern char *paddr_u (CORE_ADDR addr); extern char *paddr_d (LONGEST addr); -/* Like 0x%lx, replaces deprecated_print_address_numeric. */ +/* Like 0x%lx. */ extern const char *paddress (CORE_ADDR addr); extern char *phex (ULONGEST l, int sizeof_l); @@ -565,8 +565,6 @@ extern int build_address_symbolic (CORE_ int *line, int *unmapped); -extern void deprecated_print_address_numeric (CORE_ADDR, int, struct ui_file *); - extern void print_address (CORE_ADDR, struct ui_file *); /* From source.c */ diff -urpN src/gdb/maint.c dev/gdb/maint.c --- src/gdb/maint.c 2008-01-01 23:53:12.000000000 +0100 +++ dev/gdb/maint.c 2008-05-19 08:56:37.000000000 +0200 @@ -306,8 +306,7 @@ maint_print_section_info (const char *na CORE_ADDR addr, CORE_ADDR endaddr, unsigned long filepos) { - /* FIXME-32x64: Need deprecated_print_address_numeric with field - width. */ + /* FIXME-32x64: Need paddress with field width. */ printf_filtered (" 0x%s", paddr (addr)); printf_filtered ("->0x%s", paddr (endaddr)); printf_filtered (" at %s", diff -urpN src/gdb/printcmd.c dev/gdb/printcmd.c --- src/gdb/printcmd.c 2008-05-09 11:34:55.000000000 +0200 +++ dev/gdb/printcmd.c 2008-05-19 08:56:37.000000000 +0200 @@ -675,23 +675,6 @@ build_address_symbolic (CORE_ADDR addr, return 0; } -/* Print address ADDR on STREAM. USE_LOCAL means the same thing as for - print_longest. */ -void -deprecated_print_address_numeric (CORE_ADDR addr, int use_local, - struct ui_file *stream) -{ - if (use_local) - fputs_filtered (paddress (addr), stream); - else - { - int addr_bit = gdbarch_addr_bit (current_gdbarch); - - if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT)) - addr &= ((CORE_ADDR) 1 << addr_bit) - 1; - print_longest (stream, 'x', 0, (ULONGEST) addr); - } -} /* Print address ADDR symbolically on STREAM. First print it as a number. Then perhaps print diff -urpN src/gdb/tui/tui-stack.c dev/gdb/tui/tui-stack.c --- src/gdb/tui/tui-stack.c 2008-01-01 23:53:22.000000000 +0100 +++ dev/gdb/tui/tui-stack.c 2008-05-19 09:31:02.000000000 +0200 @@ -102,7 +102,7 @@ tui_make_status_line (struct tui_locator /* Translate PC address. */ pc_out = tui_sfileopen (128); - deprecated_print_address_numeric (loc->addr, 1, pc_out); + fputs_filtered (paddress (loc->addr), pc_out); pc_buf = tui_file_get_strbuf (pc_out); pc_width = strlen (pc_buf); --------------060205010702030900020408--