From: Nico Weber Date: Wed, 12 Jun 2019 11:32:43 +0000 (+0000) Subject: Share /machine: handling code with llvm-cvtres too X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ecbbba53904b882b60bf306779e179860a987c8;p=llvm Share /machine: handling code with llvm-cvtres too r363016 let lld-link and llvm-lib share the /machine: parsing code. This lets llvm-cvtres share it as well. Making llvm-cvtres depend on llvm-lib seemed a bit strange (it doesn't need llvm-lib's dependencies on BinaryFormat and BitReader) and I couldn't find a good place to put this code. Since it's just a few lines, put it in lib/Object for now. Differential Revision: https://reviews.llvm.org/D63120 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@363144 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Object/WindowsMachineFlag.h b/include/llvm/Object/WindowsMachineFlag.h new file mode 100644 index 00000000000..acc6afc0329 --- /dev/null +++ b/include/llvm/Object/WindowsMachineFlag.h @@ -0,0 +1,33 @@ +//===- WindowsMachineFlag.h -------------------------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// Functions for implementing the /machine: flag. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_TOOLDRIVERS_MACHINEFLAG_MACHINEFLAG_H +#define LLVM_TOOLDRIVERS_MACHINEFLAG_MACHINEFLAG_H + +namespace llvm { + +class StringRef; +namespace COFF { +enum MachineTypes : unsigned; +} + +// Returns a user-readable string for ARMNT, ARM64, AMD64, I386. +// Other MachineTypes values must not be passed in. +StringRef machineToStr(COFF::MachineTypes MT); + +// Maps /machine: arguments to a MachineTypes value. +// Only returns ARMNT, ARM64, AMD64, I386, or IMAGE_FILE_MACHINE_UNKNOWN. +COFF::MachineTypes getMachineType(StringRef S); + +} + +#endif diff --git a/include/llvm/ToolDrivers/llvm-lib/LibDriver.h b/include/llvm/ToolDrivers/llvm-lib/LibDriver.h index 9fdcdd808e2..23a2fc348a8 100644 --- a/include/llvm/ToolDrivers/llvm-lib/LibDriver.h +++ b/include/llvm/ToolDrivers/llvm-lib/LibDriver.h @@ -19,20 +19,6 @@ template class ArrayRef; int libDriverMain(ArrayRef ARgs); - -class StringRef; -namespace COFF { -enum MachineTypes : unsigned; -} - -// Returns a user-readable string for ARMNT, ARM64, AMD64, I386. -// Other MachineTypes values must not be pased in. -StringRef machineToStr(COFF::MachineTypes MT); - -// Maps /machine: arguments to a MachineTypes value. -// Only returns ARMNT, ARM64, AMD64, I386, or IMAGE_FILE_MACHINE_UNKNOWN. -COFF::MachineTypes getMachineType(StringRef S); - } #endif diff --git a/lib/Object/CMakeLists.txt b/lib/Object/CMakeLists.txt index 242ae7ef3aa..e3ed6405d14 100644 --- a/lib/Object/CMakeLists.txt +++ b/lib/Object/CMakeLists.txt @@ -22,6 +22,7 @@ add_llvm_library(LLVMObject SymbolicFile.cpp SymbolSize.cpp WasmObjectFile.cpp + WindowsMachineFlag.cpp WindowsResource.cpp XCOFFObjectFile.cpp diff --git a/lib/Object/WindowsMachineFlag.cpp b/lib/Object/WindowsMachineFlag.cpp new file mode 100644 index 00000000000..f7f2b20ae1a --- /dev/null +++ b/lib/Object/WindowsMachineFlag.cpp @@ -0,0 +1,44 @@ +//===- WindowsMachineFlag.cpp ---------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// Functions for implementing the /machine: flag. +// +//===----------------------------------------------------------------------===// + +#include "llvm/Object/WindowsMachineFlag.h" + +#include "llvm/ADT/StringRef.h" +#include "llvm/ADT/StringSwitch.h" +#include "llvm/BinaryFormat/COFF.h" + +using namespace llvm; + +// Returns /machine's value. +COFF::MachineTypes llvm::getMachineType(StringRef S) { + return StringSwitch(S.lower()) + .Cases("x64", "amd64", COFF::IMAGE_FILE_MACHINE_AMD64) + .Cases("x86", "i386", COFF::IMAGE_FILE_MACHINE_I386) + .Case("arm", COFF::IMAGE_FILE_MACHINE_ARMNT) + .Case("arm64", COFF::IMAGE_FILE_MACHINE_ARM64) + .Default(COFF::IMAGE_FILE_MACHINE_UNKNOWN); +} + +StringRef llvm::machineToStr(COFF::MachineTypes MT) { + switch (MT) { + case COFF::IMAGE_FILE_MACHINE_ARMNT: + return "arm"; + case COFF::IMAGE_FILE_MACHINE_ARM64: + return "arm64"; + case COFF::IMAGE_FILE_MACHINE_AMD64: + return "x64"; + case COFF::IMAGE_FILE_MACHINE_I386: + return "x86"; + default: + llvm_unreachable("unknown machine type"); + } +} diff --git a/lib/ToolDrivers/llvm-lib/LibDriver.cpp b/lib/ToolDrivers/llvm-lib/LibDriver.cpp index 852a977e795..1201b2809c3 100644 --- a/lib/ToolDrivers/llvm-lib/LibDriver.cpp +++ b/lib/ToolDrivers/llvm-lib/LibDriver.cpp @@ -18,6 +18,7 @@ #include "llvm/Bitcode/BitcodeReader.h" #include "llvm/Object/ArchiveWriter.h" #include "llvm/Object/COFF.h" +#include "llvm/Object/WindowsMachineFlag.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/Option.h" @@ -140,31 +141,6 @@ static void doList(opt::InputArgList& Args) { fatalOpenError(std::move(Err), B->getBufferIdentifier()); } -// Returns /machine's value. -COFF::MachineTypes llvm::getMachineType(StringRef S) { - return StringSwitch(S.lower()) - .Cases("x64", "amd64", COFF::IMAGE_FILE_MACHINE_AMD64) - .Cases("x86", "i386", COFF::IMAGE_FILE_MACHINE_I386) - .Case("arm", COFF::IMAGE_FILE_MACHINE_ARMNT) - .Case("arm64", COFF::IMAGE_FILE_MACHINE_ARM64) - .Default(COFF::IMAGE_FILE_MACHINE_UNKNOWN); -} - -StringRef llvm::machineToStr(COFF::MachineTypes MT) { - switch (MT) { - case COFF::IMAGE_FILE_MACHINE_ARMNT: - return "arm"; - case COFF::IMAGE_FILE_MACHINE_ARM64: - return "arm64"; - case COFF::IMAGE_FILE_MACHINE_AMD64: - return "x64"; - case COFF::IMAGE_FILE_MACHINE_I386: - return "x86"; - default: - llvm_unreachable("unknown machine type"); - } -} - int llvm::libDriverMain(ArrayRef ArgsArr) { BumpPtrAllocator Alloc; StringSaver Saver(Alloc); diff --git a/tools/llvm-cvtres/llvm-cvtres.cpp b/tools/llvm-cvtres/llvm-cvtres.cpp index c2e46f0f680..1322da47a70 100644 --- a/tools/llvm-cvtres/llvm-cvtres.cpp +++ b/tools/llvm-cvtres/llvm-cvtres.cpp @@ -13,6 +13,7 @@ #include "llvm/ADT/StringSwitch.h" #include "llvm/Object/Binary.h" +#include "llvm/Object/WindowsMachineFlag.h" #include "llvm/Object/WindowsResource.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" @@ -118,16 +119,12 @@ int main(int Argc, const char **Argv) { COFF::MachineTypes MachineType; - if (InputArgs.hasArg(OPT_MACHINE)) { - std::string MachineString = InputArgs.getLastArgValue(OPT_MACHINE).upper(); - MachineType = StringSwitch(MachineString) - .Case("ARM", COFF::IMAGE_FILE_MACHINE_ARMNT) - .Case("ARM64", COFF::IMAGE_FILE_MACHINE_ARM64) - .Case("X64", COFF::IMAGE_FILE_MACHINE_AMD64) - .Case("X86", COFF::IMAGE_FILE_MACHINE_I386) - .Default(COFF::IMAGE_FILE_MACHINE_UNKNOWN); - if (MachineType == COFF::IMAGE_FILE_MACHINE_UNKNOWN) - reportError("Unsupported machine architecture"); + if (opt::Arg *Arg = InputArgs.getLastArg(OPT_MACHINE)) { + MachineType = getMachineType(Arg->getValue()); + if (MachineType == COFF::IMAGE_FILE_MACHINE_UNKNOWN) { + reportError(Twine("Unsupported machine architecture ") + Arg->getValue() + + "\n"); + } } else { if (Verbose) outs() << "Machine architecture not specified; assumed X64.\n"; @@ -142,8 +139,8 @@ int main(int Argc, const char **Argv) { SmallString<128> OutputFile; - if (InputArgs.hasArg(OPT_OUT)) { - OutputFile = InputArgs.getLastArgValue(OPT_OUT); + if (opt::Arg *Arg = InputArgs.getLastArg(OPT_OUT)) { + OutputFile = Arg->getValue(); } else { OutputFile = sys::path::filename(StringRef(InputFiles[0])); sys::path::replace_extension(OutputFile, ".obj"); @@ -159,22 +156,8 @@ int main(int Argc, const char **Argv) { DateTimeStamp = getTime(); } - if (Verbose) { - outs() << "Machine: "; - switch (MachineType) { - case COFF::IMAGE_FILE_MACHINE_ARM64: - outs() << "ARM64\n"; - break; - case COFF::IMAGE_FILE_MACHINE_ARMNT: - outs() << "ARM\n"; - break; - case COFF::IMAGE_FILE_MACHINE_I386: - outs() << "X86\n"; - break; - default: - outs() << "X64\n"; - } - } + if (Verbose) + outs() << "Machine: " << machineToStr(MachineType) << '\n'; WindowsResourceParser Parser; diff --git a/utils/gn/secondary/llvm/lib/Object/BUILD.gn b/utils/gn/secondary/llvm/lib/Object/BUILD.gn index 67dde89d6cd..9f4477a084a 100644 --- a/utils/gn/secondary/llvm/lib/Object/BUILD.gn +++ b/utils/gn/secondary/llvm/lib/Object/BUILD.gn @@ -35,6 +35,7 @@ static_library("Object") { "SymbolSize.cpp", "SymbolicFile.cpp", "WasmObjectFile.cpp", + "WindowsMachineFlag.cpp", "WindowsResource.cpp", "XCOFFObjectFile.cpp", ]