[llvm-objdump] Move --start-address >= --stop-address check out of the -d code.

[ychen]

Summary

Move it into main function so the checking is effective for all actions user may do with llvm-objdump; notably, -r and -s in
addition to existing -d. Match GNU behavior.

prepare for patch on PR41911

[MaskRay]

I think the description should mention that the --start-address >= --stop-address check has been moved out of the -d code. This can be useful for -t -r

[ychen]

Thank you @MaskRay. Description changed. I intentionally leave out -t since I suspect it is a bug. See my comment in https://bugs.llvm.org/show_bug.cgi?id=41911.

[MaskRay]

llvm/test/tools/llvm-objdump/X86/start-stop-address.test

72

If this line (no command specified) gives diagnostics, the -d -r -s RUN lines may be unnecessary.

[ychen]

• update

[ychen]

llvm/test/tools/llvm-objdump/X86/start-stop-address.test

72

Missed that.

[grimar]

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

2065

Does it make sence to include the address values here? And/or the option name?
It is not really clear from the error message text what is wrong it seems.

[grimar]

My comment is not directly related to change done in this patch though, so LGTM.

[jhenderson]

llvm/test/tools/llvm-objdump/X86/start-stop-address.test

71–75

I think this change should only remove the -d part, not change the ordering of the --stop-address values.

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

2065

I agree that it might be nice to improve the error message. I'm okay with that being a separate change though.

[ychen]

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

2065

I'll leave it in another patch. Thank you!

llvm/test/tools/llvm-objdump/X86/start-stop-address.test

 // STOP-EMPTY:
 // STOP-NEXT:  0000000000000010 main:
 // STOP-NEXT:      10: 55                            pushq   %rbp
 // STOP-NOT:       {{.}}
 
 // OUT-OF-RANGE-NOT: Disassembly
 
 // RUN: not llvm-objdump -d %t.out --start-address=0x40 --stop-address=0x3f 2>&1 | FileCheck %s --check-prefix ERRMSG
 // RUN: not llvm-objdump -d %t.out --start-address=0x40 --stop-address=0x40 2>&1 | FileCheck %s --check-prefix ERRMSG
+// RUN: not llvm-objdump    %t.out --start-address=0x40 --stop-address=0x3f 2>&1 | FileCheck %s --check-prefix ERRMSG
+// RUN: not llvm-objdump -r %t.out --start-address=0x40 --stop-address=0x3f 2>&1 | FileCheck %s --check-prefix ERRMSG
+// RUN: not llvm-objdump -s %t.out --start-address=0x40 --stop-address=0x3f 2>&1 | FileCheck %s --check-prefix ERRMSG
 // ERRMSG: start address should be less than stop address.

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

#endif
   }
   StringSet<> MissingDisasmFuncsSet =
       set_difference(DisasmFuncsSet, FoundDisasmFuncsSet);
   for (StringRef MissingDisasmFunc : MissingDisasmFuncsSet.keys())
     warn("failed to disassemble missing function " + MissingDisasmFunc);
 }
 
 static void disassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
-  if (StartAddress >= StopAddress)
-    error("start address should be less than stop address");
-
   const Target *TheTarget = getTarget(Obj);
 
   // Package up features to be passed to target/subtarget
   SubtargetFeatures Features = Obj->getFeatures();
   if (!MAttrs.empty())
     for (unsigned I = 0; I != MAttrs.size(); ++I)
       Features.AddFeature(MAttrs[I]);
 
int main(int argc, char **argv) {
   InitializeAllTargetMCs();
   InitializeAllDisassemblers();
 
   // Register the target printer for --version.
   cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);
 
   cl::ParseCommandLineOptions(argc, argv, "llvm object file dumper\n");
 
+  if (StartAddress >= StopAddress)
+    error("start address should be less than stop address");
+
   ToolName = argv[0];
 
   // Defaults to a.out if no filenames specified.
   if (InputFilenames.empty())
     InputFilenames.push_back("a.out");
 
   if (AllHeaders)
     ArchiveHeaders = FileHeaders = PrivateHeaders = Relocations =