From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-95866-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 31134 invoked by alias); 13 Nov 2012 05:46:22 -0000
Received: (qmail 31114 invoked by uid 22791); 13 Nov 2012 05:46:20 -0000
X-SWARE-Spam-Status: No, hits=-7.1 required=5.0	tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,TW_BJ
X-Spam-Check-By: sourceware.org
Received: from e24smtp01.br.ibm.com (HELO e24smtp01.br.ibm.com) (32.104.18.85)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 13 Nov 2012 05:45:58 +0000
Received: from /spool/local	by e24smtp01.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted	for <gdb-patches@sourceware.org> from <emachado@linux.vnet.ibm.com>;	Tue, 13 Nov 2012 03:45:55 -0200
Received: from d24dlp02.br.ibm.com (9.18.248.206)	by e24smtp01.br.ibm.com (10.172.0.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted;	Tue, 13 Nov 2012 03:45:52 -0200
Received: from d24relay01.br.ibm.com (d24relay01.br.ibm.com [9.8.31.16])	by d24dlp02.br.ibm.com (Postfix) with ESMTP id A0E851DC001A;	Tue, 13 Nov 2012 00:45:51 -0500 (EST)
Received: from d24av01.br.ibm.com (d24av01.br.ibm.com [9.8.31.91])	by d24relay01.br.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAD5jVcO2507000;	Tue, 13 Nov 2012 03:45:31 -0200
Received: from d24av01.br.ibm.com (loopback [127.0.0.1])	by d24av01.br.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAD5jpFB018694;	Tue, 13 Nov 2012 03:45:51 -0200
Received: from grandaddy.ibm.com ([9.8.15.203])	by d24av01.br.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qAD5joE3018691;	Tue, 13 Nov 2012 03:45:51 -0200
From: Edjunior Barbosa Machado <emachado@linux.vnet.ibm.com>
To: gdb-patches@sourceware.org
Cc: binutils@sourceware.org, amodra@gmail.com
Subject: [PATCH] Fix gdb disassemble for power6/power7 instructions
Date: Tue, 13 Nov 2012 05:46:00 -0000
Message-Id: <1352785540-22911-1-git-send-email-emachado@linux.vnet.ibm.com>
X-Content-Scanned: Fidelis XPS MAILER
x-cbid: 12111305-1524-0000-0000-00000458BEF9
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2012-11/txt/msg00304.txt.bz2

Hi,

upstream gdb is unable to disassemble power6 and power7 instructions due to a
change on binutils (http://sourceware.org/ml/binutils/2012-03/msg00170.html). It
happens because powerpc_init_dialect() is currently being called before
disassembler_options is configured (it used to be called every time
print_insn_[little|big]_powerpc() was called). The patch below intends to fix
this issue moving the logic to set disassembler_options to
powerpc_init_dialect().
Moreover, with this patch, objdump is also able to disassemble power6 and power7
instructions without the additional parameter -M <option>.

Comments/sugggestions are welcome.

Thanks,
--
Edjunior

gdb/ChangeLog
2012-11-13  Edjunior Machado  <emachado@linux.vnet.ibm.com>

	* rs6000-tdep.c (gdb_print_insn_powerpc): Move logic to set
	info->disassembler_options to binutils' powerpc_init_dialect().

opcodes/ChangeLog
2012-11-13  Edjunior Machado  <emachado@linux.vnet.ibm.com>

	* ppc-dis.c (powerpc_init_dialect): If not defined, set
	info->disassembler_options to "any" or, if debugging an E500 binary,
	to "e500x2".

---
 gdb/rs6000-tdep.c |   15 ---------------
 opcodes/ppc-dis.c |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 1797cc5..07b81bc 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3084,21 +3084,6 @@ find_variant_by_arch (enum bfd_architecture arch, unsigned long mach)
 static int
 gdb_print_insn_powerpc (bfd_vma memaddr, disassemble_info *info)
 {
-  if (!info->disassembler_options)
-    {
-      /* When debugging E500 binaries and disassembling code containing
-	 E500-specific (SPE) instructions, one sometimes sees AltiVec
-	 instructions instead.  The opcode spaces for SPE instructions
-	 and AltiVec instructions overlap, and specifiying the "any" cpu
-	 looks for AltiVec instructions first.  If we know we're
-	 debugging an E500 binary, however, we can specify the "e500x2"
-	 cpu and get much more sane disassembly output.  */
-      if (info->mach == bfd_mach_ppc_e500)
-	info->disassembler_options = "e500x2";
-      else
-	info->disassembler_options = "any";
-    }
-
   if (info->endian == BFD_ENDIAN_BIG)
     return print_insn_big_powerpc (memaddr, info);
   else
diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 03b3160..63b71e5 100644
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -251,6 +251,21 @@ powerpc_init_dialect (struct disassemble_info *info)
   if (priv == NULL)
     priv = &private;
 
+  if (!info->disassembler_options)
+    {
+      /* When debugging E500 binaries and disassembling code containing
+	 E500-specific (SPE) instructions, one sometimes sees AltiVec
+	 instructions instead.  The opcode spaces for SPE instructions
+	 and AltiVec instructions overlap, and specifiying the "any" cpu
+	 looks for AltiVec instructions first.  If we know we're
+	 debugging an E500 binary, however, we can specify the "e500x2"
+	 cpu and get much more sane disassembly output.  */
+      if (info->mach == bfd_mach_ppc_e500)
+	info->disassembler_options = "e500x2";
+      else
+	info->disassembler_options = "any";
+    }
+
   arg = info->disassembler_options;
   while (arg != NULL)
     {
-- 
1.7.1