From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2925 invoked by alias); 15 Jul 2013 07:04:50 -0000 Mailing-List: contact insight-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: insight-owner@sourceware.org Received: (qmail 2900 invoked by uid 89); 15 Jul 2013 07:04:49 -0000 X-Spam-SWARE-Status: No, score=-0.6 required=5.0 tests=AWL,BAYES_40 autolearn=ham version=3.3.1 Received: from Unknown (HELO outdoor.onevision.de) (212.77.172.51) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 15 Jul 2013 07:04:47 +0000 Received: from sanders.onevision.de (moonrace [212.77.172.62]) by outdoor.onevision.de (8.14.3/8.13.7/ROSCH/DDB) with ESMTP id r6F74ZcI001254 for ; Mon, 15 Jul 2013 09:04:39 +0200 Received: from [192.168.5.32] ([192.168.5.32]) by sanders.onevision.de (Lotus Domino Release 8.5.3) with ESMTP id 2013071509043015-95682 ; Mon, 15 Jul 2013 09:04:30 +0200 Message-ID: <51E39EFE.6000107@onevision.com> Date: Mon, 15 Jul 2013 07:04:00 -0000 From: Roland Schwingel User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: insight@sourceware.org Subject: [PATCH] Update after changes in pretty printing Content-Type: multipart/mixed; boundary="------------030800010001070507000402" X-Virus-Found: No X-SW-Source: 2013-q3/txt/msg00011.txt.bz2 This is a multi-part message in MIME format. --------------030800010001070507000402 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-length: 586 Hi... Last week some changes to base gdb have been made in regard of the former prettyprinting. It is now called prettyformatting. This breaks the build of insight. Here is a small patch to adapt to these changes. Roland Changelog: 2013-07-15 Roland Schwingel * generic/gdbtk-register.c (get_register): Update to reflect changes from upstream gdb. Prettyprinting becomes prettyformatting now. * generic/gdbtk-wrapper.c (GDB_val_print,wrap_val_print): Likewise. * generic/gdbtk-wrapper.h (GDB_val_print): Likewise. --------------030800010001070507000402 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=windows-1252; name="gdbtk_prettyformat.patch" Content-Disposition: attachment; filename="gdbtk_prettyformat.patch" Content-length: 2242 diff -ruN generic_old/gdbtk-register.c generic/gdbtk-register.c --- generic_old/gdbtk-register.c 2013-07-04 11:16:34.000000000 +0200 +++ generic/gdbtk-register.c 2013-07-15 08:28:26.831725500 +0200 @@ -340,7 +340,7 @@ get_formatted_print_options (&opts, format); opts.deref_ref = 1; - opts.pretty = Val_pretty_default; + opts.prettyformat = Val_prettyformat_default; val_print (reg_vtype, value_contents_for_printing (val), value_embedded_offset (val), 0, stb, 0, val, &opts, current_language); diff -ruN generic_old/gdbtk-wrapper.c generic/gdbtk-wrapper.c --- generic_old/gdbtk-wrapper.c 2013-07-04 11:16:35.000000000 +0200 +++ generic/gdbtk-wrapper.c 2013-07-15 08:31:21.349455600 +0200 @@ -41,7 +41,7 @@ gdb_result GDB_val_print (struct type *type, char *valaddr, CORE_ADDR address, struct ui_file *stream, int format, int deref_ref, int recurse, - enum val_prettyprint pretty); + enum val_prettyformat pretty); gdb_result GDB_value_equal (value_ptr, value_ptr, int *); @@ -184,7 +184,7 @@ int format, int deref_ref, int recurse, - enum val_prettyprint pretty) + enum val_prettyformat pretty) { struct gdb_wrapper_arguments args; @@ -220,7 +220,7 @@ get_formatted_print_options (&opts, format); opts.deref_ref = (*args)->args[5].integer; recurse = (*args)->args[6].integer; - opts.pretty = (enum val_prettyprint) (*args)->args[7].integer; + opts.prettyformat = (enum val_prettyformat) (*args)->args[7].integer; val_print (type, valaddr, 0, address, stream, recurse, NULL, &opts, current_language); diff -ruN generic_old/gdbtk-wrapper.h generic/gdbtk-wrapper.h --- generic_old/gdbtk-wrapper.h 2012-08-08 15:40:33.000000000 +0200 +++ generic/gdbtk-wrapper.h 2013-07-15 08:29:48.358060400 +0200 @@ -60,7 +60,7 @@ extern gdb_result GDB_val_print (struct type *type, char *valaddr, CORE_ADDR address, struct ui_file *stream, int format, int deref_ref, int recurse, - enum val_prettyprint pretty); + enum val_prettyformat pretty); extern gdb_result GDB_value_fetch_lazy (value_ptr value); extern gdb_result GDB_value_equal (value_ptr val1, value_ptr val2, int *result); --------------030800010001070507000402--