[llvm-objdump][llvm-readobj] Be strict for decoding caprelocs permissions

We don't know what future bit patterns will mean, so don't even try, as
that's likely to be misleading.

Author: jrtc27

llvm/tools/llvm-objdump/llvm-objdump.cpp

@@ -2712,19 +2712,32 @@ printELFCapRelocations(const ELFObjectFile<ELFT> *Obj) {
     uint64_t Perms =
         support::endian::read<TargetUint, ELFT::Endianness, 1>(
                 entry + 4*sizeof(TargetUint));
-    bool isFunction = Perms & (UINT64_C(1) << ((sizeof(TargetUint) * 8) - 1));
-    bool isConstant = Perms & (UINT64_C(1) << ((sizeof(TargetUint) * 8) - 2));
-    //Perms &= 0xffffffff;
+    const uint64_t Function = UINT64_C(1) << ((sizeof(TargetUint) * 8) - 1);
+    const uint64_t Constant = UINT64_C(1) << ((sizeof(TargetUint) * 8) - 2);
+    StringRef PermStr;
+    switch (Perms) {
+    case 0:
+      PermStr = "";
+      break;
+    case Constant:
+      PermStr = " (Constant)";
+      break;
+    case Function:
+      PermStr = " (Function)";
+      break;
+    default:
+      PermStr = " (Unknown)";
+      break;
+    }
     StringRef Symbol = "<Unnamed symbol>";
     if (SymbolNames.find(Base) != SymbolNames.end())
       Symbol = SymbolNames[Base];
     outs() << format(AddrFmt.data(), Target) << "\tBase: " << Symbol << " ("
            << format(AddrFmt.data(), Base)
            << ")\tOffset: " << format(AddrFmt.data(), Offset)
            << "\tLength: " << format(AddrFmt.data(), Length)
-           << "\tPermissions: " << format(PermsFmt.data(), Perms)
-           << (isFunction ? " (Function)\n"
-                          : (isConstant ? " (Constant)\n" : "\n"));
+           << "\tPermissions: " << format(PermsFmt.data(), Perms) << PermStr
+           << "\n";
   }
   outs() << "\n";
 }

llvm/tools/llvm-readobj/ELFDumper.cpp

@@ -3526,11 +3526,23 @@ template <class ELFT> void ELFDumper<ELFT>::printCheriCapRelocs() {
     uint64_t Perms =
         support::endian::read<TargetUint, ELFT::Endianness, 1>(
                 entry + 4*sizeof(TargetUint));
-    bool isFunction = Perms & (UINT64_C(1) << ((sizeof(TargetUint) * 8) - 1));
-    bool isReadOnly = Perms & (UINT64_C(1) << ((sizeof(TargetUint) * 8) - 2));
-    const char *PermStr =
-        isFunction ? "Function" : (isReadOnly ? "Constant" : "Object");
-    // Perms &= 0xffffffff;
+    const uint64_t Function = UINT64_C(1) << ((sizeof(TargetUint) * 8) - 1);
+    const uint64_t Constant = UINT64_C(1) << ((sizeof(TargetUint) * 8) - 2);
+    StringRef PermStr;
+    switch (Perms) {
+    case 0:
+      PermStr = "Object";
+      break;
+    case Constant:
+      PermStr = "Constant";
+      break;
+    case Function:
+      PermStr = "Function";
+      break;
+    default:
+      PermStr = "Unknown";
+      break;
+    }
     std::string BaseSymbol;
     if (Base == 0) {
       // Base is 0 -> either it is really NULL or (more likely) there is a