* ia64-dis.c (print_insn_ia64): Generate symbolic names for cr

 registers instead of register number.

* gas/ia64/regs.d: Expect symbolic names for cr registers due to
 improved disassembler.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c15d17cf3e28316277ae89ea3ed2d509b80f01c0..cab5e4bdba0eba3b54fba565cfd07ecc88e52f37 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-07  Tristan Gingold  <gingold@adacore.com>
+
+       * ia64-dis.c (print_insn_ia64): Generate symbolic names for cr
+       registers instead of register number.
+
 2007-11-07  Tristan Gingold  <gingold@adacore.com>
 
        * gas/elf/elf.exp (run_elf_list_test): Fix typo.

diff --git a/gas/testsuite/gas/ia64/regs.d b/gas/testsuite/gas/ia64/regs.d
index 1dbd13787a359347b4debd8c6a80fa16527aa28c..aeb8a07e74b6bbd2dbd8bc2c5cb69f24ee30d7a1 100644 (file)
--- a/gas/testsuite/gas/ia64/regs.d
+++ b/gas/testsuite/gas/ia64/regs.d
@@ -2146,157 +2146,157 @@ Disassembly of section \.text:
     2c80:      09 00 00 00 01 00       \[MMI\]       nop\.m 0x0
     2c86:      00 00 00 02 00 20                   nop\.m 0x0
     2c8c:      00 10 ca 00                         mov\.i r1=ar\.ec;;
-    2c90:      1d 08 00 00 24 04       \[MFB\]       mov r1=cr0
+    2c90:      1d 08 00 00 24 04       \[MFB\]       mov r1=cr\.dcr
     2c96:      00 00 00 02 00 00                   nop\.f 0x0
     2c9c:      00 00 00 20                         nop\.b 0x0;;
-    2ca0:      1d 08 00 02 24 04       \[MFB\]       mov r1=cr1
+    2ca0:      1d 08 00 02 24 04       \[MFB\]       mov r1=cr\.itm
     2ca6:      00 00 00 02 00 00                   nop\.f 0x0
     2cac:      00 00 00 20                         nop\.b 0x0;;
-    2cb0:      1d 08 00 04 24 04       \[MFB\]       mov r1=cr2
+    2cb0:      1d 08 00 04 24 04       \[MFB\]       mov r1=cr\.iva
     2cb6:      00 00 00 02 00 00                   nop\.f 0x0
     2cbc:      00 00 00 20                         nop\.b 0x0;;
-    2cc0:      1d 08 00 10 24 04       \[MFB\]       mov r1=cr8
+    2cc0:      1d 08 00 10 24 04       \[MFB\]       mov r1=cr\.pta
     2cc6:      00 00 00 02 00 00                   nop\.f 0x0
     2ccc:      00 00 00 20                         nop\.b 0x0;;
     2cd0:      1d 08 00 12 24 04       \[MFB\]       mov r1=cr9
     2cd6:      00 00 00 02 00 00                   nop\.f 0x0
     2cdc:      00 00 00 20                         nop\.b 0x0;;
-    2ce0:      1d 08 00 20 24 04       \[MFB\]       mov r1=cr16
+    2ce0:      1d 08 00 20 24 04       \[MFB\]       mov r1=cr\.ipsr
     2ce6:      00 00 00 02 00 00                   nop\.f 0x0
     2cec:      00 00 00 20                         nop\.b 0x0;;
-    2cf0:      1d 08 00 22 24 04       \[MFB\]       mov r1=cr17
+    2cf0:      1d 08 00 22 24 04       \[MFB\]       mov r1=cr\.isr
     2cf6:      00 00 00 02 00 00                   nop\.f 0x0
     2cfc:      00 00 00 20                         nop\.b 0x0;;
-    2d00:      1d 08 00 26 24 04       \[MFB\]       mov r1=cr19
+    2d00:      1d 08 00 26 24 04       \[MFB\]       mov r1=cr\.iip
     2d06:      00 00 00 02 00 00                   nop\.f 0x0
     2d0c:      00 00 00 20                         nop\.b 0x0;;
-    2d10:      1d 08 00 28 24 04       \[MFB\]       mov r1=cr20
+    2d10:      1d 08 00 28 24 04       \[MFB\]       mov r1=cr\.ifa
     2d16:      00 00 00 02 00 00                   nop\.f 0x0
     2d1c:      00 00 00 20                         nop\.b 0x0;;
-    2d20:      1d 08 00 2a 24 04       \[MFB\]       mov r1=cr21
+    2d20:      1d 08 00 2a 24 04       \[MFB\]       mov r1=cr\.itir
     2d26:      00 00 00 02 00 00                   nop\.f 0x0
     2d2c:      00 00 00 20                         nop\.b 0x0;;
-    2d30:      1d 08 00 2c 24 04       \[MFB\]       mov r1=cr22
+    2d30:      1d 08 00 2c 24 04       \[MFB\]       mov r1=cr\.iipa
     2d36:      00 00 00 02 00 00                   nop\.f 0x0
     2d3c:      00 00 00 20                         nop\.b 0x0;;
-    2d40:      1d 08 00 2e 24 04       \[MFB\]       mov r1=cr23
+    2d40:      1d 08 00 2e 24 04       \[MFB\]       mov r1=cr\.ifs
     2d46:      00 00 00 02 00 00                   nop\.f 0x0
     2d4c:      00 00 00 20                         nop\.b 0x0;;
-    2d50:      1d 08 00 30 24 04       \[MFB\]       mov r1=cr24
+    2d50:      1d 08 00 30 24 04       \[MFB\]       mov r1=cr\.iim
     2d56:      00 00 00 02 00 00                   nop\.f 0x0
     2d5c:      00 00 00 20                         nop\.b 0x0;;
-    2d60:      1d 08 00 32 24 04       \[MFB\]       mov r1=cr25
+    2d60:      1d 08 00 32 24 04       \[MFB\]       mov r1=cr\.iha
     2d66:      00 00 00 02 00 00                   nop\.f 0x0
     2d6c:      00 00 00 20                         nop\.b 0x0;;
-    2d70:      1d 08 00 80 24 04       \[MFB\]       mov r1=cr64
+    2d70:      1d 08 00 80 24 04       \[MFB\]       mov r1=cr\.lid
     2d76:      00 00 00 02 00 00                   nop\.f 0x0
     2d7c:      00 00 00 20                         nop\.b 0x0;;
-    2d80:      1d 08 00 82 24 04       \[MFB\]       mov r1=cr65
+    2d80:      1d 08 00 82 24 04       \[MFB\]       mov r1=cr\.ivr
     2d86:      00 00 00 02 00 00                   nop\.f 0x0
     2d8c:      00 00 00 20                         nop\.b 0x0;;
-    2d90:      1d 08 00 84 24 04       \[MFB\]       mov r1=cr66
+    2d90:      1d 08 00 84 24 04       \[MFB\]       mov r1=cr\.tpr
     2d96:      00 00 00 02 00 00                   nop\.f 0x0
     2d9c:      00 00 00 20                         nop\.b 0x0;;
-    2da0:      1d 08 00 86 24 04       \[MFB\]       mov r1=cr67
+    2da0:      1d 08 00 86 24 04       \[MFB\]       mov r1=cr\.eoi
     2da6:      00 00 00 02 00 00                   nop\.f 0x0
     2dac:      00 00 00 20                         nop\.b 0x0;;
-    2db0:      1d 08 00 88 24 04       \[MFB\]       mov r1=cr68
+    2db0:      1d 08 00 88 24 04       \[MFB\]       mov r1=cr\.irr0
     2db6:      00 00 00 02 00 00                   nop\.f 0x0
     2dbc:      00 00 00 20                         nop\.b 0x0;;
-    2dc0:      1d 08 00 8a 24 04       \[MFB\]       mov r1=cr69
+    2dc0:      1d 08 00 8a 24 04       \[MFB\]       mov r1=cr\.irr1
     2dc6:      00 00 00 02 00 00                   nop\.f 0x0
     2dcc:      00 00 00 20                         nop\.b 0x0;;
-    2dd0:      1d 08 00 8c 24 04       \[MFB\]       mov r1=cr70
+    2dd0:      1d 08 00 8c 24 04       \[MFB\]       mov r1=cr\.irr2
     2dd6:      00 00 00 02 00 00                   nop\.f 0x0
     2ddc:      00 00 00 20                         nop\.b 0x0;;
-    2de0:      1d 08 00 8e 24 04       \[MFB\]       mov r1=cr71
+    2de0:      1d 08 00 8e 24 04       \[MFB\]       mov r1=cr\.irr3
     2de6:      00 00 00 02 00 00                   nop\.f 0x0
     2dec:      00 00 00 20                         nop\.b 0x0;;
-    2df0:      1d 08 00 90 24 04       \[MFB\]       mov r1=cr72
+    2df0:      1d 08 00 90 24 04       \[MFB\]       mov r1=cr\.itv
     2df6:      00 00 00 02 00 00                   nop\.f 0x0
     2dfc:      00 00 00 20                         nop\.b 0x0;;
-    2e00:      1d 08 00 92 24 04       \[MFB\]       mov r1=cr73
+    2e00:      1d 08 00 92 24 04       \[MFB\]       mov r1=cr\.pmv
     2e06:      00 00 00 02 00 00                   nop\.f 0x0
     2e0c:      00 00 00 20                         nop\.b 0x0;;
-    2e10:      1d 08 00 94 24 04       \[MFB\]       mov r1=cr74
+    2e10:      1d 08 00 94 24 04       \[MFB\]       mov r1=cr\.cmcv
     2e16:      00 00 00 02 00 00                   nop\.f 0x0
     2e1c:      00 00 00 20                         nop\.b 0x0;;
-    2e20:      1d 08 00 a0 24 04       \[MFB\]       mov r1=cr80
+    2e20:      1d 08 00 a0 24 04       \[MFB\]       mov r1=cr\.lrr0
     2e26:      00 00 00 02 00 00                   nop\.f 0x0
     2e2c:      00 00 00 20                         nop\.b 0x0;;
-    2e30:      1d 08 00 a2 24 04       \[MFB\]       mov r1=cr81
+    2e30:      1d 08 00 a2 24 04       \[MFB\]       mov r1=cr\.lrr1
     2e36:      00 00 00 02 00 00                   nop\.f 0x0
     2e3c:      00 00 00 20                         nop\.b 0x0;;
-    2e40:      1d 08 00 00 24 04       \[MFB\]       mov r1=cr0
+    2e40:      1d 08 00 00 24 04       \[MFB\]       mov r1=cr\.dcr
     2e46:      00 00 00 02 00 00                   nop\.f 0x0
     2e4c:      00 00 00 20                         nop\.b 0x0;;
-    2e50:      1d 08 00 02 24 04       \[MFB\]       mov r1=cr1
+    2e50:      1d 08 00 02 24 04       \[MFB\]       mov r1=cr\.itm
     2e56:      00 00 00 02 00 00                   nop\.f 0x0
     2e5c:      00 00 00 20                         nop\.b 0x0;;
-    2e60:      1d 08 00 04 24 04       \[MFB\]       mov r1=cr2
+    2e60:      1d 08 00 04 24 04       \[MFB\]       mov r1=cr\.iva
     2e66:      00 00 00 02 00 00                   nop\.f 0x0
     2e6c:      00 00 00 20                         nop\.b 0x0;;
-    2e70:      1d 08 00 10 24 04       \[MFB\]       mov r1=cr8
+    2e70:      1d 08 00 10 24 04       \[MFB\]       mov r1=cr\.pta
     2e76:      00 00 00 02 00 00                   nop\.f 0x0
     2e7c:      00 00 00 20                         nop\.b 0x0;;
-    2e80:      1d 08 00 20 24 04       \[MFB\]       mov r1=cr16
+    2e80:      1d 08 00 20 24 04       \[MFB\]       mov r1=cr\.ipsr
     2e86:      00 00 00 02 00 00                   nop\.f 0x0
     2e8c:      00 00 00 20                         nop\.b 0x0;;
-    2e90:      1d 08 00 22 24 04       \[MFB\]       mov r1=cr17
+    2e90:      1d 08 00 22 24 04       \[MFB\]       mov r1=cr\.isr
     2e96:      00 00 00 02 00 00                   nop\.f 0x0
     2e9c:      00 00 00 20                         nop\.b 0x0;;
-    2ea0:      1d 08 00 26 24 04       \[MFB\]       mov r1=cr19
+    2ea0:      1d 08 00 26 24 04       \[MFB\]       mov r1=cr\.iip
     2ea6:      00 00 00 02 00 00                   nop\.f 0x0
     2eac:      00 00 00 20                         nop\.b 0x0;;
-    2eb0:      1d 08 00 2c 24 04       \[MFB\]       mov r1=cr22
+    2eb0:      1d 08 00 2c 24 04       \[MFB\]       mov r1=cr\.iipa
     2eb6:      00 00 00 02 00 00                   nop\.f 0x0
     2ebc:      00 00 00 20                         nop\.b 0x0;;
-    2ec0:      1d 08 00 2e 24 04       \[MFB\]       mov r1=cr23
+    2ec0:      1d 08 00 2e 24 04       \[MFB\]       mov r1=cr\.ifs
     2ec6:      00 00 00 02 00 00                   nop\.f 0x0
     2ecc:      00 00 00 20                         nop\.b 0x0;;
-    2ed0:      1d 08 00 30 24 04       \[MFB\]       mov r1=cr24
+    2ed0:      1d 08 00 30 24 04       \[MFB\]       mov r1=cr\.iim
     2ed6:      00 00 00 02 00 00                   nop\.f 0x0
     2edc:      00 00 00 20                         nop\.b 0x0;;
-    2ee0:      1d 08 00 32 24 04       \[MFB\]       mov r1=cr25
+    2ee0:      1d 08 00 32 24 04       \[MFB\]       mov r1=cr\.iha
     2ee6:      00 00 00 02 00 00                   nop\.f 0x0
     2eec:      00 00 00 20                         nop\.b 0x0;;
-    2ef0:      1d 08 00 80 24 04       \[MFB\]       mov r1=cr64
+    2ef0:      1d 08 00 80 24 04       \[MFB\]       mov r1=cr\.lid
     2ef6:      00 00 00 02 00 00                   nop\.f 0x0
     2efc:      00 00 00 20                         nop\.b 0x0;;
-    2f00:      1d 08 00 82 24 04       \[MFB\]       mov r1=cr65
+    2f00:      1d 08 00 82 24 04       \[MFB\]       mov r1=cr\.ivr
     2f06:      00 00 00 02 00 00                   nop\.f 0x0
     2f0c:      00 00 00 20                         nop\.b 0x0;;
-    2f10:      1d 08 00 84 24 04       \[MFB\]       mov r1=cr66
+    2f10:      1d 08 00 84 24 04       \[MFB\]       mov r1=cr\.tpr
     2f16:      00 00 00 02 00 00                   nop\.f 0x0
     2f1c:      00 00 00 20                         nop\.b 0x0;;
-    2f20:      1d 08 00 86 24 04       \[MFB\]       mov r1=cr67
+    2f20:      1d 08 00 86 24 04       \[MFB\]       mov r1=cr\.eoi
     2f26:      00 00 00 02 00 00                   nop\.f 0x0
     2f2c:      00 00 00 20                         nop\.b 0x0;;
-    2f30:      1d 08 00 88 24 04       \[MFB\]       mov r1=cr68
+    2f30:      1d 08 00 88 24 04       \[MFB\]       mov r1=cr\.irr0
     2f36:      00 00 00 02 00 00                   nop\.f 0x0
     2f3c:      00 00 00 20                         nop\.b 0x0;;
-    2f40:      1d 08 00 8a 24 04       \[MFB\]       mov r1=cr69
+    2f40:      1d 08 00 8a 24 04       \[MFB\]       mov r1=cr\.irr1
     2f46:      00 00 00 02 00 00                   nop\.f 0x0
     2f4c:      00 00 00 20                         nop\.b 0x0;;
-    2f50:      1d 08 00 8c 24 04       \[MFB\]       mov r1=cr70
+    2f50:      1d 08 00 8c 24 04       \[MFB\]       mov r1=cr\.irr2
     2f56:      00 00 00 02 00 00                   nop\.f 0x0
     2f5c:      00 00 00 20                         nop\.b 0x0;;
-    2f60:      1d 08 00 8e 24 04       \[MFB\]       mov r1=cr71
+    2f60:      1d 08 00 8e 24 04       \[MFB\]       mov r1=cr\.irr3
     2f66:      00 00 00 02 00 00                   nop\.f 0x0
     2f6c:      00 00 00 20                         nop\.b 0x0;;
-    2f70:      1d 08 00 90 24 04       \[MFB\]       mov r1=cr72
+    2f70:      1d 08 00 90 24 04       \[MFB\]       mov r1=cr\.itv
     2f76:      00 00 00 02 00 00                   nop\.f 0x0
     2f7c:      00 00 00 20                         nop\.b 0x0;;
-    2f80:      1d 08 00 92 24 04       \[MFB\]       mov r1=cr73
+    2f80:      1d 08 00 92 24 04       \[MFB\]       mov r1=cr\.pmv
     2f86:      00 00 00 02 00 00                   nop\.f 0x0
     2f8c:      00 00 00 20                         nop\.b 0x0;;
-    2f90:      1d 08 00 a0 24 04       \[MFB\]       mov r1=cr80
+    2f90:      1d 08 00 a0 24 04       \[MFB\]       mov r1=cr\.lrr0
     2f96:      00 00 00 02 00 00                   nop\.f 0x0
     2f9c:      00 00 00 20                         nop\.b 0x0;;
-    2fa0:      1d 08 00 a2 24 04       \[MFB\]       mov r1=cr81
+    2fa0:      1d 08 00 a2 24 04       \[MFB\]       mov r1=cr\.lrr1
     2fa6:      00 00 00 02 00 00                   nop\.f 0x0
     2fac:      00 00 00 20                         nop\.b 0x0;;
-    2fb0:      1d 08 00 94 24 04       \[MFB\]       mov r1=cr74
+    2fb0:      1d 08 00 94 24 04       \[MFB\]       mov r1=cr\.cmcv
     2fb6:      00 00 00 02 00 00                   nop\.f 0x0
     2fbc:      00 00 00 20                         nop\.b 0x0;;
     2fc0:      1d 08 00 00 25 04       \[MFB\]       mov r1=psr

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index e881a8a6d598e1434107e1e579bcdfe41412af8f..b80747f3115108f7682016377b55ca2c2000401b 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-07  Tristan Gingold  <gingold@adacore.com>
+
+       * ia64-dis.c (print_insn_ia64): Generate symbolic names for cr
+       registers instead of register number.
+
 2007-11-07  David O'Brien  <obrien@FreeBSD.org>
 
        * arm-dis.c (arm_opcodes): Remove superflous escapes of percent

diff --git a/opcodes/ia64-dis.c b/opcodes/ia64-dis.c
index 146464fecbaacce2e346158b3a732a1589f802ef..23b07a3f71accf5d3a10c9ccd9e42fd06c2af343 100644 (file)
--- a/opcodes/ia64-dis.c
+++ b/opcodes/ia64-dis.c
@@ -214,6 +214,42 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
                  }
                (*info->fprintf_func) (info->stream, "%s", regname);
              }
+           else if (odesc->str[0] == 'c' && odesc->str[1] == 'r')
+             {
+               switch (value)
+                 {
+                 case 0:       strcpy (regname, "cr.dcr"); break;
+                 case 1:       strcpy (regname, "cr.itm"); break;
+                 case 2:       strcpy (regname, "cr.iva"); break;
+                 case 8:       strcpy (regname, "cr.pta"); break;
+                 case 16:      strcpy (regname, "cr.ipsr"); break;
+                 case 17:      strcpy (regname, "cr.isr"); break;
+                 case 19:      strcpy (regname, "cr.iip"); break;
+                 case 20:      strcpy (regname, "cr.ifa"); break;
+                 case 21:      strcpy (regname, "cr.itir"); break;
+                 case 22:      strcpy (regname, "cr.iipa"); break;
+                 case 23:      strcpy (regname, "cr.ifs"); break;
+                 case 24:      strcpy (regname, "cr.iim"); break;
+                 case 25:      strcpy (regname, "cr.iha"); break;
+                 case 64:      strcpy (regname, "cr.lid"); break;
+                 case 65:      strcpy (regname, "cr.ivr"); break;
+                 case 66:      strcpy (regname, "cr.tpr"); break;
+                 case 67:      strcpy (regname, "cr.eoi"); break;
+                 case 68:      strcpy (regname, "cr.irr0"); break;
+                 case 69:      strcpy (regname, "cr.irr1"); break;
+                 case 70:      strcpy (regname, "cr.irr2"); break;
+                 case 71:      strcpy (regname, "cr.irr3"); break;
+                 case 72:      strcpy (regname, "cr.itv"); break;
+                 case 73:      strcpy (regname, "cr.pmv"); break;
+                 case 74:      strcpy (regname, "cr.cmcv"); break;
+                 case 80:      strcpy (regname, "cr.lrr0"); break;
+                 case 81:      strcpy (regname, "cr.lrr1"); break;
+                 default:
+                   sprintf (regname, "cr%u", (unsigned int) value);
+                   break;
+                 }
+               (*info->fprintf_func) (info->stream, "%s", regname);
+             }
            else
              (*info->fprintf_func) (info->stream, "%s%d", odesc->str, (int)value);
            break;