* config/tc-cr16.c (getprocreg_image): Correct range check.

	(getprocregp_image): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 90f8d7f7048ee2870005de85fa09400460c4009d..13a107558dfe5ec32a1ef4f95ac605f7b784563f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-11  Alan Modra  <amodra@gmail.com>
+
+       * config/tc-cr16.c (getprocreg_image): Correct range check.
+       (getprocregp_image): Likewise.
+
 2011-04-06  Joseph Myers  <joseph@codesourcery.com>
 
        * configure.tgt (strongarm*be, strongarm*b, strongarm*,

diff --git a/gas/config/tc-cr16.c b/gas/config/tc-cr16.c
index a6185f99af817bb06cd0553cec107307ecb22b5c..09e51b3f856f7319063c0ddc25a5d4a52162bba4 100644 (file)
--- a/gas/config/tc-cr16.c
+++ b/gas/config/tc-cr16.c
@@ -1,5 +1,6 @@
 /* tc-cr16.c -- Assembler code for the CR16 CPU core.
-   Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    Contributed by M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 
@@ -1669,7 +1670,7 @@ getprocreg_image (reg r)
   char *reg_name;
 
   /* Check whether the register is in registers table.  */
-  if (r < MAX_REG)
+  if (r >= MAX_REG && r < MAX_PREG)
     rreg = &cr16_pregtab[r - MAX_REG];
   /* Register not found.  */
   else
@@ -1708,7 +1709,7 @@ getprocregp_image (reg r)
   int pregptab_disp = 0;
 
   /* Check whether the register is in registers table.  */
-  if (r < MAX_REG)
+  if (r >= MAX_REG && r < MAX_PREG)
     {
       r = r - MAX_REG;
       switch (r)