From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31244 invoked by alias); 17 Jul 2009 15:59:32 -0000 Received: (qmail 31233 invoked by uid 22791); 17 Jul 2009 15:59:32 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,MSGID_FROM_MTA_HEADER,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mtagate7.de.ibm.com (HELO mtagate7.de.ibm.com) (195.212.29.156) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 17 Jul 2009 15:59:23 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate7.de.ibm.com (8.14.3/8.13.8) with ESMTP id n6HFxJsV375852 for ; Fri, 17 Jul 2009 15:59:19 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 v9.2) with ESMTP id n6HFxJ7D2650210 for ; Fri, 17 Jul 2009 17:59:19 +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 n6HFxImW013082 for ; Fri, 17 Jul 2009 17:59:19 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with SMTP id n6HFxHTx013069; Fri, 17 Jul 2009 17:59:17 +0200 Message-Id: <200907171559.n6HFxHTx013069@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Fri, 17 Jul 2009 17:59:17 +0200 Subject: [commit] Fix mi-disassemble.exp regression To: jan.kratochvil@redhat.com (Jan Kratochvil) Date: Fri, 17 Jul 2009 17:09:00 -0000 From: "Ulrich Weigand" Cc: teawater@gmail.com (Hui Zhu), eliz@gnu.org (Eli Zaretskii), tromey@redhat.com, msnyder@vmware.com, dje@google.com, mark.kettenis@xs4all.nl, gdb-patches@sourceware.org In-Reply-To: <20090711175407.GA18892@host0.dyn.jankratochvil.net> from "Jan Kratochvil" at Jul 11, 2009 07:54:07 PM MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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: 2009-07/txt/msg00430.txt.bz2 Jan Kratochvil wrote: > On Sat, 11 Jul 2009 16:15:00 +0200, Hui Zhu wrote: > > Fixed and checked-in. > > this check-in > http://sourceware.org/ml/gdb-cvs/2009-07/msg00089.html > http://sourceware.org/ml/gdb-cvs/2009-07/msg00092.html [snip] > causes a regression on {x86_64,x86_64-32,i686}-fedora11-linux-gnu. This is caused by this part of Hui's patch: --- a/mi/mi-cmd-disas.c +++ b/mi/mi-cmd-disas.c @@ -156,6 +156,6 @@ mi_cmd_disassemble (char *command, char gdb_disassembly (gdbarch, uiout, file_string, - mixed_source_and_assembly, how_many, low, high); + DISASSEMBLY_SOURCE, how_many, low, high); } Note how the new code completely ignores the mixed_source_and_assembly flag (which is set from the mixed_mode MI parameter). The following patch fixes this. Tested on powerpc64-linux, committed to mainline. Bye, Ulrich ChangeLog: * mi/mi-cmd-disas.c (mi_cmd_disassemble): Respect mixed_mode flag. Index: gdb/mi/mi-cmd-disas.c =================================================================== RCS file: /cvs/src/src/gdb/mi/mi-cmd-disas.c,v retrieving revision 1.31 diff -u -p -r1.31 mi-cmd-disas.c --- gdb/mi/mi-cmd-disas.c 11 Jul 2009 14:04:23 -0000 1.31 +++ gdb/mi/mi-cmd-disas.c 17 Jul 2009 15:50:06 -0000 @@ -156,6 +156,6 @@ mi_cmd_disassemble (char *command, char gdb_disassembly (gdbarch, uiout, file_string, - DISASSEMBLY_SOURCE, how_many, low, high); - + mixed_source_and_assembly? DISASSEMBLY_SOURCE : 0, + how_many, low, high); } -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com