* ppc-opc.c (extract_sprg): Use ALLOW8_SPRG to include VLE.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 4d1b6c9c158dbcfdb30562fba6e220fe984b5bbf..05b792a22aa73603eae2346fee283a95e272e3ad 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-17  James Lemke  <jwlemke@codesourcery.com>
+
+       * ppc-opc.c (extract_sprg): Use ALLOW8_SPRG to include VLE.
+
 2012-05-17  Daniel Richard G.  <skunk@iskunk.org>
            Nick Clifton  <nickc@redhat.com>
 

diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index f92979cdb34b7ae4ed85082838e7f3bae67065b6..74fba6867ba607612bdc31e949b3fc9fc5280f30 100644 (file)
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -1825,8 +1825,7 @@ insert_sprg (unsigned long insn,
             const char **errmsg)
 {
   if (value > 7
-      || (value > 3
-         && (dialect & ALLOW8_SPRG) == 0))
+      || (value > 3 && (dialect & ALLOW8_SPRG) == 0))
     *errmsg = _("invalid sprg number");
 
   /* If this is mfsprg4..7 then use spr 260..263 which can be read in
@@ -1845,8 +1844,8 @@ extract_sprg (unsigned long insn,
   unsigned long val = (insn >> 16) & 0x1f;
 
   /* 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 - 0x10 > 3 && (dialect & (PPC_OPCODE_BOOKE | PPC_OPCODE_405)) == 0)
+     If not BOOKE, 405 or VLE, then both use only 272..275.  */
+  if ((val - 0x10 > 3 && (dialect & ALLOW8_SPRG) == 0)
       || (val - 0x10 > 7 && (insn & 0x100) != 0)
       || val <= 3
       || (val & 8) != 0)