6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-02 19:24:25 +00:00
Code Issues Projects Releases Wiki Activity

Use a simpler predicate. NFC.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215218 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-08-08 16:30:17 +00:00
parent 8bbca2cf38
commit 015f57679d
4 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Object/MachO.h
View File

@ -226,7 +226,7 @@ public:
static Triple::ArchType getArch(uint32_t CPUType); static Triple::ArchType getArch(uint32_t CPUType);
static Triple getArch(uint32_t CPUType, uint32_t CPUSubType); static Triple getArch(uint32_t CPUType, uint32_t CPUSubType);
static Triple getArch(StringRef ArchFlag); static bool isValidArch(StringRef ArchFlag);
static Triple getHostArch(); static Triple getHostArch();
static bool classof(const Binary *v) { static bool classof(const Binary *v) {

50
lib/Object/MachOObjectFile.cpp
View File

@ -14,6 +14,7 @@
#include "llvm/Object/MachO.h" #include "llvm/Object/MachO.h"
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/ADT/Triple.h" #include "llvm/ADT/Triple.h"
#include "llvm/Support/DataExtractor.h" #include "llvm/Support/DataExtractor.h"
#include "llvm/Support/Format.h" #include "llvm/Support/Format.h"
@ -1385,37 +1386,24 @@ Triple MachOObjectFile::getHostArch() {
return Triple(sys::getDefaultTargetTriple()); return Triple(sys::getDefaultTargetTriple());
} }
Triple MachOObjectFile::getArch(StringRef ArchFlag) { bool MachOObjectFile::isValidArch(StringRef ArchFlag) {
if (ArchFlag == "i386") return StringSwitch<bool>(ArchFlag)
return Triple("i386-apple-darwin"); .Case("i386", true)
else if (ArchFlag == "x86_64") .Case("x86_64", true)
return Triple("x86_64-apple-darwin"); .Case("x86_64h", true)
else if (ArchFlag == "x86_64h") .Case("armv4t", true)
return Triple("x86_64h-apple-darwin"); .Case("arm", true)
else if (ArchFlag == "armv4t" || ArchFlag == "arm") .Case("armv5e", true)
return Triple("armv4t-apple-darwin"); .Case("armv6", true)
else if (ArchFlag == "armv5e") .Case("armv6m", true)
return Triple("armv5e-apple-darwin"); .Case("armv7em", true)
else if (ArchFlag == "armv6") .Case("armv7k", true)
return Triple("armv6-apple-darwin"); .Case("armv7m", true)
else if (ArchFlag == "armv6m") .Case("armv7s", true)
return Triple("armv6m-apple-darwin"); .Case("arm64", true)
else if (ArchFlag == "armv7em") .Case("ppc", true)
return Triple("armv7em-apple-darwin"); .Case("ppc64", true)
else if (ArchFlag == "armv7k") .Default(false);
return Triple("armv7k-apple-darwin");
else if (ArchFlag == "armv7m")
return Triple("armv7m-apple-darwin");
else if (ArchFlag == "armv7s")
return Triple("armv7s-apple-darwin");
else if (ArchFlag == "arm64")
return Triple("arm64-apple-darwin");
else if (ArchFlag == "ppc")
return Triple("ppc-apple-darwin");
else if (ArchFlag == "ppc64")
return Triple("ppc64-apple-darwin");
else
return Triple();
} }
unsigned MachOObjectFile::getArch() const { unsigned MachOObjectFile::getArch() const {

3
tools/llvm-nm/llvm-nm.cpp
View File

@ -1275,8 +1275,7 @@ int main(int argc, char **argv) {
if (ArchFlags[i] == "all") { if (ArchFlags[i] == "all") {
ArchAll = true; ArchAll = true;
} else { } else {
Triple T = MachOObjectFile::getArch(ArchFlags[i]); if (!MachOObjectFile::isValidArch(ArchFlags[i]))
if (T.getArch() == Triple::UnknownArch)
error("Unknown architecture named '" + ArchFlags[i] + "'", error("Unknown architecture named '" + ArchFlags[i] + "'",
"for the -arch option"); "for the -arch option");
} }

3
tools/llvm-size/llvm-size.cpp
View File

@ -731,8 +731,7 @@ int main(int argc, char **argv) {
if (ArchFlags[i] == "all") { if (ArchFlags[i] == "all") {
ArchAll = true; ArchAll = true;
} else { } else {
Triple T = MachOObjectFile::getArch(ArchFlags[i]); if (!MachOObjectFile::isValidArch(ArchFlags[i])) {
if (T.getArch() == Triple::UnknownArch) {
outs() << ToolName << ": for the -arch option: Unknown architecture " outs() << ToolName << ": for the -arch option: Unknown architecture "
<< "named '" << ArchFlags[i] << "'"; << "named '" << ArchFlags[i] << "'";
return 1; return 1;