mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-21 18:29:46 +00:00
Move the logic for printing the registered targets into a static
function on the TargetRegistry. Also clean it up and use the modern LLVM utility libraries available instead of rolling a few things manually. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135756 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
6d51d26a24
commit
077c408717
@ -459,6 +459,10 @@ namespace llvm {
|
||||
}
|
||||
};
|
||||
|
||||
/// printRegisteredTargetsForVersion - Print the registered targets
|
||||
/// appropriately for inclusion in a tool's version output.
|
||||
static void printRegisteredTargetsForVersion();
|
||||
|
||||
/// @name Registry Access
|
||||
/// @{
|
||||
|
||||
|
@ -1332,11 +1332,6 @@ static void (*OverrideVersionPrinter)() = 0;
|
||||
|
||||
static std::vector<void (*)()>* ExtraVersionPrinters = 0;
|
||||
|
||||
static int TargetArraySortFn(const void *LHS, const void *RHS) {
|
||||
typedef std::pair<const char *, const Target*> pair_ty;
|
||||
return strcmp(((const pair_ty*)LHS)->first, ((const pair_ty*)RHS)->first);
|
||||
}
|
||||
|
||||
namespace {
|
||||
class VersionPrinter {
|
||||
public:
|
||||
@ -1364,27 +1359,11 @@ public:
|
||||
#endif
|
||||
<< " Host: " << sys::getHostTriple() << '\n'
|
||||
<< " Host CPU: " << CPU << '\n'
|
||||
<< '\n'
|
||||
<< " Registered Targets:\n";
|
||||
<< '\n';
|
||||
|
||||
std::vector<std::pair<const char *, const Target*> > Targets;
|
||||
size_t Width = 0;
|
||||
for (TargetRegistry::iterator it = TargetRegistry::begin(),
|
||||
ie = TargetRegistry::end(); it != ie; ++it) {
|
||||
Targets.push_back(std::make_pair(it->getName(), &*it));
|
||||
Width = std::max(Width, strlen(Targets.back().first));
|
||||
}
|
||||
if (!Targets.empty())
|
||||
qsort(&Targets[0], Targets.size(), sizeof(Targets[0]),
|
||||
TargetArraySortFn);
|
||||
|
||||
for (unsigned i = 0, e = Targets.size(); i != e; ++i) {
|
||||
OS << " " << Targets[i].first;
|
||||
OS.indent(Width - strlen(Targets[i].first)) << " - "
|
||||
<< Targets[i].second->getShortDescription() << '\n';
|
||||
}
|
||||
if (Targets.empty())
|
||||
OS << " (none)\n";
|
||||
// FIXME: This needs to be moved into each commandline tool to remove the
|
||||
// layer violation.
|
||||
TargetRegistry::printRegisteredTargetsForVersion();
|
||||
}
|
||||
void operator=(bool OptionWasSpecified) {
|
||||
if (!OptionWasSpecified) return;
|
||||
|
@ -7,9 +7,13 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "llvm/ADT/STLExtras.h"
|
||||
#include "llvm/ADT/StringRef.h"
|
||||
#include "llvm/Target/TargetRegistry.h"
|
||||
#include "llvm/Support/Host.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include <cassert>
|
||||
#include <vector>
|
||||
using namespace llvm;
|
||||
|
||||
// Clients are responsible for avoid race conditions in registration.
|
||||
@ -90,3 +94,29 @@ const Target *TargetRegistry::getClosestTargetForJIT(std::string &Error) {
|
||||
return TheTarget;
|
||||
}
|
||||
|
||||
static int TargetArraySortFn(const void *LHS, const void *RHS) {
|
||||
typedef std::pair<StringRef, const Target*> pair_ty;
|
||||
return ((const pair_ty*)LHS)->first.compare(((const pair_ty*)RHS)->first);
|
||||
}
|
||||
|
||||
void TargetRegistry::printRegisteredTargetsForVersion() {
|
||||
std::vector<std::pair<StringRef, const Target*> > Targets;
|
||||
size_t Width = 0;
|
||||
for (TargetRegistry::iterator I = TargetRegistry::begin(),
|
||||
E = TargetRegistry::end();
|
||||
I != E; ++I) {
|
||||
Targets.push_back(std::make_pair(I->getName(), &*I));
|
||||
Width = std::max(Width, Targets.back().first.size());
|
||||
}
|
||||
array_pod_sort(Targets.begin(), Targets.end(), TargetArraySortFn);
|
||||
|
||||
raw_ostream &OS = outs();
|
||||
OS << " Registered Targets:\n";
|
||||
for (unsigned i = 0, e = Targets.size(); i != e; ++i) {
|
||||
OS << " " << Targets[i].first;
|
||||
OS.indent(Width - Targets[i].first.size()) << " - "
|
||||
<< Targets[i].second->getShortDescription() << '\n';
|
||||
}
|
||||
if (Targets.empty())
|
||||
OS << " (none)\n";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user