From 6501145ec6b4e555d23a835631a848ea35b59226 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 15 Jul 2009 11:48:36 +0000 Subject: [PATCH] Kill off unused TargetMachineRegistry methods and ivars. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75774 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/TargetMachineRegistry.h | 32 +++---------- include/llvm/Target/TargetRegistry.h | 2 - lib/Target/TargetMachineRegistry.cpp | 51 --------------------- 3 files changed, 7 insertions(+), 78 deletions(-) delete mode 100644 lib/Target/TargetMachineRegistry.cpp diff --git a/include/llvm/Target/TargetMachineRegistry.h b/include/llvm/Target/TargetMachineRegistry.h index 80ff188fac5..a5cc0a607c9 100644 --- a/include/llvm/Target/TargetMachineRegistry.h +++ b/include/llvm/Target/TargetMachineRegistry.h @@ -30,17 +30,10 @@ namespace llvm { const Target &TheTarget; const char *Name; const char *ShortDesc; - TargetMachine *(*CtorFn)(const Module &, const std::string &); - unsigned (*ModuleMatchQualityFn)(const Module &M); - unsigned (*JITMatchQualityFn)(); public: - TargetMachineRegistryEntry(const Target &T, const char *N, const char *SD, - TargetMachine *(*CF)(const Module &, const std::string &), - unsigned (*MMF)(const Module &M), - unsigned (*JMF)()) - : TheTarget(T), Name(N), ShortDesc(SD), CtorFn(CF), - ModuleMatchQualityFn(MMF), JITMatchQualityFn(JMF) {} + TargetMachineRegistryEntry(const Target &T, const char *N, const char *SD) + : TheTarget(T), Name(N), ShortDesc(SD) {} }; template<> @@ -53,24 +46,15 @@ namespace llvm { }; struct TargetMachineRegistry : public Registry { - /// getClosestStaticTargetForModule - Given an LLVM module, pick the best - /// target that is compatible with the module. If no close target can be - /// found, this returns null and sets the Error string to a reason. - static const entry *getClosestStaticTargetForModule(const Module &M, - std::string &Error); - - /// getClosestTargetForJIT - Pick the best target that is compatible with - /// the current host. If no close target can be found, this returns null - /// and sets the Error string to a reason. - static const entry *getClosestTargetForJIT(std::string &Error); }; //===--------------------------------------------------------------------===// /// RegisterTarget - This class is used to make targets automatically register - /// themselves with the tool they are linked. Targets should define an - /// instance of this and implement the static methods described in the - /// TargetMachine comments. + /// themselves with the tools they are linked with. Targets should define an + /// single global Target instance and register it using the TargetRegistry + /// interfaces. Targets must also include a static instance of this class. + /// /// The type 'TargetMachineImpl' should provide a constructor with two /// parameters: /// - const Module& M: the module that is being compiled: @@ -80,9 +64,7 @@ namespace llvm { template struct RegisterTarget { RegisterTarget(Target &T, const char *Name, const char *ShortDesc) - : Entry(T, Name, ShortDesc, &Allocator, - &TargetMachineImpl::getModuleMatchQuality, - &TargetMachineImpl::getJITMatchQuality), + : Entry(T, Name, ShortDesc), Node(Entry) { TargetRegistry::RegisterTargetMachine(T, &Allocator); } diff --git a/include/llvm/Target/TargetRegistry.h b/include/llvm/Target/TargetRegistry.h index b3f9e8b897b..d445294ad39 100644 --- a/include/llvm/Target/TargetRegistry.h +++ b/include/llvm/Target/TargetRegistry.h @@ -49,8 +49,6 @@ namespace llvm { bool); friend struct TargetRegistry; - // FIXME: Temporary hack, please remove. - friend struct TargetMachineRegistry; /// Next - The next registered target in the linked list, maintained by the /// TargetRegistry. diff --git a/lib/Target/TargetMachineRegistry.cpp b/lib/Target/TargetMachineRegistry.cpp deleted file mode 100644 index e9887be9237..00000000000 --- a/lib/Target/TargetMachineRegistry.cpp +++ /dev/null @@ -1,51 +0,0 @@ -//===-- TargetMachineRegistry.cpp - Target Auto Registration Impl ---------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file exposes the RegisterTarget class, which TargetMachine -// implementations should use to register themselves with the system. This file -// also exposes the TargetMachineRegistry class, which allows tools to inspect -// all of registered targets. -// -//===----------------------------------------------------------------------===// - -#include "llvm/Target/TargetMachineRegistry.h" -#include -using namespace llvm; - -/// getClosestStaticTargetForModule - Given an LLVM module, pick the best target -/// that is compatible with the module. If no close target can be found, this -/// returns null and sets the Error string to a reason. -const TargetMachineRegistry::entry * -TargetMachineRegistry::getClosestStaticTargetForModule(const Module &M, - std::string &Error) { - const Target *T = TargetRegistry::getClosestStaticTargetForModule(M, Error); - if (!T) - return 0; - // FIXME: Temporary hack, please remove. - return new TargetMachineRegistry::entry(*T, T->Name, T->ShortDesc, - T->TargetMachineCtorFn, - T->ModuleMatchQualityFn, - T->JITMatchQualityFn); -} - -/// getClosestTargetForJIT - Pick the best target that is compatible with -/// the current host. If no close target can be found, this returns null -/// and sets the Error string to a reason. -const TargetMachineRegistry::entry * -TargetMachineRegistry::getClosestTargetForJIT(std::string &Error) { - const Target *T = TargetRegistry::getClosestTargetForJIT(Error); - if (!T) - return 0; - // FIXME: Temporary hack, please remove. - return new TargetMachineRegistry::entry(*T, T->Name, T->ShortDesc, - T->TargetMachineCtorFn, - T->ModuleMatchQualityFn, - T->JITMatchQualityFn); -} -