* arm-dis.c (print_insn_arm): Output combinations of PSR flags.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 737d7af..c0fb827 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-04  Alexandre Oliva  <aoliva@redhat.com>
+
+       * arm-dis.c (print_insn_arm): Output combinations of PSR flags.
+
 2000-07-03  Marek Michalkiewicz  <marekm@linux.org.pl>
 
        * avr-dis.c (avr_operand): Change _ () to _() around all strings

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 4c6552e..0ddcffa 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -422,27 +422,15 @@ print_insn_arm (pc, info, given)
                      break;
 
                    case 'C':
-                     switch (given & 0x000f0000)
-                       {
-                       default:
-                         func (stream, "_???");
-                         break;
-                       case 0x90000:
-                         func (stream, "_all");
-                         break;
-                       case 0x10000:
-                         func (stream, "_c");
-                         break;
-                       case 0x20000:
-                         func (stream, "_x");
-                         break;
-                       case 0x40000:
-                         func (stream, "_s");
-                         break;
-                       case 0x80000:
-                         func (stream, "_f");
-                         break;
-                       }
+                     func (stream, "_");
+                     if (given & 0x80000)
+                       func (stream, "f");
+                     if (given & 0x40000)
+                       func (stream, "s");
+                     if (given & 0x20000)
+                       func (stream, "x");
+                     if (given & 0x10000)
+                       func (stream, "c");
                      break;
 
                    case 'F':