[MIPS/GAS] Split Loongson EXT Instructions from loongson3a.

[deliverable/binutils-gdb.git] / binutils / readelf.c

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 23e61d369ac71210800bb5b8b01175ccf6a579f4..92353c596f4bd2bef7a2bc280ad3a7f472dacda9 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -15651,6 +15651,10 @@ print_mips_ases (unsigned int mask)
     fputs ("\n\tGINV ASE", stdout);
   if (mask & AFL_ASE_LOONGSON_MMI)
     fputs ("\n\tLoongson MMI ASE", stdout);
+  if (mask & AFL_ASE_LOONGSON_CAM)
+    fputs ("\n\tLoongson CAM ASE", stdout);
+  if (mask & AFL_ASE_LOONGSON_EXT)
+    fputs ("\n\tLoongson EXT ASE", stdout);
   if (mask == 0)
     fprintf (stdout, "\n\t%s", _("None"));
   else if ((mask & ~AFL_ASE_MASK) != 0)
@@ -17019,7 +17023,9 @@ decode_x86_compat_isa (unsigned int bitmask)
        case GNU_PROPERTY_X86_COMPAT_ISA_1_AVX512BW:
          printf ("AVX512BW");
          break;
-       default: printf (_("<unknown: %x>"), bit); break;
+       default:
+         printf (_("<unknown: %x>"), bit);
+         break;
        }
       if (bitmask)
        printf (", ");
@@ -17029,6 +17035,14 @@ decode_x86_compat_isa (unsigned int bitmask)
 static void
 decode_x86_isa (unsigned int bitmask)
 {
+  if (bitmask == GNU_PROPERTY_X86_UINT32_VALID)
+    {
+      printf (_("<None>"));
+      return;
+    }
+  else
+    bitmask &= ~GNU_PROPERTY_X86_UINT32_VALID;
+
   while (bitmask)
     {
       unsigned int bit = bitmask & (- bitmask);
@@ -17108,7 +17122,9 @@ decode_x86_isa (unsigned int bitmask)
        case GNU_PROPERTY_X86_ISA_1_AVX512_VNNI:
          printf ("AVX512_VNNI");
          break;
-       default: printf (_("<unknown: %x>"), bit); break;
+       default:
+         printf (_("<unknown: %x>"), bit);
+         break;
        }
       if (bitmask)
        printf (", ");
@@ -17118,6 +17134,14 @@ decode_x86_isa (unsigned int bitmask)
 static void
 decode_x86_feature_1 (unsigned int bitmask)
 {
+  if (bitmask == GNU_PROPERTY_X86_UINT32_VALID)
+    {
+      printf (_("<None>"));
+      return;
+    }
+  else
+    bitmask &= ~GNU_PROPERTY_X86_UINT32_VALID;
+
   while (bitmask)
     {
       unsigned int bit = bitmask & (- bitmask);
@@ -17143,6 +17167,14 @@ decode_x86_feature_1 (unsigned int bitmask)
 static void
 decode_x86_feature_2 (unsigned int bitmask)
 {
+  if (bitmask == GNU_PROPERTY_X86_UINT32_VALID)
+    {
+      printf (_("<None>"));
+      return;
+    }
+  else
+    bitmask &= ~GNU_PROPERTY_X86_UINT32_VALID;
+
   while (bitmask)
     {
       unsigned int bit = bitmask & (- bitmask);
@@ -17180,7 +17212,9 @@ decode_x86_feature_2 (unsigned int bitmask)
        case GNU_PROPERTY_X86_FEATURE_2_XSAVEC:
          printf ("XSAVEC");
          break;
-       default: printf (_("<unknown: %x>"), bit); break;
+       default:
+         printf (_("<unknown: %x>"), bit);
+         break;
        }
       if (bitmask)
        printf (", ");
@@ -17237,14 +17271,10 @@ print_gnu_property_note (Filedata * filedata, Elf_Internal_Note * pnote)
              if (datasz == 4)
                {
                  bitmask = byte_get (ptr, 4);
-                 if (filedata->file_header.e_type == ET_EXEC
-                     || filedata->file_header.e_type == ET_DYN)
-                   {
-                     if ((bitmask & GNU_PROPERTY_X86_UINT32_VALID))
-                       bitmask &= ~GNU_PROPERTY_X86_UINT32_VALID;
-                     else
-                       printf ("Invalid ");
-                   }
+                 if ((filedata->file_header.e_type == ET_EXEC
+                      || filedata->file_header.e_type == ET_DYN)
+                     && !(bitmask & GNU_PROPERTY_X86_UINT32_VALID))
+                   printf ("Invalid ");
                }
              else
                bitmask = 0;