maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

-d code.

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.

Reviewers: jhenderson, grimar, MaskRay, rupprecht

Subscribers: llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D63631

llvm-svn: 364118
This commit is contained in:
Yuanfang Chen 2019-06-22 00:22:57 +00:00
parent 4608868d2f
commit 0eb966c824
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/test/tools/llvm-objdump/X86/start-stop-address.test
View File

@ -67,6 +67,6 @@
// 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 %t.out --start-address=0x40 --stop-address=0x40 2>&1 | FileCheck %s --check-prefix ERRMSG
// ERRMSG: start address should be less than stop address.

6
llvm/tools/llvm-objdump/llvm-objdump.cpp
View File

@ -1453,9 +1453,6 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj,
}
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
@ -2116,6 +2113,9 @@ int main(int argc, char **argv) {
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.