From: Alan Modra <amodra@gmail.com>
Date: Thu, 27 Nov 2008 10:47:23 +0000 (+0000)
Subject: 	* ppc-opc.c (extract_sprg): Correct operand range check.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1c93c699b7dceb3fc41fb039ff5fecea73677ba;p=binutils-gdb.git

	* ppc-opc.c (extract_sprg): Correct operand range check.
---

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f85b262990c..479eed9e79a 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-27  Alan Modra  <amodra@bigpond.net.au>
+
+	* ppc-opc.c (extract_sprg): Correct operand range check.
+
 2008-11-26  Andreas Schwab  <schwab@suse.de>
 
 	* m68k-dis.c (NEXTBYTE, NEXTWORD, NEXTLONG, NEXTULONG, NEXTSINGLE)
diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index 0faf528ddcd..7d05f5f03b5 100644
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -1281,10 +1281,10 @@ extract_sprg (unsigned long insn,
 
   /* mfsprg can use 260..263 and 272..279.  mtsprg only uses spr 272..279
      If not BOOKE or 405, then both use only 272..275.  */
-  if (val <= 3
-      || (val < 0x10 && (insn & 0x100) != 0)
-      || (val - 0x10 > 3
-	  && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_403)) == 0))
+  if ((val - 0x10 > 3 && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_405)) == 0)
+      || (val - 0x10 > 7 && (insn & 0x100) != 0)
+      || val <= 3
+      || (val & 8) != 0)
     *invalid = 1;
   return val & 7;
 }