From: Jordan Rupprecht Date: Fri, 7 Jun 2019 21:49:26 +0000 (+0000) Subject: [llvm-objdump] Fix Bugzilla ID 41862 to support checking addresses of disassembled... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=699a2e567f5f0e63911455101bc65c10ac31c93c;p=llvm [llvm-objdump] Fix Bugzilla ID 41862 to support checking addresses of disassembled object Summary: This fixes the bugzilla id,41862 to support dealing with checking stop address against start address to support this not being a proper object to check the disasembly against like gnu objdump currently does. Reviewers: jakehehrlich, rupprecht, echristo, jhenderson, grimar Reviewed By: jhenderson Subscribers: MaskRay, smeenai, rupprecht, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D61969 Patch by Nicholas Krause! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@362847 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/tools/llvm-objdump/X86/start-stop-address.test b/test/tools/llvm-objdump/X86/start-stop-address.test index e8b390f25f0..3f76e793a62 100644 --- a/test/tools/llvm-objdump/X86/start-stop-address.test +++ b/test/tools/llvm-objdump/X86/start-stop-address.test @@ -68,4 +68,5 @@ // 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 -// ERRMSG: error: Start address should be less than stop address. +// RUN: not llvm-objdump -d %t.out --start-address=0x40 --stop-address=0x40 2>&1 | FileCheck %s --check-prefix ERRMSG +// ERRMSG: start address should be less than stop address. diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index bbd65d9a9a7..8f4acc79296 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -1417,8 +1417,8 @@ 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"); + if (StartAddress >= StopAddress) + error("start address should be less than stop address"); const Target *TheTarget = getTarget(Obj);