From cbabe7f06e2c54425367fac7825cda31c7d07b61 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 19 Aug 2004 21:17:53 +0000 Subject: [PATCH] Moved ConfigData -> Configuration git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15927 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvmc/ConfigData.cpp | 454 ------------------------------------------ tools/llvmc/ConfigData.h | 61 ------ tools/llvmc/Configuration.cpp | 2 +- tools/llvmc/Configuration.h | 2 +- 4 files changed, 2 insertions(+), 517 deletions(-) delete mode 100644 tools/llvmc/ConfigData.cpp delete mode 100644 tools/llvmc/ConfigData.h diff --git a/tools/llvmc/ConfigData.cpp b/tools/llvmc/ConfigData.cpp deleted file mode 100644 index a92550a9d3b..00000000000 --- a/tools/llvmc/ConfigData.cpp +++ /dev/null @@ -1,454 +0,0 @@ -//===- ConfigData.cpp - Configuration Data Mgmt -----------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file was developed by Reid Spencer and is distributed under the -// University of Illinois Open Source License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file implements the parsing of configuration files for the LLVM Compiler -// Driver (llvmc). -// -//===------------------------------------------------------------------------=== - -#include "ConfigData.h" -#include "ConfigLexer.h" -#include "CompilerDriver.h" -#include "Support/CommandLine.h" -#include "Support/StringExtras.h" -#include -#include - -using namespace llvm; - -namespace llvm { - ConfigLexerInfo ConfigLexerState; - InputProvider* ConfigLexerInput = 0; - - InputProvider::~InputProvider() {} - void InputProvider::error(const std::string& msg) { - std::cerr << name << ":" << ConfigLexerState.lineNum << ": Error: " << - msg << "\n"; - errCount++; - } - - void InputProvider::checkErrors() { - if (errCount > 0) { - std::cerr << name << " had " << errCount << " errors. Terminating.\n"; - exit(errCount); - } - } - -} - -namespace { - - class FileInputProvider : public InputProvider { - public: - FileInputProvider(const std::string & fname) - : InputProvider(fname) - , F(fname.c_str()) { - ConfigLexerInput = this; - } - virtual ~FileInputProvider() { F.close(); ConfigLexerInput = 0; } - virtual unsigned read(char *buffer, unsigned max_size) { - if (F.good()) { - F.read(buffer,max_size); - if ( F.gcount() ) return F.gcount() - 1; - } - return 0; - } - - bool okay() { return F.good(); } - private: - std::ifstream F; - }; - - cl::opt DumpTokens("dump-tokens", cl::Optional, cl::Hidden, cl::init(false), - cl::desc("Dump lexical tokens (debug use only).")); - - struct Parser - { - Parser() { - token = EOFTOK; - provider = 0; - confDat = 0; - ConfigLexerState.lineNum = 1; - ConfigLexerState.in_value = false; - ConfigLexerState.StringVal.clear(); - ConfigLexerState.IntegerVal = 0; - }; - - ConfigLexerTokens token; - InputProvider* provider; - CompilerDriver::ConfigData* confDat; - - int next() { - token = Configlex(); - if (DumpTokens) - std::cerr << token << "\n"; - return token; - } - - bool next_is_real() { - next(); - return (token != EOLTOK) && (token != ERRORTOK) && (token != 0); - } - - void eatLineRemnant() { - while (next_is_real()) ; - } - - void error(const std::string& msg, bool skip = true) { - provider->error(msg); - if (skip) - eatLineRemnant(); - } - - std::string parseName() { - std::string result; - if (next() == EQUALS) { - while (next_is_real()) { - switch (token ) { - case STRING : - case OPTION : - result += ConfigLexerState.StringVal + " "; - break; - default: - error("Invalid name"); - break; - } - } - if (result.empty()) - error("Name exepected"); - else - result.erase(result.size()-1,1); - } else - error("= expected"); - return result; - } - - bool parseBoolean() { - bool result = true; - if (next() == EQUALS) { - if (next() == FALSETOK) { - result = false; - } else if (token != TRUETOK) { - error("Expecting boolean value"); - return false; - } - if (next() != EOLTOK && token != 0) { - error("Extraneous tokens after boolean"); - } - } - else - error("Expecting '='"); - return result; - } - - bool parseSubstitution(CompilerDriver::StringVector& optList) { - switch (token) { - case IN_SUBST: optList.push_back("@in@"); break; - case OUT_SUBST: optList.push_back("@out@"); break; - case TIME_SUBST: optList.push_back("@time@"); break; - case STATS_SUBST: optList.push_back("@stats@"); break; - case OPT_SUBST: optList.push_back("@opt@"); break; - case TARGET_SUBST: optList.push_back("@target@"); break; - default: - return false; - } - return true; - } - - void parseOptionList(CompilerDriver::StringVector& optList ) { - if (next() == EQUALS) { - while (next_is_real()) { - if (token == STRING || token == OPTION) - optList.push_back(ConfigLexerState.StringVal); - else if (!parseSubstitution(optList)) { - error("Expecting a program argument or substitution", false); - break; - } - } - } else - error("Expecting '='"); - } - - void parseLang() { - switch (next() ) { - case NAME: - confDat->langName = parseName(); - break; - case OPT1: - parseOptionList(confDat->opts[CompilerDriver::OPT_FAST_COMPILE]); - break; - case OPT2: - parseOptionList(confDat->opts[CompilerDriver::OPT_SIMPLE]); - break; - case OPT3: - parseOptionList(confDat->opts[CompilerDriver::OPT_AGGRESSIVE]); - break; - case OPT4: - parseOptionList(confDat->opts[CompilerDriver::OPT_LINK_TIME]); - break; - case OPT5: - parseOptionList( - confDat->opts[CompilerDriver::OPT_AGGRESSIVE_LINK_TIME]); - break; - default: - error("Expecting 'name' or 'optN' after 'lang.'"); - break; - } - } - - void parseCommand(CompilerDriver::Action& action) { - if (next() == EQUALS) { - if (next() == EOLTOK) { - // no value (valid) - action.program.clear(); - action.args.clear(); - } else { - if (token == STRING || token == OPTION) { - action.program = ConfigLexerState.StringVal; - } else { - error("Expecting a program name"); - } - while (next_is_real()) { - if (token == STRING || token == OPTION) { - action.args.push_back(ConfigLexerState.StringVal); - } else if (!parseSubstitution(action.args)) { - error("Expecting a program argument or substitution", false); - break; - } - } - } - } - } - - void parsePreprocessor() { - switch (next()) { - case COMMAND: - parseCommand(confDat->PreProcessor); - break; - case REQUIRED: - if (parseBoolean()) - confDat->PreProcessor.set(CompilerDriver::REQUIRED_FLAG); - else - confDat->PreProcessor.clear(CompilerDriver::REQUIRED_FLAG); - break; - default: - error("Expecting 'command' or 'required'"); - break; - } - } - - void parseTranslator() { - switch (next()) { - case COMMAND: - parseCommand(confDat->Translator); - break; - case REQUIRED: - if (parseBoolean()) - confDat->Translator.set(CompilerDriver::REQUIRED_FLAG); - else - confDat->Translator.clear(CompilerDriver::REQUIRED_FLAG); - break; - case PREPROCESSES: - if (parseBoolean()) - confDat->Translator.set(CompilerDriver::PREPROCESSES_FLAG); - else - confDat->Translator.clear(CompilerDriver::PREPROCESSES_FLAG); - break; - case OPTIMIZES: - if (parseBoolean()) - confDat->Translator.set(CompilerDriver::OPTIMIZES_FLAG); - else - confDat->Translator.clear(CompilerDriver::OPTIMIZES_FLAG); - break; - case GROKS_DASH_O: - if (parseBoolean()) - confDat->Translator.set(CompilerDriver::GROKS_DASH_O_FLAG); - else - confDat->Translator.clear(CompilerDriver::GROKS_DASH_O_FLAG); - break; - case OUTPUT_IS_ASM: - if (parseBoolean()) - confDat->Translator.set(CompilerDriver::OUTPUT_IS_ASM_FLAG); - else - confDat->Translator.clear(CompilerDriver::OUTPUT_IS_ASM_FLAG); - break; - - default: - error("Expecting 'command', 'required', 'preprocesses', " - "'groks_dash_O' or 'optimizes'"); - break; - } - } - - void parseOptimizer() { - switch (next()) { - case COMMAND: - parseCommand(confDat->Optimizer); - break; - case PREPROCESSES: - if (parseBoolean()) - confDat->Optimizer.set(CompilerDriver::PREPROCESSES_FLAG); - else - confDat->Optimizer.clear(CompilerDriver::PREPROCESSES_FLAG); - break; - case TRANSLATES: - if (parseBoolean()) - confDat->Optimizer.set(CompilerDriver::TRANSLATES_FLAG); - else - confDat->Optimizer.clear(CompilerDriver::TRANSLATES_FLAG); - break; - case GROKS_DASH_O: - if (parseBoolean()) - confDat->Optimizer.set(CompilerDriver::GROKS_DASH_O_FLAG); - else - confDat->Optimizer.clear(CompilerDriver::GROKS_DASH_O_FLAG); - break; - case OUTPUT_IS_ASM: - if (parseBoolean()) - confDat->Translator.set(CompilerDriver::OUTPUT_IS_ASM_FLAG); - else - confDat->Translator.clear(CompilerDriver::OUTPUT_IS_ASM_FLAG); - break; - default: - error("Expecting 'command' or 'groks_dash_O'"); - break; - } - } - - void parseAssembler() { - switch(next()) { - case COMMAND: - parseCommand(confDat->Assembler); - break; - default: - error("Expecting 'command'"); - break; - } - } - - void parseLinker() { - switch(next()) { - case COMMAND: - parseCommand(confDat->Linker); - break; - case GROKS_DASH_O: - if (parseBoolean()) - confDat->Linker.set(CompilerDriver::GROKS_DASH_O_FLAG); - else - confDat->Linker.clear(CompilerDriver::GROKS_DASH_O_FLAG); - break; - default: - error("Expecting 'command'"); - break; - } - } - - void parseAssignment() { - switch (token) { - case LANG: parseLang(); break; - case PREPROCESSOR: parsePreprocessor(); break; - case TRANSLATOR: parseTranslator(); break; - case OPTIMIZER: parseOptimizer(); break; - case ASSEMBLER: parseAssembler(); break; - case LINKER: parseLinker(); break; - case EOLTOK: break; // just ignore - case ERRORTOK: - default: - error("Invalid top level configuration item"); - break; - } - } - - void parseFile() { - while ( next() != EOFTOK ) { - if (token == ERRORTOK) - error("Invalid token"); - else if (token != EOLTOK) - parseAssignment(); - } - provider->checkErrors(); - } - }; - - void - ParseConfigData(InputProvider& provider, CompilerDriver::ConfigData& confDat) { - Parser p; - p.token = EOFTOK; - p.provider = &provider; - p.confDat = &confDat; - p.parseFile(); - } -} - -CompilerDriver::ConfigData* -LLVMC_ConfigDataProvider::ReadConfigData(const std::string& ftype) { - CompilerDriver::ConfigData* result = 0; - if (configDir.empty()) { - FileInputProvider fip( std::string("/etc/llvm/") + ftype ); - if (!fip.okay()) { - fip.error("Configuration for '" + ftype + "' is not available."); - fip.checkErrors(); - } - else { - result = new CompilerDriver::ConfigData(); - ParseConfigData(fip,*result); - } - } else { - FileInputProvider fip( configDir + "/" + ftype ); - if (!fip.okay()) { - fip.error("Configuration for '" + ftype + "' is not available."); - fip.checkErrors(); - } - else { - result = new CompilerDriver::ConfigData(); - ParseConfigData(fip,*result); - } - } - return result; -} - -LLVMC_ConfigDataProvider::LLVMC_ConfigDataProvider() - : Configurations() - , configDir() -{ - Configurations.clear(); -} - -LLVMC_ConfigDataProvider::~LLVMC_ConfigDataProvider() -{ - ConfigDataMap::iterator cIt = Configurations.begin(); - while (cIt != Configurations.end()) { - CompilerDriver::ConfigData* cd = cIt->second; - ++cIt; - delete cd; - } - Configurations.clear(); -} - -CompilerDriver::ConfigData* -LLVMC_ConfigDataProvider::ProvideConfigData(const std::string& filetype) { - CompilerDriver::ConfigData* result = 0; - if (!Configurations.empty()) { - ConfigDataMap::iterator cIt = Configurations.find(filetype); - if ( cIt != Configurations.end() ) { - // We found one in the case, return it. - result = cIt->second; - } - } - if (result == 0) { - // The configuration data doesn't exist, we have to go read it. - result = ReadConfigData(filetype); - // If we got one, cache it - if ( result != 0 ) - Configurations.insert(std::make_pair(filetype,result)); - } - return result; // Might return 0 -} - -// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab diff --git a/tools/llvmc/ConfigData.h b/tools/llvmc/ConfigData.h deleted file mode 100644 index e94fb896428..00000000000 --- a/tools/llvmc/ConfigData.h +++ /dev/null @@ -1,61 +0,0 @@ -//===- ConfigData.h - Configuration Data Provider ---------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file was developed by Reid Spencer and is distributed under the -// University of Illinois Open Source License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file declares the LLVMC_ConfigDataProvider class which implements the -// generation of ConfigData objects for the CompilerDriver. -// -//===------------------------------------------------------------------------=== -#ifndef LLVM_TOOLS_LLVMC_CONFIGDATA_H -#define LLVM_TOOLS_LLVMC_CONFIGDATA_H - -#include "CompilerDriver.h" -#include - -namespace llvm { - /// This class provides the high level interface to the LLVM Compiler Driver. - /// The driver's purpose is to make it easier for compiler writers and users - /// of LLVM to utilize the compiler toolkits and LLVM toolset by learning only - /// the interface of one program (llvmc). - /// - /// @see llvmc.cpp - /// @brief The interface to the LLVM Compiler Driver. - class LLVMC_ConfigDataProvider : public CompilerDriver::ConfigDataProvider { - /// @name Constructor - /// @{ - public: - LLVMC_ConfigDataProvider(); - virtual ~LLVMC_ConfigDataProvider(); - - /// @name Methods - /// @{ - public: - /// @brief Provide the configuration data to the CompilerDriver. - virtual CompilerDriver::ConfigData* - ProvideConfigData(const std::string& filetype); - - /// @brief Allow the configuration directory to be set - virtual void setConfigDir(const std::string& dirName) { configDir = dirName; } - - private: - CompilerDriver::ConfigData* ReadConfigData(const std::string& ftype); - - /// @} - /// @name Data - /// @{ - private: - /// @brief This type is used internally to hold the configuration data. - typedef hash_map,std::equal_to > ConfigDataMap; - ConfigDataMap Configurations; ///< The cache of configurations - std::string configDir; - /// @} - }; -} - -#endif diff --git a/tools/llvmc/Configuration.cpp b/tools/llvmc/Configuration.cpp index a92550a9d3b..0b42e410f52 100644 --- a/tools/llvmc/Configuration.cpp +++ b/tools/llvmc/Configuration.cpp @@ -1,4 +1,4 @@ -//===- ConfigData.cpp - Configuration Data Mgmt -----------------*- C++ -*-===// +//===- Configuration.cpp - Configuration Data Mgmt --------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // diff --git a/tools/llvmc/Configuration.h b/tools/llvmc/Configuration.h index e94fb896428..59335aa92f6 100644 --- a/tools/llvmc/Configuration.h +++ b/tools/llvmc/Configuration.h @@ -1,4 +1,4 @@ -//===- ConfigData.h - Configuration Data Provider ---------------*- C++ -*-===// +//===- Configuration.h - Configuration Data Mgmt ----------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // -- 2.11.0